From a718ca1c06ae8530e65f9248ae40589f1a353362 Mon Sep 17 00:00:00 2001 From: bspkrs Date: Fri, 13 Dec 2013 23:19:15 -0500 Subject: created ItemBase.java and implemented it in item classes --- common/bspkrs/briefcasespeakers/item/ItemBase.java | 18 ++++++++++++++++++ .../briefcasespeakers/item/ItemBriefcaseSpeakers.java | 14 ++++++-------- common/bspkrs/briefcasespeakers/item/ItemRemote.java | 5 +---- common/bspkrs/briefcasespeakers/item/ItemSpeaker.java | 5 +---- .../bspkrs/briefcasespeakers/item/ItemThiefGloves.java | 11 ++++------- 5 files changed, 30 insertions(+), 23 deletions(-) create mode 100644 common/bspkrs/briefcasespeakers/item/ItemBase.java (limited to 'common/bspkrs/briefcasespeakers/item') diff --git a/common/bspkrs/briefcasespeakers/item/ItemBase.java b/common/bspkrs/briefcasespeakers/item/ItemBase.java new file mode 100644 index 0000000..a70f173 --- /dev/null +++ b/common/bspkrs/briefcasespeakers/item/ItemBase.java @@ -0,0 +1,18 @@ +package bspkrs.briefcasespeakers.item; + +import net.minecraft.item.Item; + +public abstract class ItemBase extends Item +{ + public ItemBase(int par1) + { + super(par1); + } + + @Override + public Item setUnlocalizedName(String name) + { + Item r = super.setUnlocalizedName(name); + return r.setTextureName(name.replaceAll("\\.", ":")); + } +} diff --git a/common/bspkrs/briefcasespeakers/item/ItemBriefcaseSpeakers.java b/common/bspkrs/briefcasespeakers/item/ItemBriefcaseSpeakers.java index 51793a2..818db27 100644 --- a/common/bspkrs/briefcasespeakers/item/ItemBriefcaseSpeakers.java +++ b/common/bspkrs/briefcasespeakers/item/ItemBriefcaseSpeakers.java @@ -1,21 +1,19 @@ package bspkrs.briefcasespeakers.item; -import bspkrs.briefcasespeakers.BriefcaseSpeakersMod; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; -public class ItemBriefcaseSpeakers extends Item +public class ItemBriefcaseSpeakers extends ItemBase { public ItemBriefcaseSpeakers(int par1) { super(par1); - setCreativeTab(CreativeTabs.tabMaterials); + setCreativeTab(CreativeTabs.tabMaterials); } - public void registerIcons(IconRegister reg) - { - if (itemID == BriefcaseSpeakersMod.bspkrs.itemID); + @Override + public void registerIcons(IconRegister reg) + { this.itemIcon = reg.registerIcon("amethyst"); - } + } } diff --git a/common/bspkrs/briefcasespeakers/item/ItemRemote.java b/common/bspkrs/briefcasespeakers/item/ItemRemote.java index 4fdfbe2..d9ba959 100644 --- a/common/bspkrs/briefcasespeakers/item/ItemRemote.java +++ b/common/bspkrs/briefcasespeakers/item/ItemRemote.java @@ -1,12 +1,9 @@ package bspkrs.briefcasespeakers.item; -import net.minecraft.item.Item; - -public class ItemRemote extends Item +public class ItemRemote extends ItemBase { public ItemRemote(int par1) { super(par1); } - } diff --git a/common/bspkrs/briefcasespeakers/item/ItemSpeaker.java b/common/bspkrs/briefcasespeakers/item/ItemSpeaker.java index f94e84e..fe433be 100644 --- a/common/bspkrs/briefcasespeakers/item/ItemSpeaker.java +++ b/common/bspkrs/briefcasespeakers/item/ItemSpeaker.java @@ -1,12 +1,9 @@ package bspkrs.briefcasespeakers.item; -import net.minecraft.item.Item; - -public class ItemSpeaker extends Item +public class ItemSpeaker extends ItemBase { public ItemSpeaker(int par1) { super(par1); } - } diff --git a/common/bspkrs/briefcasespeakers/item/ItemThiefGloves.java b/common/bspkrs/briefcasespeakers/item/ItemThiefGloves.java index ccd24ea..10e54d2 100644 --- a/common/bspkrs/briefcasespeakers/item/ItemThiefGloves.java +++ b/common/bspkrs/briefcasespeakers/item/ItemThiefGloves.java @@ -1,17 +1,13 @@ package bspkrs.briefcasespeakers.item; -import java.lang.reflect.Field; -import java.util.Iterator; - import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.passive.EntityVillager; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.village.MerchantRecipe; -public class ItemThiefGloves extends Item +public class ItemThiefGloves extends ItemBase { public ItemThiefGloves(int par1) { @@ -19,12 +15,13 @@ public class ItemThiefGloves extends Item this.setCreativeTab(CreativeTabs.tabTools); } + @Override public boolean itemInteractionForEntity(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, EntityLivingBase par3EntityLivingBase) { if (par3EntityLivingBase instanceof EntityVillager) { - EntityVillager entityliving = (EntityVillager)par3EntityLivingBase; - MerchantRecipe recipe = null; + EntityVillager entityliving = (EntityVillager) par3EntityLivingBase; + MerchantRecipe recipe = null; entityliving.dropItem(recipe.getItemToSell().itemID, recipe.getItemToSell().stackSize); return true; } -- cgit v1.2.3 From 904e72acd61928dadf3ec40f2bbd9e9cb66e1d5e Mon Sep 17 00:00:00 2001 From: bspkrs Date: Fri, 13 Dec 2013 23:38:41 -0500 Subject: moved items from main class to ItemList.java added ConfigHandler.java --- common/bspkrs/briefcasespeakers/item/ItemList.java | 25 ++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 common/bspkrs/briefcasespeakers/item/ItemList.java (limited to 'common/bspkrs/briefcasespeakers/item') diff --git a/common/bspkrs/briefcasespeakers/item/ItemList.java b/common/bspkrs/briefcasespeakers/item/ItemList.java new file mode 100644 index 0000000..3eaa537 --- /dev/null +++ b/common/bspkrs/briefcasespeakers/item/ItemList.java @@ -0,0 +1,25 @@ +package bspkrs.briefcasespeakers.item; + +import net.minecraft.item.Item; +import bspkrs.briefcasespeakers.config.ConfigHandler; +import cpw.mods.fml.common.event.FMLPreInitializationEvent; + +public class ItemList +{ + public static Item thiefGloves; + public static Item briefcaseSpeakers; + public static Item speaker; + public static Item remote; + + private static boolean isInitialized = false; + + public void preInit(FMLPreInitializationEvent e) + { + if (!isInitialized) + { + thiefGloves = new ItemThiefGloves(ConfigHandler.idThiefGloves).setUnlocalizedName("briefcasespeakers.thiefGloves"); + briefcaseSpeakers = new ItemBriefcaseSpeakers(ConfigHandler.idBriefcaseSpeakers).setUnlocalizedName("briefcasespeakers.briefcaseSpeakers"); + speaker = new ItemSpeaker(ConfigHandler.idSpeaker).setUnlocalizedName("briefcasespeakers.speakers"); + } + } +} -- cgit v1.2.3 From c0ee776c325f3b60010d1d013a3b1814fdb7a149 Mon Sep 17 00:00:00 2001 From: bspkrs Date: Sat, 14 Dec 2013 01:07:59 -0500 Subject: added preInit calls to main class... going to bed. fuck you, Windstream... --- common/bspkrs/briefcasespeakers/item/ItemList.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'common/bspkrs/briefcasespeakers/item') diff --git a/common/bspkrs/briefcasespeakers/item/ItemList.java b/common/bspkrs/briefcasespeakers/item/ItemList.java index 3eaa537..b127882 100644 --- a/common/bspkrs/briefcasespeakers/item/ItemList.java +++ b/common/bspkrs/briefcasespeakers/item/ItemList.java @@ -13,13 +13,14 @@ public class ItemList private static boolean isInitialized = false; - public void preInit(FMLPreInitializationEvent e) + public static void preInit(FMLPreInitializationEvent e) { if (!isInitialized) { thiefGloves = new ItemThiefGloves(ConfigHandler.idThiefGloves).setUnlocalizedName("briefcasespeakers.thiefGloves"); briefcaseSpeakers = new ItemBriefcaseSpeakers(ConfigHandler.idBriefcaseSpeakers).setUnlocalizedName("briefcasespeakers.briefcaseSpeakers"); speaker = new ItemSpeaker(ConfigHandler.idSpeaker).setUnlocalizedName("briefcasespeakers.speakers"); + remote = new ItemRemote(ConfigHandler.idRemote).setUnlocalizedName("briefcasespeakers.remote"); } } } -- cgit v1.2.3