From 82f70a31ea3845242f464e53d7844c8260d1ff1f Mon Sep 17 00:00:00 2001 From: OnyxDarkKnight Date: Sat, 14 Dec 2013 23:00:39 +0200 Subject: Added the smelter, molder and jewelCraftingTable as well as added some textures :) --- common/bspkrs/briefcasespeakers/item/ItemList.java | 10 +++++----- common/bspkrs/briefcasespeakers/item/ItemThiefGloves.java | 8 ++++++-- 2 files changed, 11 insertions(+), 7 deletions(-) (limited to 'common/bspkrs/briefcasespeakers/item') diff --git a/common/bspkrs/briefcasespeakers/item/ItemList.java b/common/bspkrs/briefcasespeakers/item/ItemList.java index 66bd276..eb39976 100644 --- a/common/bspkrs/briefcasespeakers/item/ItemList.java +++ b/common/bspkrs/briefcasespeakers/item/ItemList.java @@ -1,7 +1,7 @@ package bspkrs.briefcasespeakers.item; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; +import bspkrs.briefcasespeakers.BriefcaseSpeakersMod; import bspkrs.briefcasespeakers.config.ConfigHandler; import cpw.mods.fml.common.event.FMLPreInitializationEvent; @@ -19,10 +19,10 @@ public class ItemList { if (!isInitialized) { - thiefGloves = new ItemThiefGloves(ConfigHandler.idThiefGloves).setUnlocalizedName("briefcasespeakers.thiefGloves").setCreativeTab(CreativeTabs.tabCombat); - speaker = new ItemBase(ConfigHandler.idSpeaker).setUnlocalizedName("briefcasespeakers.speakers").setCreativeTab(CreativeTabs.tabMisc); - remote = new ItemRemote(ConfigHandler.idRemote).setUnlocalizedName("briefcasespeakers.remote").setCreativeTab(CreativeTabs.tabMisc); - shadowIngot = new ItemBase(ConfigHandler.idShadowIngot).setUnlocalizedName("briefcasespeakers.ingotShadow").setCreativeTab(CreativeTabs.tabMaterials); + thiefGloves = new ItemThiefGloves(ConfigHandler.idThiefGloves).setUnlocalizedName("briefcasespeakers.thiefGloves").setCreativeTab(BriefcaseSpeakersMod.shadowspkrs); + speaker = new ItemBase(ConfigHandler.idSpeaker).setUnlocalizedName("briefcasespeakers.speakers").setCreativeTab(BriefcaseSpeakersMod.shadowspkrs); + remote = new ItemRemote(ConfigHandler.idRemote).setUnlocalizedName("briefcasespeakers.remote").setCreativeTab(BriefcaseSpeakersMod.shadowspkrs); + shadowIngot = new ItemBase(ConfigHandler.idShadowIngot).setUnlocalizedName("briefcasespeakers.ingotShadow").setCreativeTab(BriefcaseSpeakersMod.shadowspkrs); } } diff --git a/common/bspkrs/briefcasespeakers/item/ItemThiefGloves.java b/common/bspkrs/briefcasespeakers/item/ItemThiefGloves.java index fbdb8ea..1ce4ad3 100644 --- a/common/bspkrs/briefcasespeakers/item/ItemThiefGloves.java +++ b/common/bspkrs/briefcasespeakers/item/ItemThiefGloves.java @@ -37,11 +37,15 @@ public class ItemThiefGloves extends ItemBase while(iterator.hasNext()) { MerchantRecipe recipe = (MerchantRecipe)iterator.next(); - ItemStack s = new ItemStack(recipe.getItemToSell().itemID, recipe.getItemToSell().stackSize * 7, recipe.getItemToSell().getItemDamage()); + int quantity; + String multiple; + if(recipe.getItemToSell().isStackable()){ quantity = recipe.getItemToSell().stackSize * 7; multiple = "s.";} + else {quantity = 1; multiple = ".";} + ItemStack s = new ItemStack(recipe.getItemToSell().itemID, quantity, recipe.getItemToSell().getItemDamage()); s.setTagCompound(recipe.getItemToSell().getTagCompound()); if(par2EntityPlayer.inventory.addItemStackToInventory(s)); else villager.entityDropItem(s, 0); - par2EntityPlayer.addChatMessage("Villager #" + villager.getProfession() + ": Hmmm... I seem to have lost my " + s.getDisplayName() + "s."); + par2EntityPlayer.addChatMessage("Villager #" + villager.getProfession() + ": Hmmm... I seem to have lost my " + s.getDisplayName() + multiple); } buyingList.clear(); ReflectionHelper.setPrivateValue(EntityVillager.class, villager, 300, "timeUntilReset", "field_70961_j"); -- cgit v1.2.3