Skip to content

Commit 6d79467

Browse files
committed
remove GC patch as fixed upstream
also removes temporary loot table manipulation
1 parent ce68fd9 commit 6d79467

File tree

4 files changed

+0
-69
lines changed

4 files changed

+0
-69
lines changed

build.gradle

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,6 @@ dependencies {
8585
compile fg.deobf('curse.maven:jaff-1.7:2448283')
8686
compile fg.deobf('slimeknights:TConstruct:1.12.2-2.13.0.184')
8787
compile 'curse.maven:realisticitemdrops_deobf_1.2.14:2630385'
88-
compile fg.deobf('curse.maven:primalcore_1.12.2-0.6.105:2734701')
89-
90-
// TODO: remove
91-
compile fg.deobf('curse.maven:twilightforest-3.8.689:2618264')
9288
}
9389

9490
mixin {

src/main/java/tv/darkosto/sevpatches/SevPatches.java

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,7 @@
22

33
import net.minecraft.entity.item.EntityItem;
44
import net.minecraft.item.ItemStack;
5-
import net.minecraft.util.ResourceLocation;
6-
import net.minecraft.world.storage.loot.LootEntry;
7-
import net.minecraft.world.storage.loot.LootEntryItem;
8-
import net.minecraft.world.storage.loot.LootPool;
9-
import net.minecraft.world.storage.loot.LootTable;
10-
import net.minecraft.world.storage.loot.RandomValueRange;
11-
import net.minecraft.world.storage.loot.conditions.LootCondition;
12-
import net.minecraft.world.storage.loot.functions.LootFunction;
13-
import net.minecraft.world.storage.loot.functions.SetCount;
145
import net.minecraftforge.common.MinecraftForge;
15-
import net.minecraftforge.event.LootTableLoadEvent;
166
import net.minecraftforge.event.entity.EntityJoinWorldEvent;
177
import net.minecraftforge.fml.common.Loader;
188
import net.minecraftforge.fml.common.Mod;
@@ -27,7 +17,6 @@
2717
import org.apache.logging.log4j.Logger;
2818
import realdrops.entities.EntityItemLoot;
2919
import slimeknights.tconstruct.tools.ranged.RangedEvents;
30-
import twilightforest.item.TFItems;
3120

3221
import java.util.ArrayList;
3322
import java.util.List;
@@ -82,23 +71,6 @@ public void onServerTick(TickEvent.ServerTickEvent event) {
8271
}
8372
}
8473

85-
// Temporary loot adder
86-
// TODO: remove
87-
@SubscribeEvent
88-
public void onLootTableLoad(LootTableLoadEvent event) {
89-
ResourceLocation tableName = event.getName();
90-
if (tableName.getNamespace().equals("twilightforest") && tableName.getPath().split("/")[0].equals("structures") && !tableName.getPath().matches(".*(common|uncommon|useless|rare|ultrarare)$")) {
91-
LootTable table = event.getTable();
92-
LootEntry liveRoot = new LootEntryItem(TFItems.liveroot, 1, 1, new LootFunction[]{new SetCount(new LootCondition[]{}, new RandomValueRange(1, 5))}, new LootCondition[]{}, "twilightforest:liveroot");
93-
94-
LootPool pool = new LootPool(new LootEntry[]{liveRoot}, new LootCondition[]{}, new RandomValueRange(1), new RandomValueRange(0), "liveroot");
95-
table.addPool(pool);
96-
97-
Logger logger = LogManager.getLogger();
98-
logger.debug("Adding liveroot pool to {}", tableName);
99-
}
100-
}
101-
10274
@Mod.EventHandler
10375
public void onServerStopping(FMLServerStoppingEvent event) {
10476
itemList.clear();

src/main/java/tv/darkosto/sevpatches/core/SevPatchesTransformer.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import net.minecraft.launchwrapper.IClassTransformer;
44
import tv.darkosto.sevpatches.core.patches.PatchAstralAmulet;
55
import tv.darkosto.sevpatches.core.patches.PatchAstralBootesCheat;
6-
import tv.darkosto.sevpatches.core.patches.PatchGcPickBlock;
76
import tv.darkosto.sevpatches.core.patches.PatchHarvestOOO;
87
import tv.darkosto.sevpatches.core.patches.PatchInControlHandlerPriority;
98
import tv.darkosto.sevpatches.core.patches.PatchJaffFishAreFish;
@@ -34,8 +33,6 @@ public byte[] transform(String name, String transformedName, byte[] basicClass)
3433
return new PatchAstralAmulet(basicClass).apply();
3534
case "mcjty.incontrol.ForgeEventHandlers":
3635
return new PatchInControlHandlerPriority(basicClass).apply();
37-
case "micdoodle8.mods.galacticraft.core.blocks.BlockBasic":
38-
return new PatchGcPickBlock(basicClass).apply();
3936
case "nmd.primal.core.common.entities.living.EntityHammerHead":
4037
return new PatchPrimalNicerHammerHeads(basicClass).apply();
4138
case "nmd.primal.core.common.entities.living.EntityCanisCampestris":

src/main/java/tv/darkosto/sevpatches/core/patches/PatchGcPickBlock.java

Lines changed: 0 additions & 34 deletions
This file was deleted.

0 commit comments

Comments
 (0)