23 files changed, 548 insertions, 1383 deletions

diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemBaseJewelry.java b/src/main/java/darkknight/jewelrycraft/item/ItemBaseJewelry.java
index 2c2311c..da0315f 100755
--- a/src/main/java/darkknight/jewelrycraft/item/ItemBaseJewelry.java
+++ b/src/main/java/darkknight/jewelrycraft/item/ItemBaseJewelry.java
@@ -36,16 +36,13 @@ public abstract class ItemBaseJewelry extends Item {
 	@SideOnly(Side.CLIENT)

 	public int getColorFromItemStack(ItemStack stack, int pass) {

 		if (pass == 0 && JewelryNBT.ingot(stack) != null) {

-			return JewelrycraftUtil

-					.getColor(JewelryNBT.ingot(stack));

+			return JewelrycraftUtil.getColor(JewelryNBT.ingot(stack));

 		}

 

 		if (pass == 1 && JewelryNBT.gem(stack) != null) {

-			return JewelrycraftUtil

-					.getColor(JewelryNBT.gem(stack));

+			return JewelrycraftUtil.getColor(JewelryNBT.gem(stack));

 		} else if (JewelryNBT.ingot(stack) != null) {

-			return JewelrycraftUtil

-					.getColor(JewelryNBT.ingot(stack));

+			return JewelrycraftUtil.getColor(JewelryNBT.ingot(stack));

 		}

 

 		return 16777215;

@@ -57,24 +54,14 @@ public abstract class ItemBaseJewelry extends Item {
 	 */

 	@Override

 	public String getItemStackDisplayName(ItemStack stack) {

-		if (JewelryNBT.ingot(stack) != null && Item.getIdFromItem(

-				JewelryNBT.ingot(stack).getItem()) > 0)

-			return JewelryNBT.ingot(stack).getDisplayName()

-					.replace("Ingot", " ").trim()

-					+ " "

-					+ ("" + StatCollector

-							.translateToLocal(

-									getUnlocalizedNameInefficiently(

-											stack)

-											+ ".name")).trim();

-		return ("" + StatCollector.translateToLocal(

-				getUnlocalizedNameInefficiently(stack)

-						+ ".name")).trim();

+		if (JewelryNBT.ingot(stack) != null && Item.getIdFromItem(JewelryNBT.ingot(stack).getItem()) > 0)

+			return JewelryNBT.ingot(stack).getDisplayName().replace("Ingot", " ").trim() + " "

+					+ ("" + StatCollector.translateToLocal(getUnlocalizedNameInefficiently(stack) + ".name")).trim();

+		return ("" + StatCollector.translateToLocal(getUnlocalizedNameInefficiently(stack) + ".name")).trim();

 	}

 

 	/**

-	 * allows items to add custom lines of information to the mouseover

-	 * description.

+	 * allows items to add custom lines of information to the mouseover description.

 	 *

 	 * @param stack

 	 * @param player

@@ -82,49 +69,28 @@ public abstract class ItemBaseJewelry 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 (stack.hasTagCompound() && ConfigHandler.JEWELRY_INFO) {

 			ItemStack ingot = JewelryNBT.ingot(stack);

-			if (ingot != null && Item.getIdFromItem(JewelryNBT

-					.ingot(stack).getItem()) > 0) {

-				list.add(StatCollector.translateToLocal(

-						"info." + Variables.MODID

-								+ ".metal")

-						+ ": "

-						+ EnumChatFormatting.YELLOW

-						+ ingot.getDisplayName()

-								.replace(StatCollector

-										.translateToLocal(

-												"info." + Variables.MODID

-														+ ".ingot"),

-										" "));

+			if (ingot != null && Item.getIdFromItem(JewelryNBT.ingot(stack).getItem()) > 0) {

+				list.add(StatCollector.translateToLocal("info." + Variables.MODID + ".metal") + ": "

+						+ EnumChatFormatting.YELLOW + ingot.getDisplayName()

+								.replace(StatCollector.translateToLocal("info." + Variables.MODID + ".ingot"), " "));

 			}

 

 			ItemStack gem = JewelryNBT.gem(stack);

 

 			if (gem != null) {

-				list.add(StatCollector.translateToLocal(

-						"info." + Variables.MODID

-								+ ".gem")

-						+ ": "

-						+ EnumChatFormatting.BLUE

-						+ gem.getDisplayName());

+				list.add(StatCollector.translateToLocal("info." + Variables.MODID + ".gem") + ": "

+						+ EnumChatFormatting.BLUE + gem.getDisplayName());

 			}

 

-			ArrayList<ItemStack> modifier = JewelryNBT

-					.modifier(stack);

+			ArrayList<ItemStack> modifier = JewelryNBT.modifier(stack);

 

 			if (!modifier.isEmpty())

-				list.add(StatCollector.translateToLocal(

-						"info." + Variables.MODID

-								+ ".modifiers")

-						+ ": ");

+				list.add(StatCollector.translateToLocal("info." + Variables.MODID + ".modifiers") + ": ");

 			for (int i = 0; i < modifier.size(); i++)

-				list.add(EnumChatFormatting.DARK_PURPLE

-						+ modifier.get(i)

-								.getDisplayName()

-						+ " x"

+				list.add(EnumChatFormatting.DARK_PURPLE + modifier.get(i).getDisplayName() + " x"

 						+ modifier.get(i).stackSize);

 		}

 	}

@@ -135,8 +101,7 @@ public abstract class ItemBaseJewelry extends Item {
 	 */

 	public void action(ItemStack item, EntityPlayer player) {

 		for (ModifierEffects mod : ModifierEffects.getEffects())

-			if (JewelryNBT.doesModifierExist(item,

-					mod.getModifier()))

+			if (JewelryNBT.doesModifierExist(item, mod.getModifier()))

 				mod.action(item, player, this);

 	}

 

@@ -146,15 +111,10 @@ public abstract class ItemBaseJewelry extends Item {
 	 * @param source

 	 * @return

 	 */

-	public boolean onPlayerAttackedCacellable(ItemStack item,

-			EntityPlayer player, DamageSource source,

-			float amount) {

+	public boolean onPlayerAttackedCacellable(ItemStack item, EntityPlayer player, DamageSource source, float amount) {

 		for (ModifierEffects mod : ModifierEffects.getEffects())

-			if (JewelryNBT.doesModifierExist(item,

-					mod.getModifier()))

-				return mod.onPlayerAttackedCancellable(

-						item, player, source, this,

-						amount);

+			if (JewelryNBT.doesModifierExist(item, mod.getModifier()))

+				return mod.onPlayerAttackedCancellable(item, player, source, this, amount);

 		return false;

 	}

 

@@ -164,14 +124,10 @@ public abstract class ItemBaseJewelry extends Item {
 	 * @param target

 	 * @return

 	 */

-	public boolean onEntityAttackedCacellable(ItemStack item,

-			EntityPlayer player, Entity target, float amount) {

+	public boolean onEntityAttackedCacellable(ItemStack item, EntityPlayer player, Entity target, float amount) {

 		for (ModifierEffects mod : ModifierEffects.getEffects())

-			if (JewelryNBT.doesModifierExist(item,

-					mod.getModifier()))

-				return mod.onEntityAttackedCancellable(

-						item, player, target, this,

-						amount);

+			if (JewelryNBT.doesModifierExist(item, mod.getModifier()))

+				return mod.onEntityAttackedCancellable(item, player, target, this, amount);

 		return false;

 	}

 

@@ -181,13 +137,10 @@ public abstract class ItemBaseJewelry extends Item {
 	 * @param source

 	 * @return

 	 */

-	public void onPlayerAttacked(ItemStack item, EntityPlayer player,

-			DamageSource source, float amount) {

+	public void onPlayerAttacked(ItemStack item, EntityPlayer player, DamageSource source, float amount) {

 		for (ModifierEffects mod : ModifierEffects.getEffects())

-			if (JewelryNBT.doesModifierExist(item,

-					mod.getModifier()))

-				mod.onPlayerAttacked(item, player, source,

-						this, amount);

+			if (JewelryNBT.doesModifierExist(item, mod.getModifier()))

+				mod.onPlayerAttacked(item, player, source, this, amount);

 	}

 

 	/**

@@ -196,43 +149,33 @@ public abstract class ItemBaseJewelry extends Item {
 	 * @param target

 	 * @return

 	 */

-	public void onEntityAttacked(ItemStack item, EntityPlayer player,

-			Entity target, float amount) {

+	public void onEntityAttacked(ItemStack item, EntityPlayer player, Entity target, float amount) {

 		for (ModifierEffects mod : ModifierEffects.getEffects())

-			if (JewelryNBT.doesModifierExist(item,

-					mod.getModifier()))

-				mod.onEntityAttacked(item, player, target,

-						this, amount);

+			if (JewelryNBT.doesModifierExist(item, mod.getModifier()))

+				mod.onEntityAttacked(item, player, target, this, amount);

 	}

 

-	public void onPlayerDead(ItemStack item, EntityPlayer player,

-			DamageSource source) {

+	public void onPlayerDead(ItemStack item, EntityPlayer player, DamageSource source) {

 		for (ModifierEffects mod : ModifierEffects.getEffects())

-			if (JewelryNBT.doesModifierExist(item,

-					mod.getModifier()))

-				mod.onPlayerDead(item, player, source,

-						this);

+			if (JewelryNBT.doesModifierExist(item, mod.getModifier()))

+				mod.onPlayerDead(item, player, source, this);

 	}

 

-	public void onPlayerRespawn(ItemStack item,

-			PlayerEvent.Clone event) {

+	public void onPlayerRespawn(ItemStack item, PlayerEvent.Clone event) {

 		for (ModifierEffects mod : ModifierEffects.getEffects())

-			if (JewelryNBT.doesModifierExist(item,

-					mod.getModifier()))

+			if (JewelryNBT.doesModifierExist(item, mod.getModifier()))

 				mod.onPlayerRespawn(item, event, this);

 	}

 

 	public void onJewelryEquipped(ItemStack item) {

 		for (ModifierEffects mod : ModifierEffects.getEffects())

-			if (JewelryNBT.doesModifierExist(item,

-					mod.getModifier()))

+			if (JewelryNBT.doesModifierExist(item, mod.getModifier()))

 				mod.onJewelryEquipped(item, this);

 	}

 

 	public void onJewelryUnequipped(ItemStack item) {

 		for (ModifierEffects mod : ModifierEffects.getEffects())

-			if (JewelryNBT.doesModifierExist(item,

-					mod.getModifier()))

+			if (JewelryNBT.doesModifierExist(item, mod.getModifier()))

 				mod.onJewelryUnequipped(item, this);

 	}

 }

diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemBracelet.java b/src/main/java/darkknight/jewelrycraft/item/ItemBracelet.java
index 2de324a..fe01d89 100755
--- a/src/main/java/darkknight/jewelrycraft/item/ItemBracelet.java
+++ b/src/main/java/darkknight/jewelrycraft/item/ItemBracelet.java
@@ -20,10 +20,8 @@ public class ItemBracelet extends ItemBaseJewelry {
 	 */

 	@Override

 	public void registerIcons(IIconRegister iconRegister) {

-		itemIcon = iconRegister.registerIcon(

-				Variables.MODID + ":bracelet");

-		gem = iconRegister.registerIcon(

-				Variables.MODID + ":jewelBracelet");

+		itemIcon = iconRegister.registerIcon(Variables.MODID + ":bracelet");

+		gem = iconRegister.registerIcon(Variables.MODID + ":jewelBracelet");

 	}

 

 	/**

diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemClayMolds.java b/src/main/java/darkknight/jewelrycraft/item/ItemClayMolds.java
index 10929bd..32da38e 100755
--- a/src/main/java/darkknight/jewelrycraft/item/ItemClayMolds.java
+++ b/src/main/java/darkknight/jewelrycraft/item/ItemClayMolds.java
@@ -14,12 +14,10 @@ import net.minecraft.util.MathHelper;
 

 public class ItemClayMolds extends Item {

 	/** List of molds color names */

-	public static final String[]	moldsItemNames	= new String[] {

-			"clayIngot", "clayRing", "clayNecklace",

-			"clayBracelet", "clayEarrings"

-	};

+	public static final String[] moldsItemNames = new String[] { "clayIngot", "clayRing", "clayNecklace",

+			"clayBracelet", "clayEarrings" };

 	@SideOnly(Side.CLIENT)

-	private IIcon[]			moldsIcons;

+	private IIcon[] moldsIcons;

 

 	/**

 	 * 

@@ -41,25 +39,21 @@ public class ItemClayMolds extends Item {
 	 * Gets an icon index based on an item's damage value

 	 */

 	public IIcon getIconFromDamage(int par1) {

-		int j = MathHelper.clamp_int(par1, 0,

-				moldsItemNames.length - 1);

+		int j = MathHelper.clamp_int(par1, 0, moldsItemNames.length - 1);

 		return moldsIcons[j];

 	}

 

 	/**

-	 * Returns the unlocalized name of this item. This version accepts

-	 * an ItemStack so different stacks can have different names based

-	 * on their damage or NBT.

+	 * Returns the unlocalized name of this item. This version accepts an ItemStack

+	 * so different stacks can have different names based on their damage or NBT.

 	 *

 	 * @param par1ItemStack

 	 * @return

 	 */

 	@Override

 	public String getUnlocalizedName(ItemStack par1ItemStack) {

-		int i = MathHelper.clamp_int(par1ItemStack.getItemDamage(),

-				0, moldsItemNames.length - 1);

-		return super.getUnlocalizedName() + "."

-				+ moldsItemNames[i];

+		int i = MathHelper.clamp_int(par1ItemStack.getItemDamage(), 0, moldsItemNames.length - 1);

+		return super.getUnlocalizedName() + "." + moldsItemNames[i];

 	}

 

 	/**

@@ -70,11 +64,10 @@ public class ItemClayMolds extends Item {
 	@Override

 	@SideOnly(Side.CLIENT)

 	/**

-	 * returns a list of items with the same ID, but different meta

-	 * (eg: molds returns 16 items)

+	 * returns a list of items with the same ID, but different meta (eg: molds

+	 * returns 16 items)

 	 */

-	public void getSubItems(Item par1, CreativeTabs par2CreativeTabs,

-			List par3List) {

+	public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) {

 		for (int j = 0; j < moldsItemNames.length; ++j)

 			par3List.add(new ItemStack(par1, 1, j));

 	}

@@ -87,9 +80,6 @@ public class ItemClayMolds extends Item {
 	public void registerIcons(IIconRegister par1IconRegister) {

 		moldsIcons = new IIcon[moldsItemNames.length];

 		for (int i = 0; i < moldsItemNames.length; ++i)

-			moldsIcons[i] = par1IconRegister

-					.registerIcon(Variables.MODID + ":"

-							+ moldsItemNames[i]

-							+ getIconString());

+			moldsIcons[i] = par1IconRegister.registerIcon(Variables.MODID + ":" + moldsItemNames[i] + getIconString());

 	}

 }

diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemEarrings.java b/src/main/java/darkknight/jewelrycraft/item/ItemEarrings.java
index c9e84f4..e8f4052 100755
--- a/src/main/java/darkknight/jewelrycraft/item/ItemEarrings.java
+++ b/src/main/java/darkknight/jewelrycraft/item/ItemEarrings.java
@@ -20,10 +20,8 @@ public class ItemEarrings extends ItemBaseJewelry {
 	 */

 	@Override

 	public void registerIcons(IIconRegister iconRegister) {

-		itemIcon = iconRegister.registerIcon(

-				Variables.MODID + ":earrings");

-		gem = iconRegister.registerIcon(

-				Variables.MODID + ":jewelEarrings");

+		itemIcon = iconRegister.registerIcon(Variables.MODID + ":earrings");

+		gem = iconRegister.registerIcon(Variables.MODID + ":jewelEarrings");

 	}

 

 	/**

diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemGoldObj.java b/src/main/java/darkknight/jewelrycraft/item/ItemGoldObj.java
index 331fd65..3c055c6 100755
--- a/src/main/java/darkknight/jewelrycraft/item/ItemGoldObj.java
+++ b/src/main/java/darkknight/jewelrycraft/item/ItemGoldObj.java
@@ -56,38 +56,23 @@ public class ItemGoldObj extends Item {
 

 	@Override

 	public String getItemStackDisplayName(ItemStack stack) {

-		if (stack != null && stack.hasTagCompound()

-				&& stack.getTagCompound().hasKey("target")

-				&& Item.getItemById(Integer.valueOf(stack

-						.getTagCompound()

-						.getTag("target")

-						.toString().split(",")[0]

-								.substring(4)

-								.replace("s", ""))) != null

+		if (stack != null && stack.hasTagCompound() && stack.getTagCompound().hasKey("target")

+				&& Item.getItemById(Integer.valueOf(stack.getTagCompound().getTag("target").toString().split(",")[0]

+						.substring(4).replace("s", ""))) != null

 				&& JewelryNBT.item(stack) != null)

-			return StatCollector.translateToLocal("info."

-					+ Variables.MODID + ".golden")

-					+ " " + JewelryNBT.item(stack)

-							.getDisplayName();

-		return StatCollector.translateToLocal("item."

-				+ Variables.MODID + ".goldObject.name");

+			return StatCollector.translateToLocal("info." + Variables.MODID + ".golden") + " "

+					+ JewelryNBT.item(stack).getDisplayName();

+		return StatCollector.translateToLocal("item." + Variables.MODID + ".goldObject.name");

 	}

 

 	@Override

-	public void addInformation(ItemStack stack, EntityPlayer player,

-			List list, boolean displayInfo) {

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

 		if (ConfigHandler.JEWELRY_INFO)

-			if (stack != null && JewelryNBT.item(stack) != null

-					&& JewelryNBT.item(stack)

-							.getItem() instanceof ItemFood)

+			if (stack != null && JewelryNBT.item(stack) != null && JewelryNBT.item(stack).getItem() instanceof ItemFood)

 				list.add(EnumChatFormatting.DARK_PURPLE

-						+ StatCollector.translateToLocal(

-								"item." + Variables.MODID

-										+ ".goldObject.info.food"));

+						+ StatCollector.translateToLocal("item." + Variables.MODID + ".goldObject.info.food"));

 			else

 				list.add(EnumChatFormatting.DARK_PURPLE

-						+ StatCollector.translateToLocal(

-								"item." + Variables.MODID

-										+ ".goldObject.info.standard"));

+						+ StatCollector.translateToLocal("item." + Variables.MODID + ".goldObject.info.standard"));

 	}

 }

diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemGuide.java b/src/main/java/darkknight/jewelrycraft/item/ItemGuide.java
index 83f8531..04cb5c1 100755
--- a/src/main/java/darkknight/jewelrycraft/item/ItemGuide.java
+++ b/src/main/java/darkknight/jewelrycraft/item/ItemGuide.java
@@ -13,11 +13,9 @@ public class ItemGuide extends Item {
 	}

 

 	@Override

-	public ItemStack onItemRightClick(ItemStack stack, World world,

-			EntityPlayer player) {

+	public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) {

 		if (world.isRemote)

-			player.openGui(JewelrycraftMod.instance, 1,

-					player.worldObj, 0, 0, 0);

+			player.openGui(JewelrycraftMod.instance, 1, player.worldObj, 0, 0, 0);

 		player.addStat(AchievementsList.openGuide, 1);

 		return stack;

 	}

diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemJewelryModifier.java b/src/main/java/darkknight/jewelrycraft/item/ItemJewelryModifier.java
index 481126f..78adc6c 100755
--- a/src/main/java/darkknight/jewelrycraft/item/ItemJewelryModifier.java
+++ b/src/main/java/darkknight/jewelrycraft/item/ItemJewelryModifier.java
@@ -15,17 +15,14 @@ public class ItemJewelryModifier extends Item {
 	}

 

 	@Override

-	public ItemStack onItemRightClick(ItemStack stack, World world,

-			EntityPlayer player) {

+	public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) {

 		if (!world.isRemote && player.capabilities.isCreativeMode)

-			player.openGui(JewelrycraftMod.instance, 3, world,

-					0, 0, 0);

+			player.openGui(JewelrycraftMod.instance, 3, world, 0, 0, 0);

 		return stack;

 	}

 

 	@Override

-	public void addInformation(ItemStack stack, EntityPlayer player,

-			List list, boolean par4) {

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

 		list.add(EnumChatFormatting.GRAY + "Creative Only");

 	}

 }
\ No newline at end of file
diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemList.java b/src/main/java/darkknight/jewelrycraft/item/ItemList.java
index 63bc7a4..869c944 100755
--- a/src/main/java/darkknight/jewelrycraft/item/ItemList.java
+++ b/src/main/java/darkknight/jewelrycraft/item/ItemList.java
@@ -9,103 +9,55 @@ import net.minecraft.item.ItemStack;
 import net.minecraftforge.oredict.OreDictionary;

 

 public class ItemList {

-	public static Item			thiefGloves;

-	public static Item			shadowIngot;

-	public static Item			molds;

-	public static Item			clayMolds;

-	public static ItemRing			ring;

-	public static ItemNecklace		necklace;

-	public static ItemBracelet		bracelet;

-	public static ItemEarrings		earrings;

-	public static Item			guide;

-	public static Item			jewelryModifier;

-	public static ItemMoltenMetalBucket	bucket;

-	public static ItemMoltenMetal		metal;

-	public static Item			goldObj;

-	public static Item			structureGen;

-	public static Item			spawnEgg;

-	public static Item			testItem;

+	public static Item thiefGloves;

+	public static Item shadowIngot;

+	public static Item molds;

+	public static Item clayMolds;

+	public static ItemRing ring;

+	public static ItemNecklace necklace;

+	public static ItemBracelet bracelet;

+	public static ItemEarrings earrings;

+	public static Item guide;

+	public static Item jewelryModifier;

+	public static ItemMoltenMetalBucket bucket;

+	public static ItemMoltenMetal metal;

+	public static Item goldObj;

+	public static Item structureGen;

+	public static Item spawnEgg;

+	public static Item testItem;

 

 	/**

 	 * @param e

 	 */

 	public static void preInit(FMLPreInitializationEvent e) {

-		thiefGloves = new ItemThiefGloves()

-				.setUnlocalizedName(Variables.MODID

-						+ ".thiefGloves")

-				.setTextureName(Variables.MODID

-						+ ":thiefGloves")

+		thiefGloves = new ItemThiefGloves().setUnlocalizedName(Variables.MODID + ".thiefGloves")

+				.setTextureName(Variables.MODID + ":thiefGloves").setCreativeTab(JewelrycraftMod.jewelrycraft);

+		shadowIngot = new Item().setUnlocalizedName(Variables.MODID + ".ingotShadow")

+				.setTextureName(Variables.MODID + ":ingotShadow").setCreativeTab(JewelrycraftMod.jewelrycraft);

+		molds = new ItemMolds().setUnlocalizedName(Variables.MODID + ".mold").setTextureName("Mold")

 				.setCreativeTab(JewelrycraftMod.jewelrycraft);

-		shadowIngot = new Item()

-				.setUnlocalizedName(Variables.MODID

-						+ ".ingotShadow")

-				.setTextureName(Variables.MODID

-						+ ":ingotShadow")

+		clayMolds = new ItemClayMolds().setUnlocalizedName(Variables.MODID + ".mold").setTextureName("Mold")

 				.setCreativeTab(JewelrycraftMod.jewelrycraft);

-		molds = new ItemMolds()

-				.setUnlocalizedName(

-						Variables.MODID + ".mold")

-				.setTextureName("Mold")

-				.setCreativeTab(JewelrycraftMod.jewelrycraft);

-		clayMolds = new ItemClayMolds()

-				.setUnlocalizedName(

-						Variables.MODID + ".mold")

-				.setTextureName("Mold")

-				.setCreativeTab(JewelrycraftMod.jewelrycraft);

-		ring = (ItemRing) new ItemRing()

-				.setUnlocalizedName(

-						Variables.MODID + ".ring")

-				.setTextureName(Variables.MODID + ":ring")

-				.setCreativeTab(JewelrycraftMod.jewelrycraft);

-		necklace = (ItemNecklace) new ItemNecklace()

-				.setUnlocalizedName(Variables.MODID

-						+ ".necklace")

-				.setTextureName(Variables.MODID

-						+ ":necklace")

-				.setCreativeTab(JewelrycraftMod.jewelrycraft);

-		bracelet = (ItemBracelet) new ItemBracelet()

-				.setUnlocalizedName(Variables.MODID

-						+ ".bracelet")

-				.setTextureName(Variables.MODID

-						+ ":bracelet")

-				.setCreativeTab(JewelrycraftMod.jewelrycraft);

-		earrings = (ItemEarrings) new ItemEarrings()

-				.setUnlocalizedName(Variables.MODID

-						+ ".earrings")

-				.setTextureName(Variables.MODID

-						+ ":earrings")

-				.setCreativeTab(JewelrycraftMod.jewelrycraft);

-		guide = new ItemGuide()

-				.setUnlocalizedName(

-						Variables.MODID + ".guide")

-				.setTextureName(Variables.MODID + ":guide")

-				.setCreativeTab(JewelrycraftMod.jewelrycraft);

-		bucket = (ItemMoltenMetalBucket) new ItemMoltenMetalBucket()

-				.setUnlocalizedName(Variables.MODID

-						+ ".bucket");

-		metal = (ItemMoltenMetal) new ItemMoltenMetal()

-				.setUnlocalizedName(Variables.MODID

-						+ ".bucket");

-		jewelryModifier = new ItemJewelryModifier()

-				.setUnlocalizedName(Variables.MODID

-						+ ".jewelryModifier")

-				.setTextureName(Variables.MODID

-						+ ":jewelryModifier")

-				.setCreativeTab(JewelrycraftMod.jewelrycraft);

-		goldObj = new ItemGoldObj().setUnlocalizedName(

-				Variables.MODID + ".goldObject");

-		structureGen = new ItemStructureGen()

-				.setUnlocalizedName(Variables.MODID

-						+ ".structureGen")

-				.setTextureName(Variables.MODID

-						+ ":structureGen")

-				.setCreativeTab(JewelrycraftMod.jewelrycraft);

-		spawnEgg = new ItemSpawnEgg()

-				.setUnlocalizedName(Variables.MODID

-						+ ".monsterPlacer")

+		ring = (ItemRing) new ItemRing().setUnlocalizedName(Variables.MODID + ".ring")

+				.setTextureName(Variables.MODID + ":ring").setCreativeTab(JewelrycraftMod.jewelrycraft);

+		necklace = (ItemNecklace) new ItemNecklace().setUnlocalizedName(Variables.MODID + ".necklace")

+				.setTextureName(Variables.MODID + ":necklace").setCreativeTab(JewelrycraftMod.jewelrycraft);

+		bracelet = (ItemBracelet) new ItemBracelet().setUnlocalizedName(Variables.MODID + ".bracelet")

+				.setTextureName(Variables.MODID + ":bracelet").setCreativeTab(JewelrycraftMod.jewelrycraft);

+		earrings = (ItemEarrings) new ItemEarrings().setUnlocalizedName(Variables.MODID + ".earrings")

+				.setTextureName(Variables.MODID + ":earrings").setCreativeTab(JewelrycraftMod.jewelrycraft);

+		guide = new ItemGuide().setUnlocalizedName(Variables.MODID + ".guide")

+				.setTextureName(Variables.MODID + ":guide").setCreativeTab(JewelrycraftMod.jewelrycraft);

+		bucket = (ItemMoltenMetalBucket) new ItemMoltenMetalBucket().setUnlocalizedName(Variables.MODID + ".bucket");

+		metal = (ItemMoltenMetal) new ItemMoltenMetal().setUnlocalizedName(Variables.MODID + ".bucket");

+		jewelryModifier = new ItemJewelryModifier().setUnlocalizedName(Variables.MODID + ".jewelryModifier")

+				.setTextureName(Variables.MODID + ":jewelryModifier").setCreativeTab(JewelrycraftMod.jewelrycraft);

+		goldObj = new ItemGoldObj().setUnlocalizedName(Variables.MODID + ".goldObject");

+		structureGen = new ItemStructureGen().setUnlocalizedName(Variables.MODID + ".structureGen")

+				.setTextureName(Variables.MODID + ":structureGen").setCreativeTab(JewelrycraftMod.jewelrycraft);

+		spawnEgg = new ItemSpawnEgg().setUnlocalizedName(Variables.MODID + ".monsterPlacer")

 				.setTextureName("spawn_egg");

-		testItem = new ItemTest().setUnlocalizedName(

-				Variables.MODID + ".test");

+		testItem = new ItemTest().setUnlocalizedName(Variables.MODID + ".test");

 

 		GameRegistry.registerItem(thiefGloves, "thiefGloves");

 		GameRegistry.registerItem(shadowIngot, "shadowIngot");

@@ -118,14 +70,12 @@ public class ItemList {
 		GameRegistry.registerItem(guide, "guide");

 		GameRegistry.registerItem(bucket, "moltenMetalBucket");

 		GameRegistry.registerItem(metal, "moltenMetal");

-		GameRegistry.registerItem(jewelryModifier,

-				"jewelryModifier");

+		GameRegistry.registerItem(jewelryModifier, "jewelryModifier");

 		GameRegistry.registerItem(goldObj, "goldObject");

 		GameRegistry.registerItem(structureGen, "structureGen");

 		GameRegistry.registerItem(spawnEgg, "spawnEgg");

 		GameRegistry.registerItem(testItem, "testItem");

 

-		OreDictionary.registerOre("ingotShadow",

-				new ItemStack(ItemList.shadowIngot));

+		OreDictionary.registerOre("ingotShadow", new ItemStack(ItemList.shadowIngot));

 	}

 }

diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemMolds.java b/src/main/java/darkknight/jewelrycraft/item/ItemMolds.java
index b2acd18..41b5b5a 100755
--- a/src/main/java/darkknight/jewelrycraft/item/ItemMolds.java
+++ b/src/main/java/darkknight/jewelrycraft/item/ItemMolds.java
@@ -14,11 +14,9 @@ import net.minecraft.util.MathHelper;
 

 public class ItemMolds extends Item {

 	/** List of molds color names */

-	public static final String[]	moldsItemNames	= new String[] {

-			"ingot", "ring", "necklace", "bracelet", "earrings"

-	};

+	public static final String[] moldsItemNames = new String[] { "ingot", "ring", "necklace", "bracelet", "earrings" };

 	@SideOnly(Side.CLIENT)

-	private IIcon[]			moldsIcons;

+	private IIcon[] moldsIcons;

 

 	/**

 	 * 

@@ -40,25 +38,21 @@ public class ItemMolds extends Item {
 	 * Gets an icon index based on an item's damage value

 	 */

 	public IIcon getIconFromDamage(int par1) {

-		int j = MathHelper.clamp_int(par1, 0,

-				moldsItemNames.length - 1);

+		int j = MathHelper.clamp_int(par1, 0, moldsItemNames.length - 1);

 		return moldsIcons[j];

 	}

 

 	/**

-	 * Returns the unlocalized name of this item. This version accepts

-	 * an ItemStack so different stacks can have different names based

-	 * on their damage or NBT.

+	 * Returns the unlocalized name of this item. This version accepts an ItemStack

+	 * so different stacks can have different names based on their damage or NBT.

 	 *

 	 * @param par1ItemStack

 	 * @return

 	 */

 	@Override

 	public String getUnlocalizedName(ItemStack par1ItemStack) {

-		int i = MathHelper.clamp_int(par1ItemStack.getItemDamage(),

-				0, moldsItemNames.length - 1);

-		return super.getUnlocalizedName() + "."

-				+ moldsItemNames[i];

+		int i = MathHelper.clamp_int(par1ItemStack.getItemDamage(), 0, moldsItemNames.length - 1);

+		return super.getUnlocalizedName() + "." + moldsItemNames[i];

 	}

 

 	/**

@@ -69,11 +63,10 @@ public class ItemMolds extends Item {
 	@Override

 	@SideOnly(Side.CLIENT)

 	/**

-	 * returns a list of items with the same ID, but different meta

-	 * (eg: molds returns 16 items)

+	 * returns a list of items with the same ID, but different meta (eg: molds

+	 * returns 16 items)

 	 */

-	public void getSubItems(Item par1, CreativeTabs par2CreativeTabs,

-			List par3List) {

+	public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) {

 		for (int j = 0; j < moldsItemNames.length; ++j)

 			par3List.add(new ItemStack(par1, 1, j));

 	}

@@ -86,9 +79,6 @@ public class ItemMolds extends Item {
 	public void registerIcons(IIconRegister par1IconRegister) {

 		moldsIcons = new IIcon[moldsItemNames.length];

 		for (int i = 0; i < moldsItemNames.length; ++i)

-			moldsIcons[i] = par1IconRegister

-					.registerIcon(Variables.MODID + ":"

-							+ moldsItemNames[i]

-							+ getIconString());

+			moldsIcons[i] = par1IconRegister.registerIcon(Variables.MODID + ":" + moldsItemNames[i] + getIconString());

 	}

 }

diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemMoltenMetal.java b/src/main/java/darkknight/jewelrycraft/item/ItemMoltenMetal.java
index 9b5b8a3..2961a79 100755
--- a/src/main/java/darkknight/jewelrycraft/item/ItemMoltenMetal.java
+++ b/src/main/java/darkknight/jewelrycraft/item/ItemMoltenMetal.java
@@ -23,8 +23,7 @@ public class ItemMoltenMetal extends Item {
 	 */

 	@Override

 	public void registerIcons(IIconRegister iconRegister) {

-		itemIcon = iconRegister.registerIcon(

-				Variables.MODID + ":moltenMetalStill");

+		itemIcon = iconRegister.registerIcon(Variables.MODID + ":moltenMetalStill");

 	}

 

 	/**

@@ -36,8 +35,7 @@ public class ItemMoltenMetal extends Item {
 	@SideOnly(Side.CLIENT)

 	public int getColorFromItemStack(ItemStack stack, int pass) {

 		if (JewelryNBT.ingot(stack) != null)

-			return JewelrycraftUtil

-					.getColor(JewelryNBT.ingot(stack));

+			return JewelrycraftUtil.getColor(JewelryNBT.ingot(stack));

 		else

 			return 0xFFFFFF;

 	}

diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemMoltenMetalBucket.java b/src/main/java/darkknight/jewelrycraft/item/ItemMoltenMetalBucket.java
index 72f1228..f9b915b 100755
--- a/src/main/java/darkknight/jewelrycraft/item/ItemMoltenMetalBucket.java
+++ b/src/main/java/darkknight/jewelrycraft/item/ItemMoltenMetalBucket.java
@@ -31,17 +31,14 @@ public class ItemMoltenMetalBucket extends Item {
 	}

 

 	@Override

-	public ItemStack onItemRightClick(ItemStack stack, World par2World,

-			EntityPlayer par3EntityPlayer) {

+	public ItemStack onItemRightClick(ItemStack stack, World par2World, EntityPlayer par3EntityPlayer) {

 		boolean flag = BlockList.moltenMetal == Blocks.air;

-		MovingObjectPosition movingobjectposition = getMovingObjectPositionFromPlayer(

-				par2World, par3EntityPlayer, flag);

+		MovingObjectPosition movingobjectposition = getMovingObjectPositionFromPlayer(par2World, par3EntityPlayer,

+				flag);

 		if (movingobjectposition == null)

 			return stack;

 		else {

-			FillBucketEvent event = new FillBucketEvent(

-					par3EntityPlayer, stack, par2World,

-					movingobjectposition);

+			FillBucketEvent event = new FillBucketEvent(par3EntityPlayer, stack, par2World, movingobjectposition);

 			if (MinecraftForge.EVENT_BUS.post(event))

 				return stack;

 			if (event.getResult() == Event.Result.ALLOW) {

@@ -49,41 +46,26 @@ public class ItemMoltenMetalBucket extends Item {
 					return stack;

 				if (--stack.stackSize <= 0)

 					return event.result;

-				if (!par3EntityPlayer.inventory

-						.addItemStackToInventory(

-								event.result))

-					par3EntityPlayer.dropPlayerItemWithRandomChoice(

-							event.result,

-							false);

+				if (!par3EntityPlayer.inventory.addItemStackToInventory(event.result))

+					par3EntityPlayer.dropPlayerItemWithRandomChoice(event.result, false);

 				return stack;

 			}

 			if (movingobjectposition.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) {

 				int i = movingobjectposition.blockX;

 				int j = movingobjectposition.blockY;

 				int k = movingobjectposition.blockZ;

-				if (!par2World.canMineBlock(

-						par3EntityPlayer, i, j, k))

+				if (!par2World.canMineBlock(par3EntityPlayer, i, j, k))

 					return stack;

 				if (flag) {

-					if (!par3EntityPlayer

-							.canPlayerEdit(i,

-									j,

-									k,

-									movingobjectposition.sideHit,

-									stack))

+					if (!par3EntityPlayer.canPlayerEdit(i, j, k, movingobjectposition.sideHit, stack))

 						return stack;

-					par2World.getBlock(i, j, k)

-							.getMaterial();

-					par2World.getBlockMetadata(i, j,

-							k);

+					par2World.getBlock(i, j, k).getMaterial();

+					par2World.getBlockMetadata(i, j, k);

 					par2World.setBlockToAir(i, j, k);

-					return func_150910_a(stack,

-							par3EntityPlayer,

-							ItemList.bucket);

+					return func_150910_a(stack, par3EntityPlayer, ItemList.bucket);

 				} else {

 					if (BlockList.moltenMetal == Blocks.air)

-						return new ItemStack(

-								Items.bucket);

+						return new ItemStack(Items.bucket);

 					if (movingobjectposition.sideHit == 0)

 						--j;

 					else if (movingobjectposition.sideHit == 1)

@@ -96,66 +78,44 @@ public class ItemMoltenMetalBucket extends Item {
 						--i;

 					else if (movingobjectposition.sideHit == 5)

 						++i;

-					if (!par3EntityPlayer

-							.canPlayerEdit(i,

-									j,

-									k,

-									movingobjectposition.sideHit,

-									stack))

+					if (!par3EntityPlayer.canPlayerEdit(i, j, k, movingobjectposition.sideHit, stack))

 						return stack;

-					if (tryPlaceContainedLiquid(

-							par2World, i, j, k,

-							stack)

+					if (tryPlaceContainedLiquid(par2World, i, j, k, stack)

 							&& !par3EntityPlayer.capabilities.isCreativeMode)

-						return new ItemStack(

-								Items.bucket);

+						return new ItemStack(Items.bucket);

 				}

 			}

 			return stack;

 		}

 	}

 

-	private ItemStack func_150910_a(ItemStack p_150910_1_,

-			EntityPlayer p_150910_2_, Item p_150910_3_) {

+	private ItemStack func_150910_a(ItemStack p_150910_1_, EntityPlayer p_150910_2_, Item p_150910_3_) {

 		if (p_150910_2_.capabilities.isCreativeMode)

 			return p_150910_1_;

 		else if (--p_150910_1_.stackSize <= 0)

 			return new ItemStack(p_150910_3_);

 		else {

-			if (!p_150910_2_.inventory.addItemStackToInventory(

-					new ItemStack(p_150910_3_)))

-				p_150910_2_.dropPlayerItemWithRandomChoice(

-						new ItemStack(p_150910_3_,

-								1, 0),

-						false);

+			if (!p_150910_2_.inventory.addItemStackToInventory(new ItemStack(p_150910_3_)))

+				p_150910_2_.dropPlayerItemWithRandomChoice(new ItemStack(p_150910_3_, 1, 0), false);

 			return p_150910_1_;

 		}

 	}

 

-	public static boolean tryPlaceContainedLiquid(World world, int x,

-			int y, int z, ItemStack stack) {

+	public static boolean tryPlaceContainedLiquid(World world, int x, int y, int z, ItemStack stack) {

 		if (BlockList.moltenMetal == Blocks.air)

 			return false;

 		else {

-			Material material = world.getBlock(x, y, z)

-					.getMaterial();

+			Material material = world.getBlock(x, y, z).getMaterial();

 			boolean flag = !material.isSolid();

 			if (!world.isAirBlock(x, y, z) && !flag)

 				return false;

-			else if (stack != null && JewelryNBT

-					.ingot(stack) != null) {

-				if (!world.isRemote && flag

-						&& !material.isLiquid())

+			else if (stack != null && JewelryNBT.ingot(stack) != null) {

+				if (!world.isRemote && flag && !material.isLiquid())

 					world.func_147480_a(x, y, z, true);

-				world.setBlock(x, y, z,

-						BlockList.moltenMetal, 0,

-						3);

-				TileEntity moltenLiquid = world

-						.getTileEntity(x, y, z);

+				world.setBlock(x, y, z, BlockList.moltenMetal, 0, 3);

+				TileEntity moltenLiquid = world.getTileEntity(x, y, z);

 				if (moltenLiquid instanceof TileEntityMoltenMetal)

-					((TileEntityMoltenMetal) moltenLiquid)

-							.setMetal(JewelryNBT

-									.ingot(stack));

+					((TileEntityMoltenMetal) moltenLiquid).setMetal(JewelryNBT.ingot(stack));

 				return true;

 			} else

 				return false;

@@ -165,16 +125,14 @@ public class ItemMoltenMetalBucket extends Item {
 	@Override

 	public void registerIcons(IIconRegister iconRegister) {

 		itemIcon = iconRegister.registerIcon("bucket_empty");

-		liquid = iconRegister.registerIcon(

-				Variables.MODID + ":bucketOverlay");

+		liquid = iconRegister.registerIcon(Variables.MODID + ":bucketOverlay");

 	}

 

 	@Override

 	@SideOnly(Side.CLIENT)

 	public int getColorFromItemStack(ItemStack stack, int pass) {

 		if (pass == 1 && JewelryNBT.ingot(stack) != null)

-			return JewelrycraftUtil

-					.getColor(JewelryNBT.ingot(stack));

+			return JewelrycraftUtil.getColor(JewelryNBT.ingot(stack));

 		return 16777215;

 	}

 

@@ -204,29 +162,15 @@ public class ItemMoltenMetalBucket extends Item {
 			if (JewelryNBT.ingot(stack) != null) {

 				ItemStack ingot = JewelryNBT.ingot(stack);

 				if (ingot != null) {

-					return StatCollector

-							.translateToLocal(

-									getUnlocalizedNameInefficiently(

-											stack)

-											+ ".name")

-							.trim()

-							+ " "

-							+ ingot.getDisplayName()

-									.replace("Ingot",

-											" ")

-									.trim();

+					return StatCollector.translateToLocal(getUnlocalizedNameInefficiently(stack) + ".name").trim() + " "

+							+ ingot.getDisplayName().replace("Ingot", " ").trim();

 				} else

-					return StatCollector

-							.translateToLocal(

-									"bucket.unknown");

+					return StatCollector.translateToLocal("bucket.unknown");

 			}

 		} catch (Exception e) {

 			System.out.println("Error: " + e);

 		}

-		return ("" + StatCollector.translateToLocal(

-				getUnlocalizedNameInefficiently(stack)

-						+ ".name")).trim()

-				+ " " + StatCollector.translateToLocal(

-						"info.jewelrycraft2.metal");

+		return ("" + StatCollector.translateToLocal(getUnlocalizedNameInefficiently(stack) + ".name")).trim() + " "

+				+ StatCollector.translateToLocal("info.jewelrycraft2.metal");

 	}

 }

diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemNecklace.java b/src/main/java/darkknight/jewelrycraft/item/ItemNecklace.java
index 3a71d0b..8f67ab6 100755
--- a/src/main/java/darkknight/jewelrycraft/item/ItemNecklace.java
+++ b/src/main/java/darkknight/jewelrycraft/item/ItemNecklace.java
@@ -20,10 +20,8 @@ public class ItemNecklace extends ItemBaseJewelry {
 	 */

 	@Override

 	public void registerIcons(IIconRegister iconRegister) {

-		itemIcon = iconRegister.registerIcon(

-				Variables.MODID + ":necklace");

-		gem = iconRegister.registerIcon(

-				Variables.MODID + ":jewelNecklace");

+		itemIcon = iconRegister.registerIcon(Variables.MODID + ":necklace");

+		gem = iconRegister.registerIcon(Variables.MODID + ":jewelNecklace");

 	}

 

 	/**

diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemRing.java b/src/main/java/darkknight/jewelrycraft/item/ItemRing.java
index 4df83d0..87ca8d8 100755
--- a/src/main/java/darkknight/jewelrycraft/item/ItemRing.java
+++ b/src/main/java/darkknight/jewelrycraft/item/ItemRing.java
@@ -20,10 +20,8 @@ public class ItemRing extends ItemBaseJewelry {
 	 */

 	@Override

 	public void registerIcons(IIconRegister iconRegister) {

-		itemIcon = iconRegister

-				.registerIcon(Variables.MODID + ":ring");

-		gem = iconRegister.registerIcon(

-				Variables.MODID + ":jewelRing");

+		itemIcon = iconRegister.registerIcon(Variables.MODID + ":ring");

+		gem = iconRegister.registerIcon(Variables.MODID + ":jewelRing");

 	}

 

 	/**

diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemSpawnEgg.java b/src/main/java/darkknight/jewelrycraft/item/ItemSpawnEgg.java
index bb57f9a..265e692 100755
--- a/src/main/java/darkknight/jewelrycraft/item/ItemSpawnEgg.java
+++ b/src/main/java/darkknight/jewelrycraft/item/ItemSpawnEgg.java
@@ -30,14 +30,9 @@ import net.minecraft.world.World;
 public class ItemSpawnEgg extends ItemMonsterPlacer {

 	private static final Map<Short, EggData> eggTypes = new LinkedHashMap<Short, EggData>();

 

-	public static void registerSpawnEgg(

-			Class<? extends EntityLiving> entity,

-			String entityName, int id, int eggBackgroundColor,

-			int eggForegroundColor) {

-		eggTypes.put((short) id,

-				new EggData(id, entityName, entity,

-						eggBackgroundColor,

-						eggForegroundColor));

+	public static void registerSpawnEgg(Class<? extends EntityLiving> entity, String entityName, int id,

+			int eggBackgroundColor, int eggForegroundColor) {

+		eggTypes.put((short) id, new EggData(id, entityName, entity, eggBackgroundColor, eggForegroundColor));

 	}

 

 	private static EggData getEggData(ItemStack is) {

@@ -51,23 +46,19 @@ public class ItemSpawnEgg extends ItemMonsterPlacer {
 

 	@Override

 	public String getItemStackDisplayName(ItemStack is) {

-		String s = StatCollector.translateToLocal(

-				getUnlocalizedName() + ".name").trim();

+		String s = StatCollector.translateToLocal(getUnlocalizedName() + ".name").trim();

 		String mob = "";

 

 		EggData egg = getEggData(is);

 		if (egg != null)

-			mob = StatCollector.translateToLocal("entity."

-					+ Variables.MODID + "."

-					+ egg.entityName + ".name");

+			mob = StatCollector.translateToLocal("entity." + Variables.MODID + "." + egg.entityName + ".name");

 

 		return String.format(s, mob);

 	}

 

 	@Override

-	public boolean onItemUse(ItemStack is, EntityPlayer player,

-			World world, int x, int y, int z, int side,

-			float hitX, float hitY, float hitZ) {

+	public boolean onItemUse(ItemStack is, EntityPlayer player, World world, int x, int y, int z, int side, float hitX,

+			float hitY, float hitZ) {

 		if (world.isRemote)

 			return true;

 

@@ -78,11 +69,7 @@ public class ItemSpawnEgg extends ItemMonsterPlacer {
 

 		EggData egg = getEggData(is);

 		if (egg != null) {

-			egg.spawnMob(world, x + 0.5D, y + (side == 1

-					&& block != null

-					&& block.getRenderType() == 11

-							? 0.5D

-							: 0D),

+			egg.spawnMob(world, x + 0.5D, y + (side == 1 && block != null && block.getRenderType() == 11 ? 0.5D : 0D),

 					z + 0.5D, is);

 

 			if (!player.capabilities.isCreativeMode)

@@ -93,24 +80,19 @@ public class ItemSpawnEgg extends ItemMonsterPlacer {
 	}

 

 	@Override

-	public ItemStack onItemRightClick(ItemStack is, World world,

-			EntityPlayer player) {

+	public ItemStack onItemRightClick(ItemStack is, World world, EntityPlayer player) {

 		if (world.isRemote)

 			return is;

 

-		MovingObjectPosition mop = getMovingObjectPositionFromPlayer(

-				world, player, true);

+		MovingObjectPosition mop = getMovingObjectPositionFromPlayer(world, player, true);

 

 		if (mop != null && mop.typeOfHit == MovingObjectType.BLOCK) {

 			int x = mop.blockX, y = mop.blockY, z = mop.blockZ;

 

-			if (!world.canMineBlock(player, x, y, z)

-					|| !player.canPlayerEdit(x, y, z,

-							mop.sideHit, is))

+			if (!world.canMineBlock(player, x, y, z) || !player.canPlayerEdit(x, y, z, mop.sideHit, is))

 				return is;

 

-			if (world.getBlock(x, y, z)

-					.getMaterial() == Material.water) {

+			if (world.getBlock(x, y, z).getMaterial() == Material.water) {

 				EggData egg = getEggData(is);

 				if (egg != null) {

 					egg.spawnMob(world, x, y, z, is);

@@ -124,8 +106,7 @@ public class ItemSpawnEgg extends ItemMonsterPlacer {
 		return is;

 	}

 

-	public static EntityLiving getEntity(World world, double x,

-			double y, double z, ItemStack is) {

+	public static EntityLiving getEntity(World world, double x, double y, double z, ItemStack is) {

 		EggData egg = getEggData(is);

 		return egg.spawnMob(world, x, y, z, is);

 	}

@@ -134,10 +115,7 @@ public class ItemSpawnEgg extends ItemMonsterPlacer {
 	@SideOnly(Side.CLIENT)

 	public int getColorFromItemStack(ItemStack is, int pass) {

 		EggData egg = getEggData(is);

-		return egg != null

-				? pass == 0 ? egg.primaryColor

-						: egg.secondaryColor

-				: 16777215;

+		return egg != null ? pass == 0 ? egg.primaryColor : egg.secondaryColor : 16777215;

 	}

 

 	@Override

@@ -148,28 +126,20 @@ public class ItemSpawnEgg extends ItemMonsterPlacer {
 	}

 

 	static class EggData {

-		private final short				id;

-		String						entityName;

-		private final Class<? extends EntityLiving>	entityClass;

-		int						primaryColor;

-		int						secondaryColor;

-

-		EggData(int id, String entityName,

-				Class<? extends EntityLiving> entityClass,

-				int[] rgbPrimaryColor,

+		private final short id;

+		String entityName;

+		private final Class<? extends EntityLiving> entityClass;

+		int primaryColor;

+		int secondaryColor;

+

+		EggData(int id, String entityName, Class<? extends EntityLiving> entityClass, int[] rgbPrimaryColor,

 				int[] rgbSecondaryColor) {

-			this(id, entityName, entityClass,

-					rgbPrimaryColor[0] << 16

-							| rgbPrimaryColor[1] << 8

-							| rgbPrimaryColor[2],

-					rgbSecondaryColor[0] << 16

-							| rgbSecondaryColor[1] << 8

-							| rgbSecondaryColor[2]);

+			this(id, entityName, entityClass, rgbPrimaryColor[0] << 16 | rgbPrimaryColor[1] << 8 | rgbPrimaryColor[2],

+					rgbSecondaryColor[0] << 16 | rgbSecondaryColor[1] << 8 | rgbSecondaryColor[2]);

 		}

 

-		EggData(int id, String entityName,

-				Class<? extends EntityLiving> entityClass,

-				int primaryColor, int secondaryColor) {

+		EggData(int id, String entityName, Class<? extends EntityLiving> entityClass, int primaryColor,

+				int secondaryColor) {

 			this.id = (short) id;

 			this.entityName = entityName;

 			this.entityClass = entityClass;

@@ -177,13 +147,11 @@ public class ItemSpawnEgg extends ItemMonsterPlacer {
 			this.secondaryColor = secondaryColor;

 		}

 

-		public EntityLiving spawnMob(World world, double x,

-				double y, double z, ItemStack is) {

+		public EntityLiving spawnMob(World world, double x, double y, double z, ItemStack is) {

 			EntityLiving e = null;

 

 			try {

-				e = entityClass.getConstructor(World.class)

-						.newInstance(world);

+				e = entityClass.getConstructor(World.class).newInstance(world);

 			} catch (Exception ex) {

 				ex.printStackTrace();

 				return null;

@@ -208,11 +176,7 @@ public class ItemSpawnEgg extends ItemMonsterPlacer {
 				else

 					((EntityHeart) e).setType("Red");

 			}

-			e.setLocationAndAngles(x, y, z, MathHelper

-					.wrapAngleTo180_float(world.rand

-							.nextFloat()

-							* 360F),

-					0F);

+			e.setLocationAndAngles(x, y, z, MathHelper.wrapAngleTo180_float(world.rand.nextFloat() * 360F), 0F);

 			e.rotationYawHead = e.rotationYaw;

 			e.renderYawOffset = e.rotationYaw;

 			e.onSpawnWithEgg((IEntityLivingData) null);

diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemStructureGen.java b/src/main/java/darkknight/jewelrycraft/item/ItemStructureGen.java
index a929430..e06b3f4 100755
--- a/src/main/java/darkknight/jewelrycraft/item/ItemStructureGen.java
+++ b/src/main/java/darkknight/jewelrycraft/item/ItemStructureGen.java
@@ -18,13 +18,10 @@ public class ItemStructureGen extends Item {
 	}

 

 	@Override

-	public ItemStack onItemRightClick(ItemStack stack, World world,

-			EntityPlayer player) {

-		if (!world.isRemote

-				&& player.capabilities.isCreativeMode) {

+	public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) {

+		if (!world.isRemote && player.capabilities.isCreativeMode) {

 			if (!player.isSneaking()) {

-				if (no < JewelrycraftUtil.structures.size()

-						- 1)

+				if (no < JewelrycraftUtil.structures.size() - 1)

 					no++;

 				else

 					no = 0;

@@ -32,29 +29,24 @@ public class ItemStructureGen extends Item {
 				if (no > 0)

 					no--;

 				else

-					no = JewelrycraftUtil.structures

-							.size() - 1;

+					no = JewelrycraftUtil.structures.size() - 1;

 			}

-			player.addChatMessage(new ChatComponentText(

-					"Structure no. " + (no + 1)));

+			player.addChatMessage(new ChatComponentText("Structure no. " + (no + 1)));

 		}

 		return stack;

 	}

 

 	@Override

-	public boolean onItemUse(ItemStack stack, EntityPlayer player,

-			World world, int x, int y, int z, int par1,

+	public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int par1,

 			float par2, float par3, float par4) {

 		if (player.capabilities.isCreativeMode)

-			JewelrycraftUtil.structures.get(no).generate(world,

-					world.getBiomeGenForCoords(x, z),

-					itemRand, x, y + 1, z);

+			JewelrycraftUtil.structures.get(no).generate(world, world.getBiomeGenForCoords(x, z), itemRand, x, y + 1,

+					z);

 		return true;

 	}

 

 	@Override

-	public void addInformation(ItemStack stack, EntityPlayer player,

-			List list, boolean par4) {

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

 		list.add(EnumChatFormatting.GRAY + "Creative Only");

 	}

 }
\ No newline at end of file
diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemTest.java b/src/main/java/darkknight/jewelrycraft/item/ItemTest.java
index 312c38c..69d0554 100755
--- a/src/main/java/darkknight/jewelrycraft/item/ItemTest.java
+++ b/src/main/java/darkknight/jewelrycraft/item/ItemTest.java
@@ -21,8 +21,8 @@ import net.minecraft.world.World;
 

 public class ItemTest extends Item {

 	@SideOnly(Side.CLIENT)

-	private IIcon[]		icons;

-	private NBTTagCompound	nbt	= new NBTTagCompound();

+	private IIcon[] icons;

+	private NBTTagCompound nbt = new NBTTagCompound();

 

 	public ItemTest() {

 		super();

@@ -32,14 +32,12 @@ public class ItemTest extends Item {
 	@Override

 	@SideOnly(Side.CLIENT)

 	public IIcon getIconFromDamage(int damage) {

-		int j = MathHelper.clamp_int(damage, 0,

-				Curse.getCurseList().size() - 1);

+		int j = MathHelper.clamp_int(damage, 0, Curse.getCurseList().size() - 1);

 		return icons[j];

 	}

 

 	@Override

-	public void getSubItems(Item par1, CreativeTabs par2CreativeTabs,

-			List par3List) {

+	public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) {

 		for (int j = 0; j < Curse.getCurseList().size(); ++j)

 			par3List.add(new ItemStack(par1, 1, j));

 	}

@@ -48,16 +46,12 @@ public class ItemTest extends Item {
 	public void registerIcons(IIconRegister par1IconRegister) {

 		icons = new IIcon[Curse.getCurseList().size()];

 		for (int i = 0; i < Curse.getCurseList().size(); ++i)

-			icons[i] = par1IconRegister

-					.registerIcon(Variables.MODID + ":"

-							+ "testItem_" + i);

+			icons[i] = par1IconRegister.registerIcon(Variables.MODID + ":" + "testItem_" + i);

 	}

 

 	@Override

-	public ItemStack onItemRightClick(ItemStack stack, World world,

-			EntityPlayer player) {

-		MovingObjectPosition mop = getMovingObjectPositionFromPlayer(

-				world, player, true);

+	public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) {

+		MovingObjectPosition mop = getMovingObjectPositionFromPlayer(world, player, true);

 		if (mop != null && mop.typeOfHit == MovingObjectType.BLOCK) {

 			int x = mop.blockX, y = mop.blockY, z = mop.blockZ;

 			TileEntity tile = world.getTileEntity(x, y, z);

@@ -67,8 +61,7 @@ public class ItemTest extends Item {
 				else {

 					NBTTagCompound block = new NBTTagCompound();

 					tile.writeToNBT(block);

-					nbt.setString("id", block

-							.getString("id"));

+					nbt.setString("id", block.getString("id"));

 					nbt.setInteger("x", tile.xCoord);

 					nbt.setInteger("y", tile.yCoord);

 					nbt.setInteger("z", tile.zCoord);

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;

 	}

 }

diff --git a/src/main/java/darkknight/jewelrycraft/item/render/BraceletRender.java b/src/main/java/darkknight/jewelrycraft/item/render/BraceletRender.java
index 2f1ba9e..65ab7e1 100755
--- a/src/main/java/darkknight/jewelrycraft/item/render/BraceletRender.java
+++ b/src/main/java/darkknight/jewelrycraft/item/render/BraceletRender.java
@@ -12,37 +12,28 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.ResourceLocation;

 

 public class BraceletRender extends TileEntitySpecialRenderer {

-	public ModelBracelet	bracelet	= new ModelBracelet();

-	ResourceLocation	texture		= new ResourceLocation(

-			Variables.MODID, "textures/entities/Bracelet.png");

+	public ModelBracelet bracelet = new ModelBracelet();

+	ResourceLocation texture = new ResourceLocation(Variables.MODID, "textures/entities/Bracelet.png");

 

 	@Override

-	public void renderTileEntityAt(TileEntity te, double x, double y,

-			double z, float scale) {

+	public void renderTileEntityAt(TileEntity te, double x, double y, double z, float scale) {

 	}

 

-	public void doRender(Entity entity, double x, double y, double z,

-			float f, float g) {

+	public void doRender(Entity entity, double x, double y, double z, float f, float g) {

 		GL11.glPushMatrix();

 		Minecraft.getMinecraft().renderEngine.bindTexture(texture);

 		if ((float) z != -1)

-			bracelet.render(entity, 0F, 0F, 0F, (float) z, f,

-					1.0F);

-		if (Loader.isModLoaded(

-				"alpaca") /*

-						 * && fiskfille.alpaca.

-						 * AlpacaAPI.

-						 * isAlpacaClient((

-						 * EntityPlayer)entity)

-						 */) {

+			bracelet.render(entity, 0F, 0F, 0F, (float) z, f, 1.0F);

+		if (Loader.isModLoaded("alpaca") /*

+											 * && fiskfille.alpaca. AlpacaAPI. isAlpacaClient(( EntityPlayer)entity)

+											 */) {

 			GL11.glTranslatef(1F, 0F, -9F);

 			GL11.glRotatef(25F, 1F, 0F, 0F);

 			GL11.glRotatef(-25F, 0F, 1F, 0F);

 		} else

 			GL11.glTranslatef(0F, 3F, 0F);

 		if ((float) x != -1)

-			bracelet.render(entity, 0F, 0F, 0F, (float) x,

-					(float) y, 1.0F);

+			bracelet.render(entity, 0F, 0F, 0F, (float) x, (float) y, 1.0F);

 		GL11.glPopMatrix();

 	}

 }
\ No newline at end of file
diff --git a/src/main/java/darkknight/jewelrycraft/item/render/EarringsRender.java b/src/main/java/darkknight/jewelrycraft/item/render/EarringsRender.java
index c82f2e2..3ebc858 100755
--- a/src/main/java/darkknight/jewelrycraft/item/render/EarringsRender.java
+++ b/src/main/java/darkknight/jewelrycraft/item/render/EarringsRender.java
@@ -11,17 +11,14 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.ResourceLocation;

 

 public class EarringsRender extends TileEntitySpecialRenderer {

-	ModelEarrings		earrings	= new ModelEarrings();

-	ResourceLocation	texture		= new ResourceLocation(

-			Variables.MODID, "textures/entities/Earrings.png");

+	ModelEarrings earrings = new ModelEarrings();

+	ResourceLocation texture = new ResourceLocation(Variables.MODID, "textures/entities/Earrings.png");

 

 	@Override

-	public void renderTileEntityAt(TileEntity te, double x, double y,

-			double z, float scale) {

+	public void renderTileEntityAt(TileEntity te, double x, double y, double z, float scale) {

 	}

 

-	public void doRender(Entity entity, double x, double y, double z,

-			float f, float g) {

+	public void doRender(Entity entity, double x, double y, double z, float f, float g) {

 		GL11.glPushMatrix();

 		Minecraft.getMinecraft().renderEngine.bindTexture(texture);

 		earrings.render(entity, 0F, 0F, 0F, (float) z, f, 1.0F);

diff --git a/src/main/java/darkknight/jewelrycraft/item/render/ItemRender.java b/src/main/java/darkknight/jewelrycraft/item/render/ItemRender.java
index 50f3472..d29f397 100755
--- a/src/main/java/darkknight/jewelrycraft/item/render/ItemRender.java
+++ b/src/main/java/darkknight/jewelrycraft/item/render/ItemRender.java
@@ -31,23 +31,21 @@ import net.minecraftforge.client.IItemRenderer;
 import net.minecraftforge.client.MinecraftForgeClient;

 

 public class ItemRender implements IItemRenderer {

-	TileEntitySpecialRenderer		render;

-	public TileEntity			entity;

-	ModelBase				model;

-	private RenderBlocks			renderBlocksIr	= new RenderBlocks();

-	private Minecraft			mc		= Minecraft

-			.getMinecraft();

-	private static final ResourceLocation	RES_ITEM_GLINT	= new ResourceLocation(

+	TileEntitySpecialRenderer render;

+	public TileEntity entity;

+	ModelBase model;

+	private RenderBlocks renderBlocksIr = new RenderBlocks();

+	private Minecraft mc = Minecraft.getMinecraft();

+	private static final ResourceLocation RES_ITEM_GLINT = new ResourceLocation(

 			"textures/misc/enchanted_item_glint.png");

-	private float				tran		= 0F;

+	private float tran = 0F;

 

 	/**

 	 * @param render

 	 * @param entity

 	 * @param model

 	 */

-	public ItemRender(TileEntitySpecialRenderer render,

-			TileEntity entity, ModelBase model) {

+	public ItemRender(TileEntitySpecialRenderer render, TileEntity entity, ModelBase model) {

 		this.entity = entity;

 		this.render = render;

 		this.model = model;

@@ -62,8 +60,7 @@ public class ItemRender implements IItemRenderer {
 	 * @return

 	 */

 	@Override

-	public boolean handleRenderType(ItemStack item,

-			ItemRenderType type) {

+	public boolean handleRenderType(ItemStack item, ItemRenderType type) {

 		return true;

 	}

 

@@ -74,8 +71,7 @@ public class ItemRender implements IItemRenderer {
 	 * @return

 	 */

 	@Override

-	public boolean shouldUseRenderHelper(ItemRenderType type,

-			ItemStack item, ItemRendererHelper helper) {

+	public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) {

 		return true;

 	}

 

@@ -85,91 +81,55 @@ public class ItemRender implements IItemRenderer {
 	 * @param data

 	 */

 	@Override

-	public void renderItem(ItemRenderType type, ItemStack item,

-			Object... data) {

+	public void renderItem(ItemRenderType type, ItemStack item, Object... data) {

 		if (item != null) {

-			if (render != null && entity != null

-					&& JewelryNBT.item(item) == null) {

+			if (render != null && entity != null && JewelryNBT.item(item) == null) {

 				if (type == IItemRenderer.ItemRenderType.ENTITY) {

 					GL11.glRotatef(180f, 0f, 1f, 0f);

-					GL11.glTranslatef(-0.5f, -0.5f,

-							-0.4f);

+					GL11.glTranslatef(-0.5f, -0.5f, -0.4f);

 				}

-				render.renderTileEntityAt(entity, 0.0D,

-						0.0D, 0.0D, 0.0F);

+				render.renderTileEntityAt(entity, 0.0D, 0.0D, 0.0D, 0.0F);

 			} else if (JewelryNBT.item(item) != null) {

 				GL11.glPushMatrix();

 				GL11.glColor3f(1F, 1F, 0F);

-				if (Item.getItemById(Integer.valueOf(item

-						.getTagCompound()

-						.getTag("target")

-						.toString().split(",")[0]

-								.substring(4)

-								.replace("s", ""))) != null)

-					renderItem(Minecraft

-							.getMinecraft().thePlayer,

-							JewelryNBT.item(item),

-							0, type);

+				if (Item.getItemById(Integer.valueOf(item.getTagCompound().getTag("target").toString().split(",")[0]

+						.substring(4).replace("s", ""))) != null)

+					renderItem(Minecraft.getMinecraft().thePlayer, JewelryNBT.item(item), 0, type);

 				else

-					renderItem(Minecraft

-							.getMinecraft().thePlayer,

-							new ItemStack(Blocks.end_portal),

-							0, type);

+					renderItem(Minecraft.getMinecraft().thePlayer, new ItemStack(Blocks.end_portal), 0, type);

 				GL11.glPopMatrix();

 			} else {

 				GL11.glPushMatrix();

 				GL11.glColor3f(1F, 1F, 0F);

-				renderItem(Minecraft

-						.getMinecraft().thePlayer,

-						new ItemStack(Blocks.end_portal),

-						0, type);

+				renderItem(Minecraft.getMinecraft().thePlayer, new ItemStack(Blocks.end_portal), 0, type);

 				GL11.glPopMatrix();

 			}

 		}

 	}

 

-	public void renderItem(EntityLivingBase entity,

-			ItemStack itemStack, int meta,

-			ItemRenderType type) {

+	public void renderItem(EntityLivingBase entity, ItemStack itemStack, int meta, ItemRenderType type) {

 		GL11.glPushMatrix();

-		TextureManager texturemanager = this.mc

-				.getTextureManager();

+		TextureManager texturemanager = this.mc.getTextureManager();

 		if (itemStack != null) {

 			Item item = itemStack.getItem();

 			Block block = Block.getBlockFromItem(item);

-			IItemRenderer customRenderer = MinecraftForgeClient

-					.getItemRenderer(itemStack, type);

+			IItemRenderer customRenderer = MinecraftForgeClient.getItemRenderer(itemStack, type);

 			if (customRenderer != null) {

-				texturemanager.bindTexture(texturemanager

-						.getResourceLocation(

-								itemStack.getItemSpriteNumber()));

+				texturemanager.bindTexture(texturemanager.getResourceLocation(itemStack.getItemSpriteNumber()));

 				if (type.equals(ItemRenderType.EQUIPPED))

-					GL11.glTranslatef(0.7F, 0.55F,

-							0.55F);

-				ForgeHooksClient.renderEquippedItem(type,

-						customRenderer,

-						renderBlocksIr, entity,

-						itemStack);

-			} else if (itemStack.getItemSpriteNumber() == 0

-					&& item instanceof ItemBlock

-					&& RenderBlocks.renderItemIn3d(

-							block.getRenderType())) {

-				texturemanager.bindTexture(texturemanager

-						.getResourceLocation(0));

+					GL11.glTranslatef(0.7F, 0.55F, 0.55F);

+				ForgeHooksClient.renderEquippedItem(type, customRenderer, renderBlocksIr, entity, itemStack);

+			} else if (itemStack.getItemSpriteNumber() == 0 && item instanceof ItemBlock

+					&& RenderBlocks.renderItemIn3d(block.getRenderType())) {

+				texturemanager.bindTexture(texturemanager.getResourceLocation(0));

 				if (type.equals(ItemRenderType.EQUIPPED))

-					GL11.glTranslatef(0.5F, 0.5F,

-							0.5F);

-				if (itemStack != null && block != null

-						&& block.getRenderBlockPass() != 0) {

+					GL11.glTranslatef(0.5F, 0.5F, 0.5F);

+				if (itemStack != null && block != null && block.getRenderBlockPass() != 0) {

 					GL11.glDepthMask(false);

-					renderBlockAsItem(block, itemStack

-							.getItemDamage(),

-							1.0F);

+					renderBlockAsItem(block, itemStack.getItemDamage(), 1.0F);

 					GL11.glDepthMask(true);

 				} else {

-					renderBlockAsItem(block, itemStack

-							.getItemDamage(),

-							1.0F);

+					renderBlockAsItem(block, itemStack.getItemDamage(), 1.0F);

 				}

 			} else {

 				IIcon iicon = itemStack.getIconIndex();

@@ -177,11 +137,8 @@ public class ItemRender implements IItemRenderer {
 					GL11.glPopMatrix();

 					return;

 				}

-				texturemanager.bindTexture(texturemanager

-						.getResourceLocation(

-								itemStack.getItemSpriteNumber()));

-				TextureUtil.func_152777_a(false, false,

-						1.0F);

+				texturemanager.bindTexture(texturemanager.getResourceLocation(itemStack.getItemSpriteNumber()));

+				TextureUtil.func_152777_a(false, false, 1.0F);

 				Tessellator tessellator = Tessellator.instance;

 				float f = iicon.getMinU();

 				float f1 = iicon.getMaxU();

@@ -191,63 +148,37 @@ public class ItemRender implements IItemRenderer {
 				float f6 = 1.6F;

 				GL11.glScalef(f6, f6, f6);

 				if (type.equals(ItemRenderType.ENTITY)) {

-					GL11.glTranslatef(0.0F, 0.0265F,

-							0.0F);

-					GL11.glRotatef(-30F, 0.0F, 0.0F,

-							1.0F);

-					GL11.glRotatef(45F, 0.0F, 1.0F,

-							0.0F);

-					GL11.glScalef(0.625F, 0.625F,

-							0.625F);

+					GL11.glTranslatef(0.0F, 0.0265F, 0.0F);

+					GL11.glRotatef(-30F, 0.0F, 0.0F, 1.0F);

+					GL11.glRotatef(45F, 0.0F, 1.0F, 0.0F);

+					GL11.glScalef(0.625F, 0.625F, 0.625F);

 				}

-				if (!type.equals(

-						ItemRenderType.EQUIPPED_FIRST_PERSON)) {

+				if (!type.equals(ItemRenderType.EQUIPPED_FIRST_PERSON)) {

 					GL11.glRotatef(45f, 0f, 1f, 0f);

 					GL11.glRotatef(180f, 0f, 1f, 0f);

 					GL11.glRotatef(30f, 1f, 0f, 0f);

 					if (type.equals(ItemRenderType.EQUIPPED)) {

-						GL11.glRotatef(35f, 1f, 0f,

-								0f);

-						GL11.glTranslatef(0F,

-								-0.15F,

-								-0.6F);

+						GL11.glRotatef(35f, 1f, 0f, 0f);

+						GL11.glTranslatef(0F, -0.15F, -0.6F);

 					}

-					GL11.glTranslatef(-0.5F, -0.5F,

-							0.0F);

-				} else if (type.equals(

-						ItemRenderType.EQUIPPED_FIRST_PERSON)) {

-					GL11.glTranslatef(-0.35F, 0.4F,

-							0.93F);

+					GL11.glTranslatef(-0.5F, -0.5F, 0.0F);

+				} else if (type.equals(ItemRenderType.EQUIPPED_FIRST_PERSON)) {

+					GL11.glTranslatef(-0.35F, 0.4F, 0.93F);

 					GL11.glRotatef(45f, 0f, 1f, 0f);

 					GL11.glRotatef(-25f, 0f, 0f, 1f);

 				}

-				if (itemStack.getItem()

-						.requiresMultipleRenderPasses()) {

-					for (int x = 0; x < itemStack

-							.getItem()

-							.getRenderPasses(

-									itemStack.getItemDamage()); x++) {

-						iicon = itemStack.getItem()

-								.getIcon(itemStack,

-										x);

+				if (itemStack.getItem().requiresMultipleRenderPasses()) {

+					for (int x = 0; x < itemStack.getItem().getRenderPasses(itemStack.getItemDamage()); x++) {

+						iicon = itemStack.getItem().getIcon(itemStack, x);

 						f = iicon.getMinU();

 						f1 = iicon.getMaxU();

 						f2 = iicon.getMinV();

 						f3 = iicon.getMaxV();

-						ItemRenderer.renderItemIn2D(

-								tessellator,

-								f1, f2, f,

-								f3,

-								iicon.getIconWidth(),

-								iicon.getIconHeight(),

-								0.0625F);

+						ItemRenderer.renderItemIn2D(tessellator, f1, f2, f, f3, iicon.getIconWidth(),

+								iicon.getIconHeight(), 0.0625F);

 					}

 				} else {

-					ItemRenderer.renderItemIn2D(

-							tessellator, f1,

-							f2, f, f3,

-							iicon.getIconWidth(),

-							iicon.getIconHeight(),

+					ItemRenderer.renderItemIn2D(tessellator, f1, f2, f, f3, iicon.getIconWidth(), iicon.getIconHeight(),

 							0.0625F);

 				}

 				GL11.glDepthFunc(GL11.GL_EQUAL);

@@ -255,33 +186,25 @@ public class ItemRender implements IItemRenderer {
 				GL11.glPushMatrix();

 				float f8 = 0.325F;

 				GL11.glScalef(f8, f8, f8);

-				float f9 = (float) (Minecraft

-						.getSystemTime() % 30000L)

-						/ 30000.0F * 8.0F;

+				float f9 = (float) (Minecraft.getSystemTime() % 30000L) / 30000.0F * 8.0F;

 				GL11.glTranslatef(-f9, 0.0F, 0.0F);

 				GL11.glRotatef(30.0F, 0.0F, 0.0F, 1.0F);

-				ItemRenderer.renderItemIn2D(tessellator,

-						0.0F, 0.0F, 1.0F, 1.0F,

-						256, 256, 0.0625F);

+				ItemRenderer.renderItemIn2D(tessellator, 0.0F, 0.0F, 1.0F, 1.0F, 256, 256, 0.0625F);

 				GL11.glPopMatrix();

 				GL11.glMatrixMode(GL11.GL_MODELVIEW);

 				GL11.glDisable(GL11.GL_BLEND);

 				GL11.glDepthFunc(GL11.GL_LEQUAL);

 				GL11.glDisable(GL12.GL_RESCALE_NORMAL);

-				texturemanager.bindTexture(texturemanager

-						.getResourceLocation(

-								itemStack.getItemSpriteNumber()));

+				texturemanager.bindTexture(texturemanager.getResourceLocation(itemStack.getItemSpriteNumber()));

 				TextureUtil.func_147945_b();

 			}

 		}

 		GL11.glPopMatrix();

 	}

 

-	public void renderBlockAsItem(Block block, int damage,

-			float luminacy) {

+	public void renderBlockAsItem(Block block, int damage, float luminacy) {

 		Tessellator tessellator = Tessellator.instance;

-		if (block == Blocks.dispenser || block == Blocks.dropper

-				|| block == Blocks.furnace)

+		if (block == Blocks.dispenser || block == Blocks.dropper || block == Blocks.furnace)

 			damage = 3;

 		int j;

 		float f1;

@@ -299,155 +222,89 @@ public class ItemRender implements IItemRenderer {
 				f1 = 0.0625F;

 				tessellator.startDrawingQuads();

 				tessellator.setNormal(0.0F, -1.0F, 0.0F);

-				renderBlocksIr.renderFaceYNeg(block, 0.0D,

-						0.0D, 0.0D,

-						renderBlocksIr.getBlockIconFromSide(

-								block, 0));

+				renderBlocksIr.renderFaceYNeg(block, 0.0D, 0.0D, 0.0D, renderBlocksIr.getBlockIconFromSide(block, 0));

 				tessellator.draw();

 				tessellator.startDrawingQuads();

 				tessellator.setNormal(0.0F, 1.0F, 0.0F);

-				renderBlocksIr.renderFaceYPos(block, 0.0D,

-						0.0D, 0.0D,

-						renderBlocksIr.getBlockIconFromSide(

-								block, 1));

+				renderBlocksIr.renderFaceYPos(block, 0.0D, 0.0D, 0.0D, renderBlocksIr.getBlockIconFromSide(block, 1));

 				tessellator.draw();

 				tessellator.startDrawingQuads();

 				tessellator.setNormal(0.0F, 0.0F, -1.0F);

 				tessellator.addTranslation(0.0F, 0.0F, f1);

-				renderBlocksIr.renderFaceZNeg(block, 0.0D,

-						0.0D, 0.0D,

-						renderBlocksIr.getBlockIconFromSide(

-								block, 2));

-				tessellator.addTranslation(0.0F, 0.0F,

-						-f1);

+				renderBlocksIr.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D, renderBlocksIr.getBlockIconFromSide(block, 2));

+				tessellator.addTranslation(0.0F, 0.0F, -f1);

 				tessellator.draw();

 				tessellator.startDrawingQuads();

 				tessellator.setNormal(0.0F, 0.0F, 1.0F);

-				tessellator.addTranslation(0.0F, 0.0F,

-						-f1);

-				renderBlocksIr.renderFaceZPos(block, 0.0D,

-						0.0D, 0.0D,

-						renderBlocksIr.getBlockIconFromSide(

-								block, 3));

+				tessellator.addTranslation(0.0F, 0.0F, -f1);

+				renderBlocksIr.renderFaceZPos(block, 0.0D, 0.0D, 0.0D, renderBlocksIr.getBlockIconFromSide(block, 3));

 				tessellator.addTranslation(0.0F, 0.0F, f1);

 				tessellator.draw();

 				tessellator.startDrawingQuads();

 				tessellator.setNormal(-1.0F, 0.0F, 0.0F);

 				tessellator.addTranslation(f1, 0.0F, 0.0F);

-				renderBlocksIr.renderFaceXNeg(block, 0.0D,

-						0.0D, 0.0D,

-						renderBlocksIr.getBlockIconFromSide(

-								block, 4));

-				tessellator.addTranslation(-f1, 0.0F,

-						0.0F);

+				renderBlocksIr.renderFaceXNeg(block, 0.0D, 0.0D, 0.0D, renderBlocksIr.getBlockIconFromSide(block, 4));

+				tessellator.addTranslation(-f1, 0.0F, 0.0F);

 				tessellator.draw();

 				tessellator.startDrawingQuads();

 				tessellator.setNormal(1.0F, 0.0F, 0.0F);

-				tessellator.addTranslation(-f1, 0.0F,

-						0.0F);

-				renderBlocksIr.renderFaceXPos(block, 0.0D,

-						0.0D, 0.0D,

-						renderBlocksIr.getBlockIconFromSide(

-								block, 5));

+				tessellator.addTranslation(-f1, 0.0F, 0.0F);

+				renderBlocksIr.renderFaceXPos(block, 0.0D, 0.0D, 0.0D, renderBlocksIr.getBlockIconFromSide(block, 5));

 				tessellator.addTranslation(f1, 0.0F, 0.0F);

 				tessellator.draw();

 				GL11.glTranslatef(0.0625F, 0.0F, 0.0625F);

-				GL11.glScalef(0.9375F - 0.0625F, 1F,

-						0.9375F - 0.0625F);

+				GL11.glScalef(0.9375F - 0.0625F, 1F, 0.9375F - 0.0625F);

 				shinyBlock(tessellator, false);

 			} else if (j == 22) {

 				// Chest

 				GL11.glRotatef(90.0F, 0.0F, 1.0F, 0.0F);

 				GL11.glTranslatef(-0.5F, -0.5F, -0.5F);

-				TileEntityRendererChestHelper.instance

-						.renderChest(block, damage,

-								luminacy);

+				TileEntityRendererChestHelper.instance.renderChest(block, damage, luminacy);

 				GL11.glEnable(GL12.GL_RESCALE_NORMAL);

 				GL11.glTranslatef(0.0625F, 0.0F, 0.0625F);

-				GL11.glScalef(0.9375F - 0.0625F, 0.875F,

-						0.9375F - 0.0625F);

+				GL11.glScalef(0.9375F - 0.0625F, 0.875F, 0.9375F - 0.0625F);

 				shinyBlock(tessellator, false);

 			} else if (j == 10) {

 				// Stairs

 				for (k = 0; k < 2; ++k) {

 					if (k == 0) {

-						renderBlocksIr.setRenderBounds(

-								0.0D, 0.0D,

-								0.0D, 1.0D,

-								1.0D,

-								0.5D);

+						renderBlocksIr.setRenderBounds(0.0D, 0.0D, 0.0D, 1.0D, 1.0D, 0.5D);

 					}

 					if (k == 1) {

-						renderBlocksIr.setRenderBounds(

-								0.0D, 0.0D,

-								0.5D, 1.0D,

-								0.5D,

-								1.0D);

+						renderBlocksIr.setRenderBounds(0.0D, 0.0D, 0.5D, 1.0D, 0.5D, 1.0D);

 					}

-					GL11.glTranslatef(-0.5F, -0.5F,

-							-0.5F);

+					GL11.glTranslatef(-0.5F, -0.5F, -0.5F);

 					tessellator.startDrawingQuads();

-					tessellator.setNormal(0.0F, -1.0F,

-							0.0F);

-					renderBlocksIr.renderFaceYNeg(

-							block, 0.0D, 0.0D,

-							0.0D,

-							renderBlocksIr.getBlockIconFromSide(

-									block,

-									0));

+					tessellator.setNormal(0.0F, -1.0F, 0.0F);

+					renderBlocksIr.renderFaceYNeg(block, 0.0D, 0.0D, 0.0D,

+							renderBlocksIr.getBlockIconFromSide(block, 0));

 					tessellator.draw();

 					tessellator.startDrawingQuads();

-					tessellator.setNormal(0.0F, 1.0F,

-							0.0F);

-					renderBlocksIr.renderFaceYPos(

-							block, 0.0D, 0.0D,

-							0.0D,

-							renderBlocksIr.getBlockIconFromSide(

-									block,

-									1));

+					tessellator.setNormal(0.0F, 1.0F, 0.0F);

+					renderBlocksIr.renderFaceYPos(block, 0.0D, 0.0D, 0.0D,

+							renderBlocksIr.getBlockIconFromSide(block, 1));

 					tessellator.draw();

 					tessellator.startDrawingQuads();

-					tessellator.setNormal(0.0F, 0.0F,

-							-1.0F);

-					renderBlocksIr.renderFaceZNeg(

-							block, 0.0D, 0.0D,

-							0.0D,

-							renderBlocksIr.getBlockIconFromSide(

-									block,

-									2));

+					tessellator.setNormal(0.0F, 0.0F, -1.0F);

+					renderBlocksIr.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D,

+							renderBlocksIr.getBlockIconFromSide(block, 2));

 					tessellator.draw();

 					tessellator.startDrawingQuads();

-					tessellator.setNormal(0.0F, 0.0F,

-							1.0F);

-					renderBlocksIr.renderFaceZPos(

-							block, 0.0D, 0.0D,

-							0.0D,

-							renderBlocksIr.getBlockIconFromSide(

-									block,

-									3));

+					tessellator.setNormal(0.0F, 0.0F, 1.0F);

+					renderBlocksIr.renderFaceZPos(block, 0.0D, 0.0D, 0.0D,

+							renderBlocksIr.getBlockIconFromSide(block, 3));

 					tessellator.draw();

 					tessellator.startDrawingQuads();

-					tessellator.setNormal(-1.0F, 0.0F,

-							0.0F);

-					renderBlocksIr.renderFaceXNeg(

-							block, 0.0D, 0.0D,

-							0.0D,

-							renderBlocksIr.getBlockIconFromSide(

-									block,

-									4));

+					tessellator.setNormal(-1.0F, 0.0F, 0.0F);

+					renderBlocksIr.renderFaceXNeg(block, 0.0D, 0.0D, 0.0D,

+							renderBlocksIr.getBlockIconFromSide(block, 4));

 					tessellator.draw();

 					tessellator.startDrawingQuads();

-					tessellator.setNormal(1.0F, 0.0F,

-							0.0F);

-					renderBlocksIr.renderFaceXPos(

-							block, 0.0D, 0.0D,

-							0.0D,

-							renderBlocksIr.getBlockIconFromSide(

-									block,

-									5));

+					tessellator.setNormal(1.0F, 0.0F, 0.0F);

+					renderBlocksIr.renderFaceXPos(block, 0.0D, 0.0D, 0.0D,

+							renderBlocksIr.getBlockIconFromSide(block, 5));

 					tessellator.draw();

-					GL11.glTranslatef(0.5F, 0.5F,

-							0.5F);

+					GL11.glTranslatef(0.5F, 0.5F, 0.5F);

 				}

 			} else if (j == 27) {

 				// Dragon Egg

@@ -486,502 +343,243 @@ public class ItemRender implements IItemRenderer {
 						b0 = 3;

 					}

 					float f5 = (float) b0 / 16.0F;

-					float f6 = 1.0F - (float) k

-							/ 16.0F;

-					float f7 = 1.0F - (float) (k + b1)

-							/ 16.0F;

+					float f6 = 1.0F - (float) k / 16.0F;

+					float f7 = 1.0F - (float) (k + b1) / 16.0F;

 					k += b1;

-					renderBlocksIr.setRenderBounds(

-							(double) (0.5F - f5),

-							(double) f7,

-							(double) (0.5F - f5),

-							(double) (0.5F + f5),

-							(double) f6,

-							(double) (0.5F + f5));

-					tessellator.setNormal(0.0F, -1.0F,

-							0.0F);

-					renderBlocksIr.renderFaceYNeg(

-							block, 0.0D, 0.0D,

-							0.0D,

-							renderBlocksIr.getBlockIconFromSide(

-									block,

-									0));

-					tessellator.setNormal(0.0F, 1.0F,

-							0.0F);

-					renderBlocksIr.renderFaceYPos(

-							block, 0.0D, 0.0D,

-							0.0D,

-							renderBlocksIr.getBlockIconFromSide(

-									block,

-									1));

-					tessellator.setNormal(0.0F, 0.0F,

-							-1.0F);

-					renderBlocksIr.renderFaceZNeg(

-							block, 0.0D, 0.0D,

-							0.0D,

-							renderBlocksIr.getBlockIconFromSide(

-									block,

-									2));

-					tessellator.setNormal(0.0F, 0.0F,

-							1.0F);

-					renderBlocksIr.renderFaceZPos(

-							block, 0.0D, 0.0D,

-							0.0D,

-							renderBlocksIr.getBlockIconFromSide(

-									block,

-									3));

-					tessellator.setNormal(-1.0F, 0.0F,

-							0.0F);

-					renderBlocksIr.renderFaceXNeg(

-							block, 0.0D, 0.0D,

-							0.0D,

-							renderBlocksIr.getBlockIconFromSide(

-									block,

-									4));

-					tessellator.setNormal(1.0F, 0.0F,

-							0.0F);

-					renderBlocksIr.renderFaceXPos(

-							block, 0.0D, 0.0D,

-							0.0D,

-							renderBlocksIr.getBlockIconFromSide(

-									block,

-									5));

+					renderBlocksIr.setRenderBounds((double) (0.5F - f5), (double) f7, (double) (0.5F - f5),

+							(double) (0.5F + f5), (double) f6, (double) (0.5F + f5));

+					tessellator.setNormal(0.0F, -1.0F, 0.0F);

+					renderBlocksIr.renderFaceYNeg(block, 0.0D, 0.0D, 0.0D,

+							renderBlocksIr.getBlockIconFromSide(block, 0));

+					tessellator.setNormal(0.0F, 1.0F, 0.0F);

+					renderBlocksIr.renderFaceYPos(block, 0.0D, 0.0D, 0.0D,

+							renderBlocksIr.getBlockIconFromSide(block, 1));

+					tessellator.setNormal(0.0F, 0.0F, -1.0F);

+					renderBlocksIr.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D,

+							renderBlocksIr.getBlockIconFromSide(block, 2));

+					tessellator.setNormal(0.0F, 0.0F, 1.0F);

+					renderBlocksIr.renderFaceZPos(block, 0.0D, 0.0D, 0.0D,

+							renderBlocksIr.getBlockIconFromSide(block, 3));

+					tessellator.setNormal(-1.0F, 0.0F, 0.0F);

+					renderBlocksIr.renderFaceXNeg(block, 0.0D, 0.0D, 0.0D,

+							renderBlocksIr.getBlockIconFromSide(block, 4));

+					tessellator.setNormal(1.0F, 0.0F, 0.0F);

+					renderBlocksIr.renderFaceXPos(block, 0.0D, 0.0D, 0.0D,

+							renderBlocksIr.getBlockIconFromSide(block, 5));

 				}

 				tessellator.draw();

 				GL11.glTranslatef(0.5F, 0.5F, 0.5F);

-				renderBlocksIr.setRenderBounds(0.0D, 0.0D,

-						0.0D, 1.0D, 1.0D, 1.0D);

+				renderBlocksIr.setRenderBounds(0.0D, 0.0D, 0.0D, 1.0D, 1.0D, 1.0D);

 			} else if (j == 11) {

 				// Fence

 				for (k = 0; k < 4; ++k) {

 					f2 = 0.125F;

 					if (k == 0) {

-						renderBlocksIr.setRenderBounds(

-								(double) (0.5F - f2),

-								0.0D, 0.0D,

-								(double) (0.5F + f2),

-								1.0D,

+						renderBlocksIr.setRenderBounds((double) (0.5F - f2), 0.0D, 0.0D, (double) (0.5F + f2), 1.0D,

 								(double) (f2 * 2.0F));

 					}

 					if (k == 1) {

-						renderBlocksIr.setRenderBounds(

-								(double) (0.5F - f2),

-								0.0D,

-								(double) (1.0F - f2

-										* 2.0F),

-								(double) (0.5F + f2),

-								1.0D,

-								1.0D);

+						renderBlocksIr.setRenderBounds((double) (0.5F - f2), 0.0D, (double) (1.0F - f2 * 2.0F),

+								(double) (0.5F + f2), 1.0D, 1.0D);

 					}

 					f2 = 0.0625F;

 					if (k == 2) {

-						renderBlocksIr.setRenderBounds(

-								(double) (0.5F - f2),

-								(double) (1.0F - f2

-										* 3.0F),

-								(double) (-f2 * 2.0F),

-								(double) (0.5F + f2),

-								(double) (1.0F - f2),

-								(double) (1.0F + f2

-										* 2.0F));

+						renderBlocksIr.setRenderBounds((double) (0.5F - f2), (double) (1.0F - f2 * 3.0F),

+								(double) (-f2 * 2.0F), (double) (0.5F + f2), (double) (1.0F - f2),

+								(double) (1.0F + f2 * 2.0F));

 					}

 					if (k == 3) {

-						renderBlocksIr.setRenderBounds(

-								(double) (0.5F - f2),

-								(double) (0.5F - f2

-										* 3.0F),

-								(double) (-f2 * 2.0F),

-								(double) (0.5F + f2),

-								(double) (0.5F - f2),

-								(double) (1.0F + f2

-										* 2.0F));

+						renderBlocksIr.setRenderBounds((double) (0.5F - f2), (double) (0.5F - f2 * 3.0F),

+								(double) (-f2 * 2.0F), (double) (0.5F + f2), (double) (0.5F - f2),

+								(double) (1.0F + f2 * 2.0F));

 					}

-					GL11.glTranslatef(-0.5F, -0.5F,

-							-0.5F);

+					GL11.glTranslatef(-0.5F, -0.5F, -0.5F);

 					tessellator.startDrawingQuads();

-					tessellator.setNormal(0.0F, -1.0F,

-							0.0F);

-					renderBlocksIr.renderFaceYNeg(

-							block, 0.0D, 0.0D,

-							0.0D,

-							renderBlocksIr.getBlockIconFromSide(

-									block,

-									0));

+					tessellator.setNormal(0.0F, -1.0F, 0.0F);

+					renderBlocksIr.renderFaceYNeg(block, 0.0D, 0.0D, 0.0D,

+							renderBlocksIr.getBlockIconFromSide(block, 0));

 					tessellator.draw();

 					tessellator.startDrawingQuads();

-					tessellator.setNormal(0.0F, 1.0F,

-							0.0F);

-					renderBlocksIr.renderFaceYPos(

-							block, 0.0D, 0.0D,

-							0.0D,

-							renderBlocksIr.getBlockIconFromSide(

-									block,

-									1));

+					tessellator.setNormal(0.0F, 1.0F, 0.0F);

+					renderBlocksIr.renderFaceYPos(block, 0.0D, 0.0D, 0.0D,

+							renderBlocksIr.getBlockIconFromSide(block, 1));

 					tessellator.draw();

 					tessellator.startDrawingQuads();

-					tessellator.setNormal(0.0F, 0.0F,

-							-1.0F);

-					renderBlocksIr.renderFaceZNeg(

-							block, 0.0D, 0.0D,

-							0.0D,

-							renderBlocksIr.getBlockIconFromSide(

-									block,

-									2));

+					tessellator.setNormal(0.0F, 0.0F, -1.0F);

+					renderBlocksIr.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D,

+							renderBlocksIr.getBlockIconFromSide(block, 2));

 					tessellator.draw();

 					tessellator.startDrawingQuads();

-					tessellator.setNormal(0.0F, 0.0F,

-							1.0F);

-					renderBlocksIr.renderFaceZPos(

-							block, 0.0D, 0.0D,

-							0.0D,

-							renderBlocksIr.getBlockIconFromSide(

-									block,

-									3));

+					tessellator.setNormal(0.0F, 0.0F, 1.0F);

+					renderBlocksIr.renderFaceZPos(block, 0.0D, 0.0D, 0.0D,

+							renderBlocksIr.getBlockIconFromSide(block, 3));

 					tessellator.draw();

 					tessellator.startDrawingQuads();

-					tessellator.setNormal(-1.0F, 0.0F,

-							0.0F);

-					renderBlocksIr.renderFaceXNeg(

-							block, 0.0D, 0.0D,

-							0.0D,

-							renderBlocksIr.getBlockIconFromSide(

-									block,

-									4));

+					tessellator.setNormal(-1.0F, 0.0F, 0.0F);

+					renderBlocksIr.renderFaceXNeg(block, 0.0D, 0.0D, 0.0D,

+							renderBlocksIr.getBlockIconFromSide(block, 4));

 					tessellator.draw();

 					tessellator.startDrawingQuads();

-					tessellator.setNormal(1.0F, 0.0F,

-							0.0F);

-					renderBlocksIr.renderFaceXPos(

-							block, 0.0D, 0.0D,

-							0.0D,

-							renderBlocksIr.getBlockIconFromSide(

-									block,

-									5));

+					tessellator.setNormal(1.0F, 0.0F, 0.0F);

+					renderBlocksIr.renderFaceXPos(block, 0.0D, 0.0D, 0.0D,

+							renderBlocksIr.getBlockIconFromSide(block, 5));

 					tessellator.draw();

-					GL11.glTranslatef(0.5F, 0.5F,

-							0.5F);

+					GL11.glTranslatef(0.5F, 0.5F, 0.5F);

 				}

-				renderBlocksIr.setRenderBounds(0.0D, 0.0D,

-						0.0D, 1.0D, 1.0D, 1.0D);

+				renderBlocksIr.setRenderBounds(0.0D, 0.0D, 0.0D, 1.0D, 1.0D, 1.0D);

 			} else if (j == 21) {

 				// Fence Gate

 				for (k = 0; k < 3; ++k) {

 					f2 = 0.0625F;

 					if (k == 0) {

-						renderBlocksIr.setRenderBounds(

-								(double) (0.5F - f2),

-								0.30000001192092896D,

-								0.0D,

-								(double) (0.5F + f2),

-								1.0D,

-								(double) (f2 * 2.0F));

+						renderBlocksIr.setRenderBounds((double) (0.5F - f2), 0.30000001192092896D, 0.0D,

+								(double) (0.5F + f2), 1.0D, (double) (f2 * 2.0F));

 					}

 					if (k == 1) {

-						renderBlocksIr.setRenderBounds(

-								(double) (0.5F - f2),

-								0.30000001192092896D,

-								(double) (1.0F - f2

-										* 2.0F),

-								(double) (0.5F + f2),

-								1.0D,

-								1.0D);

+						renderBlocksIr.setRenderBounds((double) (0.5F - f2), 0.30000001192092896D,

+								(double) (1.0F - f2 * 2.0F), (double) (0.5F + f2), 1.0D, 1.0D);

 					}

 					f2 = 0.0625F;

 					if (k == 2) {

-						renderBlocksIr.setRenderBounds(

-								(double) (0.5F - f2),

-								0.5D, 0.0D,

-								(double) (0.5F + f2),

-								(double) (1.0F - f2),

-								1.0D);

+						renderBlocksIr.setRenderBounds((double) (0.5F - f2), 0.5D, 0.0D, (double) (0.5F + f2),

+								(double) (1.0F - f2), 1.0D);

 					}

-					GL11.glTranslatef(-0.5F, -0.5F,

-							-0.5F);

+					GL11.glTranslatef(-0.5F, -0.5F, -0.5F);

 					tessellator.startDrawingQuads();

-					tessellator.setNormal(0.0F, -1.0F,

-							0.0F);

-					renderBlocksIr.renderFaceYNeg(

-							block, 0.0D, 0.0D,

-							0.0D,

-							renderBlocksIr.getBlockIconFromSide(

-									block,

-									0));

+					tessellator.setNormal(0.0F, -1.0F, 0.0F);

+					renderBlocksIr.renderFaceYNeg(block, 0.0D, 0.0D, 0.0D,

+							renderBlocksIr.getBlockIconFromSide(block, 0));

 					tessellator.draw();

 					tessellator.startDrawingQuads();

-					tessellator.setNormal(0.0F, 1.0F,

-							0.0F);

-					renderBlocksIr.renderFaceYPos(

-							block, 0.0D, 0.0D,

-							0.0D,

-							renderBlocksIr.getBlockIconFromSide(

-									block,

-									1));

+					tessellator.setNormal(0.0F, 1.0F, 0.0F);

+					renderBlocksIr.renderFaceYPos(block, 0.0D, 0.0D, 0.0D,

+							renderBlocksIr.getBlockIconFromSide(block, 1));

 					tessellator.draw();

 					tessellator.startDrawingQuads();

-					tessellator.setNormal(0.0F, 0.0F,

-							-1.0F);

-					renderBlocksIr.renderFaceZNeg(

-							block, 0.0D, 0.0D,

-							0.0D,

-							renderBlocksIr.getBlockIconFromSide(

-									block,

-									2));

+					tessellator.setNormal(0.0F, 0.0F, -1.0F);

+					renderBlocksIr.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D,

+							renderBlocksIr.getBlockIconFromSide(block, 2));

 					tessellator.draw();

 					tessellator.startDrawingQuads();

-					tessellator.setNormal(0.0F, 0.0F,

-							1.0F);

-					renderBlocksIr.renderFaceZPos(

-							block, 0.0D, 0.0D,

-							0.0D,

-							renderBlocksIr.getBlockIconFromSide(

-									block,

-									3));

+					tessellator.setNormal(0.0F, 0.0F, 1.0F);

+					renderBlocksIr.renderFaceZPos(block, 0.0D, 0.0D, 0.0D,

+							renderBlocksIr.getBlockIconFromSide(block, 3));

 					tessellator.draw();

 					tessellator.startDrawingQuads();

-					tessellator.setNormal(-1.0F, 0.0F,

-							0.0F);

-					renderBlocksIr.renderFaceXNeg(

-							block, 0.0D, 0.0D,

-							0.0D,

-							renderBlocksIr.getBlockIconFromSide(

-									block,

-									4));

+					tessellator.setNormal(-1.0F, 0.0F, 0.0F);

+					renderBlocksIr.renderFaceXNeg(block, 0.0D, 0.0D, 0.0D,

+							renderBlocksIr.getBlockIconFromSide(block, 4));

 					tessellator.draw();

 					tessellator.startDrawingQuads();

-					tessellator.setNormal(1.0F, 0.0F,

-							0.0F);

-					renderBlocksIr.renderFaceXPos(

-							block, 0.0D, 0.0D,

-							0.0D,

-							renderBlocksIr.getBlockIconFromSide(

-									block,

-									5));

+					tessellator.setNormal(1.0F, 0.0F, 0.0F);

+					renderBlocksIr.renderFaceXPos(block, 0.0D, 0.0D, 0.0D,

+							renderBlocksIr.getBlockIconFromSide(block, 5));

 					tessellator.draw();

-					GL11.glTranslatef(0.5F, 0.5F,

-							0.5F);

+					GL11.glTranslatef(0.5F, 0.5F, 0.5F);

 				}

 			} else if (j == 32) {

 				// Wall

 				for (k = 0; k < 2; ++k) {

 					if (k == 0) {

-						renderBlocksIr.setRenderBounds(

-								0.0D, 0.0D,

-								0.3125D,

-								1.0D,

-								0.8125D,

-								0.6875D);

+						renderBlocksIr.setRenderBounds(0.0D, 0.0D, 0.3125D, 1.0D, 0.8125D, 0.6875D);

 					}

 					if (k == 1) {

-						renderBlocksIr.setRenderBounds(

-								0.25D,

-								0.0D,

-								0.25D,

-								0.75D,

-								1.0D,

-								0.75D);

+						renderBlocksIr.setRenderBounds(0.25D, 0.0D, 0.25D, 0.75D, 1.0D, 0.75D);

 					}

-					GL11.glTranslatef(-0.5F, -0.5F,

-							-0.5F);

+					GL11.glTranslatef(-0.5F, -0.5F, -0.5F);

 					tessellator.startDrawingQuads();

-					tessellator.setNormal(0.0F, -1.0F,

-							0.0F);

-					renderBlocksIr.renderFaceYNeg(

-							block, 0.0D, 0.0D,

-							0.0D,

-							renderBlocksIr.getBlockIconFromSideAndMetadata(

-									block,

-									0,

-									damage));

+					tessellator.setNormal(0.0F, -1.0F, 0.0F);

+					renderBlocksIr.renderFaceYNeg(block, 0.0D, 0.0D, 0.0D,

+							renderBlocksIr.getBlockIconFromSideAndMetadata(block, 0, damage));

 					tessellator.draw();

 					tessellator.startDrawingQuads();

-					tessellator.setNormal(0.0F, 1.0F,

-							0.0F);

-					renderBlocksIr.renderFaceYPos(

-							block, 0.0D, 0.0D,

-							0.0D,

-							renderBlocksIr.getBlockIconFromSideAndMetadata(

-									block,

-									1,

-									damage));

+					tessellator.setNormal(0.0F, 1.0F, 0.0F);

+					renderBlocksIr.renderFaceYPos(block, 0.0D, 0.0D, 0.0D,

+							renderBlocksIr.getBlockIconFromSideAndMetadata(block, 1, damage));

 					tessellator.draw();

 					tessellator.startDrawingQuads();

-					tessellator.setNormal(0.0F, 0.0F,

-							-1.0F);

-					renderBlocksIr.renderFaceZNeg(

-							block, 0.0D, 0.0D,

-							0.0D,

-							renderBlocksIr.getBlockIconFromSideAndMetadata(

-									block,

-									2,

-									damage));

+					tessellator.setNormal(0.0F, 0.0F, -1.0F);

+					renderBlocksIr.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D,

+							renderBlocksIr.getBlockIconFromSideAndMetadata(block, 2, damage));

 					tessellator.draw();

 					tessellator.startDrawingQuads();

-					tessellator.setNormal(0.0F, 0.0F,

-							1.0F);

-					renderBlocksIr.renderFaceZPos(

-							block, 0.0D, 0.0D,

-							0.0D,

-							renderBlocksIr.getBlockIconFromSideAndMetadata(

-									block,

-									3,

-									damage));

+					tessellator.setNormal(0.0F, 0.0F, 1.0F);

+					renderBlocksIr.renderFaceZPos(block, 0.0D, 0.0D, 0.0D,

+							renderBlocksIr.getBlockIconFromSideAndMetadata(block, 3, damage));

 					tessellator.draw();

 					tessellator.startDrawingQuads();

-					tessellator.setNormal(-1.0F, 0.0F,

-							0.0F);

-					renderBlocksIr.renderFaceXNeg(

-							block, 0.0D, 0.0D,

-							0.0D,

-							renderBlocksIr.getBlockIconFromSideAndMetadata(

-									block,

-									4,

-									damage));

+					tessellator.setNormal(-1.0F, 0.0F, 0.0F);

+					renderBlocksIr.renderFaceXNeg(block, 0.0D, 0.0D, 0.0D,

+							renderBlocksIr.getBlockIconFromSideAndMetadata(block, 4, damage));

 					tessellator.draw();

 					tessellator.startDrawingQuads();

-					tessellator.setNormal(1.0F, 0.0F,

-							0.0F);

-					renderBlocksIr.renderFaceXPos(

-							block, 0.0D, 0.0D,

-							0.0D,

-							renderBlocksIr.getBlockIconFromSideAndMetadata(

-									block,

-									5,

-									damage));

+					tessellator.setNormal(1.0F, 0.0F, 0.0F);

+					renderBlocksIr.renderFaceXPos(block, 0.0D, 0.0D, 0.0D,

+							renderBlocksIr.getBlockIconFromSideAndMetadata(block, 5, damage));

 					tessellator.draw();

-					GL11.glTranslatef(0.5F, 0.5F,

-							0.5F);

+					GL11.glTranslatef(0.5F, 0.5F, 0.5F);

 				}

-				renderBlocksIr.setRenderBounds(0.0D, 0.0D,

-						0.0D, 1.0D, 1.0D, 1.0D);

+				renderBlocksIr.setRenderBounds(0.0D, 0.0D, 0.0D, 1.0D, 1.0D, 1.0D);

 			} else if (j == 35) {

 				// Anvil

 				GL11.glTranslatef(-0.5F, -0.5F, -0.5F);

-				renderBlocksIr.renderBlockAnvilOrient(

-						(BlockAnvil) block, 0, 0,

-						0, damage << 2, true);

+				renderBlocksIr.renderBlockAnvilOrient((BlockAnvil) block, 0, 0, 0, damage << 2, true);

 				GL11.glTranslatef(0.5F, 0.5F, 0.5F);

 			} else if (j == 34) {

 				// Beacon

 				for (k = 0; k < 3; ++k) {

 					if (k == 0) {

-						renderBlocksIr.setRenderBounds(

-								0.125D,

-								0.0D,

-								0.125D,

-								0.875D,

-								0.1875D,

-								0.875D);

-						renderBlocksIr.setOverrideBlockTexture(

-								renderBlocksIr.getBlockIcon(

-										Blocks.obsidian));

+						renderBlocksIr.setRenderBounds(0.125D, 0.0D, 0.125D, 0.875D, 0.1875D, 0.875D);

+						renderBlocksIr.setOverrideBlockTexture(renderBlocksIr.getBlockIcon(Blocks.obsidian));

 					} else if (k == 1) {

-						renderBlocksIr.setRenderBounds(

-								0.1875D,

-								0.1875D,

-								0.1875D,

-								0.8125D,

-								0.875D,

-								0.8125D);

-						renderBlocksIr.setOverrideBlockTexture(

-								renderBlocksIr.getBlockIcon(

-										Blocks.beacon));

+						renderBlocksIr.setRenderBounds(0.1875D, 0.1875D, 0.1875D, 0.8125D, 0.875D, 0.8125D);

+						renderBlocksIr.setOverrideBlockTexture(renderBlocksIr.getBlockIcon(Blocks.beacon));

 					} else if (k == 2) {

-						renderBlocksIr.setRenderBounds(

-								0.0D, 0.0D,

-								0.0D, 1.0D,

-								1.0D,

-								1.0D);

-						renderBlocksIr.setOverrideBlockTexture(

-								renderBlocksIr.getBlockIcon(

-										Blocks.glass));

+						renderBlocksIr.setRenderBounds(0.0D, 0.0D, 0.0D, 1.0D, 1.0D, 1.0D);

+						renderBlocksIr.setOverrideBlockTexture(renderBlocksIr.getBlockIcon(Blocks.glass));

 					}

-					GL11.glTranslatef(-0.5F, -0.5F,

-							-0.5F);

+					GL11.glTranslatef(-0.5F, -0.5F, -0.5F);

 					tessellator.startDrawingQuads();

-					tessellator.setNormal(0.0F, -1.0F,

-							0.0F);

-					renderBlocksIr.renderFaceYNeg(

-							block, 0.0D, 0.0D,

-							0.0D,

-							renderBlocksIr.getBlockIconFromSideAndMetadata(

-									block,

-									0,

-									damage));

+					tessellator.setNormal(0.0F, -1.0F, 0.0F);

+					renderBlocksIr.renderFaceYNeg(block, 0.0D, 0.0D, 0.0D,

+							renderBlocksIr.getBlockIconFromSideAndMetadata(block, 0, damage));

 					tessellator.draw();

 					tessellator.startDrawingQuads();

-					tessellator.setNormal(0.0F, 1.0F,

-							0.0F);

-					renderBlocksIr.renderFaceYPos(

-							block, 0.0D, 0.0D,

-							0.0D,

-							renderBlocksIr.getBlockIconFromSideAndMetadata(

-									block,

-									1,

-									damage));

+					tessellator.setNormal(0.0F, 1.0F, 0.0F);

+					renderBlocksIr.renderFaceYPos(block, 0.0D, 0.0D, 0.0D,

+							renderBlocksIr.getBlockIconFromSideAndMetadata(block, 1, damage));

 					tessellator.draw();

 					tessellator.startDrawingQuads();

-					tessellator.setNormal(0.0F, 0.0F,

-							-1.0F);

-					renderBlocksIr.renderFaceZNeg(

-							block, 0.0D, 0.0D,

-							0.0D,

-							renderBlocksIr.getBlockIconFromSideAndMetadata(

-									block,

-									2,

-									damage));

+					tessellator.setNormal(0.0F, 0.0F, -1.0F);

+					renderBlocksIr.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D,

+							renderBlocksIr.getBlockIconFromSideAndMetadata(block, 2, damage));

 					tessellator.draw();

 					tessellator.startDrawingQuads();

-					tessellator.setNormal(0.0F, 0.0F,

-							1.0F);

-					renderBlocksIr.renderFaceZPos(

-							block, 0.0D, 0.0D,

-							0.0D,

-							renderBlocksIr.getBlockIconFromSideAndMetadata(

-									block,

-									3,

-									damage));

+					tessellator.setNormal(0.0F, 0.0F, 1.0F);

+					renderBlocksIr.renderFaceZPos(block, 0.0D, 0.0D, 0.0D,

+							renderBlocksIr.getBlockIconFromSideAndMetadata(block, 3, damage));

 					tessellator.draw();

 					tessellator.startDrawingQuads();

-					tessellator.setNormal(-1.0F, 0.0F,

-							0.0F);

-					renderBlocksIr.renderFaceXNeg(

-							block, 0.0D, 0.0D,

-							0.0D,

-							renderBlocksIr.getBlockIconFromSideAndMetadata(

-									block,

-									4,

-									damage));

+					tessellator.setNormal(-1.0F, 0.0F, 0.0F);

+					renderBlocksIr.renderFaceXNeg(block, 0.0D, 0.0D, 0.0D,

+							renderBlocksIr.getBlockIconFromSideAndMetadata(block, 4, damage));

 					tessellator.draw();

 					tessellator.startDrawingQuads();

-					tessellator.setNormal(1.0F, 0.0F,

-							0.0F);

-					renderBlocksIr.renderFaceXPos(

-							block, 0.0D, 0.0D,

-							0.0D,

-							renderBlocksIr.getBlockIconFromSideAndMetadata(

-									block,

-									5,

-									damage));

+					tessellator.setNormal(1.0F, 0.0F, 0.0F);

+					renderBlocksIr.renderFaceXPos(block, 0.0D, 0.0D, 0.0D,

+							renderBlocksIr.getBlockIconFromSideAndMetadata(block, 5, damage));

 					tessellator.draw();

-					GL11.glTranslatef(0.5F, 0.5F,

-							0.5F);

+					GL11.glTranslatef(0.5F, 0.5F, 0.5F);

 				}

-				renderBlocksIr.setRenderBounds(0.0D, 0.0D,

-						0.0D, 1.0D, 1.0D, 1.0D);

+				renderBlocksIr.setRenderBounds(0.0D, 0.0D, 0.0D, 1.0D, 1.0D, 1.0D);

 				renderBlocksIr.clearOverrideBlockTexture();

 				GL11.glTranslatef(-0.5F, -0.5F, -0.5F);

 				shinyBlock(tessellator, false);

 			} else {

 				try {

-					FMLRenderAccessLibrary

-							.renderInventoryBlock(

-									renderBlocksIr,

-									block,

-									damage,

-									j);

+					FMLRenderAccessLibrary.renderInventoryBlock(renderBlocksIr, block, damage, j);

 				} catch (Exception e) {

-					JewelrycraftMod.logger.error(

-							"Something went wrong with rendering the item");

+					JewelrycraftMod.logger.error("Something went wrong with rendering the item");

 					e.printStackTrace();

 				}

 			}

@@ -995,67 +593,48 @@ public class ItemRender implements IItemRenderer {
 			GL11.glTranslatef(-0.5F, -0.5F, -0.5F);

 			tessellator.startDrawingQuads();

 			tessellator.setNormal(0.0F, -1.0F, 0.0F);

-			renderBlocksIr.renderFaceYNeg(block, 0.0D, 0.0D,

-					0.0D,

-					renderBlocksIr.getBlockIconFromSideAndMetadata(

-							block, 0, damage));

+			renderBlocksIr.renderFaceYNeg(block, 0.0D, 0.0D, 0.0D,

+					renderBlocksIr.getBlockIconFromSideAndMetadata(block, 0, damage));

 			tessellator.draw();

 			GL11.glColor4f(1F, 1F, 0F, 1.0F);

 			tessellator.startDrawingQuads();

 			tessellator.setNormal(0.0F, 1.0F, 0.0F);

-			renderBlocksIr.renderFaceYPos(block, 0.0D, 0.0D,

-					0.0D,

-					renderBlocksIr.getBlockIconFromSideAndMetadata(

-							block, 1, damage));

+			renderBlocksIr.renderFaceYPos(block, 0.0D, 0.0D, 0.0D,

+					renderBlocksIr.getBlockIconFromSideAndMetadata(block, 1, damage));

 			tessellator.draw();

 			GL11.glColor4f(1F, 1F, 0F, 1.0F);

 			tessellator.startDrawingQuads();

 			tessellator.setNormal(0.0F, 0.0F, -1.0F);

-			renderBlocksIr.renderFaceZNeg(block, 0.0D, 0.0D,

-					0.0D,

-					renderBlocksIr.getBlockIconFromSideAndMetadata(

-							block, 2, damage));

+			renderBlocksIr.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D,

+					renderBlocksIr.getBlockIconFromSideAndMetadata(block, 2, damage));

 			tessellator.draw();

 			tessellator.startDrawingQuads();

 			tessellator.setNormal(0.0F, 0.0F, 1.0F);

-			renderBlocksIr.renderFaceZPos(block, 0.0D, 0.0D,

-					0.0D,

-					renderBlocksIr.getBlockIconFromSideAndMetadata(

-							block, 3, damage));

+			renderBlocksIr.renderFaceZPos(block, 0.0D, 0.0D, 0.0D,

+					renderBlocksIr.getBlockIconFromSideAndMetadata(block, 3, damage));

 			tessellator.draw();

 			tessellator.startDrawingQuads();

 			tessellator.setNormal(-1.0F, 0.0F, 0.0F);

-			renderBlocksIr.renderFaceXNeg(block, 0.0D, 0.0D,

-					0.0D,

-					renderBlocksIr.getBlockIconFromSideAndMetadata(

-							block, 4, damage));

+			renderBlocksIr.renderFaceXNeg(block, 0.0D, 0.0D, 0.0D,

+					renderBlocksIr.getBlockIconFromSideAndMetadata(block, 4, damage));

 			tessellator.draw();

 			tessellator.startDrawingQuads();

 			tessellator.setNormal(1.0F, 0.0F, 0.0F);

-			renderBlocksIr.renderFaceXPos(block, 0.0D, 0.0D,

-					0.0D,

-					renderBlocksIr.getBlockIconFromSideAndMetadata(

-							block, 5, damage));

+			renderBlocksIr.renderFaceXPos(block, 0.0D, 0.0D, 0.0D,

+					renderBlocksIr.getBlockIconFromSideAndMetadata(block, 5, damage));

 			tessellator.draw();

-			GL11.glTranslatef(

-					(float) block.getBlockBoundsMinX(),

-					(float) block.getBlockBoundsMinY(),

+			GL11.glTranslatef((float) block.getBlockBoundsMinX(), (float) block.getBlockBoundsMinY(),

 					(float) block.getBlockBoundsMinZ());

-			GL11.glScalef((float) block.getBlockBoundsMaxX()

-					- (float) block.getBlockBoundsMinX(),

-					(float) block.getBlockBoundsMaxY()

-							- (float) block.getBlockBoundsMinY(),

-					(float) block.getBlockBoundsMaxZ()

-							- (float) block.getBlockBoundsMinZ());

+			GL11.glScalef((float) block.getBlockBoundsMaxX() - (float) block.getBlockBoundsMinX(),

+					(float) block.getBlockBoundsMaxY() - (float) block.getBlockBoundsMinY(),

+					(float) block.getBlockBoundsMaxZ() - (float) block.getBlockBoundsMinZ());

 			shinyBlock(tessellator, false);

 			GL11.glTranslatef(0.5F, 0.5F, 0.5F);

 		}

 	}

 

-	public void renderShine(Tessellator tessellator,

-			boolean autoAnimate) {

-		TextureManager texturemanager = this.mc

-				.getTextureManager();

+	public void renderShine(Tessellator tessellator, boolean autoAnimate) {

+		TextureManager texturemanager = this.mc.getTextureManager();

 		texturemanager.bindTexture(RES_ITEM_GLINT);

 		GL11.glEnable(GL11.GL_BLEND);

 		OpenGlHelper.glBlendFunc(768, 1, 1, 0);

@@ -1073,13 +652,11 @@ public class ItemRender implements IItemRenderer {
 		}

 		GL11.glRotatef(-30.0F, 0.0F, 0.0F, 1.0F);

 		GL11.glColor3f(1F, 1F, 0F);

-		ItemRenderer.renderItemIn2D(tessellator, 0.0F, 0.0F, 1.0F,

-				1.0F, 256, 256, 0.001F);

+		ItemRenderer.renderItemIn2D(tessellator, 0.0F, 0.0F, 1.0F, 1.0F, 256, 256, 0.001F);

 		GL11.glPopMatrix();

 	}

 

-	public void shinyBlock(Tessellator tessellator,

-			boolean autoAnimate) {

+	public void shinyBlock(Tessellator tessellator, boolean autoAnimate) {

 		GL11.glPushMatrix();

 		GL11.glTranslatef(0F, 0.0F, -0.001F);

 		renderShine(tessellator, autoAnimate);

diff --git a/src/main/java/darkknight/jewelrycraft/item/render/MaskRender.java b/src/main/java/darkknight/jewelrycraft/item/render/MaskRender.java
index dd671e2..6197ab0 100755
--- a/src/main/java/darkknight/jewelrycraft/item/render/MaskRender.java
+++ b/src/main/java/darkknight/jewelrycraft/item/render/MaskRender.java
@@ -11,17 +11,14 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.ResourceLocation;

 

 public class MaskRender extends TileEntitySpecialRenderer {

-	ModelMask		mask	= new ModelMask();

-	ResourceLocation	texture	= new ResourceLocation(

-			Variables.MODID, "textures/entities/Mask.png");

+	ModelMask mask = new ModelMask();

+	ResourceLocation texture = new ResourceLocation(Variables.MODID, "textures/entities/Mask.png");

 

 	@Override

-	public void renderTileEntityAt(TileEntity te, double x, double y,

-			double z, float scale) {

+	public void renderTileEntityAt(TileEntity te, double x, double y, double z, float scale) {

 	}

 

-	public void doRender(Entity entity, double x, double y, double z,

-			float f, float g) {

+	public void doRender(Entity entity, double x, double y, double z, float f, float g) {

 		GL11.glPushMatrix();

 		Minecraft.getMinecraft().renderEngine.bindTexture(texture);

 		GL11.glTranslatef(0.1615F, 0F, 0.03F);

diff --git a/src/main/java/darkknight/jewelrycraft/item/render/NecklaceRender.java b/src/main/java/darkknight/jewelrycraft/item/render/NecklaceRender.java
index c021e7a..d10f7f7 100755
--- a/src/main/java/darkknight/jewelrycraft/item/render/NecklaceRender.java
+++ b/src/main/java/darkknight/jewelrycraft/item/render/NecklaceRender.java
@@ -11,22 +11,18 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.ResourceLocation;

 

 public class NecklaceRender extends TileEntitySpecialRenderer {

-	public ModelNeckalce	neckalce	= new ModelNeckalce();

-	ResourceLocation	texture		= new ResourceLocation(

-			Variables.MODID, "textures/entities/Necklace.png");

+	public ModelNeckalce neckalce = new ModelNeckalce();

+	ResourceLocation texture = new ResourceLocation(Variables.MODID, "textures/entities/Necklace.png");

 

 	@Override

-	public void renderTileEntityAt(TileEntity te, double x, double y,

-			double z, float scale) {

+	public void renderTileEntityAt(TileEntity te, double x, double y, double z, float scale) {

 	}

 

-	public void doRender(Entity entity, double x, double y, double z,

-			float f, float g) {

+	public void doRender(Entity entity, double x, double y, double z, float f, float g) {

 		GL11.glPushMatrix();

 		Minecraft.getMinecraft().renderEngine.bindTexture(texture);

 		if ((float) z != -1)

-			neckalce.render(entity, 0F, 0F, 0F, (float) z, f,

-					1.0F);

+			neckalce.render(entity, 0F, 0F, 0F, (float) z, f, 1.0F);

 		GL11.glPopMatrix();

 	}

 }
\ No newline at end of file
diff --git a/src/main/java/darkknight/jewelrycraft/item/render/RingRender.java b/src/main/java/darkknight/jewelrycraft/item/render/RingRender.java
index 1cde268..1a289ee 100755
--- a/src/main/java/darkknight/jewelrycraft/item/render/RingRender.java
+++ b/src/main/java/darkknight/jewelrycraft/item/render/RingRender.java
@@ -11,22 +11,18 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.ResourceLocation;

 

 public class RingRender extends TileEntitySpecialRenderer {

-	public ModelRing	ring	= new ModelRing();

-	ResourceLocation	texture	= new ResourceLocation(

-			Variables.MODID, "textures/entities/Ring.png");

+	public ModelRing ring = new ModelRing();

+	ResourceLocation texture = new ResourceLocation(Variables.MODID, "textures/entities/Ring.png");

 

 	@Override

-	public void renderTileEntityAt(TileEntity te, double x, double y,

-			double z, float scale) {

+	public void renderTileEntityAt(TileEntity te, double x, double y, double z, float scale) {

 	}

 

-	public void doRender(Entity entity, double x, double y, double z,

-			float f, float g) {

+	public void doRender(Entity entity, double x, double y, double z, float f, float g) {

 		GL11.glPushMatrix();

 		Minecraft.getMinecraft().renderEngine.bindTexture(texture);

 		if ((float) z != -1)

-			ring.render(entity, 0F, 0F, 0F, (float) z, f,

-					1.0F);

+			ring.render(entity, 0F, 0F, 0F, (float) z, f, 1.0F);

 		GL11.glPopMatrix();

 	}

 }
\ No newline at end of file