update

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

dependencies.gradle

@@ -1,12 +1,12 @@
 // Add your dependencies here
 
 dependencies {
-	api('com.github.GTNewHorizons:ForestryMC:4.10.0:dev')
-	implementation('com.github.GTNewHorizons:GTNHLib:0.6.0: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.8-GTNH:dev')
+    devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.7.79-GTNH:dev')
 
-	compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.39:api')
-	compileOnly('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev')
-	compileOnly("curse.maven:extrabiomesxl-60041:2273301")
+    compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.44:api')
+    compileOnly('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev')
+    compileOnly("curse.maven:extrabiomesxl-60041:2273301")
 }

gradle.properties

@@ -14,7 +14,7 @@ modId = BinnieCore
 modGroup = binnie
 
 # Whether to use modGroup as the maven publishing group.
-# Due to a history of using JitPack, the default is com.github.GTNewHorizons for all mods.
+# When false, com.github.GTNewHorizons is used.
 useModGroupForPublishing = false
 
 # Updates your build.gradle and settings.gradle automatically whenever an update is available.
@@ -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.

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -86,8 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -206,7 +205,7 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.

settings.gradle

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

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

@@ -6,6 +6,7 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
+import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.entity.player.BonemealEvent;
 import net.minecraftforge.event.entity.player.PlayerInteractEvent;
 import net.minecraftforge.event.world.BlockEvent;
