Delete brute forcing of items to generate Thaumcraft aspects (#213)

Co-authored-by: Martin Robertz <[email protected]>

dependencies.gradle

@@ -1,24 +1,24 @@
 // Add your dependencies here
 
 dependencies {
-    api('com.github.GTNewHorizons:EnderCore:0.4.8:dev') {transitive = false}
+    api('com.github.GTNewHorizons:EnderCore:0.5.0:dev') {transitive = false}
     compileOnly('com.github.GTNewHorizons:ForestryMC:4.10.17:dev')
-    compileOnly('com.github.GTNewHorizons:NotEnoughItems:2.7.91-GTNH:dev')
-    api("com.github.GTNewHorizons:GTNHLib:0.6.40:dev")
+    compileOnly('com.github.GTNewHorizons:NotEnoughItems:2.8.19-GTNH:dev')
+    api("com.github.GTNewHorizons:GTNHLib:0.7.0:dev")
     compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.45:dev')
     api('curse.maven:cofh-lib-220333:2388748') // https://www.curseforge.com/minecraft/mc-mods/cofh-lib/files/2388748
     shadowImplementation('cglib:cglib-nodep:3.3.0')
-    api("com.github.GTNewHorizons:TinkersConstruct:1.13.54-GTNH:dev")
+    api("com.github.GTNewHorizons:TinkersConstruct:1.14.6-GTNH:dev")
 
-    compileOnly('com.github.GTNewHorizons:waila:1.8.14:api') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-691-GTNH:api') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:Baubles-Expanded:2.1.16-GTNH:dev') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.474:dev') {transitive = false}
-    compileOnly("com.github.GTNewHorizons:ModularUI2:2.2.10-1.7.10:dev") {transitive = false}
-    compileOnly('com.github.GTNewHorizons:Railcraft:9.16.33:dev') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:StorageDrawers:2.1.9-GTNH:api') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:Chisel:2.16.14-GTNH:dev') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:OpenComputers:1.11.20-GTNH:api') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:waila:1.9.2:api') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-717-GTNH:api') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:Baubles-Expanded:2.2.1-GTNH:dev') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.52.60:dev') {transitive = false}
+    compileOnly("com.github.GTNewHorizons:ModularUI2:2.3.4-1.7.10:dev") {transitive = false}
+    compileOnly('com.github.GTNewHorizons:Railcraft:9.17.0:dev') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:StorageDrawers:2.2.0-GTNH:api') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:Chisel:2.17.0-GTNH:dev') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:OpenComputers:1.12.2-GTNH:api') {transitive = false}
     compileOnly('curse.maven:minefactory-reloaded-66672:2366150') // https://www.curseforge.com/minecraft/mc-mods/minefactory-reloaded/files/2366150
     compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev')
     compileOnly('curse.maven:ee3-65509:2305023') // https://www.curseforge.com/minecraft/mc-mods/ee3/files/2305023

src/main/java/crazypants/enderio/CommonProxy.java

@@ -9,12 +9,18 @@ import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.World;
 
 import cpw.mods.fml.common.FMLCommonHandler;
+import cpw.mods.fml.common.event.FMLServerAboutToStartEvent;
+import cpw.mods.fml.common.event.FMLServerStartedEvent;
+import cpw.mods.fml.common.event.FMLServerStoppedEvent;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.common.gameevent.TickEvent.ClientTickEvent;
 import cpw.mods.fml.common.gameevent.TickEvent.Phase;
 import cpw.mods.fml.common.gameevent.TickEvent.ServerTickEvent;
+import crazypants.enderio.conduit.ConduitNetworkTickHandler;
 import crazypants.enderio.conduit.IConduit;
 import crazypants.enderio.conduit.render.ConduitRenderer;
