diff --git a/src/main/java/binnie/Binnie.java b/src/main/java/binnie/Binnie.java index bfd4bfb0..d836e504 100644 --- a/src/main/java/binnie/Binnie.java +++ b/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(); } diff --git a/src/main/java/binnie/botany/gardening/ModuleGardening.java b/src/main/java/binnie/botany/gardening/ModuleGardening.java index 55bf7a3c..6e7e257b 100644 --- a/src/main/java/binnie/botany/gardening/ModuleGardening.java +++ b/src/main/java/binnie/botany/gardening/ModuleGardening.java @@ -1,5 +1,6 @@ package binnie.botany.gardening; +import binnie.core.item.ItemMisc; import java.util.HashMap; import java.util.Map; @@ -12,7 +13,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; @@ -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(); diff --git a/src/main/java/binnie/core/item/ItemMisc.java b/src/main/java/binnie/core/item/ItemMisc.java index 05909bf8..b7980019 100644 --- a/src/main/java/binnie/core/item/ItemMisc.java +++ b/src/main/java/binnie/core/item/ItemMisc.java @@ -16,7 +16,7 @@ public class ItemMisc extends Item { private final IItemMisc[] items; - protected ItemMisc(CreativeTabs tab, IItemMisc[] items2) { + public ItemMisc(CreativeTabs tab, IItemMisc[] items2) { setCreativeTab(tab); setHasSubtypes(true); setUnlocalizedName("misc"); diff --git a/src/main/java/binnie/core/item/ManagerItem.java b/src/main/java/binnie/core/item/ManagerItem.java deleted file mode 100644 index d9b8d5df..00000000 --- a/src/main/java/binnie/core/item/ManagerItem.java +++ /dev/null @@ -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); - } -} diff --git a/src/main/java/binnie/extrabees/core/ModuleCore.java b/src/main/java/binnie/extrabees/core/ModuleCore.java index 3f914f26..d5df65d0 100644 --- a/src/main/java/binnie/extrabees/core/ModuleCore.java +++ b/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 diff --git a/src/main/java/binnie/extratrees/item/ModuleItems.java b/src/main/java/binnie/extratrees/item/ModuleItems.java index a884aefd..23ea53f3 100644 --- a/src/main/java/binnie/extratrees/item/ModuleItems.java +++ b/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(); diff --git a/src/main/java/binnie/genetics/item/ModuleItem.java b/src/main/java/binnie/genetics/item/ModuleItem.java index dffd7e87..43921e64 100644 --- a/src/main/java/binnie/genetics/item/ModuleItem.java +++ b/src/main/java/binnie/genetics/item/ModuleItem.java @@ -1,5 +1,6 @@ package binnie.genetics.item; +import binnie.core.item.ItemMisc; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; @@ -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();