From 6478c25ea749e3f6e87ec5a28f483e053e17a645 Mon Sep 17 00:00:00 2001 From: ah-OOG-ah <75745146+ah-OOG-ah@users.noreply.github.com> Date: Sat, 1 Nov 2025 12:17:41 -0400 Subject: [PATCH] Genetics: self-register items --- src/main/java/binnie/genetics/Genetics.java | 25 +++++++++++-------- .../binnie/genetics/item/ItemAnalyst.java | 4 +++ .../binnie/genetics/item/ItemDatabase.java | 4 +++ .../java/binnie/genetics/item/ItemGene.java | 4 +++ .../genetics/item/ItemMasterRegistry.java | 4 +++ .../binnie/genetics/item/ItemRegistry.java | 4 +++ .../binnie/genetics/item/ItemSequence.java | 4 +++ 7 files changed, 39 insertions(+), 10 deletions(-) diff --git a/src/main/java/binnie/genetics/Genetics.java b/src/main/java/binnie/genetics/Genetics.java index 44123647..48a4e585 100644 --- a/src/main/java/binnie/genetics/Genetics.java +++ b/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; diff --git a/src/main/java/binnie/genetics/item/ItemAnalyst.java b/src/main/java/binnie/genetics/item/ItemAnalyst.java index c58f9231..53e6bf1c 100644 --- a/src/main/java/binnie/genetics/item/ItemAnalyst.java +++ b/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 diff --git a/src/main/java/binnie/genetics/item/ItemDatabase.java b/src/main/java/binnie/genetics/item/ItemDatabase.java index a2a3ab80..d9a7fa82 100644 --- a/src/main/java/binnie/genetics/item/ItemDatabase.java +++ b/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 diff --git a/src/main/java/binnie/genetics/item/ItemGene.java b/src/main/java/binnie/genetics/item/ItemGene.java index b25e5238..6034ef65 100644 --- a/src/main/java/binnie/genetics/item/ItemGene.java +++ b/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 diff --git a/src/main/java/binnie/genetics/item/ItemMasterRegistry.java b/src/main/java/binnie/genetics/item/ItemMasterRegistry.java index 6a861e45..e5a6808d 100644 --- a/src/main/java/binnie/genetics/item/ItemMasterRegistry.java +++ b/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 diff --git a/src/main/java/binnie/genetics/item/ItemRegistry.java b/src/main/java/binnie/genetics/item/ItemRegistry.java index f3f83cbd..2659b5b3 100644 --- a/src/main/java/binnie/genetics/item/ItemRegistry.java +++ b/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 diff --git a/src/main/java/binnie/genetics/item/ItemSequence.java b/src/main/java/binnie/genetics/item/ItemSequence.java index 4dfca467..544d6dc2 100644 --- a/src/main/java/binnie/genetics/item/ItemSequence.java +++ b/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) {