+import crazypants.enderio.machine.hypercube.HyperCubeRegister;
+import crazypants.enderio.machine.transceiver.ServerChannelRegister;
 
 public class CommonProxy {
 
@@ -23,6 +29,7 @@ public class CommonProxy {
     protected long serverTickCount = 0;
     protected long clientTickCount = 0;
     protected final TickTimer tickTimer = new TickTimer();
+    public ConduitNetworkTickHandler conduitNetworkTickHandler = null;
 
     public CommonProxy() {}
 
@@ -44,7 +51,7 @@ public class CommonProxy {
     }
 
     public void loadIcons() {
-        ;
+
     }
 
     public void load() {
@@ -76,6 +83,22 @@ public class CommonProxy {
         return new ResourceLocation(EnderIO.DOMAIN + TEXTURE_PATH + name + TEXTURE_EXT);
     }
 
+    public void onServerAboutToStart(FMLServerAboutToStartEvent event) {
+        conduitNetworkTickHandler = new ConduitNetworkTickHandler();
+        FMLCommonHandler.instance().bus().register(conduitNetworkTickHandler);
+    }
+
+    public void onServerStarted(FMLServerStartedEvent event) {
+        HyperCubeRegister.load();
+        ServerChannelRegister.load();
+    }
+
+    public void onServerStopped(FMLServerStoppedEvent event) {
+        HyperCubeRegister.unload();
+        FMLCommonHandler.instance().bus().unregister(conduitNetworkTickHandler);
+        conduitNetworkTickHandler = null;
+    }
+
     public final class TickTimer {
 
         @SubscribeEvent

src/main/java/crazypants/enderio/EnderIO.java

@@ -38,6 +38,7 @@ import cpw.mods.fml.common.event.FMLLoadCompleteEvent;
 import cpw.mods.fml.common.event.FMLMissingMappingsEvent;
 import cpw.mods.fml.common.event.FMLPostInitializationEvent;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
+import cpw.mods.fml.common.event.FMLServerAboutToStartEvent;
 import cpw.mods.fml.common.event.FMLServerStartedEvent;
 import cpw.mods.fml.common.event.FMLServerStoppedEvent;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
@@ -111,7 +112,6 @@ import crazypants.enderio.machine.generator.zombie.BlockZombieGenerator.BlockEnd
 import crazypants.enderio.machine.generator.zombie.BlockZombieGenerator.BlockFrankenZombieGenerator;
 import crazypants.enderio.machine.generator.zombie.PacketNutrientTank;
 import crazypants.enderio.machine.hypercube.BlockHyperCube;
-import crazypants.enderio.machine.hypercube.HyperCubeRegister;
 import crazypants.enderio.machine.invpanel.BlockInventoryPanel;
 import crazypants.enderio.machine.killera.BlockKillerJoe;
 import crazypants.enderio.machine.light.BlockElectricLight;
@@ -894,22 +894,18 @@ public class EnderIO {
     }
 
     @EventHandler
-    public void serverStarted(FMLServerStartedEvent event) {
-        HyperCubeRegister.load();
-        ServerChannelRegister.load();
-    }
-
-    @SubscribeEvent
-    public void worldSaved(WorldEvent.Save event) {
-        // Only save together with the overworld, because this gets called for every dimension separately
-        if (event.world.provider != null && event.world.provider.dimensionId == 0) {
-            ServerChannelRegister.store();
-        }
+    public void onServerAboutToStart(FMLServerAboutToStartEvent event) {
+        proxy.onServerAboutToStart(event);
     }
 
     @EventHandler
-    public void serverStopped(FMLServerStoppedEvent event) {
-        HyperCubeRegister.unload();
+    public void onServerStarted(FMLServerStartedEvent event) {
+        proxy.onServerStarted(event);
+    }
+
+    @EventHandler
+    public void onServerStopped(FMLServerStoppedEvent event) {
+        proxy.onServerStopped(event);
     }
 
     @EventHandler
@@ -921,4 +917,12 @@ public class EnderIO {
             }
         }
     }
+
+    @SubscribeEvent
+    public void worldSaved(WorldEvent.Save event) {
+        // Only save together with the overworld, because this gets called for every dimension separately
+        if (event.world.provider != null && event.world.provider.dimensionId == 0) {
+            ServerChannelRegister.store();
+        }
+    }
 }

src/main/java/crazypants/enderio/conduit/AbstractConduitNetwork.java

@@ -7,6 +7,8 @@ import java.util.List;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 
+import crazypants.enderio.EnderIO;
+
 // I=base type, I is the base class of the implementations accepted by the network
 public abstract class AbstractConduitNetwork<T extends IConduit, I extends T> {
 
@@ -64,7 +66,7 @@ public abstract class AbstractConduitNetwork<T extends IConduit, I extends T> {
     public void addConduit(I con) {
         if (!conduits.contains(con)) {
             if (conduits.isEmpty()) {
-                ConduitNetworkTickHandler.instance.registerNetwork(this);
+                EnderIO.proxy.conduitNetworkTickHandler.registerNetwork(this);
             }
             conduits.add(con);
         }
@@ -75,7 +77,7 @@ public abstract class AbstractConduitNetwork<T extends IConduit, I extends T> {
             con.setNetwork(null);
         }
         conduits.clear();
-        ConduitNetworkTickHandler.instance.unregisterNetwork(this);
+        EnderIO.proxy.conduitNetworkTickHandler.unregisterNetwork(this);
     }
 
     public List<I> getConduits() {

src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java

@@ -32,7 +32,6 @@ import com.enderio.core.client.render.BoundingBox;
 import com.enderio.core.common.util.BlockCoord;
 import com.enderio.core.common.util.Util;
 
-import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.Optional;
 import cpw.mods.fml.common.Optional.Interface;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
@@ -93,9 +92,6 @@ public class BlockConduitBundle extends BlockEio
 
     public static BlockConduitBundle create() {
 
-        MinecraftForge.EVENT_BUS.register(ConduitNetworkTickHandler.instance);
-        FMLCommonHandler.instance().bus().register(ConduitNetworkTickHandler.instance);
-
         PacketHandler.INSTANCE
                 .registerMessage(PacketFluidLevel.class, PacketFluidLevel.class, PacketHandler.nextID(), Side.CLIENT);
         PacketHandler.INSTANCE

src/main/java/crazypants/enderio/conduit/ConduitNetworkTickHandler.java

@@ -10,18 +10,15 @@ import cpw.mods.fml.common.gameevent.TickEvent.Phase;
 
 public class ConduitNetworkTickHandler {
 
-    public static final ConduitNetworkTickHandler instance = new ConduitNetworkTickHandler();
+    public interface TickListener {
 
-    public static interface TickListener {
+        void tickStart(TickEvent.ServerTickEvent evt);
 
-        public void tickStart(TickEvent.ServerTickEvent evt);
-
-        public void tickEnd(TickEvent.ServerTickEvent evt);
+        void tickEnd(TickEvent.ServerTickEvent evt);
     }
 
-    private final List<TickListener> listeners = new ArrayList<TickListener>();
-
-    private final IdentityHashMap<AbstractConduitNetwork<?, ?>, Boolean> networks = new IdentityHashMap<AbstractConduitNetwork<?, ?>, Boolean>();
+    private final List<TickListener> listeners = new ArrayList<>();
+    private final IdentityHashMap<AbstractConduitNetwork<?, ?>, Boolean> networks = new IdentityHashMap<>();
 
     public void addListener(TickListener listener) {
         listeners.add(listener);

src/main/java/crazypants/enderio/machine/capbank/network/CapBankNetwork.java

@@ -16,7 +16,7 @@ import com.enderio.core.common.util.RoundRobinIterator;
 
 import cofh.api.energy.IEnergyContainerItem;
 import cpw.mods.fml.common.gameevent.TickEvent.ServerTickEvent;
-import crazypants.enderio.conduit.ConduitNetworkTickHandler;
+import crazypants.enderio.EnderIO;
 import crazypants.enderio.conduit.ConduitNetworkTickHandler.TickListener;
 import crazypants.enderio.conduit.ConnectionMode;
 import crazypants.enderio.conduit.power.IPowerConduit;
@@ -212,7 +212,7 @@ public class CapBankNetwork implements ICapBankNetwork {
         long curTime = world.getTotalWorldTime();
         if (curTime != timeAtLastApply) {
             timeAtLastApply = curTime;
-            ConduitNetworkTickHandler.instance.addListener(tickListener);
+            EnderIO.proxy.conduitNetworkTickHandler.addListener(tickListener);
         }
     }
 

src/main/java/crazypants/enderio/thaumcraft/ThaumcraftCompat.java

@@ -20,7 +20,6 @@ import crazypants.enderio.material.FrankenSkull;
 import crazypants.enderio.material.Material;
 import crazypants.enderio.power.Capacitors;
 import thaumcraft.api.ThaumcraftApi;
-import thaumcraft.api.ThaumcraftApiHelper;
 import thaumcraft.api.aspects.Aspect;
 import thaumcraft.api.aspects.AspectList;
 
@@ -153,19 +152,6 @@ public class ThaumcraftCompat {
         ThaumcraftApi.registerObjectTag(
                 new ItemStack(EnderIO.blockFusedQuartz, 1, BlockFusedQuartz.Type.ENLIGHTENED_GLASS.ordinal()),
                 new AspectList().add(Aspect.CRYSTAL, 2).add(Aspect.LIGHT, 8).add(Aspect.SENSES, 2));
-
-        // This is a horrible hack due to the fact that I am assembling my aspects after TC does recipe parsing
-        // Therefore I redo all EIO items
-        for (Object o : Item.itemRegistry.getKeys()) {
-            if (o instanceof String) {
-                String ownermod = ((String) o).substring(0, ((String) o).indexOf(':'));
-                if (EnderIO.MODID.equals(ownermod)) {
-                    for (int idx = 0; idx < 16; idx++) {
-                        addAspectsFromRecipes((Item) Item.itemRegistry.getObject((String) o), idx);
-                    }
-                }
-            }
-        }
     }
 
     private static AspectList getAspects(Block block) {
@@ -185,10 +171,6 @@ public class ThaumcraftCompat {
         return new AspectList(item);
     }
 
-    private static void addAspectsFromRecipes(Item item, int meta) {
-        ThaumcraftApi.registerObjectTag(new ItemStack(item, 1, meta), ThaumcraftApiHelper.generateTags(item, meta));
-    }
-
     public static void loadUpgrades(List<IDarkSteelUpgrade> upgrades) {
         upgrades.add(GogglesOfRevealingUpgrade.INSTANCE);
     }