@@ -92,6 +93,7 @@ public class Botany extends AbstractMod {
 
     public Botany() {
         Botany.instance = this;
+        MinecraftForge.EVENT_BUS.register(new EventHandler());
     }
 
     @Mod.EventHandler
@@ -142,118 +144,6 @@ public class Botany extends AbstractMod {
         return PacketHandler.class;
     }
 
-    @SubscribeEvent
-    public void onShearFlower(PlayerInteractEvent event) {
-        if (event.action != PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK) {
-            return;
-        }
-
-        if (event.entityPlayer != null && event.entityPlayer.getHeldItem() != null
-                && event.entityPlayer.getHeldItem().getItem() == Items.shears) {
-            TileEntity tile = event.world.getTileEntity(event.x, event.y, event.z);
-            if (tile instanceof TileEntityFlower tileFlower) {
-                tileFlower.onShear();
-                event.entityPlayer.getHeldItem().damageItem(1, event.entityPlayer);
-            }
-        }
-
-        if (event.entityPlayer != null && event.entityPlayer.getHeldItem() != null
-                && event.entityPlayer.getHeldItem().getItem() == Botany.pollen) {
-            TileEntity tile = event.world.getTileEntity(event.x, event.y, event.z);
-            if (tile instanceof TileEntityFlower tileFlower) {
-                IFlower pollen = BotanyCore.getFlowerRoot().getMember(event.entityPlayer.getHeldItem());
-                if (pollen != null && tileFlower.canMateWith(pollen)) {
-                    tileFlower.mateWith(pollen);
-                    if (!event.entityPlayer.capabilities.isCreativeMode) {
-                        ItemStack heldItem = event.entityPlayer.getHeldItem();
-                        heldItem.stackSize--;
-                    }
-                }
-            }
-        }
-    }
-
-    @SubscribeEvent
-    public void onFertiliseSoil(PlayerInteractEvent event) {
-        if (event.action != PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK || event.world == null) {
-            return;
-        }
-
-        if (event.entityPlayer == null || event.entityPlayer.getHeldItem() == null) {
-            return;
-        }
-
-        int y = event.y;
-        Block block = event.world.getBlock(event.x, y, event.z);
-        if (!Gardening.isSoil(block)) {
-            block = event.world.getBlock(event.x, --y, event.z);
-        }
-        if (!Gardening.isSoil(block)) {
-            return;
-        }
-
-        IBlockSoil soil = (IBlockSoil) block;
-        if (Gardening.isNutrientFertiliser(event.entityPlayer.getHeldItem())
-                && soil.getType(event.world, event.x, y, event.z) != EnumSoilType.FLOWERBED) {
-            EnumSoilType type = soil.getType(event.world, event.x, y, event.z);
-            int next = Math.min(type.ordinal() + Gardening.getFertiliserStrength(event.entityPlayer.getHeldItem()), 2);
-            if (soil.fertilise(event.world, event.x, y, event.z, EnumSoilType.values()[next])
-                    && !event.entityPlayer.capabilities.isCreativeMode) {
-                ItemStack heldItem = event.entityPlayer.getHeldItem();
-                heldItem.stackSize--;
-                return;
-            }
-        }
-
-        if (Gardening.isAcidFertiliser(event.entityPlayer.getHeldItem())
-                && soil.getPH(event.world, event.x, y, event.z) != EnumAcidity.ACID) {
-            EnumAcidity pH = soil.getPH(event.world, event.x, y, event.z);
-            int next = Math.max(pH.ordinal() - Gardening.getFertiliserStrength(event.entityPlayer.getHeldItem()), 0);
-            if (soil.setPH(event.world, event.x, y, event.z, EnumAcidity.values()[next])
-                    && !event.entityPlayer.capabilities.isCreativeMode) {
-                ItemStack heldItem2 = event.entityPlayer.getHeldItem();
-                heldItem2.stackSize--;
-                return;
-            }
-        }
-
-        if (Gardening.isAlkalineFertiliser(event.entityPlayer.getHeldItem())
-                && soil.getPH(event.world, event.x, y, event.z) != EnumAcidity.ALKALINE) {
-            EnumAcidity pH = soil.getPH(event.world, event.x, y, event.z);
-            int next = Math.min(pH.ordinal() + Gardening.getFertiliserStrength(event.entityPlayer.getHeldItem()), 2);
-            if (soil.setPH(event.world, event.x, y, event.z, EnumAcidity.values()[next])
-                    && !event.entityPlayer.capabilities.isCreativeMode) {
-                ItemStack heldItem3 = event.entityPlayer.getHeldItem();
-                heldItem3.stackSize--;
-                return;
-            }
-        }
-
-        if (Gardening.isWeedkiller(event.entityPlayer.getHeldItem())
-                && Gardening.addWeedKiller(event.world, event.x, y, event.z)
-                && !event.entityPlayer.capabilities.isCreativeMode) {
-            ItemStack heldItem4 = event.entityPlayer.getHeldItem();
-            heldItem4.stackSize--;
-        }
-    }
-
-    @SubscribeEvent
-    public void plantVanilla(BlockEvent.PlaceEvent event) {
-        World world = event.world;
-        int x = event.x;
-        int y = event.y;
-        int z = event.z;
-        Block block = world.getBlock(x, y - 1, z);
-        if (!(block instanceof IBlockSoil)) {
-            return;
-        }
-
-        IFlower flower = BotanyCore.getFlowerRoot().getConversion(event.itemInHand);
-        if (flower != null) {
-            Gardening.plant(world, x, y, z, flower, event.player.getGameProfile());
-        }
-    }
-
     @Deprecated
     public void onPlantVanilla(PlayerInteractEvent event) {
         if (!BinnieCore.proxy.isSimulating(event.world)
@@ -287,22 +177,6 @@ public class Botany extends AbstractMod {
         }
     }
 
-    @SubscribeEvent
-    public void onBonemeal(BonemealEvent event) {
-        Block block = event.world.getBlock(event.x, event.y, event.z);
-        if (Gardening.isSoil(block)) {
-            IBlockSoil soil = (IBlockSoil) block;
-            if (soil.fertilise(event.world, event.x, event.y, event.z, EnumSoilType.LOAM)) {
-                event.setResult(Event.Result.ALLOW);
-            }
-        }
-
-        TileEntity tile = event.world.getTileEntity(event.x, event.y, event.z);
-        if (tile instanceof TileEntityFlower && ((TileEntityFlower) tile).onBonemeal()) {
-            event.setResult(Event.Result.ALLOW);
-        }
-    }
-
     @Mod.EventHandler
     public void onIMC(FMLInterModComms.IMCEvent event) {
         for (FMLInterModComms.IMCMessage message : event.getMessages()) {
@@ -333,4 +207,138 @@ public class Botany extends AbstractMod {
             super(Botany.instance);
         }
     }
+
+    public static class EventHandler {
+
+        @SubscribeEvent
+        public void onShearFlower(PlayerInteractEvent event) {
+            if (event.action != PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK) {
+                return;
+            }
+
+            if (event.entityPlayer != null && event.entityPlayer.getHeldItem() != null
+                    && event.entityPlayer.getHeldItem().getItem() == Items.shears) {
+                TileEntity tile = event.world.getTileEntity(event.x, event.y, event.z);
+                if (tile instanceof TileEntityFlower tileFlower) {
+                    tileFlower.onShear();
+                    event.entityPlayer.getHeldItem().damageItem(1, event.entityPlayer);
+                }
+            }
+
+            if (event.entityPlayer != null && event.entityPlayer.getHeldItem() != null
+                    && event.entityPlayer.getHeldItem().getItem() == Botany.pollen) {
+                TileEntity tile = event.world.getTileEntity(event.x, event.y, event.z);
+                if (tile instanceof TileEntityFlower tileFlower) {
+                    IFlower pollen = BotanyCore.getFlowerRoot().getMember(event.entityPlayer.getHeldItem());
+                    if (pollen != null && tileFlower.canMateWith(pollen)) {
+                        tileFlower.mateWith(pollen);
+                        if (!event.entityPlayer.capabilities.isCreativeMode) {
+                            ItemStack heldItem = event.entityPlayer.getHeldItem();
+                            heldItem.stackSize--;
+                        }
+                    }
+                }
+            }
+        }
+
+        @SubscribeEvent
+        public void onFertiliseSoil(PlayerInteractEvent event) {
+            if (event.action != PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK || event.world == null) {
+                return;
+            }
+
+            if (event.entityPlayer == null || event.entityPlayer.getHeldItem() == null) {
+                return;
+            }
+
+            int y = event.y;
+            Block block = event.world.getBlock(event.x, y, event.z);
+            if (!Gardening.isSoil(block)) {
+                block = event.world.getBlock(event.x, --y, event.z);
+            }
+            if (!Gardening.isSoil(block)) {
+                return;
+            }
+
+            IBlockSoil soil = (IBlockSoil) block;
+            if (Gardening.isNutrientFertiliser(event.entityPlayer.getHeldItem())
+                    && soil.getType(event.world, event.x, y, event.z) != EnumSoilType.FLOWERBED) {
+                EnumSoilType type = soil.getType(event.world, event.x, y, event.z);
+                int next = Math
+                        .min(type.ordinal() + Gardening.getFertiliserStrength(event.entityPlayer.getHeldItem()), 2);
+                if (soil.fertilise(event.world, event.x, y, event.z, EnumSoilType.values()[next])
+                        && !event.entityPlayer.capabilities.isCreativeMode) {
+                    ItemStack heldItem = event.entityPlayer.getHeldItem();
+                    heldItem.stackSize--;
+                    return;
+                }
+            }
+
+            if (Gardening.isAcidFertiliser(event.entityPlayer.getHeldItem())
+                    && soil.getPH(event.world, event.x, y, event.z) != EnumAcidity.ACID) {
+                EnumAcidity pH = soil.getPH(event.world, event.x, y, event.z);
+                int next = Math
+                        .max(pH.ordinal() - Gardening.getFertiliserStrength(event.entityPlayer.getHeldItem()), 0);
+                if (soil.setPH(event.world, event.x, y, event.z, EnumAcidity.values()[next])
+                        && !event.entityPlayer.capabilities.isCreativeMode) {
+                    ItemStack heldItem2 = event.entityPlayer.getHeldItem();
+                    heldItem2.stackSize--;
+                    return;
+                }
+            }
+
+            if (Gardening.isAlkalineFertiliser(event.entityPlayer.getHeldItem())
+                    && soil.getPH(event.world, event.x, y, event.z) != EnumAcidity.ALKALINE) {
+                EnumAcidity pH = soil.getPH(event.world, event.x, y, event.z);
+                int next = Math
+                        .min(pH.ordinal() + Gardening.getFertiliserStrength(event.entityPlayer.getHeldItem()), 2);
+                if (soil.setPH(event.world, event.x, y, event.z, EnumAcidity.values()[next])
+                        && !event.entityPlayer.capabilities.isCreativeMode) {
+                    ItemStack heldItem3 = event.entityPlayer.getHeldItem();
+                    heldItem3.stackSize--;
+                    return;
+                }
+            }
+
+            if (Gardening.isWeedkiller(event.entityPlayer.getHeldItem())
+                    && Gardening.addWeedKiller(event.world, event.x, y, event.z)
+                    && !event.entityPlayer.capabilities.isCreativeMode) {
+                ItemStack heldItem4 = event.entityPlayer.getHeldItem();
+                heldItem4.stackSize--;
+            }
+        }
+
+        @SubscribeEvent
+        public void plantVanilla(BlockEvent.PlaceEvent event) {
+            World world = event.world;
+            int x = event.x;
+            int y = event.y;
+            int z = event.z;
+            Block block = world.getBlock(x, y - 1, z);
+            if (!(block instanceof IBlockSoil)) {
+                return;
+            }
+
+            IFlower flower = BotanyCore.getFlowerRoot().getConversion(event.itemInHand);
+            if (flower != null) {
+                Gardening.plant(world, x, y, z, flower, event.player.getGameProfile());
+            }
+        }
+
+        @SubscribeEvent
+        public void onBonemeal(BonemealEvent event) {
+            Block block = event.world.getBlock(event.x, event.y, event.z);
+            if (Gardening.isSoil(block)) {
+                IBlockSoil soil = (IBlockSoil) block;
+                if (soil.fertilise(event.world, event.x, event.y, event.z, EnumSoilType.LOAM)) {
+                    event.setResult(Event.Result.ALLOW);
+                }
+            }
+
+            TileEntity tile = event.world.getTileEntity(event.x, event.y, event.z);
+            if (tile instanceof TileEntityFlower && ((TileEntityFlower) tile).onBonemeal()) {
+                event.setResult(Event.Result.ALLOW);
+            }
+        }
+    }
 }

src/main/java/binnie/botany/ceramic/BlockStained.java

@@ -34,6 +34,7 @@ public class BlockStained extends Block implements IBlockMetadata {
 
     public BlockStained() {
         super(Material.glass);
+        setHardness(0.3f);
         setCreativeTab(CreativeTabBotany.instance);
         setBlockName("stained");
     }

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

@@ -6,8 +6,6 @@ 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;
@@ -29,7 +27,6 @@ public abstract class AbstractMod implements IPacketProvider, IInitializable {
         fields = new LinkedHashSet<>();
         modules = new ArrayList<>();
         BinnieCore.registerMod(this);
-        MinecraftForge.EVENT_BUS.register(this);
     }
 
     public boolean isActive() {
@@ -131,6 +128,6 @@ public abstract class AbstractMod implements IPacketProvider, IInitializable {
 
     protected void addModule(IInitializable init) {
         modules.add(init);
-        MinecraftForge.EVENT_BUS.register(init);
+        init.registerEventHandler();
     }
 }

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

@@ -5,9 +5,9 @@ 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;
 
 import binnie.Binnie;
 import binnie.core.block.MultipassBlockRenderer;
@@ -69,6 +69,10 @@ 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) {
@@ -161,23 +165,6 @@ public class BinnieCore extends AbstractMod {
         return list;
     }
 
-    @SubscribeEvent
-    @SideOnly(Side.CLIENT)
-    public void handleSpeciesDiscovered(ForestryEvent.SpeciesDiscovered event) {
-        try {
-            EntityPlayerMP player = MinecraftServer.getServer().getConfigurationManager()
-                    .func_152612_a(event.username.getName());
-            if (player == null) {
-                return;
-            }
-            event.tracker.synchToPlayer(player);
-            NBTTagCompound nbt = new NBTTagCompound();
-            nbt.setString("species", event.species.getUID());
-        } catch (Exception ex) {
-            // ignored
-        }
-    }
-
     @Override
     public String getChannel() {
         return "BIN";
@@ -198,15 +185,6 @@ public class BinnieCore extends AbstractMod {
         return BinnieCorePacketID.values();
     }
 
-    @SubscribeEvent
-    @SideOnly(Side.CLIENT)
-    public void handleTextureRemap(TextureStitchEvent.Pre event) {
-        if (event.map.getTextureType() == 0) {
-            Binnie.Liquid.reloadIcons(event.map);
-        }
-        Binnie.Resource.registerIcons(event.map, event.map.getTextureType());
-    }
-
     @Override
     protected Class<? extends BinniePacketHandler> getPacketHandler() {
         return PacketHandler.class;
@@ -223,4 +201,31 @@ public class BinnieCore extends AbstractMod {
             super(instance);
         }
     }
+
+    public static class EventHandler {
+
+        @SubscribeEvent
+        @SideOnly(Side.CLIENT)
+        public void handleSpeciesDiscovered(ForestryEvent.SpeciesDiscovered event) {
+            try {
+                EntityPlayerMP player = MinecraftServer.getServer().getConfigurationManager()
+                        .func_152612_a(event.username.getName());
+                if (player == null) {
+                    return;
+                }
+                event.tracker.synchToPlayer(player);
+            } catch (Exception ex) {
+                // ignored
+            }
+        }
+
+        @SubscribeEvent
+        @SideOnly(Side.CLIENT)
+        public void handleTextureRemap(TextureStitchEvent.Pre event) {
+            if (event.map.getTextureType() == 0) {
+                Binnie.Liquid.reloadIcons(event.map);
+            }
+            Binnie.Resource.registerIcons(event.map, event.map.getTextureType());
+        }
+    }
 }

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;
@@ -67,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");
     }
@@ -140,11 +146,6 @@ 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()) {
@@ -219,4 +220,12 @@ 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,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;
@@ -49,36 +50,44 @@ public class ModuleItems implements IInitializable {
                 new ItemStack(Items.dye, 1));
     }
 
-    @SubscribeEvent
-    public void onUseFieldKit(PlayerInteractEvent event) {
-        if (event.action != PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK) {
-            return;
-        }
+    @Override
+    public void registerEventHandler() {
+        MinecraftForge.EVENT_BUS.register(new EventHandler());
+    }
 
-        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)) {
+    public static class EventHandler {
+
+        @SubscribeEvent
+        public void onUseFieldKit(PlayerInteractEvent event) {
+            if (event.action != PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK) {
                 return;
             }
 
-            IFlower flower = tileFlower.getFlower();
-            if (flower == null) {
-                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;
+                }
 
-            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/core/machines/storage/WindowCompartment.java

@@ -488,7 +488,9 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh
 
     public void updateTabs() {
         CompartmentTab tab = getCurrentTab();
-        tabName.setValue(tab.getName());
+        if (!tabName.isFocused()) {
+            tabName.setValue(tab.getName());
+        }
         tabIcon.setItemStack(tab.getIcon());
         tabColour.setValue(tab.getColor());
     }

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/apiary/machine/mutator/MutatorModifierComponent.java

@@ -18,8 +18,7 @@ public class MutatorModifierComponent extends ComponentBeeModifier implements IB
             return 1.0f;
         }
 
-        float mult = AlvearyMutator.getMutationMult(getUtil().getStack(AlvearyMutator.SLOT_MUTATOR));
-        return Math.min(mult, 15.0f / currentModifier);
+        return AlvearyMutator.getMutationMult(getUtil().getStack(AlvearyMutator.SLOT_MUTATOR));
     }
 
     @Override

src/main/java/binnie/extrabees/genetics/effect/ExtraBeesEffect.java

@@ -389,34 +389,27 @@ public enum ExtraBeesEffect implements IAlleleBeeEffect {
     }
 
     private void onFoodEffect(IBeeGenome genome, IBeeHousing housing) {
-        for (EntityLivingBase entity : getEntities(EntityLivingBase.class, genome, housing)) {
-            if (entity instanceof EntityPlayer player) {
-                player.getFoodStats().addStats(2, 0.2f);
-            }
+        for (EntityPlayer player : getEntities(EntityPlayer.class, genome, housing)) {
+            player.getFoodStats().addStats(2, 0.2f);
         }
     }
 
     private void onHungerEffect(IBeeGenome genome, IBeeHousing housing, World world) {
-        for (EntityLivingBase entity : getEntities(EntityLivingBase.class, genome, housing)) {
-            if (entity instanceof EntityPlayer player) {
-                if (world.rand.nextInt(4) < wearsItems(player)) {
-                    continue;
-                }
-
-                player.getFoodStats().addExhaustion(4.0f);
-                player.addPotionEffect(new PotionEffect(Potion.hunger.id, 100));
+        for (EntityPlayer player : getEntities(EntityPlayer.class, genome, housing)) {
+            if (world.rand.nextInt(4) < wearsItems(player)) {
+                continue;
             }
+            player.addExhaustion(4.0f);
+            player.addPotionEffect(new PotionEffect(Potion.hunger.id, 100));
         }
     }
 
     private void onPotionEffect(IBeeGenome genome, IBeeHousing housing, World world, PotionEffect potion) {
-        for (EntityLivingBase entity : getEntities(EntityLivingBase.class, genome, housing)) {
-            if (entity instanceof EntityPlayer player) {
-                if (world.rand.nextInt(4) < wearsItems(player)) {
-                    continue;
-                }
-                player.addPotionEffect(potion);
+        for (EntityPlayer player : getEntities(EntityPlayer.class, genome, housing)) {
+            if (world.rand.nextInt(4) < wearsItems(player)) {
+                continue;
             }
+            player.addPotionEffect(potion);
         }
     }
 
@@ -611,13 +604,16 @@ public enum ExtraBeesEffect implements IAlleleBeeEffect {
 
     public <T extends Entity> List<T> getEntities(Class<T> eClass, IBeeGenome genome, IBeeHousing housing) {
         int[] area = genome.getTerritory();
-        int[] offset = { -Math.round(area[0] / 2f), -Math.round(area[1] / 2f), -Math.round(area[2] / 2f) };
-        int[] min = { housing.getCoordinates().posX + offset[0], housing.getCoordinates().posY + offset[1],
-                housing.getCoordinates().posZ + offset[2] };
-        int[] max = { housing.getCoordinates().posX + offset[0] + area[0],
-                housing.getCoordinates().posY + offset[1] + area[1],
-                housing.getCoordinates().posZ + offset[2] + area[2] };
-        AxisAlignedBB box = AxisAlignedBB.getBoundingBox(min[0], min[1], min[2], max[0], max[1], max[2]);
+        int offsetX = -Math.round(area[0] / 2f);
+        int offsetY = -Math.round(area[1] / 2f);
+        int offsetZ = -Math.round(area[2] / 2f);
+        int minX = housing.getCoordinates().posX + offsetX;
+        int minY = housing.getCoordinates().posY + offsetY;
+        int minZ = housing.getCoordinates().posZ + offsetZ;
+        int maxX = housing.getCoordinates().posX + offsetX + area[0];
+        int maxY = housing.getCoordinates().posY + offsetY + area[1];
+        int maxZ = housing.getCoordinates().posZ + offsetZ + area[2];
+        AxisAlignedBB box = AxisAlignedBB.getBoundingBox(minX, minY, minZ, maxX, maxY, maxZ);
         return housing.getWorld().getEntitiesWithinAABB(eClass, box);
     }
 

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;
 
@@ -40,36 +41,12 @@ public abstract class BlockDesign extends BlockMetadata implements IMultipassBlo
         designSystem = system;
     }
 
-    public static int getMetadata(int plank1, int plank2, int design) {
-        return plank1 + (plank2 << 9) + (design << 18);
+    public void registerHandler() {
+        MinecraftForge.EVENT_BUS.register(new 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);
+    public static int getMetadata(int plank1, int plank2, int design) {
+        return plank1 + (plank2 << 9) + (design << 18);
     }
 
     public abstract ItemStack getCreativeStack(IDesign design);
@@ -160,4 +137,35 @@ 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,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);
-        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

src/main/java/binnie/extratrees/genetics/ExtraTreeFruitGene.java

@@ -376,7 +376,7 @@ public enum ExtraTreeFruitGene implements IAlleleFruit, IFruitProvider {
 
         float modeYieldMod = 1.0f;
         for (Map.Entry<ItemStack, Float> entry2 : products.entrySet()) {
-            if (world.rand.nextFloat() <= genome.getYield() * modeYieldMod * entry2.getValue() * stage) {
+            if (world.rand.nextFloat() <= genome.getYield() * modeYieldMod * entry2.getValue() * 5.0f * stage) {
                 product2.add(entry2.getKey().copy());
             }
         }

src/main/java/binnie/genetics/craftgui/WindowGeneBank.java

@@ -46,7 +46,7 @@ public class WindowGeneBank extends WindowMachine {
     protected ControlGeneScroll genes;
 
     public WindowGeneBank(EntityPlayer player, IInventory inventory, Side side, boolean isNEI) {
-        super(320, 224, player, inventory, side);
+        super(400, 224, player, inventory, side);
         isNei = isNEI;
     }
 
@@ -100,7 +100,7 @@ public class WindowGeneBank extends WindowMachine {
         new ControlPlayerInventory(this, x, y);
         x += 124;
         boxX = x;
-        int geneBoxWidth = 120;
+        int geneBoxWidth = 200;
         new Panel(this, boxX + 24, 32.0f, geneBoxWidth, 120.0f, MinecraftGUI.PanelType.Black);
         new Panel(this, boxX + 24 + geneBoxWidth, 32.0f, 14.0f, 120.0f, MinecraftGUI.PanelType.Gray);
         ControlScrollableContent scroll = new ControlScrollableContent(

src/main/java/binnie/genetics/machine/isolator/IsolatorComponentLogic.java

@@ -1,12 +1,11 @@
 package binnie.genetics.machine.isolator;
 
+import java.util.Arrays;
+import java.util.Objects;
 import java.util.Random;
 
 import net.minecraft.item.ItemStack;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
 import binnie.core.genetics.Gene;
 import binnie.core.machines.Machine;
 import binnie.core.machines.inventory.IChargedSlots;
@@ -18,14 +17,13 @@ import binnie.extrabees.config.EBConfigMachines;
 import binnie.genetics.item.ItemSequence;
 import forestry.api.genetics.AlleleManager;
 import forestry.api.genetics.IAllele;
+import forestry.api.genetics.IChromosome;
 import forestry.api.genetics.IChromosomeType;
 import forestry.api.genetics.IIndividual;
 import forestry.api.genetics.ISpeciesRoot;
 
 public class IsolatorComponentLogic extends ComponentProcessSetCost implements IProcess {
 
-    private static final Logger LOG = LogManager.getLogger("Genetics");
-
     protected float enzymePerProcess = 0.5f;
     protected float ethanolPerProcess = 10.0f;
 
@@ -84,22 +82,19 @@ public class IsolatorComponentLogic extends ComponentProcessSetCost implements I
         }
 
         final IChromosomeType[] karyo = root.getKaryotype();
-        final IChromosomeType chromosome = karyo[rand.nextInt(karyo.length)];
-        final IAllele allele;
-        try {
-            allele = rand.nextBoolean() ? individual.getGenome().getActiveAllele(chromosome)
-                    : individual.getGenome().getInactiveAllele(chromosome);
-        } catch (NullPointerException npe) {
-            // just return and eat the power without eating the rest of it
-            LOG.warn(
-                    "NPE occurred on unknown gene: name: " + chromosome.getName()
-                            + " | ordinal: "
-                            + chromosome.ordinal()
-                            + " | is null? "
-                            + (individual.getGenome().getChromosomes()[chromosome.ordinal()] == null ? "true"
-                                    : "false"));
+
+        final IChromosome[] chromosomes = individual.getGenome().getChromosomes();
+        if (Arrays.stream(chromosomes).allMatch(Objects::isNull)) {
             return;
         }
+
+        IChromosomeType chromosome;
+        do {
+            chromosome = karyo[rand.nextInt(karyo.length)];
+        } while (chromosomes[chromosome.ordinal()] == null);
+
+        final IAllele allele = rand.nextBoolean() ? individual.getGenome().getActiveAllele(chromosome)
+                : individual.getGenome().getInactiveAllele(chromosome);
         final Gene gene = new Gene(allele, chromosome, root);
 
         ItemStack serum = ItemSequence.create(gene);