diff --git a/src/main/java/com/mr208/ExpandedArmory/ExpandedArmory.java b/src/main/java/com/mr208/ExpandedArmory/ExpandedArmory.java index 73aa443..bc141d1 100644 --- a/src/main/java/com/mr208/ExpandedArmory/ExpandedArmory.java +++ b/src/main/java/com/mr208/ExpandedArmory/ExpandedArmory.java @@ -25,8 +25,7 @@ acceptedMinecraftVersions = "@MC_RANGE@", dependencies = "required-after:Forge;required-after:weaponmod@@BWM_VERSION_RANGE@;" + "after:Botania;after:appliedenergistics2;after:Thaumcraft;after:simpleores;after:fusion;" + - "after:netherrocks;after:Steamcraft;after:Railcraft;after:gildediron;after:etfuturum;" + - "after:netheriteplus") + "after:netherrocks;after:Steamcraft;after:Railcraft;after:etfuturum;after:netheriteplus") public class ExpandedArmory { @Mod.Instance(MOD_ID) diff --git a/src/main/java/com/mr208/ExpandedArmory/Items/GenericIntegration.java b/src/main/java/com/mr208/ExpandedArmory/Items/GenericIntegration.java index 2770e87..fc59763 100644 --- a/src/main/java/com/mr208/ExpandedArmory/Items/GenericIntegration.java +++ b/src/main/java/com/mr208/ExpandedArmory/Items/GenericIntegration.java @@ -26,11 +26,8 @@ public class GenericIntegration { public static void preInitGI() { GameRegistry.registerItem(ingotBronze = new ItemIngot("ingotBronze"), "ingotBronze"); - ingotBronze.registerOreDictionary(); GameRegistry.registerItem(ingotSteel = new ItemIngot("ingotSteel"), "ingotSteel"); - ingotSteel.registerOreDictionary(); GameRegistry.registerItem(ingotNetherite = new ItemIngot("ingotNetherite"), "ingotNetherite"); - ingotNetherite.registerOreDictionary(); if (Loader.isModLoaded("Railcraft")) RailcraftIntegration.preInit(); } diff --git a/src/main/java/com/mr208/ExpandedArmory/Items/ItemIngot.java b/src/main/java/com/mr208/ExpandedArmory/Items/ItemIngot.java index 3543a3c..faeb8cb 100644 --- a/src/main/java/com/mr208/ExpandedArmory/Items/ItemIngot.java +++ b/src/main/java/com/mr208/ExpandedArmory/Items/ItemIngot.java @@ -8,16 +8,10 @@ public class ItemIngot extends Item { - private final String oreDict; - public ItemIngot(String oreDict) { - this.oreDict = oreDict; this.setUnlocalizedName(MOD_ID + "_" + oreDict); this.setCreativeTab(CreativeTabs.tabMaterials); this.setTextureName(MOD_ID + ":" + oreDict); - } - - public void registerOreDictionary() { OreDictionary.registerOre(oreDict, this); } diff --git a/src/main/resources/assets/exparmory/textures/items/ingotgildediron.png b/src/main/resources/assets/exparmory/textures/items/ingotGildedIron.png similarity index 100% rename from src/main/resources/assets/exparmory/textures/items/ingotgildediron.png rename to src/main/resources/assets/exparmory/textures/items/ingotGildedIron.png