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 ++++------- reference/assets/briefcasespeakers/lang/en_US.lang | 4 ++++ 6 files changed, 34 insertions(+), 23 deletions(-) create mode 100644 common/bspkrs/briefcasespeakers/item/ItemBase.java 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; } diff --git a/reference/assets/briefcasespeakers/lang/en_US.lang b/reference/assets/briefcasespeakers/lang/en_US.lang index e69de29..bd376e1 100644 --- a/reference/assets/briefcasespeakers/lang/en_US.lang +++ b/reference/assets/briefcasespeakers/lang/en_US.lang @@ -0,0 +1,4 @@ +item.briefcasespeakers.briefcaseSpeakers=Briefcase Speakers +item.briefcasespeakers.remote=Audio Remote +item.briefcasespeakers.speaker=Speaker +item.briefcasespeakers.thiefGloves=Thiefing Gloves \ No newline at end of file -- 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 --- .../briefcasespeakers/BriefcaseSpeakersMod.java | 10 +------ .../briefcasespeakers/config/ConfigHandler.java | 34 ++++++++++++++++++++++ common/bspkrs/briefcasespeakers/item/ItemList.java | 25 ++++++++++++++++ 3 files changed, 60 insertions(+), 9 deletions(-) create mode 100644 common/bspkrs/briefcasespeakers/config/ConfigHandler.java create mode 100644 common/bspkrs/briefcasespeakers/item/ItemList.java diff --git a/common/bspkrs/briefcasespeakers/BriefcaseSpeakersMod.java b/common/bspkrs/briefcasespeakers/BriefcaseSpeakersMod.java index 656ea1a..2d7f38b 100644 --- a/common/bspkrs/briefcasespeakers/BriefcaseSpeakersMod.java +++ b/common/bspkrs/briefcasespeakers/BriefcaseSpeakersMod.java @@ -1,14 +1,11 @@ package bspkrs.briefcasespeakers; -import net.minecraft.item.Item; import net.minecraft.network.INetworkManager; import net.minecraft.network.NetLoginHandler; import net.minecraft.network.packet.NetHandler; import net.minecraft.network.packet.Packet1Login; import net.minecraft.server.MinecraftServer; import bspkrs.briefcasespeakers.client.BriefcaseSpeakersClient; -import bspkrs.briefcasespeakers.item.ItemBriefcaseSpeakers; -import bspkrs.briefcasespeakers.item.ItemThiefGloves; import bspkrs.briefcasespeakers.lib.Reference; import bspkrs.briefcasespeakers.server.BriefcaseSpeakersServer; import cpw.mods.fml.common.Mod; @@ -24,7 +21,6 @@ import cpw.mods.fml.common.network.IConnectionHandler; import cpw.mods.fml.common.network.NetworkMod; import cpw.mods.fml.common.network.NetworkMod.SidedPacketHandler; import cpw.mods.fml.common.network.Player; -import cpw.mods.fml.common.registry.LanguageRegistry; @Mod(modid = Reference.MODID, name = Reference.MODNAME, version = Reference.VERSION) @NetworkMod(clientSideRequired = false, serverSideRequired = false, @@ -42,9 +38,6 @@ public class BriefcaseSpeakersMod implements IConnectionHandler @SidedProxy(clientSide = "bspkrs.briefcasespeakers.client.ClientProxy", serverSide = "bspkrs.briefcasespeakers.CommonProxy") public static CommonProxy proxy; - public static Item bspkrs = new ItemBriefcaseSpeakers(1000).setUnlocalizedName("BriefcaseSpeakers"); - public static Item thief = new ItemThiefGloves(1001).setUnlocalizedName("ThiefGloves"); - @EventHandler public void preInit(FMLPreInitializationEvent e) { @@ -54,8 +47,7 @@ public class BriefcaseSpeakersMod implements IConnectionHandler @EventHandler public void init(FMLInitializationEvent e) { - LanguageRegistry.addName(bspkrs, "Briefcase Speakers"); - LanguageRegistry.addName(thief, "Thiefing Gloves"); + } @EventHandler diff --git a/common/bspkrs/briefcasespeakers/config/ConfigHandler.java b/common/bspkrs/briefcasespeakers/config/ConfigHandler.java new file mode 100644 index 0000000..00c088d --- /dev/null +++ b/common/bspkrs/briefcasespeakers/config/ConfigHandler.java @@ -0,0 +1,34 @@ +package bspkrs.briefcasespeakers.config; + +import net.minecraftforge.common.Configuration; +import cpw.mods.fml.common.event.FMLPreInitializationEvent; + +public class ConfigHandler +{ + private static Configuration config; + public static int idThiefGloves = 17493; + public static int idBriefcaseSpeakers = 17494; + public static int idSpeaker = 17495; + public static int idRemote = 17496; + + private static boolean isInitialized = false; + + public static void preInit(FMLPreInitializationEvent e) + { + if (!isInitialized) + { + config = new Configuration(e.getSuggestedConfigurationFile()); + + config.load(); + + idThiefGloves = config.getItem("id.ThiefGloves", idThiefGloves).getInt(); + idBriefcaseSpeakers = config.getItem("id.BriefcaseSpeakers", idBriefcaseSpeakers).getInt(); + idSpeaker = config.getItem("id.Speaker", idSpeaker).getInt(); + idRemote = config.getItem("id.Remote", idRemote).getInt(); + + config.save(); + + isInitialized = true; + } + } +} 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/BriefcaseSpeakersMod.java | 6 +++++- common/bspkrs/briefcasespeakers/item/ItemList.java | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/common/bspkrs/briefcasespeakers/BriefcaseSpeakersMod.java b/common/bspkrs/briefcasespeakers/BriefcaseSpeakersMod.java index 2d7f38b..3d81ea8 100644 --- a/common/bspkrs/briefcasespeakers/BriefcaseSpeakersMod.java +++ b/common/bspkrs/briefcasespeakers/BriefcaseSpeakersMod.java @@ -6,6 +6,8 @@ import net.minecraft.network.packet.NetHandler; import net.minecraft.network.packet.Packet1Login; import net.minecraft.server.MinecraftServer; import bspkrs.briefcasespeakers.client.BriefcaseSpeakersClient; +import bspkrs.briefcasespeakers.config.ConfigHandler; +import bspkrs.briefcasespeakers.item.ItemList; import bspkrs.briefcasespeakers.lib.Reference; import bspkrs.briefcasespeakers.server.BriefcaseSpeakersServer; import cpw.mods.fml.common.Mod; @@ -40,7 +42,9 @@ public class BriefcaseSpeakersMod implements IConnectionHandler @EventHandler public void preInit(FMLPreInitializationEvent e) - { + { + ConfigHandler.preInit(e); + ItemList.preInit(e); } 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 From 7645990feb3254d08dafc72811786c5f33009bdd Mon Sep 17 00:00:00 2001 From: bspkrs Date: Sat, 14 Dec 2013 01:10:27 -0500 Subject: saved uncommitted file... NOW i'm going to bed. --- common/bspkrs/briefcasespeakers/BriefcaseSpeakersMod.java | 1 - 1 file changed, 1 deletion(-) diff --git a/common/bspkrs/briefcasespeakers/BriefcaseSpeakersMod.java b/common/bspkrs/briefcasespeakers/BriefcaseSpeakersMod.java index 3d81ea8..f5dc840 100644 --- a/common/bspkrs/briefcasespeakers/BriefcaseSpeakersMod.java +++ b/common/bspkrs/briefcasespeakers/BriefcaseSpeakersMod.java @@ -45,7 +45,6 @@ public class BriefcaseSpeakersMod implements IConnectionHandler { ConfigHandler.preInit(e); ItemList.preInit(e); - } @EventHandler -- cgit v1.2.3 From 9706e1c6a4ffca40a39a6b38bd18c8acdc927840 Mon Sep 17 00:00:00 2001 From: bspkrs Date: Sat, 14 Dec 2013 01:15:47 -0500 Subject: added item icon file placeholders --- reference/assets/briefcasespeakers/textures/items/briefcaseSpeakers.png | 0 reference/assets/briefcasespeakers/textures/items/remote.png | 0 reference/assets/briefcasespeakers/textures/items/speaker.png | 0 3 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 reference/assets/briefcasespeakers/textures/items/briefcaseSpeakers.png create mode 100644 reference/assets/briefcasespeakers/textures/items/remote.png create mode 100644 reference/assets/briefcasespeakers/textures/items/speaker.png diff --git a/reference/assets/briefcasespeakers/textures/items/briefcaseSpeakers.png b/reference/assets/briefcasespeakers/textures/items/briefcaseSpeakers.png new file mode 100644 index 0000000..e69de29 diff --git a/reference/assets/briefcasespeakers/textures/items/remote.png b/reference/assets/briefcasespeakers/textures/items/remote.png new file mode 100644 index 0000000..e69de29 diff --git a/reference/assets/briefcasespeakers/textures/items/speaker.png b/reference/assets/briefcasespeakers/textures/items/speaker.png new file mode 100644 index 0000000..e69de29 -- cgit v1.2.3