diff --git a/src/main/java/binnie/extrabees/ExtraBees.java b/src/main/java/binnie/extrabees/ExtraBees.java index 12bcc092..4f6c1bb7 100644 --- a/src/main/java/binnie/extrabees/ExtraBees.java +++ b/src/main/java/binnie/extrabees/ExtraBees.java @@ -1,16 +1,10 @@ package binnie.extrabees; -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.item.Item; - -import com.gtnewhorizon.gtnhlib.config.ConfigException; -import com.gtnewhorizon.gtnhlib.config.ConfigurationManager; - import binnie.core.AbstractMod; import binnie.core.BinnieCore; import binnie.core.Tags; import binnie.core.gui.IBinnieGUID; +import binnie.core.item.ItemMisc; import binnie.core.network.BinniePacketHandler; import binnie.core.proxy.IProxyCore; import binnie.extrabees.apiary.ModuleApiary; @@ -18,15 +12,23 @@ import binnie.extrabees.config.EBConfig; import binnie.extrabees.core.ExtraBeeGUID; import binnie.extrabees.core.ModuleCore; import binnie.extrabees.genetics.ModuleGenetics; +import binnie.extrabees.genetics.items.ItemDictionary; import binnie.extrabees.liquids.ModuleLiquids; +import binnie.extrabees.products.ItemHoneyComb; +import binnie.extrabees.products.ItemHoneyDrop; +import binnie.extrabees.products.ItemPropolis; import binnie.extrabees.products.ModuleProducts; import binnie.extrabees.proxy.ExtraBeesProxy; import binnie.extrabees.worldgen.ModuleGeneration; +import com.gtnewhorizon.gtnhlib.config.ConfigException; +import com.gtnewhorizon.gtnhlib.config.ConfigurationManager; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.SidedProxy; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; @Mod( modid = ExtraBees.EB_MODID, @@ -58,11 +60,11 @@ public class ExtraBees extends AbstractMod { public static Block hive; public static Material materialBeehive; public static Block ectoplasm; - public static Item comb; - public static Item propolis; - public static Item honeyDrop; - public static Item dictionary; - public static Item itemMisc; + public static ItemHoneyComb comb; + public static ItemPropolis propolis; + public static ItemHoneyDrop honeyDrop; + public static ItemDictionary dictionary; + public static ItemMisc itemMisc; public ExtraBees() { ExtraBees.instance = this; diff --git a/src/main/java/binnie/extrabees/genetics/items/ItemDictionary.java b/src/main/java/binnie/extrabees/genetics/items/ItemDictionary.java index bbb5df2c..8cc10085 100644 --- a/src/main/java/binnie/extrabees/genetics/items/ItemDictionary.java +++ b/src/main/java/binnie/extrabees/genetics/items/ItemDictionary.java @@ -1,14 +1,6 @@ package binnie.extrabees.genetics.items; -import java.util.List; - -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; -import net.minecraft.world.World; +import static cpw.mods.fml.common.registry.GameRegistry.registerItem; import binnie.core.util.I18N; import binnie.extrabees.ExtraBees; @@ -16,6 +8,14 @@ import binnie.extrabees.core.ExtraBeeGUID; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import forestry.api.core.Tabs; +import java.util.List; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.world.World; public class ItemDictionary extends Item { @@ -25,6 +25,8 @@ public class ItemDictionary extends Item { setCreativeTab(Tabs.tabApiculture); setUnlocalizedName("dictionary"); setMaxStackSize(1); + + registerItem(this, getUnlocalizedName().substring(5)); } @Override diff --git a/src/main/java/binnie/extrabees/products/ItemHoneyComb.java b/src/main/java/binnie/extrabees/products/ItemHoneyComb.java index fbb1c0ef..581b9e47 100644 --- a/src/main/java/binnie/extrabees/products/ItemHoneyComb.java +++ b/src/main/java/binnie/extrabees/products/ItemHoneyComb.java @@ -21,9 +21,8 @@ public class ItemHoneyComb extends ItemProduct { protected IIcon icon2; public ItemHoneyComb() { - super(EnumHoneyComb.values()); + super("honeyComb", EnumHoneyComb.values()); setCreativeTab(Tabs.tabApiculture); - setUnlocalizedName("honeyComb"); } public static void addSubtypes() { diff --git a/src/main/java/binnie/extrabees/products/ItemHoneyDrop.java b/src/main/java/binnie/extrabees/products/ItemHoneyDrop.java index 8a44cf03..3208b7b3 100644 --- a/src/main/java/binnie/extrabees/products/ItemHoneyDrop.java +++ b/src/main/java/binnie/extrabees/products/ItemHoneyDrop.java @@ -15,9 +15,8 @@ public class ItemHoneyDrop extends ItemProduct { protected IIcon icon2; public ItemHoneyDrop() { - super(EnumHoneyDrop.values()); + super("honeyDrop", EnumHoneyDrop.values()); setCreativeTab(Tabs.tabApiculture); - setUnlocalizedName("honeyDrop"); } @Override diff --git a/src/main/java/binnie/extrabees/products/ItemProduct.java b/src/main/java/binnie/extrabees/products/ItemProduct.java index fed448af..513bf9cc 100644 --- a/src/main/java/binnie/extrabees/products/ItemProduct.java +++ b/src/main/java/binnie/extrabees/products/ItemProduct.java @@ -1,5 +1,7 @@ package binnie.extrabees.products; +import static cpw.mods.fml.common.registry.GameRegistry.registerItem; + import java.util.List; import net.minecraft.creativetab.CreativeTabs; @@ -12,11 +14,14 @@ public class ItemProduct extends Item { protected IItemEnum[] types; - public ItemProduct(IItemEnum[] types) { + public ItemProduct(String name, IItemEnum[] types) { this.types = types; setMaxStackSize(64); setMaxDamage(0); setHasSubtypes(true); + setUnlocalizedName(name); + + registerItem(this, getUnlocalizedName().substring(5)); } public IItemEnum get(ItemStack stack) { diff --git a/src/main/java/binnie/extrabees/products/ItemPropolis.java b/src/main/java/binnie/extrabees/products/ItemPropolis.java index 0278cb9f..c9b1a065 100644 --- a/src/main/java/binnie/extrabees/products/ItemPropolis.java +++ b/src/main/java/binnie/extrabees/products/ItemPropolis.java @@ -11,9 +11,8 @@ import forestry.api.core.Tabs; public class ItemPropolis extends ItemProduct { public ItemPropolis() { - super(EnumPropolis.values()); + super("propolis", EnumPropolis.values()); setCreativeTab(Tabs.tabApiculture); - setUnlocalizedName("propolis"); } @Override