From a1ff81e055bed486fbb6c81ef7307b88d0a8bc14 Mon Sep 17 00:00:00 2001
From: chochem <40274384+chochem@users.noreply.github.com>
Date: Fri, 4 Oct 2024 19:43:18 +0100
Subject: [PATCH] Remove the stickhelmet (#25)

* remove cursed helmet sticks

* and restrict oredict registration
---
 src/main/java/mods/natura/common/NContent.java | 8 ++++++--
 src/main/java/mods/natura/items/StickItem.java | 2 --
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/java/mods/natura/common/NContent.java b/src/main/java/mods/natura/common/NContent.java
index b3762e62..ae8b9a2a 100644
--- a/src/main/java/mods/natura/common/NContent.java
+++ b/src/main/java/mods/natura/common/NContent.java
@@ -1737,10 +1737,14 @@ public void addOredictSupport() {
 
         if (!Loader.isModLoaded("ExtraTiC")) {
             // Wooden Planks
-            OreDictionary.registerOre("plankWood", new ItemStack(planks, 1, OreDictionary.WILDCARD_VALUE));
+            for (int i = 0; i < Planks.textureNames.length; i++) {
+                OreDictionary.registerOre("plankWood", new ItemStack(planks, 1, i));
+            }
 
             // Wooden Sticks
-            OreDictionary.registerOre("stickWood", new ItemStack(stickItem, 1, OreDictionary.WILDCARD_VALUE));
+            for (int i = 0; i < StickItem.textureNames.length; i++) {
+                OreDictionary.registerOre("stickWood", new ItemStack(stickItem, 1, i));
+            }
         } else {
             int[] toRegister = { 0, 1, 3, 5, 6, 7, 8, 9, 10 };
             for (int i : toRegister) {
diff --git a/src/main/java/mods/natura/items/StickItem.java b/src/main/java/mods/natura/items/StickItem.java
index 44d63351..edc7ec96 100644
--- a/src/main/java/mods/natura/items/StickItem.java
+++ b/src/main/java/mods/natura/items/StickItem.java
@@ -4,7 +4,6 @@
 
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.init.Items;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
@@ -26,7 +25,6 @@ public StickItem() {
     @SideOnly(Side.CLIENT)
     @Override
     public IIcon getIconFromDamage(int meta) {
-        if (meta >= textureNames.length) return Items.leather_helmet.getIconFromDamage(meta);
         return icons[meta];
     }