Skip to content

Commit

Permalink
remove GC patch as fixed upstream
Browse files Browse the repository at this point in the history
also removes temporary loot table manipulation
  • Loading branch information
sam-kirby committed Oct 26, 2020
1 parent ce68fd9 commit 6d79467
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 69 deletions.
4 changes: 0 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,6 @@ dependencies {
compile fg.deobf('curse.maven:jaff-1.7:2448283')
compile fg.deobf('slimeknights:TConstruct:1.12.2-2.13.0.184')
compile 'curse.maven:realisticitemdrops_deobf_1.2.14:2630385'
compile fg.deobf('curse.maven:primalcore_1.12.2-0.6.105:2734701')

// TODO: remove
compile fg.deobf('curse.maven:twilightforest-3.8.689:2618264')
}

mixin {
Expand Down
28 changes: 0 additions & 28 deletions src/main/java/tv/darkosto/sevpatches/SevPatches.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,7 @@

import net.minecraft.entity.item.EntityItem;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
import net.minecraft.world.storage.loot.LootEntry;
import net.minecraft.world.storage.loot.LootEntryItem;
import net.minecraft.world.storage.loot.LootPool;
import net.minecraft.world.storage.loot.LootTable;
import net.minecraft.world.storage.loot.RandomValueRange;
import net.minecraft.world.storage.loot.conditions.LootCondition;
import net.minecraft.world.storage.loot.functions.LootFunction;
import net.minecraft.world.storage.loot.functions.SetCount;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.LootTableLoadEvent;
import net.minecraftforge.event.entity.EntityJoinWorldEvent;
import net.minecraftforge.fml.common.Loader;
import net.minecraftforge.fml.common.Mod;
Expand All @@ -27,7 +17,6 @@
import org.apache.logging.log4j.Logger;
import realdrops.entities.EntityItemLoot;
import slimeknights.tconstruct.tools.ranged.RangedEvents;
import twilightforest.item.TFItems;

import java.util.ArrayList;
import java.util.List;
Expand Down Expand Up @@ -82,23 +71,6 @@ public void onServerTick(TickEvent.ServerTickEvent event) {
}
}

// Temporary loot adder
// TODO: remove
@SubscribeEvent
public void onLootTableLoad(LootTableLoadEvent event) {
ResourceLocation tableName = event.getName();
if (tableName.getNamespace().equals("twilightforest") && tableName.getPath().split("/")[0].equals("structures") && !tableName.getPath().matches(".*(common|uncommon|useless|rare|ultrarare)$")) {
LootTable table = event.getTable();
LootEntry liveRoot = new LootEntryItem(TFItems.liveroot, 1, 1, new LootFunction[]{new SetCount(new LootCondition[]{}, new RandomValueRange(1, 5))}, new LootCondition[]{}, "twilightforest:liveroot");

LootPool pool = new LootPool(new LootEntry[]{liveRoot}, new LootCondition[]{}, new RandomValueRange(1), new RandomValueRange(0), "liveroot");
table.addPool(pool);

Logger logger = LogManager.getLogger();
logger.debug("Adding liveroot pool to {}", tableName);
}
}

@Mod.EventHandler
public void onServerStopping(FMLServerStoppingEvent event) {
itemList.clear();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import net.minecraft.launchwrapper.IClassTransformer;
import tv.darkosto.sevpatches.core.patches.PatchAstralAmulet;
import tv.darkosto.sevpatches.core.patches.PatchAstralBootesCheat;
import tv.darkosto.sevpatches.core.patches.PatchGcPickBlock;
import tv.darkosto.sevpatches.core.patches.PatchHarvestOOO;
import tv.darkosto.sevpatches.core.patches.PatchInControlHandlerPriority;
import tv.darkosto.sevpatches.core.patches.PatchJaffFishAreFish;
Expand Down Expand Up @@ -34,8 +33,6 @@ public byte[] transform(String name, String transformedName, byte[] basicClass)
return new PatchAstralAmulet(basicClass).apply();
case "mcjty.incontrol.ForgeEventHandlers":
return new PatchInControlHandlerPriority(basicClass).apply();
case "micdoodle8.mods.galacticraft.core.blocks.BlockBasic":
return new PatchGcPickBlock(basicClass).apply();
case "nmd.primal.core.common.entities.living.EntityHammerHead":
return new PatchPrimalNicerHammerHeads(basicClass).apply();
case "nmd.primal.core.common.entities.living.EntityCanisCampestris":
Expand Down

This file was deleted.

0 comments on commit 6d79467

Please sign in to comment.