From 938e33bfab9ca19b6c541dc5b9df52a5db999515 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:24:52 -0400 Subject: [PATCH] Botany Gardening: self-register items --- src/main/java/binnie/botany/Botany.java | 29 +++++++++++-------- .../botany/flower/ItemInsulatedTube.java | 4 +++ .../botany/gardening/ItemSoilMeter.java | 4 +++ .../binnie/botany/gardening/ItemTrowel.java | 4 +++ .../java/binnie/botany/items/ItemClay.java | 4 +++ .../java/binnie/botany/items/ItemPigment.java | 4 +++ 6 files changed, 37 insertions(+), 12 deletions(-) diff --git a/src/main/java/binnie/botany/Botany.java b/src/main/java/binnie/botany/Botany.java index 3ae6a944..c58a8a41 100644 --- a/src/main/java/binnie/botany/Botany.java +++ b/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; diff --git a/src/main/java/binnie/botany/flower/ItemInsulatedTube.java b/src/main/java/binnie/botany/flower/ItemInsulatedTube.java index 068dd792..73842c5c 100644 --- a/src/main/java/binnie/botany/flower/ItemInsulatedTube.java +++ b/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) { diff --git a/src/main/java/binnie/botany/gardening/ItemSoilMeter.java b/src/main/java/binnie/botany/gardening/ItemSoilMeter.java index 5173969e..6aea1285 100644 --- a/src/main/java/binnie/botany/gardening/ItemSoilMeter.java +++ b/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 diff --git a/src/main/java/binnie/botany/gardening/ItemTrowel.java b/src/main/java/binnie/botany/gardening/ItemTrowel.java index 5a2408c1..01a3cfea 100644 --- a/src/main/java/binnie/botany/gardening/ItemTrowel.java +++ b/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 diff --git a/src/main/java/binnie/botany/items/ItemClay.java b/src/main/java/binnie/botany/items/ItemClay.java index bc116aea..e3c2900b 100644 --- a/src/main/java/binnie/botany/items/ItemClay.java +++ b/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 diff --git a/src/main/java/binnie/botany/items/ItemPigment.java b/src/main/java/binnie/botany/items/ItemPigment.java index fe2ae787..cf9bb575 100644 --- a/src/main/java/binnie/botany/items/ItemPigment.java +++ b/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