update

Co-authored-by: Alexdoru <[email protected]>

dependencies.gradle

@@ -1,10 +1,10 @@
 // Add your dependencies here
 
 dependencies {
-    api('com.github.GTNewHorizons:ForestryMC:4.10.14:dev')
-    implementation('com.github.GTNewHorizons:GTNHLib:0.6.38:dev')
+    api('com.github.GTNewHorizons:ForestryMC:4.10.17:dev')
+    implementation('com.github.GTNewHorizons:GTNHLib:0.6.39:dev')
 
-    devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.7.64-GTNH:dev')
+    devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.7.79-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.41'
+    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.42'
 }

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

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

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

@@ -128,5 +128,6 @@ 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,7 +5,6 @@ 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;
@@ -61,11 +60,6 @@ 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;
 
@@ -75,21 +69,19 @@ 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());
         }
@@ -210,7 +202,7 @@ public class BinnieCore extends AbstractMod {
         }
     }
 
-    public class EventHandler {
+    public static class EventHandler {
 
         @SubscribeEvent
         @SideOnly(Side.CLIENT)
@@ -222,8 +214,6 @@ 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,4 +7,6 @@ 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(this);
+        MinecraftForge.EVENT_BUS.register(new EventHandler());
     }
 
     public String getChromosomeName(IChromosomeType chromo) {
@@ -294,13 +294,16 @@ public abstract class BreedingSystem implements IItemStackRepresentative {
 
     public abstract Class<? extends IBreedingTracker> getTrackerClass();
 
-    @SubscribeEvent
-    public void onSyncBreedingTracker(ForestryEvent.SyncedBreedingTracker event) {
-        IBreedingTracker tracker = event.tracker;
-        if (!getTrackerClass().isInstance(tracker)) {
-            return;
+    public class EventHandler {
+
+        @SubscribeEvent
+        public void onSyncBreedingTracker(ForestryEvent.SyncedBreedingTracker event) {
+            IBreedingTracker tracker = event.tracker;
+            if (!getTrackerClass().isInstance(tracker)) {
+                return;
+            }
+            syncTracker(tracker);
         }
-        syncTracker(tracker);
     }
 
     public void syncTracker(IBreedingTracker tracker) {

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

@@ -9,6 +9,7 @@ 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;
@@ -40,13 +41,11 @@ 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
@@ -69,6 +68,11 @@ 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,6 +6,7 @@ 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;
@@ -21,12 +22,6 @@ 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();
@@ -55,7 +50,12 @@ public class ModuleItems implements IInitializable {
                 new ItemStack(Items.dye, 1));
     }
 
-    public class EventHandler {
+    @Override
+    public void registerEventHandler() {
+        MinecraftForge.EVENT_BUS.register(new EventHandler());
+    }
+
+    public static class EventHandler {
 
         @SubscribeEvent
         public void onUseFieldKit(PlayerInteractEvent event) {

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("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(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(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,6 +7,7 @@ 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;
@@ -48,7 +49,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 * 18;
+        int w = size * 17;
 
         if (size <= 0) {
             return;
@@ -58,8 +59,9 @@ 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 += 18.0f;
+            x += 17.0f;
         }
     }
 

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

@@ -11,6 +11,7 @@ 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;
 
@@ -35,12 +36,13 @@ public abstract class BlockDesign extends BlockMetadata implements IMultipassBlo
 
     protected IDesignSystem designSystem;
 
-    public EventHandler handler;
-
     public BlockDesign(IDesignSystem system, Material material) {
         super(material);
         designSystem = system;
-        handler = new EventHandler();
+    }
+
+    public void registerHandler() {
+        MinecraftForge.EVENT_BUS.register(new EventHandler());
     }
 
     public static int getMetadata(int plank1, int plank2, int design) {
@@ -136,7 +138,7 @@ public abstract class BlockDesign extends BlockMetadata implements IMultipassBlo
         return 2;
     }
 
-    public class EventHandler {
+    public static class EventHandler {
 
         @SubscribeEvent
         public void onClick(PlayerInteractEvent event) {

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

@@ -2,7 +2,6 @@ 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;
@@ -81,21 +80,18 @@ 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());
-        MinecraftForge.EVENT_BUS.register(ExtraTrees.blockCarpentry.handler);
-        BinnieCore.proxy
-                .registerCustomItemRenderer(Item.getItemFromBlock(ExtraTrees.blockPanel), new MultipassItemRenderer());
+        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
     }
 
     @Override