update

dependencies.gradle

@@ -1,10 +1,10 @@
 // Add your dependencies here
 
 dependencies {
-    api('com.github.GTNewHorizons:ForestryMC:4.10.17:dev')
-    implementation('com.github.GTNewHorizons:GTNHLib:0.6.39: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.79-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')

settings.gradle

@@ -17,5 +17,5 @@ pluginManagement {
 }
 
 plugins {
-    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.42'
+    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

@@ -6,6 +6,8 @@ import java.util.Collections;
 import java.util.LinkedHashSet;
 import java.util.List;
 
+import net.minecraftforge.common.MinecraftForge;
+
 import binnie.core.gui.IBinnieGUID;
 import binnie.core.mod.parser.FieldParser;
 import binnie.core.network.BinniePacketHandler;
@@ -128,6 +130,6 @@ public abstract class AbstractMod implements IPacketProvider, IInitializable {
 
     protected void addModule(IInitializable init) {
         modules.add(init);
-        init.registerEventHandler();
+        MinecraftForge.EVENT_BUS.register(init);
     }
 }

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,10 +75,6 @@ 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) {
@@ -202,7 +204,7 @@ public class BinnieCore extends AbstractMod {
         }
     }
 
-    public static class EventHandler {
+    public class EventHandler {
 
         @SubscribeEvent
         @SideOnly(Side.CLIENT)
@@ -214,6 +216,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;
@@ -68,11 +67,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");
     }
@@ -146,6 +140,11 @@ public class ManagerGenetics extends ManagerBase {
         return (system == null) ? null : system.getConversion(stack);
     }
 
+    @SubscribeEvent
+    public void onWorldLoad(WorldEvent.Load event) {
+        refreshData();
+    }
+
     private void refreshData() {
         loadAlleles();
         for (BreedingSystem system : Binnie.Genetics.getActiveSystems()) {
@@ -220,12 +219,4 @@ public class ManagerGenetics extends ManagerBase {
             return o1.getUID().compareTo(o2.getUID());
         }
     }
-
-    public class EventHandler {
-
-        @SubscribeEvent
-        public void onWorldLoad(WorldEvent.Load event) {
-            refreshData();
-        }
-    }
 }

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;
@@ -50,44 +49,36 @@ public class ModuleItems implements IInitializable {
                 new ItemStack(Items.dye, 1));
     }
 
-    @Override
-    public void registerEventHandler() {
-        MinecraftForge.EVENT_BUS.register(new EventHandler());
-    }
+    @SubscribeEvent
+    public void onUseFieldKit(PlayerInteractEvent event) {
+        if (event.action != PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK) {
+            return;
+        }
 
-    public static class EventHandler {
-
-        @SubscribeEvent
-        public void onUseFieldKit(PlayerInteractEvent event) {
-            if (event.action != PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK) {
+        EntityPlayer player = event.entityPlayer;
+        if (player != null && player.getHeldItem() != null
+                && player.getHeldItem().getItem() == BinnieCore.fieldKit
+                && player.isSneaking()) {
+            TileEntity tile = event.world.getTileEntity(event.x, event.y, event.z);
+            if (!(tile instanceof TileEntityFlower tileFlower)) {
                 return;
             }
 
-            EntityPlayer player = event.entityPlayer;
-            if (player != null && player.getHeldItem() != null
-                    && player.getHeldItem().getItem() == BinnieCore.fieldKit
-                    && player.isSneaking()) {
-                TileEntity tile = event.world.getTileEntity(event.x, event.y, event.z);
-                if (!(tile instanceof TileEntityFlower tileFlower)) {
-                    return;
-                }
-
-                IFlower flower = tileFlower.getFlower();
-                if (flower == null) {
-                    return;
-                }
-
-                NBTTagCompound info = new NBTTagCompound();
-                info.setString("Species", flower.getGenome().getPrimary().getUID());
-                info.setString("Species2", flower.getGenome().getSecondary().getUID());
-                info.setFloat("Age", flower.getAge() / flower.getGenome().getLifespan());
-                info.setShort("Colour", (short) flower.getGenome().getPrimaryColor().getID());
-                info.setShort("Colour2", (short) flower.getGenome().getSecondaryColor().getID());
-                info.setBoolean("Wilting", flower.isWilted());
-                info.setBoolean("Flowered", flower.hasFlowered());
-                Botany.proxy.sendToPlayer(new MessageNBT(PacketID.FieldKit.ordinal(), info), event.entityPlayer);
-                event.entityPlayer.getHeldItem().damageItem(1, event.entityPlayer);
+            IFlower flower = tileFlower.getFlower();
+            if (flower == null) {
+                return;
             }
+
+            NBTTagCompound info = new NBTTagCompound();
+            info.setString("Species", flower.getGenome().getPrimary().getUID());
+            info.setString("Species2", flower.getGenome().getSecondary().getUID());
+            info.setFloat("Age", flower.getAge() / flower.getGenome().getLifespan());
+            info.setShort("Colour", (short) flower.getGenome().getPrimaryColor().getID());
+            info.setShort("Colour2", (short) flower.getGenome().getSecondaryColor().getID());
+            info.setBoolean("Wilting", flower.isWilted());
+            info.setBoolean("Flowered", flower.hasFlowered());
+            Botany.proxy.sendToPlayer(new MessageNBT(PacketID.FieldKit.ordinal(), info), event.entityPlayer);
+            event.entityPlayer.getHeldItem().damageItem(1, event.entityPlayer);
         }
     }
 }

src/main/java/binnie/extrabees/apiary/ModuleApiary.java

@@ -34,12 +34,12 @@ public class ModuleApiary implements IInitializable {
                 BinnieCore.proxy.createObject("binnie.core.machines.RendererMachine"));
         ModuleApiary.blockComponent = machineGroup.getBlock();
         AlvearyMutator.addMutationItem(new ItemStack(Blocks.soul_sand), 1.5f);
-        AlvearyMutator.addMutationItem(Mods.ic2.stack("itemUran"), 8.0f);
-        AlvearyMutator.addMutationItem(Mods.ic2.stack("itemPlutonium"), 15.0f);
-        AlvearyMutator.addMutationItem(Mods.ic2.stack("itemPlutoniumSmall"), 9.0f);
-        AlvearyMutator.addMutationItem(Mods.ic2.stack("itemUran235"), 10.0f);
-        AlvearyMutator.addMutationItem(Mods.ic2.stack("itemUran235small"), 5.5f);
-        AlvearyMutator.addMutationItem(Mods.ic2.stack("itemUran238"), 2.0f);
+        AlvearyMutator.addMutationItem(Mods.ic2.stack("UranFuel"), 8.0f);
+        AlvearyMutator.addMutationItem(Mods.ic2.stack("Plutonium"), 15.0f);
+        AlvearyMutator.addMutationItem(Mods.ic2.stack("smallPlutonium"), 9.0f);
+        AlvearyMutator.addMutationItem(Mods.ic2.stack("Uran235"), 10.0f);
+        AlvearyMutator.addMutationItem(Mods.ic2.stack("smallUran235"), 5.5f);
+        AlvearyMutator.addMutationItem(Mods.ic2.stack("Uran238"), 2.0f);
         AlvearyMutator.addMutationItem(new ItemStack(Items.nether_star), 50.0f);
         AlvearyMutator.addMutationItem(new ItemStack(Items.ender_pearl), 2.0f);
         AlvearyMutator.addMutationItem(new ItemStack(Items.ender_eye), 4.0f);

src/main/java/binnie/extrabees/gui/WindowAlvearyMutator.java

@@ -7,7 +7,6 @@ import net.minecraft.item.ItemStack;
 import binnie.core.AbstractMod;
 import binnie.core.craftgui.controls.ControlText;
 import binnie.core.craftgui.geometry.IArea;
-import binnie.core.craftgui.geometry.IPoint;
 import binnie.core.craftgui.geometry.TextJustification;
 import binnie.core.craftgui.minecraft.Window;
 import binnie.core.craftgui.minecraft.control.ControlItemDisplay;
@@ -49,7 +48,7 @@ public class WindowAlvearyMutator extends Window {
                 I18N.localise("extrabees.machine.alveay.mutator.mutagens"),
                 TextJustification.MIDDLE_CENTER).setColor(0x555555);
         int size = AlvearyMutator.getMutagens().size();
-        int w = size * 17;
+        int w = size * 18;
 
         if (size <= 0) {
             return;
@@ -59,9 +58,8 @@ public class WindowAlvearyMutator extends Window {
         for (ItemStack stack : AlvearyMutator.getMutagens()) {
             ControlItemDisplay display = new ControlItemDisplay(this, x, 66.0f);
             display.setItemStack(stack);
-            display.setSize(new IPoint(14, 14));
             display.hastooltip = true;
-            x += 17.0f;
+            x += 18.0f;
         }
     }
 

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;
 
@@ -41,14 +40,38 @@ public abstract class BlockDesign extends BlockMetadata implements IMultipassBlo
         designSystem = system;
     }
 
-    public void registerHandler() {
-        MinecraftForge.EVENT_BUS.register(new EventHandler());
-    }
-
     public static int getMetadata(int plank1, int plank2, int design) {
         return plank1 + (plank2 << 9) + (design << 18);
     }
 
+    @SubscribeEvent
+    public void onClick(PlayerInteractEvent event) {
+        if (event.action != PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK) {
+            return;
+        }
+
+        World world = event.entityPlayer.worldObj;
+        EntityPlayer player = event.entityPlayer;
+        int x = event.x;
+        int y = event.y;
+        int z = event.z;
+        if (!(world.getBlock(x, y, z) instanceof BlockDesign blockDesign)) {
+            return;
+        }
+
+        ItemStack item = player.getHeldItem();
+        if (item == null || !(item.getItem() instanceof IToolHammer)
+                || !((IToolHammer) item.getItem()).isActive(item)) {
+            return;
+        }
+
+        DesignBlock carpentryBlock = blockDesign.getCarpentryBlock(world, x, y, z);
+        TileEntityMetadata tile = (TileEntityMetadata) world.getTileEntity(x, y, z);
+        carpentryBlock.rotate(event.face, item, player, world, x, y, z);
+        int meta = carpentryBlock.getBlockMetadata(blockDesign.getDesignSystem());
+        tile.setTileMetadata(meta, true);
+    }
+
     public abstract ItemStack getCreativeStack(IDesign design);
 
     @Override
@@ -137,35 +160,4 @@ public abstract class BlockDesign extends BlockMetadata implements IMultipassBlo
     public int getNumberOfPasses() {
         return 2;
     }
-
-    public static class EventHandler {
-
-        @SubscribeEvent
-        public void onClick(PlayerInteractEvent event) {
-            if (event.action != PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK) {
-                return;
-            }
-
-            World world = event.entityPlayer.worldObj;
-            EntityPlayer player = event.entityPlayer;
-            int x = event.x;
-            int y = event.y;
-            int z = event.z;
-            if (!(world.getBlock(x, y, z) instanceof BlockDesign blockDesign)) {
-                return;
-            }
-
-            ItemStack item = player.getHeldItem();
-            if (item == null || !(item.getItem() instanceof IToolHammer)
-                    || !((IToolHammer) item.getItem()).isActive(item)) {
-                return;
-            }
-
-            DesignBlock carpentryBlock = blockDesign.getCarpentryBlock(world, x, y, z);
-            TileEntityMetadata tile = (TileEntityMetadata) world.getTileEntity(x, y, z);
-            carpentryBlock.rotate(event.face, item, player, world, x, y, z);
-            int meta = carpentryBlock.getBlockMetadata(blockDesign.getDesignSystem());
-            tile.setTileMetadata(meta, true);
-        }
-    }
 }

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);
+        BinnieCore.proxy
+                .registerCustomItemRenderer(Item.getItemFromBlock(ExtraTrees.blockPanel), new MultipassItemRenderer());
     }
 
     @Override