From 943f1a493b27c630e95730b385e6524643d98564 Mon Sep 17 00:00:00 2001 From: bspkrs Date: Sat, 14 Dec 2013 20:51:01 -0500 Subject: changed mod back to being Jewelrycraft and removed all Briefcase Speakers code Let's face it, they don't belong together in the same mod... I'll still help you with the SMP compatibility like you originally asked me to, but I'd rather keep my mod idea for another day instead of have it be part of a mod that I'm not really that interested in. Let me know when your code is far enough that you're ready for SMP stuff. --- common/bspkrs/briefcasespeakers/item/ItemBase.java | 18 ------ common/bspkrs/briefcasespeakers/item/ItemList.java | 29 ---------- .../bspkrs/briefcasespeakers/item/ItemRemote.java | 9 --- .../briefcasespeakers/item/ItemThiefGloves.java | 64 ---------------------- 4 files changed, 120 deletions(-) delete mode 100644 common/bspkrs/briefcasespeakers/item/ItemBase.java delete mode 100644 common/bspkrs/briefcasespeakers/item/ItemList.java delete mode 100644 common/bspkrs/briefcasespeakers/item/ItemRemote.java delete mode 100644 common/bspkrs/briefcasespeakers/item/ItemThiefGloves.java (limited to 'common/bspkrs/briefcasespeakers/item') diff --git a/common/bspkrs/briefcasespeakers/item/ItemBase.java b/common/bspkrs/briefcasespeakers/item/ItemBase.java deleted file mode 100644 index 9a017b6..0000000 --- a/common/bspkrs/briefcasespeakers/item/ItemBase.java +++ /dev/null @@ -1,18 +0,0 @@ -package bspkrs.briefcasespeakers.item; - -import net.minecraft.item.Item; - -public 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/ItemList.java b/common/bspkrs/briefcasespeakers/item/ItemList.java deleted file mode 100644 index eb39976..0000000 --- a/common/bspkrs/briefcasespeakers/item/ItemList.java +++ /dev/null @@ -1,29 +0,0 @@ -package bspkrs.briefcasespeakers.item; - -import net.minecraft.item.Item; -import bspkrs.briefcasespeakers.BriefcaseSpeakersMod; -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; - public static Item shadowIngot; - - private static boolean isInitialized = false; - - public static void preInit(FMLPreInitializationEvent e) - { - if (!isInitialized) - { - 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/ItemRemote.java b/common/bspkrs/briefcasespeakers/item/ItemRemote.java deleted file mode 100644 index d9ba959..0000000 --- a/common/bspkrs/briefcasespeakers/item/ItemRemote.java +++ /dev/null @@ -1,9 +0,0 @@ -package bspkrs.briefcasespeakers.item; - -public class ItemRemote extends ItemBase -{ - public ItemRemote(int par1) - { - super(par1); - } -} diff --git a/common/bspkrs/briefcasespeakers/item/ItemThiefGloves.java b/common/bspkrs/briefcasespeakers/item/ItemThiefGloves.java deleted file mode 100644 index d80da55..0000000 --- a/common/bspkrs/briefcasespeakers/item/ItemThiefGloves.java +++ /dev/null @@ -1,64 +0,0 @@ -package bspkrs.briefcasespeakers.item; - -import java.util.Iterator; -import java.util.Random; - -import cpw.mods.fml.relauncher.ReflectionHelper; - -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; -import net.minecraft.village.MerchantRecipeList; - -public class ItemThiefGloves extends ItemBase -{ - public Random rand; - public ItemThiefGloves(int par1) - { - super(par1); - this.setCreativeTab(CreativeTabs.tabTools); - } - - @Override - public boolean itemInteractionForEntity(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, EntityLivingBase par3EntityLivingBase) - { - if (par3EntityLivingBase instanceof EntityVillager) - { - EntityVillager villager = (EntityVillager) par3EntityLivingBase; - int wealth = (Integer) ReflectionHelper.getPrivateValue(EntityVillager.class, villager, "wealth", "field_70956_bz"); - MerchantRecipeList buyingList = (MerchantRecipeList) ReflectionHelper.getPrivateValue(EntityVillager.class, villager, "buyingList", "field_70963_i"); - if(buyingList!=null) - { - Iterator iterator = buyingList.iterator(); - while(iterator.hasNext()) - { - MerchantRecipe recipe = (MerchantRecipe)iterator.next(); - int quantity; - if(recipe.getItemToSell().isStackable()) quantity = recipe.getItemToSell().stackSize * 7; - else quantity = 1; - 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() + "!"); - } - buyingList.clear(); - ReflectionHelper.setPrivateValue(EntityVillager.class, villager, 300, "timeUntilReset", "field_70961_j"); - ReflectionHelper.setPrivateValue(EntityVillager.class, villager, true, "needsInitilization", "field_70959_by"); - } - - villager.dropItem(Item.emerald.itemID, wealth); - ReflectionHelper.setPrivateValue(EntityVillager.class, villager, 0, "wealth", "field_70956_bz"); - return true; - } - else - { - return super.itemInteractionForEntity(par1ItemStack, par2EntityPlayer, par3EntityLivingBase); - } - } - -} -- cgit v1.2.3