Format/import cleanup

1 files changed, 73 insertions, 198 deletions

diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemThiefGloves.java b/src/main/java/darkknight/jewelrycraft/item/ItemThiefGloves.java
index 76d056d..abaefdf 100755
--- a/src/main/java/darkknight/jewelrycraft/item/ItemThiefGloves.java
+++ b/src/main/java/darkknight/jewelrycraft/item/ItemThiefGloves.java
@@ -43,37 +43,20 @@ 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);

+			boolean areOtherVillagersAround = false, canTheySeeYou = false;

+			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;

@@ -87,179 +70,83 @@ public class ItemThiefGloves extends Item {
 			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();

+				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);

+						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))

+							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);

+							villager.entityDropItem(s, 0);

 						if (!player.capabilities.isCreativeMode)

-							JewelrycraftUtil.addCursePoints(

-									player,

-									5);

+							JewelrycraftUtil.addCursePoints(player, 5);

 						player.addChatMessage(

-								new ChatComponentText(

-										villagerString + " #"

-												+ villager.getProfession()

-												+ ": "

-												+ StatCollector.translateToLocal(

-														"chatmessage." + Variables.MODID

-																+ ".villager.confusion")

-												+ " "

-												+ s.getDisplayName()

-												+ "!"));

-						stack.damageItem(1,

-								player);

+								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",

+					ReflectionHelper.setPrivateValue(EntityVillager.class, villager, 300, "timeUntilReset",

 							"field_70961_j");

-					ReflectionHelper.setPrivateValue(

-							EntityVillager.class,

-							villager, true,

-							"needsInitilization",

+					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")));

+					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.isPotionActive(

-							Potion.invisibility)) {

-						player.addChatMessage(

-								new ChatComponentText(

-										villagerString + " #"

-												+ villager.getProfession()

-												+ " "

-												+ StatCollector.translateToLocal(

-														"chatmessage." + Variables.MODID

-																+ ".steal.fail")));

+						JewelrycraftUtil.addCursePoints(player, 25);

+					if (player.isPotionActive(Potion.invisibility)) {

+						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")));

+								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")));

+							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;

 						}

 					}

@@ -267,8 +154,7 @@ public class ItemThiefGloves extends Item {
 			}

 			return true;

 		} else

-			return super.itemInteractionForEntity(stack,

-					player, entity);

+			return super.itemInteractionForEntity(stack, player, entity);

 	}

 

 	/**

@@ -278,24 +164,16 @@ public class ItemThiefGloves extends Item {
 	 * @param par4

 	 */

 	@Override

-	public void addInformation(ItemStack stack, EntityPlayer player,

-			List list, boolean par4) {

+	public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) {

 		if (!shouldAddAdditionalInfo())

-			list.add(EnumChatFormatting.GRAY

-					+ additionalInfoInstructions());

+			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"));

 		}

 	}

 

@@ -303,8 +181,7 @@ public class ItemThiefGloves extends Item {
 	 * @return

 	 */

 	public static boolean shouldAddAdditionalInfo() {

-		if (FMLCommonHandler.instance()

-				.getEffectiveSide() == Side.CLIENT)

+		if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT)

 			if (Keyboard.isKeyDown(Keyboard.KEY_LSHIFT))

 				return true;

 		return false;

@@ -314,9 +191,7 @@ 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;

 	}

 }