Yeet reflective item parsing (#75)

dependencies.gradle

@@ -1,12 +1,12 @@
 // Add your dependencies here
 
 dependencies {
-    api('com.github.GTNewHorizons:ForestryMC:4.10.17:dev')
-    implementation('com.github.GTNewHorizons:GTNHLib:0.7.0:dev')
+    api('com.github.GTNewHorizons:ForestryMC:4.11.0:dev')
+    implementation('com.github.GTNewHorizons:GTNHLib:0.7.3:dev')
 
-    devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.8.0-GTNH:dev')
+    devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.8.26-GTNH:dev')
 
-    compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.44:api')
+    compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.45:api')
     compileOnly('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev')
     compileOnly("curse.maven:extrabiomesxl-60041:2273301")
 }

gradle.properties

@@ -43,6 +43,10 @@ developmentEnvironmentUserName = Developer
 # See https://github.com/bsideup/jabel for details on how this works.
 enableModernJavaSyntax = true
 
+# If set, ignores the above setting and compiles with the given toolchain. This may cause unexpected issues,
+# and should *not* be used in most situations. -1 disables this.
+# forceToolchainVersion = -1
+
 # Enables injecting missing generics into the decompiled source code for a better coding experience.
 # Turns most publicly visible List, Map, etc. into proper List<E>, Map<K, V> types.
 enableGenericInjection = true
@@ -96,7 +100,9 @@ usesMixinDebug = false
 # Specify the location of your implementation of IMixinConfigPlugin. Leave it empty otherwise.
 mixinPlugin =
 
-# Specify the package that contains all of your Mixins. You may only place Mixins in this package or the build will fail!
+# Specify the package that contains all of your Mixins. The package must exist or
+# the build will fail. If you have a package property defined in your mixins.<modid>.json,
+# it must match with this or the build will fail.
 mixinsPackage =
 
 # Specify the core mod entry class if you use a core mod. This class must implement IFMLLoadingPlugin!
@@ -172,6 +178,12 @@ curseForgeRelations =
 # projects. New projects should not use this parameter.
 customArchiveBaseName = binnie-mods
 
+# Optional parameter to customize the default working directory used by the runClient* tasks. Relative to the project directory.
+# runClientWorkingDirectory = run/client
+
+# Optional parameter to customize the default working directory used by the runServer* tasks. Relative to the project directory.
+# runServerWorkingDirectory = run/server
+
 # Optional parameter to have the build automatically fail if an illegal version is used.
 # This can be useful if you e.g. only want to allow versions in the form of '1.1.xxx'.
 # The check is ONLY performed if the version is a git tag.

gradle/gradle-daemon-jvm.properties

@@ -0,0 +1,12 @@
+#This file is generated by updateDaemonJvm
+toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/c5ee947fbfb70bc347d8d531e3a578c4/redirect
+toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/5ee463876563a46fff651cce1bc53a4c/redirect
+toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/c5ee947fbfb70bc347d8d531e3a578c4/redirect
+toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/5ee463876563a46fff651cce1bc53a4c/redirect
+toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/e1118b4c7c2858d28154d086dbff010e/redirect
+toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/59a9771cad43219260d9aac9a8ec4d6a/redirect
+toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/c5ee947fbfb70bc347d8d531e3a578c4/redirect
+toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/5ee463876563a46fff651cce1bc53a4c/redirect
+toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/832229f0f6f0be60ed817c5a5e5848eb/redirect
+toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/b96cb7670c095245220e7d01d5927b58/redirect
+toolchainVersion=25

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -114,7 +114,6 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 
 # Determine the Java command to use to start the JVM.
@@ -172,7 +171,6 @@ fi
 # For Cygwin or MSYS, switch paths to Windows format before running java
 if "$cygwin" || "$msys" ; then
     APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
 
     JAVACMD=$( cygpath --unix "$JAVACMD" )
 
@@ -212,8 +210,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.

gradlew.bat

@@ -70,11 +70,10 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell

settings.gradle

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

src/main/java/binnie/Binnie.java

@@ -5,7 +5,6 @@ import java.util.List;
 
 import binnie.core.ManagerBase;
 import binnie.core.genetics.ManagerGenetics;
-import binnie.core.item.ManagerItem;
 import binnie.core.liquid.ManagerLiquid;
 import binnie.core.machines.ManagerMachine;
 import binnie.core.resource.ManagerResource;
@@ -16,6 +15,5 @@ public final class Binnie {
     public static ManagerGenetics Genetics = new ManagerGenetics();
     public static ManagerLiquid Liquid = new ManagerLiquid();
     public static ManagerMachine Machine = new ManagerMachine();
-    public static ManagerItem Item = new ManagerItem();
     public static ManagerResource Resource = new ManagerResource();
 }

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

@@ -64,32 +64,37 @@ public class Botany extends AbstractMod {
     @SidedProxy(clientSide = "binnie.botany.proxy.ProxyClient", serverSide = "binnie.botany.proxy.ProxyServer")
     public static Proxy proxy;
 
+    // Genetics module
     public static BlockFlower flower;
-    public static Item seed;
+
+    public static ItemFlower flowerItem;
     public static Item pollen;
+    public static Item seed;
     public static ItemDictionary database;
+
+    // Gardening module
     public static BlockPlant plant;
-    public static ItemTrowel trowelWood;
-    public static ItemTrowel trowelStone;
-    public static ItemTrowel trowelIron;
-    public static ItemTrowel trowelDiamond;
-    public static ItemTrowel trowelGold;
     public static BlockSoil soil;
     public static BlockSoil loam;
     public static BlockSoil flowerbed;
     public static BlockSoil soilNoWeed;
     public static BlockSoil loamNoWeed;
     public static BlockSoil flowerbedNoWeed;
-    public static ItemInsulatedTube insulatedTube;
+    public static BlockCeramic ceramic;
+    public static BlockStained stained;
+    public static BlockCeramicPatterned ceramicTile;
+    public static BlockCeramicBrick ceramicBrick;
+
     public static ItemSoilMeter soilMeter;
+    public static ItemInsulatedTube insulatedTube;
+    public static ItemTrowel trowelWood;
+    public static ItemTrowel trowelStone;
+    public static ItemTrowel trowelIron;
+    public static ItemTrowel trowelDiamond;
+    public static ItemTrowel trowelGold;
     public static ItemMisc misc;
-    public static ItemFlower flowerItem;
     public static ItemPigment pigment;
     public static ItemClay clay;
-    public static BlockCeramic ceramic;
-    public static BlockCeramicPatterned ceramicTile;
-    public static BlockStained stained;
-    public static BlockCeramicBrick ceramicBrick;
 
     public Botany() {
         Botany.instance = this;

src/main/java/binnie/botany/flower/ItemBotany.java

@@ -1,5 +1,7 @@
 package binnie.botany.flower;
 
+import static cpw.mods.fml.common.registry.GameRegistry.registerItem;
+
 import java.util.List;
 
 import net.minecraft.block.Block;
@@ -39,6 +41,8 @@ public abstract class ItemBotany extends Item {
         setCreativeTab(CreativeTabBotany.instance);
         setUnlocalizedName(name);
         hasSubtypes = true;
+
+        registerItem(this, getUnlocalizedName().substring(5));
     }
 
     @Override

src/main/java/binnie/botany/flower/ItemInsulatedTube.java

@@ -1,5 +1,7 @@
 package binnie.botany.flower;
 
+import static cpw.mods.fml.common.registry.GameRegistry.registerItem;
+
 import java.util.List;
 
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -25,6 +27,8 @@ public class ItemInsulatedTube extends Item {
         setUnlocalizedName("insulatedTube");
         setCreativeTab(CreativeTabBotany.instance);
         setHasSubtypes(true);
+
+        registerItem(this, getUnlocalizedName().substring(5));
     }
 
     public static ItemStack getInsulateStack(ItemStack stack) {

src/main/java/binnie/botany/gardening/ItemSoilMeter.java

@@ -1,5 +1,7 @@
 package binnie.botany.gardening;
 
+import static cpw.mods.fml.common.registry.GameRegistry.registerItem;
+
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.player.EntityPlayer;
@@ -28,6 +30,8 @@ public class ItemSoilMeter extends Item {
         setCreativeTab(CreativeTabBotany.instance);
         setUnlocalizedName("soilMeter");
         setMaxStackSize(1);
+
+        registerItem(this, getUnlocalizedName().substring(5));
     }
 
     @Override

src/main/java/binnie/botany/gardening/ItemTrowel.java

@@ -1,5 +1,7 @@
 package binnie.botany.gardening;
 
+import static cpw.mods.fml.common.registry.GameRegistry.registerItem;
+
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.player.EntityPlayer;
@@ -28,6 +30,8 @@ public class ItemTrowel extends Item {
         setCreativeTab(CreativeTabBotany.instance);
         setUnlocalizedName("trowel" + material);
         locName = "trowel" + material;
+
+        registerItem(this, getUnlocalizedName().substring(5));
     }
 
     @Override

src/main/java/binnie/botany/gardening/ModuleGardening.java

@@ -12,7 +12,6 @@ import net.minecraftforge.oredict.RecipeSorter;
 import net.minecraftforge.oredict.ShapedOreRecipe;
 import net.minecraftforge.oredict.ShapelessOreRecipe;
 
-import binnie.Binnie;
 import binnie.botany.Botany;
 import binnie.botany.CreativeTabBotany;
 import binnie.botany.api.EnumAcidity;
@@ -37,6 +36,7 @@ import binnie.core.block.ItemMetadata;
 import binnie.core.block.ItemMetadataRenderer;
 import binnie.core.block.MultipassItemRenderer;
 import binnie.core.block.TileEntityMetadata;
+import binnie.core.item.ItemMisc;
 import cpw.mods.fml.common.registry.GameRegistry;
 
 public class ModuleGardening implements IInitializable {
@@ -75,7 +75,7 @@ public class ModuleGardening implements IInitializable {
         Botany.trowelIron = new ItemTrowel(Item.ToolMaterial.IRON, "Iron");
         Botany.trowelDiamond = new ItemTrowel(Item.ToolMaterial.EMERALD, "Diamond");
         Botany.trowelGold = new ItemTrowel(Item.ToolMaterial.GOLD, "Gold");
-        Botany.misc = Binnie.Item.registerMiscItems(BotanyItems.values(), CreativeTabBotany.instance);
+        Botany.misc = new ItemMisc(CreativeTabBotany.instance, BotanyItems.values());
         Botany.pigment = new ItemPigment();
         Botany.clay = new ItemClay();
 

src/main/java/binnie/botany/genetics/ItemDictionary.java

@@ -1,5 +1,7 @@
 package binnie.botany.genetics;
 
+import static cpw.mods.fml.common.registry.GameRegistry.registerItem;
+
 import java.util.List;
 
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -25,6 +27,8 @@ public class ItemDictionary extends Item {
         setCreativeTab(CreativeTabBotany.instance);
         setUnlocalizedName("database");
         setMaxStackSize(1);
+
+        registerItem(this, getUnlocalizedName().substring(5));
     }
 
     @Override

src/main/java/binnie/botany/items/ItemClay.java

@@ -1,5 +1,7 @@
 package binnie.botany.items;
 
+import static cpw.mods.fml.common.registry.GameRegistry.registerItem;
+
 import java.util.List;
 
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -22,6 +24,8 @@ public class ItemClay extends Item {
         setUnlocalizedName("clay");
         setHasSubtypes(true);
         setCreativeTab(CreativeTabBotany.instance);
+
+        registerItem(this, getUnlocalizedName().substring(5));
     }
 
     @Override

src/main/java/binnie/botany/items/ItemPigment.java

@@ -1,5 +1,7 @@
 package binnie.botany.items;
 
+import static cpw.mods.fml.common.registry.GameRegistry.registerItem;
+
 import java.util.List;
 
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -22,6 +24,8 @@ public class ItemPigment extends Item {
         setUnlocalizedName("pigment");
         setHasSubtypes(true);
         setCreativeTab(CreativeTabBotany.instance);
+
+        registerItem(this, getUnlocalizedName().substring(5));
     }
 
     @Override

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

@@ -1,13 +1,9 @@
 package binnie.core;
 
-import java.lang.reflect.Field;
 import java.util.ArrayList;
-import java.util.Collections;
-import java.util.LinkedHashSet;
 import java.util.List;
 
 import binnie.core.gui.IBinnieGUID;
-import binnie.core.mod.parser.FieldParser;
 import binnie.core.network.BinniePacketHandler;
 import binnie.core.network.IPacketID;
 import binnie.core.network.IPacketProvider;
@@ -20,11 +16,9 @@ import cpw.mods.fml.relauncher.Side;
 public abstract class AbstractMod implements IPacketProvider, IInitializable {
 
     private SimpleNetworkWrapper wrapper;
-    private final LinkedHashSet<Field> fields;
     protected final List<IInitializable> modules;
 
     public AbstractMod() {
-        fields = new LinkedHashSet<>();
         modules = new ArrayList<>();
         BinnieCore.registerMod(this);
     }
@@ -65,22 +59,6 @@ public abstract class AbstractMod implements IPacketProvider, IInitializable {
         for (IInitializable module : modules) {
             module.preInit();
         }
-
-        // TODO what does it mean?
-        Collections.addAll(fields, getClass().getFields());
-        for (Class<?> cls : getClass().getClasses()) {
-            Collections.addAll(fields, getClass().getFields());
-        }
-        for (IInitializable module : modules) {
-            Collections.addAll(fields, module.getClass().getFields());
-        }
-        for (Field field4 : fields) {
-            try {
-                FieldParser.preInitParse(field4, this);
-            } catch (Exception e) {
-                throw new RuntimeException(e);
-            }
-        }
     }
 
     @Override
@@ -96,14 +74,6 @@ public abstract class AbstractMod implements IPacketProvider, IInitializable {
         for (IInitializable module : modules) {
             module.init();
         }
-
-        for (Field field : fields) {
-            try {
-                FieldParser.initParse(field, this);
-            } catch (Exception e) {
-                throw new RuntimeException(e);
-            }
-        }
     }
 
     @Override
@@ -116,14 +86,6 @@ public abstract class AbstractMod implements IPacketProvider, IInitializable {
         for (IInitializable module : modules) {
             module.postInit();
         }
-
-        for (Field field : fields) {
-            try {
-                FieldParser.postInitParse(field, this);
-            } catch (Exception e) {
-                throw new RuntimeException(e);
-            }
-        }
     }
 
     protected void addModule(IInitializable init) {

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

@@ -22,8 +22,6 @@ import binnie.core.liquid.FluidContainer;
 import binnie.core.liquid.ItemFluidContainer;
 import binnie.core.machines.MachineGroup;
 import binnie.core.machines.storage.ModuleStorage;
-import binnie.core.mod.parser.FieldParser;
-import binnie.core.mod.parser.ItemParser;
 import binnie.core.network.BinnieCorePacketID;
 import binnie.core.network.BinniePacketHandler;
 import binnie.core.network.IPacketID;
@@ -110,7 +108,6 @@ public class BinnieCore extends AbstractMod {
             Item item = new ItemFluidContainer(container);
             GameRegistry.registerItem(item, item.getUnlocalizedName().substring(5));
         }
-        FieldParser.parsers.add(new ItemParser());
         super.preInit();
     }
 

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

@@ -1,5 +1,7 @@
 package binnie.core.item;
 
+import static cpw.mods.fml.common.registry.GameRegistry.registerItem;
+
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
@@ -25,6 +27,8 @@ public class ItemGenesis extends Item {
         setCreativeTab(Tabs.tabApiculture);
         setUnlocalizedName("genesis");
         setMaxStackSize(1);
+
+        registerItem(this, getUnlocalizedName().substring(5));
     }
 
     @Override

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

@@ -1,5 +1,7 @@
 package binnie.core.item;
 
+import static cpw.mods.fml.common.registry.GameRegistry.registerItem;
+
 import java.util.List;
 
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -16,11 +18,13 @@ public class ItemMisc extends Item {
 
     private final IItemMisc[] items;
 
-    protected ItemMisc(CreativeTabs tab, IItemMisc[] items2) {
+    public ItemMisc(CreativeTabs tab, IItemMisc[] items) {
         setCreativeTab(tab);
         setHasSubtypes(true);
         setUnlocalizedName("misc");
-        items = items2;
+        this.items = items;
+
+        registerItem(this, getUnlocalizedName().substring(5));
     }
 
     @Override

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

@@ -1,10 +0,0 @@
-package binnie.core.item;
-
-import net.minecraft.creativetab.CreativeTabs;
-
-public class ManagerItem {
-
-    public ItemMisc registerMiscItems(IItemMisc[] items, CreativeTabs tab) {
-        return new ItemMisc(tab, items);
-    }
-}

src/main/java/binnie/core/mod/parser/FieldParser.java

@@ -1,52 +0,0 @@
-package binnie.core.mod.parser;
-
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.Collection;
-
-import binnie.core.AbstractMod;
-
-public abstract class FieldParser {
-
-    public static Collection<FieldParser> parsers = new ArrayList<>();
-
-    public abstract boolean isHandled(Field field, AbstractMod mod);
-
-    public void preInit(Field field, AbstractMod mod) throws IllegalArgumentException, IllegalAccessException {
-        // ignored
-    }
-
-    public void init(Field field, AbstractMod mod) throws IllegalArgumentException, IllegalAccessException {
-        // ignored
-    }
-
-    public void postInit(Field field, AbstractMod mod) throws IllegalArgumentException, IllegalAccessException {
-        // ignored
-    }
-
-    public static void preInitParse(Field field, AbstractMod mod)
-            throws IllegalArgumentException, IllegalAccessException {
-        for (FieldParser parser : FieldParser.parsers) {
-            if (parser.isHandled(field, mod)) {
-                parser.preInit(field, mod);
-            }
-        }
-    }
-
-    public static void initParse(Field field, AbstractMod mod) throws IllegalArgumentException, IllegalAccessException {
-        for (FieldParser parser : FieldParser.parsers) {
-            if (parser.isHandled(field, mod)) {
-                parser.init(field, mod);
-            }
-        }
-    }
-
-    public static void postInitParse(Field field, AbstractMod mod)
-            throws IllegalArgumentException, IllegalAccessException {
-        for (FieldParser parser : FieldParser.parsers) {
-            if (parser.isHandled(field, mod)) {
-                parser.postInit(field, mod);
-            }
-        }
-    }
-}

src/main/java/binnie/core/mod/parser/ItemParser.java

@@ -1,24 +0,0 @@
-package binnie.core.mod.parser;
-
-import java.lang.reflect.Field;
-
-import net.minecraft.item.Item;
-
-import binnie.core.AbstractMod;
-import cpw.mods.fml.common.registry.GameRegistry;
-
-public class ItemParser extends FieldParser {
-
-    @Override
-    public boolean isHandled(Field field, AbstractMod mod) {
-        return Item.class.isAssignableFrom(field.getType());
-    }
-
-    @Override
-    public void preInit(Field field, AbstractMod mod) throws IllegalArgumentException, IllegalAccessException {
-        Item item = (Item) field.get(null);
-        if (item != null) {
-            GameRegistry.registerItem(item, item.getUnlocalizedName().substring(5));
-        }
-    }
-}

src/main/java/binnie/extrabees/ExtraBees.java

@@ -2,7 +2,6 @@ package binnie.extrabees;
 
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
-import net.minecraft.item.Item;
 
 import com.gtnewhorizon.gtnhlib.config.ConfigException;
 import com.gtnewhorizon.gtnhlib.config.ConfigurationManager;
@@ -11,6 +10,7 @@ import binnie.core.AbstractMod;
 import binnie.core.BinnieCore;
 import binnie.core.Tags;
 import binnie.core.gui.IBinnieGUID;
+import binnie.core.item.ItemMisc;
 import binnie.core.network.BinniePacketHandler;
 import binnie.core.proxy.IProxyCore;
 import binnie.extrabees.apiary.ModuleApiary;
@@ -18,7 +18,11 @@ import binnie.extrabees.config.EBConfig;
 import binnie.extrabees.core.ExtraBeeGUID;
 import binnie.extrabees.core.ModuleCore;
 import binnie.extrabees.genetics.ModuleGenetics;
+import binnie.extrabees.genetics.items.ItemDictionary;
 import binnie.extrabees.liquids.ModuleLiquids;
+import binnie.extrabees.products.ItemHoneyComb;
+import binnie.extrabees.products.ItemHoneyDrop;
+import binnie.extrabees.products.ItemPropolis;
 import binnie.extrabees.products.ModuleProducts;
 import binnie.extrabees.proxy.ExtraBeesProxy;
 import binnie.extrabees.worldgen.ModuleGeneration;
@@ -58,11 +62,11 @@ public class ExtraBees extends AbstractMod {
     public static Block hive;
     public static Material materialBeehive;
     public static Block ectoplasm;
-    public static Item comb;
-    public static Item propolis;
-    public static Item honeyDrop;
-    public static Item dictionary;
-    public static Item itemMisc;
+    public static ItemHoneyComb comb;
+    public static ItemPropolis propolis;
+    public static ItemHoneyDrop honeyDrop;
+    public static ItemDictionary dictionary;
+    public static ItemMisc itemMisc;
 
     public ExtraBees() {
         ExtraBees.instance = this;

src/main/java/binnie/extrabees/core/ModuleCore.java

@@ -1,7 +1,7 @@
 package binnie.extrabees.core;
 
-import binnie.Binnie;
 import binnie.core.IInitializable;
+import binnie.core.item.ItemMisc;
 import binnie.extrabees.ExtraBees;
 import forestry.api.core.Tabs;
 
@@ -9,7 +9,7 @@ public class ModuleCore implements IInitializable {
 
     @Override
     public void preInit() {
-        ExtraBees.itemMisc = Binnie.Item.registerMiscItems(ExtraBeeItems.values(), Tabs.tabApiculture);
+        ExtraBees.itemMisc = new ItemMisc(Tabs.tabApiculture, ExtraBeeItems.values());
     }
 
     @Override

src/main/java/binnie/extrabees/genetics/items/ItemDictionary.java

@@ -1,5 +1,7 @@
 package binnie.extrabees.genetics.items;
 
+import static cpw.mods.fml.common.registry.GameRegistry.registerItem;
+
 import java.util.List;
 
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -25,6 +27,8 @@ public class ItemDictionary extends Item {
         setCreativeTab(Tabs.tabApiculture);
         setUnlocalizedName("dictionary");
         setMaxStackSize(1);
+
+        registerItem(this, getUnlocalizedName().substring(5));
     }
 
     @Override

src/main/java/binnie/extrabees/products/ItemHoneyComb.java

@@ -21,9 +21,8 @@ public class ItemHoneyComb extends ItemProduct {
     protected IIcon icon2;
 
     public ItemHoneyComb() {
-        super(EnumHoneyComb.values());
+        super("honeyComb", EnumHoneyComb.values());
         setCreativeTab(Tabs.tabApiculture);
-        setUnlocalizedName("honeyComb");
     }
 
     public static void addSubtypes() {

src/main/java/binnie/extrabees/products/ItemHoneyDrop.java

@@ -15,9 +15,8 @@ public class ItemHoneyDrop extends ItemProduct {
     protected IIcon icon2;
 
     public ItemHoneyDrop() {
-        super(EnumHoneyDrop.values());
+        super("honeyDrop", EnumHoneyDrop.values());
         setCreativeTab(Tabs.tabApiculture);
-        setUnlocalizedName("honeyDrop");
     }
 
     @Override

src/main/java/binnie/extrabees/products/ItemProduct.java

@@ -1,5 +1,7 @@
 package binnie.extrabees.products;
 
+import static cpw.mods.fml.common.registry.GameRegistry.registerItem;
+
 import java.util.List;
 
 import net.minecraft.creativetab.CreativeTabs;
@@ -12,11 +14,14 @@ public class ItemProduct extends Item {
 
     protected IItemEnum[] types;
 
-    public ItemProduct(IItemEnum[] types) {
+    public ItemProduct(String name, IItemEnum[] types) {
         this.types = types;
         setMaxStackSize(64);
         setMaxDamage(0);
         setHasSubtypes(true);
+        setUnlocalizedName(name);
+
+        registerItem(this, getUnlocalizedName().substring(5));
     }
 
     public IItemEnum get(ItemStack stack) {

src/main/java/binnie/extrabees/products/ItemPropolis.java

@@ -11,9 +11,8 @@ import forestry.api.core.Tabs;
 public class ItemPropolis extends ItemProduct {
 
     public ItemPropolis() {
-        super(EnumPropolis.values());
+        super("propolis", EnumPropolis.values());
         setCreativeTab(Tabs.tabApiculture);
-        setUnlocalizedName("propolis");
     }
 
     @Override

src/main/java/binnie/extratrees/ExtraTrees.java

@@ -4,7 +4,6 @@ import static binnie.extratrees.ExtraTrees.EB_MOD_NAME;
 import static binnie.extratrees.ExtraTrees.ET_MODID;
 
 import net.minecraft.block.Block;
-import net.minecraft.item.Item;
 
 import com.gtnewhorizon.gtnhlib.config.ConfigException;
 import com.gtnewhorizon.gtnhlib.config.ConfigurationManager;
@@ -13,6 +12,7 @@ import binnie.core.AbstractMod;
 import binnie.core.BinnieCore;
 import binnie.core.Tags;
 import binnie.core.gui.IBinnieGUID;
+import binnie.core.item.ItemMisc;
 import binnie.core.network.BinniePacketHandler;
 import binnie.core.proxy.IProxyCore;
 import binnie.extrabees.ExtraBees;
@@ -26,6 +26,10 @@ import binnie.extratrees.config.ETConfig;
 import binnie.extratrees.core.ExtraTreesGUID;
 import binnie.extratrees.core.ModuleCore;
 import binnie.extratrees.genetics.ModuleGenetics;
+import binnie.extratrees.item.ItemDictionary;
+import binnie.extratrees.item.ItemFood;
+import binnie.extratrees.item.ItemHammer;
+import binnie.extratrees.item.ItemMothDatabase;
 import binnie.extratrees.item.ModuleItems;
 import binnie.extratrees.machines.ModuleMachine;
 import binnie.extratrees.nei.IMCForNEI;
@@ -61,10 +65,13 @@ public class ExtraTrees extends AbstractMod {
         }
     }
 
-    public static Item itemDictionary;
-    public static Item itemDictionaryLepi;
-    public static Item itemMisc;
-    public static Item itemFood;
+    public static ItemDictionary itemDictionary;
+    public static ItemMothDatabase itemDictionaryLepi;
+    public static ItemMisc itemMisc;
+    public static ItemFood itemFood;
+    public static ItemHammer itemHammer;
+    public static ItemHammer itemDurableHammer;
+
     public static Block blockStairs;
     public static Block blockLog;
     public static BlockCarpentry blockCarpentry;
@@ -75,13 +82,12 @@ public class ExtraTrees extends AbstractMod {
     public static BlockCarpentry blockPanel;
     public static Block blockSlab;
     public static Block blockDoubleSlab;
-    public static Item itemHammer;
-    public static Item itemDurableHammer;
     public static Block blockGate;
     public static Block blockDoor;
     public static BlockMultiFence blockMultiFence;
     public static BlockHedge blockHedge;
     public static BlockStainedDesign blockStained;
+
     public static int doorRenderId;
     public static int branchRenderId;
     public static int fenceID;

src/main/java/binnie/extratrees/item/ItemDictionary.java

@@ -1,5 +1,7 @@
 package binnie.extratrees.item;
 
+import static cpw.mods.fml.common.registry.GameRegistry.registerItem;
+
 import java.util.List;
 
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -25,6 +27,8 @@ public class ItemDictionary extends Item {
         setCreativeTab(Tabs.tabArboriculture);
         setUnlocalizedName("database");
         setMaxStackSize(1);
+
+        registerItem(this, getUnlocalizedName().substring(5));
     }
 
     @Override

src/main/java/binnie/extratrees/item/ItemFood.java

@@ -1,5 +1,7 @@
 package binnie.extratrees.item;
 
+import static cpw.mods.fml.common.registry.GameRegistry.registerItem;
+
 import java.util.List;
 
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -24,6 +26,8 @@ public class ItemFood extends net.minecraft.item.ItemFood {
         setCreativeTab(Tabs.tabArboriculture);
         setHasSubtypes(true);
         items = Food.values();
+
+        registerItem(this, getUnlocalizedName().substring(5));
     }
 
     @Override

src/main/java/binnie/extratrees/item/ItemHammer.java

@@ -1,5 +1,7 @@
 package binnie.extratrees.item;
 
+import static cpw.mods.fml.common.registry.GameRegistry.registerItem;
+
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
@@ -22,6 +24,8 @@ public class ItemHammer extends Item implements IToolHammer {
         setUnlocalizedName(durable ? "durableHammer" : "hammer");
         setMaxStackSize(1);
         setMaxDamage(durable ? 1562 : 251);
+
+        registerItem(this, getUnlocalizedName().substring(5));
     }
 
     @Override

src/main/java/binnie/extratrees/item/ItemMothDatabase.java

@@ -1,5 +1,7 @@
 package binnie.extratrees.item;
 
+import static cpw.mods.fml.common.registry.GameRegistry.registerItem;
+
 import java.util.List;
 
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -25,6 +27,8 @@ public class ItemMothDatabase extends Item {
         setCreativeTab(Tabs.tabLepidopterology);
         setUnlocalizedName("databaseMoth");
         setMaxStackSize(1);
+
+        registerItem(this, getUnlocalizedName().substring(5));
     }
 
     @Override

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

@@ -28,7 +28,7 @@ public class ModuleItems implements IInitializable {
 
     @Override
     public void preInit() {
-        ExtraTrees.itemMisc = Binnie.Item.registerMiscItems(ExtraTreeItems.values(), Tabs.tabArboriculture);
+        ExtraTrees.itemMisc = new ItemMisc(Tabs.tabArboriculture, ExtraTreeItems.values());
         ExtraTrees.itemDictionary = new ItemDictionary();
         if (BinnieCore.isLepidopteryActive()) {
             ExtraTrees.itemDictionaryLepi = new ItemMothDatabase();

src/main/java/binnie/genetics/Genetics.java

@@ -1,10 +1,9 @@
 package binnie.genetics;
 
-import net.minecraft.item.Item;
-
 import binnie.core.AbstractMod;
 import binnie.core.Tags;
 import binnie.core.gui.IBinnieGUID;
+import binnie.core.item.ItemMisc;
 import binnie.core.machines.MachineGroup;
 import binnie.core.network.BinniePacketHandler;
 import binnie.core.network.IPacketID;
@@ -13,6 +12,10 @@ import binnie.genetics.core.GeneticsGUI;
 import binnie.genetics.core.GeneticsPacket;
 import binnie.genetics.item.ItemAnalyst;
 import binnie.genetics.item.ItemDatabase;
+import binnie.genetics.item.ItemMasterRegistry;
+import binnie.genetics.item.ItemRegistry;
+import binnie.genetics.item.ItemSequence;
+import binnie.genetics.item.ItemSerum;
 import binnie.genetics.item.ItemSerumArray;
 import binnie.genetics.item.ModuleItem;
 import binnie.genetics.machine.ModuleMachine;
@@ -38,18 +41,20 @@ public class Genetics extends AbstractMod {
     @SidedProxy(clientSide = "binnie.genetics.proxy.ProxyClient", serverSide = "binnie.genetics.proxy.ProxyServer")
     public static Proxy proxy;
 
-    public static ItemSerumArray itemSerumArray = null;
     public static final String CHANNEL = "GEN";
-    public static Item itemGenetics;
-    public static Item itemSerum;
-    public static Item itemSequencer;
+
+    public static ItemSerumArray itemSerumArray = null;
+    public static ItemMisc itemGenetics;
+    public static ItemSerum itemSerum;
+    public static ItemSequence itemSequencer;
+    public static ItemDatabase database;
+    public static ItemAnalyst analyst;
+    public static ItemRegistry registry;
+    public static ItemMasterRegistry masterRegistry;
+
     public static MachineGroup packageGenetic;
     public static MachineGroup packageAdvGenetic;
     public static MachineGroup packageLabMachine;
-    public static ItemDatabase database;
-    public static ItemAnalyst analyst;
-    public static Item registry;
-    public static Item masterRegistry;
 
     public Genetics() {
         Genetics.instance = this;

src/main/java/binnie/genetics/item/GeneticsItems.java

@@ -56,9 +56,6 @@ public enum GeneticsItems implements IItemMisc {
 
     @Override
     public ItemStack get(int count) {
-        if (Genetics.itemGenetics == null) {
-            return null;
-        }
         return new ItemStack(Genetics.itemGenetics, count, ordinal());
     }
 

src/main/java/binnie/genetics/item/ItemAnalyst.java

@@ -1,5 +1,7 @@
 package binnie.genetics.item;
 
+import static cpw.mods.fml.common.registry.GameRegistry.registerItem;
+
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
@@ -19,6 +21,8 @@ public class ItemAnalyst extends Item {
         setCreativeTab(GeneticsCreativeTab.instance);
         setUnlocalizedName("analyst");
         setMaxStackSize(1);
+
+        registerItem(this, getUnlocalizedName().substring(5));
     }
 
     @Override

src/main/java/binnie/genetics/item/ItemDatabase.java

@@ -1,5 +1,7 @@
 package binnie.genetics.item;
 
+import static cpw.mods.fml.common.registry.GameRegistry.registerItem;
+
 import java.util.List;
 
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -25,6 +27,8 @@ public class ItemDatabase extends Item {
         setCreativeTab(GeneticsCreativeTab.instance);
         setUnlocalizedName("database");
         setMaxStackSize(1);
+
+        registerItem(this, getUnlocalizedName().substring(5));
     }
 
     @Override

src/main/java/binnie/genetics/item/ItemFieldKit.java

@@ -1,5 +1,7 @@
 package binnie.genetics.item;
 
+import static cpw.mods.fml.common.registry.GameRegistry.registerItem;
+
 import java.util.List;
 
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -29,6 +31,8 @@ public class ItemFieldKit extends Item {
         setCreativeTab(GeneticsCreativeTab.instance);
         setMaxStackSize(1);
         setMaxDamage(64);
+
+        registerItem(this, getUnlocalizedName().substring(5));
     }
 
     @Override

src/main/java/binnie/genetics/item/ItemGene.java

@@ -1,5 +1,7 @@
 package binnie.genetics.item;
 
+import static cpw.mods.fml.common.registry.GameRegistry.registerItem;
+
 import java.util.List;
 
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -26,6 +28,8 @@ public abstract class ItemGene extends Item {
         setMaxDamage(16);
         setUnlocalizedName(unlocName);
         setCreativeTab(GeneticsCreativeTab.instance);
+
+        registerItem(this, getUnlocalizedName().substring(5));
     }
 
     @Override

src/main/java/binnie/genetics/item/ItemMasterRegistry.java

@@ -1,5 +1,7 @@
 package binnie.genetics.item;
 
+import static cpw.mods.fml.common.registry.GameRegistry.registerItem;
+
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
@@ -19,6 +21,8 @@ public class ItemMasterRegistry extends Item {
         setCreativeTab(GeneticsCreativeTab.instance);
         setUnlocalizedName("masterRegistry");
         setMaxStackSize(1);
+
+        registerItem(this, getUnlocalizedName().substring(5));
     }
 
     @Override

src/main/java/binnie/genetics/item/ItemRegistry.java

@@ -1,5 +1,7 @@
 package binnie.genetics.item;
 
+import static cpw.mods.fml.common.registry.GameRegistry.registerItem;
+
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
@@ -19,6 +21,8 @@ public class ItemRegistry extends Item {
         setCreativeTab(GeneticsCreativeTab.instance);
         setUnlocalizedName("registry");
         setMaxStackSize(1);
+
+        registerItem(this, getUnlocalizedName().substring(5));
     }
 
     @Override

src/main/java/binnie/genetics/item/ItemSequence.java

@@ -1,5 +1,7 @@
 package binnie.genetics.item;
 
+import static cpw.mods.fml.common.registry.GameRegistry.registerItem;
+
 import java.util.List;
 
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -31,6 +33,8 @@ public class ItemSequence extends Item implements IItemAnalysable, IItemChargabl
         setMaxDamage(5);
         setUnlocalizedName("sequence");
         setCreativeTab(GeneticsCreativeTab.instance);
+
+        registerItem(this, getUnlocalizedName().substring(5));
     }
 
     public static ItemStack create(IGene gene) {

src/main/java/binnie/genetics/item/ModuleItem.java

@@ -12,6 +12,7 @@ import binnie.botany.Botany;
 import binnie.core.BinnieCore;
 import binnie.core.IInitializable;
 import binnie.core.Mods;
+import binnie.core.item.ItemMisc;
 import binnie.core.liquid.ItemFluidContainer;
 import binnie.core.resource.BinnieIcon;
 import binnie.extrabees.ExtraBees;
@@ -44,7 +45,7 @@ public class ModuleItem implements IInitializable {
         Genetics.itemSerum = new ItemSerum();
         Genetics.itemSerumArray = new ItemSerumArray();
         Genetics.itemSequencer = new ItemSequence();
-        Genetics.itemGenetics = Binnie.Item.registerMiscItems(GeneticsItems.values(), GeneticsCreativeTab.instance);
+        Genetics.itemGenetics = new ItemMisc(GeneticsCreativeTab.instance, GeneticsItems.values());
         Genetics.database = new ItemDatabase();
         Genetics.analyst = new ItemAnalyst();
         Genetics.registry = new ItemRegistry();