Merge remote-tracking branch 'origin/speed-up' into dev

dependencies.gradle

@@ -1,10 +1,10 @@
 // Add your dependencies here
 
 dependencies {
-    api('com.github.GTNewHorizons:ForestryMC:4.10.13:dev')
-    implementation('com.github.GTNewHorizons:GTNHLib:0.6.36:dev')
+    api('com.github.GTNewHorizons:ForestryMC:4.10.14:dev')
+    implementation('com.github.GTNewHorizons:GTNHLib:0.6.38:dev')
 
-    devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.7.60-GTNH:dev')
+    devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.7.64-GTNH:dev')
 
     compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.44:api')
     compileOnly('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev')

gradle.properties

@@ -151,7 +151,7 @@ modrinthProjectId =
 #       type can be one of [project, version],
 #       and the name is the Modrinth project or version slug/id of the other mod.
 # Example: required-project:fplib;optional-project:gasstation;incompatible-project:gregtech
-# Note: GTNH Mixins is automatically set as a required dependency if usesMixins = true
+# Note: UniMixins is automatically set as a required dependency if usesMixins = true.
 modrinthRelations =
 
 # Publishing to CurseForge requires you to set the CURSEFORGE_TOKEN environment variable to one of your CurseForge API tokens.

settings.gradle

@@ -17,5 +17,5 @@ pluginManagement {
 }
 
 plugins {
-    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.38'
+    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.41'
 }

src/main/java/binnie/botany/Botany.java

@@ -92,6 +92,7 @@ public class Botany extends AbstractMod {
     public static BlockCeramicBrick ceramicBrick;
 
     public Botany() {
+        super();
         Botany.instance = this;
         MinecraftForge.EVENT_BUS.register(new EventHandler());
     }
@@ -208,7 +209,7 @@ public class Botany extends AbstractMod {
         }
     }
 
-    public static class EventHandler {
+    public class EventHandler {
 
         @SubscribeEvent
         public void onShearFlower(PlayerInteractEvent event) {

src/main/java/binnie/core/AbstractMod.java

@@ -128,6 +128,5 @@ public abstract class AbstractMod implements IPacketProvider, IInitializable {
 
     protected void addModule(IInitializable init) {
         modules.add(init);
-        init.registerEventHandler();
     }
 }

src/main/java/binnie/core/BinnieCore.java

@@ -5,6 +5,7 @@ import java.util.List;
 
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.Item;
+import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.server.MinecraftServer;
 import net.minecraftforge.client.event.TextureStitchEvent;
 import net.minecraftforge.common.MinecraftForge;
@@ -60,6 +61,11 @@ public class BinnieCore extends AbstractMod {
     @Mod.Instance("BinnieCore")
     public static BinnieCore instance;
 
+    public BinnieCore() {
+        super();
+        MinecraftForge.EVENT_BUS.register(new EventHandler());
+    }
+
     @SidedProxy(clientSide = "binnie.core.proxy.BinnieProxyClient", serverSide = "binnie.core.proxy.BinnieProxyServer")
     public static BinnieProxy proxy;
 
@@ -69,19 +75,21 @@ public class BinnieCore extends AbstractMod {
     public static ItemGenesis genesis;
     public static ItemFieldKit fieldKit;
 
-    public BinnieCore() {
-        MinecraftForge.EVENT_BUS.register(new EventHandler());
-    }
-
     @Mod.EventHandler
     public void preInit(FMLPreInitializationEvent event) {
         for (ManagerBase baseManager : Binnie.Managers) {
             addModule(baseManager);
         }
 
+        MinecraftForge.EVENT_BUS.register(Binnie.Genetics.handler);
+
         addModule(new ModuleCraftGUI());
         addModule(new ModuleStorage());
+
+        ModuleItems moduleItems = new ModuleItems();
         addModule(new ModuleItems());
+        MinecraftForge.EVENT_BUS.register(moduleItems.handler);
+
         if (Loader.isModLoaded("BuildCraft|Silicon")) {
             addModule(new ModuleTrigger());
         }
@@ -202,7 +210,7 @@ public class BinnieCore extends AbstractMod {
         }
     }
 
-    public static class EventHandler {
+    public class EventHandler {
 
         @SubscribeEvent
         @SideOnly(Side.CLIENT)
@@ -214,6 +222,8 @@ public class BinnieCore extends AbstractMod {
                     return;
                 }
                 event.tracker.synchToPlayer(player);
+                NBTTagCompound nbt = new NBTTagCompound();
+                nbt.setString("species", event.species.getUID());
             } catch (Exception ex) {
                 // ignored
             }

src/main/java/binnie/core/IInitializable.java

@@ -7,6 +7,4 @@ public interface IInitializable {
     void init();
 
     void postInit();
-
-    default void registerEventHandler() {}
 }

src/main/java/binnie/core/genetics/BreedingSystem.java

@@ -57,7 +57,7 @@ public abstract class BreedingSystem implements IItemStackRepresentative {
 
     public BreedingSystem() {
         Binnie.Genetics.registerBreedingSystem(this);
-        MinecraftForge.EVENT_BUS.register(new EventHandler());
+        MinecraftForge.EVENT_BUS.register(this);
     }
 
     public String getChromosomeName(IChromosomeType chromo) {
@@ -294,16 +294,13 @@ public abstract class BreedingSystem implements IItemStackRepresentative {
 
     public abstract Class<? extends IBreedingTracker> getTrackerClass();
 
-    public class EventHandler {
-
-        @SubscribeEvent
-        public void onSyncBreedingTracker(ForestryEvent.SyncedBreedingTracker event) {
-            IBreedingTracker tracker = event.tracker;
-            if (!getTrackerClass().isInstance(tracker)) {
-                return;
-            }
-            syncTracker(tracker);
+    @SubscribeEvent
+    public void onSyncBreedingTracker(ForestryEvent.SyncedBreedingTracker event) {
+        IBreedingTracker tracker = event.tracker;
+        if (!getTrackerClass().isInstance(tracker)) {
+            return;
         }
+        syncTracker(tracker);
     }
 
     public void syncTracker(IBreedingTracker tracker) {

src/main/java/binnie/core/genetics/ManagerGenetics.java

@@ -9,7 +9,6 @@ import java.util.Map;
 import java.util.TreeSet;
 
 import net.minecraft.item.ItemStack;
-import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.world.WorldEvent;
 
 import binnie.Binnie;
@@ -41,11 +40,13 @@ public class ManagerGenetics extends ManagerBase {
     private final Map<ISpeciesRoot, BreedingSystem> breedingSystems;
     private final List<IChromosomeType> invalidChromosomeTypes;
     private final Map<ISpeciesRoot, Map<IChromosomeType, List<IAllele>>> chromosomeArray;
+    public EventHandler handler;
 
     public ManagerGenetics() {
         breedingSystems = new LinkedHashMap<>();
         invalidChromosomeTypes = new ArrayList<>();
         chromosomeArray = new LinkedHashMap<>();
+        handler = new EventHandler();
     }
 
     @Override
@@ -68,11 +69,6 @@ public class ManagerGenetics extends ManagerBase {
         refreshData();
     }
 
-    @Override
-    public void registerEventHandler() {
-        MinecraftForge.EVENT_BUS.register(new EventHandler());
-    }
-
     public ITreeRoot getTreeRoot() {
         return (ITreeRoot) AlleleManager.alleleRegistry.getSpeciesRoot("rootTrees");
     }

src/main/java/binnie/core/item/ModuleItems.java

@@ -6,7 +6,6 @@ import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.entity.player.PlayerInteractEvent;
 
 import binnie.botany.Botany;
@@ -22,6 +21,12 @@ import cpw.mods.fml.common.registry.GameRegistry;
 
 public class ModuleItems implements IInitializable {
 
+    public EventHandler handler;
+
+    public ModuleItems() {
+        handler = new EventHandler();
+    }
+
     @Override
     public void preInit() {
         BinnieCore.fieldKit = new ItemFieldKit();
@@ -50,12 +55,7 @@ public class ModuleItems implements IInitializable {
                 new ItemStack(Items.dye, 1));
     }
 
-    @Override
-    public void registerEventHandler() {
-        MinecraftForge.EVENT_BUS.register(new EventHandler());
-    }
-
-    public static class EventHandler {
+    public class EventHandler {
 
         @SubscribeEvent
         public void onUseFieldKit(PlayerInteractEvent event) {

src/main/java/binnie/extratrees/carpentry/BlockDesign.java

@@ -11,7 +11,6 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
-import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.event.entity.player.PlayerInteractEvent;
 
@@ -36,13 +35,12 @@ public abstract class BlockDesign extends BlockMetadata implements IMultipassBlo
 
     protected IDesignSystem designSystem;
 
+    public EventHandler handler;
+
     public BlockDesign(IDesignSystem system, Material material) {
         super(material);
         designSystem = system;
-    }
-
-    public void registerHandler() {
-        MinecraftForge.EVENT_BUS.register(new EventHandler());
+        handler = new EventHandler();
     }
 
     public static int getMetadata(int plank1, int plank2, int design) {
@@ -138,7 +136,7 @@ public abstract class BlockDesign extends BlockMetadata implements IMultipassBlo
         return 2;
     }
 
-    public static class EventHandler {
+    public class EventHandler {
 
         @SubscribeEvent
         public void onClick(PlayerInteractEvent event) {

src/main/java/binnie/extratrees/carpentry/ModuleCarpentry.java

@@ -2,6 +2,7 @@ package binnie.extratrees.carpentry;
 
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.common.util.ForgeDirection;
 
 import binnie.core.BinnieCore;
@@ -80,18 +81,21 @@ public class ModuleCarpentry implements IInitializable {
 
     @Override
     public void preInit() {
-        // spotless:off
         ExtraTrees.blockCarpentry = new BlockCarpentry();
         ExtraTrees.blockPanel = new BlockCarpentryPanel();
         ExtraTrees.blockStained = new BlockStainedDesign();
         GameRegistry.registerBlock(ExtraTrees.blockCarpentry, ItemMetadata.class, "carpentry");
         GameRegistry.registerBlock(ExtraTrees.blockPanel, ItemMetadata.class, "panel");
         GameRegistry.registerBlock(ExtraTrees.blockStained, ItemMetadata.class, "stainedglass");
-        BinnieCore.proxy.registerCustomItemRenderer(Item.getItemFromBlock(ExtraTrees.blockCarpentry), new MultipassItemRenderer());
-        BinnieCore.proxy.registerCustomItemRenderer(Item.getItemFromBlock(ExtraTrees.blockStained), new MultipassItemRenderer());
-        ExtraTrees.blockCarpentry.registerHandler();
-        BinnieCore.proxy.registerCustomItemRenderer(Item.getItemFromBlock(ExtraTrees.blockPanel), new MultipassItemRenderer());
-        // spotless:on
+        BinnieCore.proxy.registerCustomItemRenderer(
+                Item.getItemFromBlock(ExtraTrees.blockCarpentry),
+                new MultipassItemRenderer());
+        BinnieCore.proxy.registerCustomItemRenderer(
+                Item.getItemFromBlock(ExtraTrees.blockStained),
+                new MultipassItemRenderer());
+        MinecraftForge.EVENT_BUS.register(ExtraTrees.blockCarpentry.handler);
+        BinnieCore.proxy
+                .registerCustomItemRenderer(Item.getItemFromBlock(ExtraTrees.blockPanel), new MultipassItemRenderer());
     }
 
     @Override