diff --git a/src/main/java/binnie/extratrees/ExtraTrees.java b/src/main/java/binnie/extratrees/ExtraTrees.java index 7c43941f..cb0a0d16 100644 --- a/src/main/java/binnie/extratrees/ExtraTrees.java +++ b/src/main/java/binnie/extratrees/ExtraTrees.java @@ -3,16 +3,11 @@ package binnie.extratrees; import static binnie.extratrees.ExtraTrees.EB_MOD_NAME; import static binnie.extratrees.ExtraTrees.ET_MODID; -import net.minecraft.block.Block; -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.ExtraBees; @@ -26,15 +21,22 @@ import binnie.extratrees.config.ETConfig; import binnie.extratrees.core.ExtraTreesGUID; import binnie.extratrees.core.ModuleCore; import binnie.extratrees.genetics.ModuleGenetics; +import binnie.extratrees.item.ItemDictionary; +import binnie.extratrees.item.ItemFood; +import binnie.extratrees.item.ItemHammer; +import binnie.extratrees.item.ItemMothDatabase; import binnie.extratrees.item.ModuleItems; import binnie.extratrees.machines.ModuleMachine; import binnie.extratrees.nei.IMCForNEI; import binnie.extratrees.proxy.Proxy; +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; @Mod( modid = ET_MODID, @@ -61,10 +63,13 @@ public class ExtraTrees extends AbstractMod { } } - public static Item itemDictionary; - public static Item itemDictionaryLepi; - public static Item itemMisc; - public static Item itemFood; + public static ItemDictionary itemDictionary; + public static ItemMothDatabase itemDictionaryLepi; + public static ItemMisc itemMisc; + public static ItemFood itemFood; + public static ItemHammer itemHammer; + public static ItemHammer itemDurableHammer; + public static Block blockStairs; public static Block blockLog; public static BlockCarpentry blockCarpentry; @@ -75,13 +80,12 @@ public class ExtraTrees extends AbstractMod { public static BlockCarpentry blockPanel; public static Block blockSlab; public static Block blockDoubleSlab; - public static Item itemHammer; - public static Item itemDurableHammer; public static Block blockGate; public static Block blockDoor; public static BlockMultiFence blockMultiFence; public static BlockHedge blockHedge; public static BlockStainedDesign blockStained; + public static int doorRenderId; public static int branchRenderId; public static int fenceID; diff --git a/src/main/java/binnie/extratrees/item/ItemDictionary.java b/src/main/java/binnie/extratrees/item/ItemDictionary.java index 822faff5..572421de 100644 --- a/src/main/java/binnie/extratrees/item/ItemDictionary.java +++ b/src/main/java/binnie/extratrees/item/ItemDictionary.java @@ -1,5 +1,7 @@ package binnie.extratrees.item; +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 ItemDictionary extends Item { setCreativeTab(Tabs.tabArboriculture); setUnlocalizedName("database"); setMaxStackSize(1); + + registerItem(this, getUnlocalizedName().substring(5)); } @Override diff --git a/src/main/java/binnie/extratrees/item/ItemFood.java b/src/main/java/binnie/extratrees/item/ItemFood.java index 712914e0..75998c4b 100644 --- a/src/main/java/binnie/extratrees/item/ItemFood.java +++ b/src/main/java/binnie/extratrees/item/ItemFood.java @@ -1,5 +1,7 @@ package binnie.extratrees.item; +import static cpw.mods.fml.common.registry.GameRegistry.registerItem; + import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; @@ -24,6 +26,8 @@ public class ItemFood extends net.minecraft.item.ItemFood { setCreativeTab(Tabs.tabArboriculture); setHasSubtypes(true); items = Food.values(); + + registerItem(this, getUnlocalizedName().substring(5)); } @Override diff --git a/src/main/java/binnie/extratrees/item/ItemHammer.java b/src/main/java/binnie/extratrees/item/ItemHammer.java index 783e27ee..00ab0fb6 100644 --- a/src/main/java/binnie/extratrees/item/ItemHammer.java +++ b/src/main/java/binnie/extratrees/item/ItemHammer.java @@ -1,5 +1,7 @@ package binnie.extratrees.item; +import static cpw.mods.fml.common.registry.GameRegistry.registerItem; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -22,6 +24,8 @@ public class ItemHammer extends Item implements IToolHammer { setUnlocalizedName(durable ? "durableHammer" : "hammer"); setMaxStackSize(1); setMaxDamage(durable ? 1562 : 251); + + registerItem(this, getUnlocalizedName().substring(5)); } @Override diff --git a/src/main/java/binnie/extratrees/item/ItemMothDatabase.java b/src/main/java/binnie/extratrees/item/ItemMothDatabase.java index 46c056c2..6d5c2b03 100644 --- a/src/main/java/binnie/extratrees/item/ItemMothDatabase.java +++ b/src/main/java/binnie/extratrees/item/ItemMothDatabase.java @@ -1,5 +1,7 @@ package binnie.extratrees.item; +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 ItemMothDatabase extends Item { setCreativeTab(Tabs.tabLepidopterology); setUnlocalizedName("databaseMoth"); setMaxStackSize(1); + + registerItem(this, getUnlocalizedName().substring(5)); } @Override