diff --git a/src/main/java/binnie/extratrees/api/IToolHammer.java b/src/main/java/binnie/extratrees/api/IToolHammer.java index cce432e2..bdeab664 100644 --- a/src/main/java/binnie/extratrees/api/IToolHammer.java +++ b/src/main/java/binnie/extratrees/api/IToolHammer.java @@ -5,7 +5,5 @@ import net.minecraft.item.ItemStack; public interface IToolHammer { - boolean isActive(ItemStack stack); - void onHammerUsed(ItemStack stack, EntityPlayer player); } diff --git a/src/main/java/binnie/extratrees/carpentry/BlockDesign.java b/src/main/java/binnie/extratrees/carpentry/BlockDesign.java index b27e5133..4f2c6914 100644 --- a/src/main/java/binnie/extratrees/carpentry/BlockDesign.java +++ b/src/main/java/binnie/extratrees/carpentry/BlockDesign.java @@ -60,8 +60,7 @@ public abstract class BlockDesign extends BlockMetadata implements IMultipassBlo } ItemStack item = player.getHeldItem(); - if (item == null || !(item.getItem() instanceof IToolHammer) - || !((IToolHammer) item.getItem()).isActive(item)) { + if (item == null || !(item.getItem() instanceof IToolHammer)) { return; } diff --git a/src/main/java/binnie/extratrees/item/ItemDictionary.java b/src/main/java/binnie/extratrees/item/ItemDictionary.java index 822faff5..ce1f8f6b 100644 --- a/src/main/java/binnie/extratrees/item/ItemDictionary.java +++ b/src/main/java/binnie/extratrees/item/ItemDictionary.java @@ -1,5 +1,6 @@ package binnie.extratrees.item; +import cpw.mods.fml.common.registry.GameRegistry; import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; @@ -22,9 +23,13 @@ public class ItemDictionary extends Item { protected IIcon iconMaster; public ItemDictionary() { + final String name = "database"; + setCreativeTab(Tabs.tabArboriculture); - setUnlocalizedName("database"); + setUnlocalizedName(name); setMaxStackSize(1); + + GameRegistry.registerItem(this, name); } @Override diff --git a/src/main/java/binnie/extratrees/item/ItemFood.java b/src/main/java/binnie/extratrees/item/ItemFood.java index f8435180..183a3dba 100644 --- a/src/main/java/binnie/extratrees/item/ItemFood.java +++ b/src/main/java/binnie/extratrees/item/ItemFood.java @@ -1,6 +1,7 @@ package binnie.extratrees.item; import binnie.core.item.IItemMisc; +import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import forestry.api.core.Tabs; @@ -17,10 +18,14 @@ public class ItemFood extends net.minecraft.item.ItemFood { public ItemFood() { super(0, 0.0f, false); - setUnlocalizedName("food"); + final String name = "food"; + + setUnlocalizedName(name); setCreativeTab(Tabs.tabArboriculture); setHasSubtypes(true); items = Food.values(); + + GameRegistry.registerItem(this, name); } @Override diff --git a/src/main/java/binnie/extratrees/item/ItemHammer.java b/src/main/java/binnie/extratrees/item/ItemHammer.java index 783e27ee..94f0e6ce 100644 --- a/src/main/java/binnie/extratrees/item/ItemHammer.java +++ b/src/main/java/binnie/extratrees/item/ItemHammer.java @@ -1,5 +1,6 @@ package binnie.extratrees.item; +import cpw.mods.fml.common.registry.GameRegistry; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -14,31 +15,31 @@ import cpw.mods.fml.relauncher.SideOnly; public class ItemHammer extends Item implements IToolHammer { + private final String name; protected boolean isDurableHammer; public ItemHammer(boolean durable) { + name = durable ? "durableHammer" : "hammer"; + isDurableHammer = durable; setCreativeTab(CreativeTabs.tabTools); - setUnlocalizedName(durable ? "durableHammer" : "hammer"); + setUnlocalizedName(name); setMaxStackSize(1); setMaxDamage(durable ? 1562 : 251); + + GameRegistry.registerItem(this, name); } @Override @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister register) { - itemIcon = ExtraTrees.proxy.getIcon(register, isDurableHammer ? "durableHammer" : "carpentryHammer"); + itemIcon = ExtraTrees.proxy.getIcon(register, name); } @Override public String getItemStackDisplayName(ItemStack i) { - return isDurableHammer ? I18N.localise("extratrees.item.masterCarpentryHammer") - : I18N.localise("extratrees.item.carpentryHammer"); - } - - @Override - public boolean isActive(ItemStack stack) { - return true; + return isDurableHammer ? I18N.localise("extratrees.item.masterCarpentryHammer.name") + : I18N.localise("extratrees.item.carpentryHammer.name"); } @Override diff --git a/src/main/java/binnie/extratrees/item/ItemMothDatabase.java b/src/main/java/binnie/extratrees/item/ItemMothDatabase.java index 46c056c2..006119ca 100644 --- a/src/main/java/binnie/extratrees/item/ItemMothDatabase.java +++ b/src/main/java/binnie/extratrees/item/ItemMothDatabase.java @@ -1,5 +1,6 @@ package binnie.extratrees.item; +import cpw.mods.fml.common.registry.GameRegistry; import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; @@ -22,9 +23,13 @@ public class ItemMothDatabase extends Item { protected IIcon iconMaster; public ItemMothDatabase() { + final String name = "databaseMoth"; + setCreativeTab(Tabs.tabLepidopterology); - setUnlocalizedName("databaseMoth"); + setUnlocalizedName(name); setMaxStackSize(1); + + GameRegistry.registerItem(this, name); } @Override diff --git a/src/main/java/binnie/extratrees/item/ModuleItems.java b/src/main/java/binnie/extratrees/item/ModuleItems.java index 889186e2..89e7cfc9 100644 --- a/src/main/java/binnie/extratrees/item/ModuleItems.java +++ b/src/main/java/binnie/extratrees/item/ModuleItems.java @@ -1,9 +1,10 @@ package binnie.extratrees.item; +import static binnie.extratrees.item.ETItems.itemMisc; import static binnie.extratrees.item.ETMisc.Items.Bark; -import static binnie.extratrees.item.ETMisc.Items.WoodWax; -import static binnie.extratrees.item.ETMisc.Items.ProvenGear; import static binnie.extratrees.item.ETMisc.Items.GlassFitting; +import static binnie.extratrees.item.ETMisc.Items.ProvenGear; +import static binnie.extratrees.item.ETMisc.Items.WoodWax; import binnie.Binnie; import binnie.core.BinnieCore; @@ -29,6 +30,10 @@ public class ModuleItems implements IInitializable { @Override public void preInit() { + // Loads ETItems.class, guaranteeing that items are init by this point + // TODO: is this needed? + itemMisc.getUnlocalizedName(); + if (BinnieCore.isLepidopteryActive()) { ETItems.itemDictionaryLepi = new ItemMothDatabase(); }