From 4f7ad220df0438b6f3382110577b53f29da46453 Mon Sep 17 00:00:00 2001 From: bculkin2442 Date: Thu, 24 May 2018 15:50:07 -0400 Subject: Update of all changes --- .../jewelrycraft/item/ItemThiefGloves.java | 231 ++++++++++++++++----- 1 file changed, 178 insertions(+), 53 deletions(-) mode change 100644 => 100755 src/main/java/darkknight/jewelrycraft/item/ItemThiefGloves.java (limited to 'src/main/java/darkknight/jewelrycraft/item/ItemThiefGloves.java') diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemThiefGloves.java b/src/main/java/darkknight/jewelrycraft/item/ItemThiefGloves.java old mode 100644 new mode 100755 index 1d664be..4ca3c0f --- a/src/main/java/darkknight/jewelrycraft/item/ItemThiefGloves.java +++ b/src/main/java/darkknight/jewelrycraft/item/ItemThiefGloves.java @@ -3,7 +3,9 @@ package darkknight.jewelrycraft.item; import java.util.Iterator; import java.util.List; import java.util.Random; + import org.lwjgl.input.Keyboard; + import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.ReflectionHelper; import cpw.mods.fml.relauncher.Side; @@ -41,85 +43,197 @@ public class ItemThiefGloves extends Item { * @return */ @Override - public boolean itemInteractionForEntity(ItemStack stack, EntityPlayer player, EntityLivingBase entity) { - String villagerString = StatCollector.translateToLocal("info." + Variables.MODID + ".villager"); + public boolean itemInteractionForEntity(ItemStack stack, + EntityPlayer player, EntityLivingBase entity) { + String villagerString = StatCollector + .translateToLocal("info." + Variables.MODID + ".villager"); if (entity instanceof EntityVillager) { EntityVillager villager = (EntityVillager) entity; - int wealth = (Integer) ReflectionHelper.getPrivateValue(EntityVillager.class, villager, "wealth", "field_70956_bz"); - MerchantRecipeList buyingList = (MerchantRecipeList) ReflectionHelper.getPrivateValue(EntityVillager.class, villager, "buyingList", "field_70963_i"); + int wealth = (Integer) ReflectionHelper.getPrivateValue( + EntityVillager.class, villager, "wealth", + "field_70956_bz"); + MerchantRecipeList buyingList = + (MerchantRecipeList) ReflectionHelper.getPrivateValue( + EntityVillager.class, villager, "buyingList", + "field_70963_i"); int chance = 1; boolean areOtherVillagersAround = false, canTheySeeYou = false; - AxisAlignedBB axisalignedbb = villager.boundingBox.expand(2.0D, 0.0D, 2.0D); - List entities = villager.worldObj.getEntitiesWithinAABBExcludingEntity(villager, axisalignedbb); + AxisAlignedBB axisalignedbb = + villager.boundingBox.expand(2.0D, 0.0D, 2.0D); + List entities = + villager.worldObj.getEntitiesWithinAABBExcludingEntity( + villager, axisalignedbb); for (Object s : entities) - if (s instanceof EntityVillager && ((EntityVillager) s).canEntityBeSeen(player)) { + if (s instanceof EntityVillager + && ((EntityVillager) s).canEntityBeSeen(player)) { chance += 1; canTheySeeYou = true; areOtherVillagersAround = true; } - if (villager.canEntityBeSeen(player)) chance += 2; - if (player.isPotionActive(Potion.invisibility)) chance -= (0.8 * chance); - if (player.capabilities.isCreativeMode) chance = 1; + if (villager.canEntityBeSeen(player)) + chance += 2; + if (player.isPotionActive(Potion.invisibility)) + chance -= (0.8 * chance); + if (player.capabilities.isCreativeMode) + chance = 1; int steal = rand.nextInt(chance); if (steal == 0) { villager.dropItem(Items.emerald, wealth); - ReflectionHelper.setPrivateValue(EntityVillager.class, villager, 0, "wealth", "field_70956_bz"); + ReflectionHelper.setPrivateValue(EntityVillager.class, + villager, 0, "wealth", "field_70956_bz"); } if (buyingList != null) { Iterator iterator = buyingList.iterator(); if (steal == 0) { while (iterator.hasNext()) { - MerchantRecipe recipe = (MerchantRecipe) iterator.next(); - int toolUses = (Integer) ReflectionHelper.getPrivateValue(MerchantRecipe.class, recipe, "toolUses", "field_77400_d"); + MerchantRecipe recipe = + (MerchantRecipe) iterator.next(); + int toolUses = + (Integer) ReflectionHelper.getPrivateValue( + MerchantRecipe.class, recipe, + "toolUses", "field_77400_d"); int quantity; - if (recipe.getItemToSell().isStackable()) quantity = recipe.getItemToSell().stackSize * (7 - toolUses); - else quantity = recipe.getItemToSell().stackSize; - ItemStack s = new ItemStack(recipe.getItemToSell().getItem(), quantity, recipe.getItemToSell().getItemDamage()); - s.setTagCompound(recipe.getItemToSell().getTagCompound()); - if (player.inventory.addItemStackToInventory(s)) ; - else villager.entityDropItem(s, 0); - if (!player.capabilities.isCreativeMode) JewelrycraftUtil.addCursePoints(player, 5); - player.addChatMessage(new ChatComponentText(villagerString + " #" + villager.getProfession() + ": " + StatCollector.translateToLocal("chatmessage." + Variables.MODID + ".villager.confusion") + " " + s.getDisplayName() + "!")); + if (recipe.getItemToSell().isStackable()) + quantity = recipe.getItemToSell().stackSize + * (7 - toolUses); + else + quantity = recipe.getItemToSell().stackSize; + ItemStack s = new ItemStack( + recipe.getItemToSell().getItem(), quantity, + recipe.getItemToSell().getItemDamage()); + s.setTagCompound( + recipe.getItemToSell().getTagCompound()); + if (player.inventory.addItemStackToInventory(s)) + ; + else + villager.entityDropItem(s, 0); + if (!player.capabilities.isCreativeMode) + JewelrycraftUtil.addCursePoints(player, 5); + player.addChatMessage( + new ChatComponentText(villagerString + " #" + + villager.getProfession() + ": " + + StatCollector.translateToLocal( + "chatmessage." + + Variables.MODID + + ".villager.confusion") + + " " + s.getDisplayName() + "!")); stack.damageItem(1, player); } buyingList.clear(); - ReflectionHelper.setPrivateValue(EntityVillager.class, villager, 300, "timeUntilReset", "field_70961_j"); - ReflectionHelper.setPrivateValue(EntityVillager.class, villager, true, "needsInitilization", "field_70959_by"); - player.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("chatmessage." + Variables.MODID + ".whisper") + ": ")); - player.addChatMessage(new ChatComponentText(EnumChatFormatting.DARK_PURPLE + StatCollector.translateToLocal("chatmessage." + Variables.MODID + ".stealSuccess1"))); - player.addChatMessage(new ChatComponentText(EnumChatFormatting.DARK_PURPLE + StatCollector.translateToLocal("chatmessage." + Variables.MODID + ".stealSuccess2"))); - player.addChatMessage(new ChatComponentText(EnumChatFormatting.DARK_PURPLE + StatCollector.translateToLocal("chatmessage." + Variables.MODID + ".stealSuccess3"))); - } - else { + ReflectionHelper.setPrivateValue(EntityVillager.class, + villager, 300, "timeUntilReset", + "field_70961_j"); + ReflectionHelper.setPrivateValue(EntityVillager.class, + villager, true, "needsInitilization", + "field_70959_by"); + player.addChatMessage( + new ChatComponentText(StatCollector + .translateToLocal("chatmessage." + + Variables.MODID + ".whisper") + + ": ")); + player.addChatMessage(new ChatComponentText( + EnumChatFormatting.DARK_PURPLE + StatCollector + .translateToLocal("chatmessage." + + Variables.MODID + + ".stealSuccess1"))); + player.addChatMessage(new ChatComponentText( + EnumChatFormatting.DARK_PURPLE + StatCollector + .translateToLocal("chatmessage." + + Variables.MODID + + ".stealSuccess2"))); + player.addChatMessage(new ChatComponentText( + EnumChatFormatting.DARK_PURPLE + StatCollector + .translateToLocal("chatmessage." + + Variables.MODID + + ".stealSuccess3"))); + } else { stack.damageItem(1, player); - if (!player.capabilities.isCreativeMode) JewelrycraftUtil.addCursePoints(player, 25); + if (!player.capabilities.isCreativeMode) + JewelrycraftUtil.addCursePoints(player, 25); if (player.isPotionActive(Potion.invisibility)) { - player.addChatMessage(new ChatComponentText(villagerString + " #" + villager.getProfession() + " " + StatCollector.translateToLocal("chatmessage." + Variables.MODID + ".steal.fail"))); - } - else { + player.addChatMessage( + new ChatComponentText(villagerString + " #" + + villager.getProfession() + " " + + StatCollector.translateToLocal( + "chatmessage." + + Variables.MODID + + ".steal.fail"))); + } else { if (areOtherVillagersAround) { if (!canTheySeeYou) { - player.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("chatmessage." + Variables.MODID + ".steal.caught1") + " " + villagerString + " #" + villager.getProfession() + ".")); - player.addChatMessage(new ChatComponentText(villagerString + " #" + villager.getProfession() + " " + StatCollector.translateToLocal("chatmessage." + Variables.MODID + ".steal2"))); + player.addChatMessage( + new ChatComponentText(StatCollector + .translateToLocal( + "chatmessage." + + Variables.MODID + + ".steal.caught1") + + " " + villagerString + + " #" + + villager.getProfession() + + ".")); + player.addChatMessage( + new ChatComponentText( + villagerString + " #" + + villager + .getProfession() + + " " + + StatCollector + .translateToLocal( + "chatmessage." + + Variables.MODID + + ".steal2"))); return true; - } - else { - player.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("chatmessage." + Variables.MODID + ".steal.caught2") + " " + villagerString + " #" + villager.getProfession() + ".")); - player.addChatMessage(new ChatComponentText(villagerString + " #" + villager.getProfession() + " " + StatCollector.translateToLocal("chatmessage." + Variables.MODID + ".steal2"))); + } else { + player.addChatMessage( + new ChatComponentText(StatCollector + .translateToLocal( + "chatmessage." + + Variables.MODID + + ".steal.caught2") + + " " + villagerString + + " #" + + villager.getProfession() + + ".")); + player.addChatMessage( + new ChatComponentText( + villagerString + " #" + + villager + .getProfession() + + " " + + StatCollector + .translateToLocal( + "chatmessage." + + Variables.MODID + + ".steal2"))); return true; } - } - else { - player.addChatMessage(new ChatComponentText(villagerString + " #" + villager.getProfession() + " " + StatCollector.translateToLocal("chatmessage." + Variables.MODID + ".steal1"))); - player.addChatMessage(new ChatComponentText(villagerString + " #" + villager.getProfession() + " " + StatCollector.translateToLocal("chatmessage." + Variables.MODID + ".steal2"))); + } else { + player.addChatMessage(new ChatComponentText( + villagerString + " #" + + villager.getProfession() + + " " + + StatCollector + .translateToLocal( + "chatmessage." + + Variables.MODID + + ".steal1"))); + player.addChatMessage(new ChatComponentText( + villagerString + " #" + + villager.getProfession() + + " " + + StatCollector + .translateToLocal( + "chatmessage." + + Variables.MODID + + ".steal2"))); return true; } } } } return true; - } - else return super.itemInteractionForEntity(stack, player, entity); + } else + return super.itemInteractionForEntity(stack, player, entity); } /** @@ -129,13 +243,21 @@ public class ItemThiefGloves extends Item { * @param par4 */ @Override - @SuppressWarnings("unchecked") - public void addInformation(ItemStack stack, EntityPlayer player, @SuppressWarnings("rawtypes") List list, boolean par4) { - if (!shouldAddAdditionalInfo()) list.add(EnumChatFormatting.GRAY + additionalInfoInstructions()); + public void addInformation(ItemStack stack, EntityPlayer player, + List list, boolean par4) { + if (!shouldAddAdditionalInfo()) + list.add(EnumChatFormatting.GRAY + + additionalInfoInstructions()); else { - list.add(EnumChatFormatting.GRAY + StatCollector.translateToLocal("item." + Variables.MODID + ".thievingGloves.info.1")); - list.add(EnumChatFormatting.GRAY + StatCollector.translateToLocal("item." + Variables.MODID + ".thievingGloves.info.2")); - list.add(EnumChatFormatting.GRAY + StatCollector.translateToLocal("item." + Variables.MODID + ".thievingGloves.info.3")); + list.add(EnumChatFormatting.GRAY + + StatCollector.translateToLocal("item." + + Variables.MODID + ".thievingGloves.info.1")); + list.add(EnumChatFormatting.GRAY + + StatCollector.translateToLocal("item." + + Variables.MODID + ".thievingGloves.info.2")); + list.add(EnumChatFormatting.GRAY + + StatCollector.translateToLocal("item." + + Variables.MODID + ".thievingGloves.info.3")); } } @@ -143,7 +265,9 @@ public class ItemThiefGloves extends Item { * @return */ public static boolean shouldAddAdditionalInfo() { - if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT) if (Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) return true; + if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT) + if (Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) + return true; return false; } @@ -151,7 +275,8 @@ public class ItemThiefGloves extends Item { * @return */ public static String additionalInfoInstructions() { - String message = StatCollector.translateToLocal("item." + Variables.MODID + ".thievingGloves.info.extra"); + String message = StatCollector.translateToLocal( + "item." + Variables.MODID + ".thievingGloves.info.extra"); return message; } } -- cgit v1.2.3