Format/import cleanup

6 files changed, 204 insertions, 353 deletions

diff --git a/src/main/java/darkknight/jewelrycraft/util/BlockUtils.java b/src/main/java/darkknight/jewelrycraft/util/BlockUtils.java
index 17a6cdc..615f2ac 100755
--- a/src/main/java/darkknight/jewelrycraft/util/BlockUtils.java
+++ b/src/main/java/darkknight/jewelrycraft/util/BlockUtils.java
@@ -13,29 +13,26 @@ public class BlockUtils {
 	public static final ForgeDirection DEFAULT_BLOCK_DIRECTION = ForgeDirection.WEST;

 

 	/**

-	 * This method is used to get the direction an entity is facing

-	 * (NORTH, SOUTH, EAST or WEST) based on the entity's rotationYaw.

+	 * This method is used to get the direction an entity is facing (NORTH, SOUTH,

+	 * EAST or WEST) based on the entity's rotationYaw.

 	 * 

 	 * @param entity

-	 *                the living entity

+	 *            the living entity

 	 * @return a direction

 	 */

-	public static ForgeDirection get2dOrientation(

-			EntityLivingBase entity) {

-		int l = MathHelper.floor_double(

-				entity.rotationYaw * 4.0F / 360.0F + 0.5D)

-				& 0x3;

+	public static ForgeDirection get2dOrientation(EntityLivingBase entity) {

+		int l = MathHelper.floor_double(entity.rotationYaw * 4.0F / 360.0F + 0.5D) & 0x3;

 		switch (l) {

-			case 0:

-				return ForgeDirection.SOUTH;

-			case 1:

-				return ForgeDirection.WEST;

-			case 2:

-				return ForgeDirection.NORTH;

-			case 3:

-				return ForgeDirection.EAST;

-			default:

-				return ForgeDirection.SOUTH;

+		case 0:

+			return ForgeDirection.SOUTH;

+		case 1:

+			return ForgeDirection.WEST;

+		case 2:

+			return ForgeDirection.NORTH;

+		case 3:

+			return ForgeDirection.EAST;

+		default:

+			return ForgeDirection.SOUTH;

 		}

 	}

 

@@ -43,40 +40,38 @@ public class BlockUtils {
 	 * This gets a float value depending on a direction

 	 * 

 	 * @param direction

-	 *                the forge direction

+	 *            the forge direction

 	 * @return value depending on direction

 	 */

-	public static float getRotationFromDirection(

-			ForgeDirection direction) {

+	public static float getRotationFromDirection(ForgeDirection direction) {

 		switch (direction) {

-			case NORTH:

-				return 0F;

-			case SOUTH:

-				return 180F;

-			case WEST:

-				return 90F;

-			case EAST:

-				return -90F;

-			case DOWN:

-				return -90f;

-			case UP:

-				return 90f;

-			case UNKNOWN:

-			default:

-				return 0f;

+		case NORTH:

+			return 0F;

+		case SOUTH:

+			return 180F;

+		case WEST:

+			return 90F;

+		case EAST:

+			return -90F;

+		case DOWN:

+			return -90f;

+		case UP:

+			return 90f;

+		case UNKNOWN:

+		default:

+			return 0f;

 		}

 	}

 

 	/**

-	 * This method is used to get the direction an entity is looking at

-	 * (UP or DOWN) based on the entitiy's rotationPitch

+	 * This method is used to get the direction an entity is looking at (UP or DOWN)

+	 * based on the entitiy's rotationPitch

 	 * 

 	 * @param entity

-	 *                the living entity

+	 *            the living entity

 	 * @return a forge direction

 	 */

-	public static ForgeDirection get3dOrientation(

-			EntityLivingBase entity) {

+	public static ForgeDirection get3dOrientation(EntityLivingBase entity) {

 		if (entity.rotationPitch > 45.5F)

 			return ForgeDirection.DOWN;

 		else if (entity.rotationPitch < -45.5F)

@@ -85,38 +80,29 @@ public class BlockUtils {
 	}

 

 	/**

-	 * This spawns the item specified and returns the EntityItem it

-	 * created

+	 * This spawns the item specified and returns the EntityItem it created

 	 * 

 	 * @param worldObj

-	 *                the world

+	 *            the world

 	 * @param x

-	 *                position of the item to drop on the X axis

+	 *            position of the item to drop on the X axis

 	 * @param y

-	 *                position of the item to drop on the Y axis

+	 *            position of the item to drop on the Y axis

 	 * @param z

-	 *                position of the item to drop on the Z axis

+	 *            position of the item to drop on the Z axis

 	 * @param stack

-	 *                the item to spawn

+	 *            the item to spawn

 	 * @return the EntityItem of the stack

 	 */

-	public static EntityItem dropItemStackInWorld(World worldObj,

-			double x, double y, double z, ItemStack stack) {

+	public static EntityItem dropItemStackInWorld(World worldObj, double x, double y, double z, ItemStack stack) {

 		float f = 0.7F;

-		float d0 = worldObj.rand.nextFloat() * f

-				+ (1.0F - f) * 0.5F;

-		float d1 = worldObj.rand.nextFloat() * f

-				+ (1.0F - f) * 0.5F;

-		float d2 = worldObj.rand.nextFloat() * f

-				+ (1.0F - f) * 0.5F;

-		EntityItem entityitem = new EntityItem(worldObj, x + d0,

-				y + d1, z + d2, stack);

+		float d0 = worldObj.rand.nextFloat() * f + (1.0F - f) * 0.5F;

+		float d1 = worldObj.rand.nextFloat() * f + (1.0F - f) * 0.5F;

+		float d2 = worldObj.rand.nextFloat() * f + (1.0F - f) * 0.5F;

+		EntityItem entityitem = new EntityItem(worldObj, x + d0, y + d1, z + d2, stack);

 		entityitem.delayBeforeCanPickup = 10;

 		if (stack.hasTagCompound())

-			entityitem.getEntityItem().setTagCompound(

-					(NBTTagCompound) stack

-							.getTagCompound()

-							.copy());

+			entityitem.getEntityItem().setTagCompound((NBTTagCompound) stack.getTagCompound().copy());

 		worldObj.spawnEntityInWorld(entityitem);

 		return entityitem;

 	}

@@ -125,24 +111,22 @@ public class BlockUtils {
 	 * It spawns the item with momentum in a certain direction

 	 * 

 	 * @param world

-	 *                the world to spawn the item

+	 *            the world to spawn the item

 	 * @param x

-	 *                the X coordinate to spawn it in

+	 *            the X coordinate to spawn it in

 	 * @param y

-	 *                the Y coordinate to spawn it in

+	 *            the Y coordinate to spawn it in

 	 * @param z

-	 *                the Z coordinate to spawn it in

+	 *            the Z coordinate to spawn it in

 	 * @param direction

-	 *                the direction towards which it should eject

+	 *            the direction towards which it should eject

 	 * @param stack

-	 *                the item to spawn

+	 *            the item to spawn

 	 * @return the spawned EntityItem

 	 */

-	public static EntityItem ejectItemInDirection(World world,

-			double x, double y, double z,

-			ForgeDirection direction, ItemStack stack) {

-		EntityItem item = BlockUtils.dropItemStackInWorld(world, x,

-				y, z, stack);

+	public static EntityItem ejectItemInDirection(World world, double x, double y, double z, ForgeDirection direction,

+			ItemStack stack) {

+		EntityItem item = BlockUtils.dropItemStackInWorld(world, x, y, z, stack);

 		item.motionX = direction.offsetX / 5F;

 		item.motionY = direction.offsetY / 5F;

 		item.motionZ = direction.offsetZ / 5F;

@@ -153,25 +137,23 @@ public class BlockUtils {
 	 * Drops the content of an inventory with doubles as coordinates

 	 * 

 	 * @param inventory

-	 *                the inventory the items are contained in

+	 *            the inventory the items are contained in

 	 * @param world

-	 *                the world in which to spawn

+	 *            the world in which to spawn

 	 * @param x

-	 *                the X coordinate to spawn it in

+	 *            the X coordinate to spawn it in

 	 * @param y

-	 *                the Y coordinate to spawn it in

+	 *            the Y coordinate to spawn it in

 	 * @param z

-	 *                the Z coordinate to spawn it in

+	 *            the Z coordinate to spawn it in

 	 */

-	public static void dropInventory(IInventory inventory, World world,

-			double x, double y, double z) {

+	public static void dropInventory(IInventory inventory, World world, double x, double y, double z) {

 		if (inventory == null)

 			return;

 		for (int i = 0; i < inventory.getSizeInventory(); ++i) {

 			ItemStack itemStack = inventory.getStackInSlot(i);

 			if (itemStack != null)

-				dropItemStackInWorld(world, x, y, z,

-						itemStack);

+				dropItemStackInWorld(world, x, y, z, itemStack);

 		}

 	}

 

@@ -179,18 +161,17 @@ public class BlockUtils {
 	 * Drops the content of an inventory with integer as coordinates

 	 * 

 	 * @param inventory

-	 *                the inventory the items are contained in

+	 *            the inventory the items are contained in

 	 * @param world

-	 *                the world in which to spawn

+	 *            the world in which to spawn

 	 * @param x

-	 *                the X coordinate to spawn it in

+	 *            the X coordinate to spawn it in

 	 * @param y

-	 *                the Y coordinate to spawn it in

+	 *            the Y coordinate to spawn it in

 	 * @param z

-	 *                the Z coordinate to spawn it in

+	 *            the Z coordinate to spawn it in

 	 */

-	public static void dropInventory(IInventory inventory, World world,

-			int x, int y, int z) {

+	public static void dropInventory(IInventory inventory, World world, int x, int y, int z) {

 		dropInventory(inventory, world, x + 0.5, y + 0.5, z + 0.5);

 	}

 }
\ No newline at end of file
diff --git a/src/main/java/darkknight/jewelrycraft/util/EntitySelector.java b/src/main/java/darkknight/jewelrycraft/util/EntitySelector.java
index 2398817..572e2e9 100755
--- a/src/main/java/darkknight/jewelrycraft/util/EntitySelector.java
+++ b/src/main/java/darkknight/jewelrycraft/util/EntitySelector.java
@@ -13,9 +13,7 @@ public class EntitySelector {
 
 			@Override
 			public boolean isEntityApplicable(Entity arg0) {
-				if (arg0.isCreatureType(
-						EnumCreatureType.monster,
-						false)) {
+				if (arg0.isCreatureType(EnumCreatureType.monster, false)) {
 					return true;
 				}
 
diff --git a/src/main/java/darkknight/jewelrycraft/util/JewelryNBT.java b/src/main/java/darkknight/jewelrycraft/util/JewelryNBT.java
index 320497b..3d42750 100755
--- a/src/main/java/darkknight/jewelrycraft/util/JewelryNBT.java
+++ b/src/main/java/darkknight/jewelrycraft/util/JewelryNBT.java
@@ -25,9 +25,9 @@ public class JewelryNBT {
 

 	/**

 	 * @param item

-	 *                The item you want to add the NBT data on

+	 *            The item you want to add the NBT data on

 	 * @param metal

-	 *                The metal you want to add on the item

+	 *            The metal you want to add on the item

 	 */

 	public static void addMetal(ItemStack item, ItemStack metal) {

 		NBTTagCompound itemStackData;

@@ -46,9 +46,9 @@ public class JewelryNBT {
 

 	/**

 	 * @param item

-	 *                The item you want to add the NBT data on

+	 *            The item you want to add the NBT data on

 	 * @param gem

-	 *                The gem you want to add on the item

+	 *            The gem you want to add on the item

 	 */

 	public static void addGem(ItemStack item, ItemStack gem) {

 		if (gem != null) {

@@ -67,12 +67,11 @@ public class JewelryNBT {
 

 	/**

 	 * @param item

-	 *                The item you want to add the NBT data on

+	 *            The item you want to add the NBT data on

 	 * @param modifier

-	 *                The modifier you want to add on the item

+	 *            The modifier you want to add on the item

 	 */

-	public static void addModifiers(ItemStack item,

-			ArrayList<ItemStack> modifier) {

+	public static void addModifiers(ItemStack item, ArrayList<ItemStack> modifier) {

 		if (modifier != null) {

 			NBTTagCompound itemStackData;

 			if (item.hasTagCompound())

@@ -84,11 +83,9 @@ public class JewelryNBT {
 			for (int i = 0; i < modifier.size(); i++) {

 				NBTTagCompound modifierNBT = new NBTTagCompound();

 				modifier.get(i).writeToNBT(modifierNBT);

-				itemStackData.setTag("modifier" + i,

-						modifierNBT);

+				itemStackData.setTag("modifier" + i, modifierNBT);

 			}

-			itemStackData.setInteger("modifierSize",

-					modifier.size());

+			itemStackData.setInteger("modifierSize", modifier.size());

 		}

 	}

 

@@ -148,10 +145,8 @@ public class JewelryNBT {
 	 * @return

 	 */

 	public static boolean isGemX(ItemStack stack, ItemStack gem) {

-		if (gem(stack) != null

-				&& gem(stack).getItem() == gem.getItem()

-				&& gem(stack).getItemDamage() == gem

-						.getItemDamage())

+		if (gem(stack) != null && gem(stack).getItem() == gem.getItem()

+				&& gem(stack).getItemDamage() == gem.getItemDamage())

 			return true;

 		return false;

 	}

@@ -161,29 +156,23 @@ public class JewelryNBT {
 	 * @param modifier

 	 * @return

 	 */

-	public static boolean doesModifierExist(ItemStack stack,

-			ItemStack modifier) {

+	public static boolean doesModifierExist(ItemStack stack, ItemStack modifier) {

 		if (modifier(stack) != null) {

 			ArrayList<ItemStack> list = modifier(stack);

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

-				if (list.get(i).getItem() == modifier

-						.getItem()

-						&& list.get(i).getItemDamage() == modifier

-								.getItemDamage())

+				if (list.get(i).getItem() == modifier.getItem()

+						&& list.get(i).getItemDamage() == modifier.getItemDamage())

 					return true;

 		}

 		return false;

 	}

 

-	public static int modifierSize(ItemStack stack,

-			ItemStack modifier) {

+	public static int modifierSize(ItemStack stack, ItemStack modifier) {

 		if (modifier(stack) != null) {

 			ArrayList<ItemStack> list = modifier(stack);

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

-				if (list.get(i).getItem() == modifier

-						.getItem()

-						&& list.get(i).getItemDamage() == modifier

-								.getItemDamage())

+				if (list.get(i).getItem() == modifier.getItem()

+						&& list.get(i).getItemDamage() == modifier.getItemDamage())

 					return list.get(i).stackSize;

 		}

 		return -1;

@@ -201,27 +190,18 @@ public class JewelryNBT {
 	 * @return

 	 */

 	public static boolean isIngotX(ItemStack stack, ItemStack ingot) {

-		if (ingot(stack) != null

-				&& ingot(stack).getItem() == ingot

-						.getItem()

-				&& ingot(stack).getItemDamage() == ingot

-						.getItemDamage())

+		if (ingot(stack) != null && ingot(stack).getItem() == ingot.getItem()

+				&& ingot(stack).getItemDamage() == ingot.getItemDamage())

 			return true;

 		return false;

 	}

 

 	// TODO Return components based on NBT

 	public static ItemStack item(ItemStack stack) {

-		if (stack != null

-				&& stack != new ItemStack(

-						Item.getItemById(0), 0, 0)

-				&& stack.hasTagCompound()

-				&& stack.getTagCompound()

-						.hasKey("target")) {

-			NBTTagCompound itemNBT = (NBTTagCompound) stack

-					.getTagCompound().getTag("target");

-			ItemStack target = new ItemStack(

-					Item.getItemById(0), 0, 0);

+		if (stack != null && stack != new ItemStack(Item.getItemById(0), 0, 0) && stack.hasTagCompound()

+				&& stack.getTagCompound().hasKey("target")) {

+			NBTTagCompound itemNBT = (NBTTagCompound) stack.getTagCompound().getTag("target");

+			ItemStack target = new ItemStack(Item.getItemById(0), 0, 0);

 			target.readFromNBT(itemNBT);

 			return target;

 		}

@@ -233,15 +213,10 @@ public class JewelryNBT {
 	 * @return

 	 */

 	public static ItemStack gem(ItemStack stack) {

-		if (stack != null

-				&& stack != new ItemStack(

-						Item.getItemById(0), 0, 0)

-				&& stack.hasTagCompound()

+		if (stack != null && stack != new ItemStack(Item.getItemById(0), 0, 0) && stack.hasTagCompound()

 				&& stack.getTagCompound().hasKey("gem")) {

-			NBTTagCompound jewelNBT = (NBTTagCompound) stack

-					.getTagCompound().getTag("gem");

-			ItemStack gem = new ItemStack(Item.getItemById(0),

-					0, 0);

+			NBTTagCompound jewelNBT = (NBTTagCompound) stack.getTagCompound().getTag("gem");

+			ItemStack gem = new ItemStack(Item.getItemById(0), 0, 0);

 			gem.readFromNBT(jewelNBT);

 			return gem;

 		}

@@ -253,19 +228,12 @@ public class JewelryNBT {
 	 * @return

 	 */

 	public static ArrayList<ItemStack> modifier(ItemStack stack) {

-		if (stack != null

-				&& stack != new ItemStack(

-						Item.getItemById(0), 0, 0)

-				&& stack.hasTagCompound()) {

-			int size = stack.getTagCompound()

-					.getInteger("modifierSize");

+		if (stack != null && stack != new ItemStack(Item.getItemById(0), 0, 0) && stack.hasTagCompound()) {

+			int size = stack.getTagCompound().getInteger("modifierSize");

 			ArrayList<ItemStack> list = new ArrayList<>();

 			for (int i = 0; i < size; i++) {

-				ItemStack modifier = new ItemStack(

-						Item.getItemById(0), 0, 0);

-				NBTTagCompound modifierNBT = (NBTTagCompound) stack

-						.getTagCompound()

-						.getTag("modifier" + i);

+				ItemStack modifier = new ItemStack(Item.getItemById(0), 0, 0);

+				NBTTagCompound modifierNBT = (NBTTagCompound) stack.getTagCompound().getTag("modifier" + i);

 				modifier.readFromNBT(modifierNBT);

 				list.add(modifier);

 			}

@@ -279,16 +247,10 @@ public class JewelryNBT {
 	 * @return

 	 */

 	public static ItemStack ingot(ItemStack stack) {

-		if (stack != null

-				&& stack != new ItemStack(

-						Item.getItemById(0), 0, 0)

-				&& stack.hasTagCompound()

-				&& stack.getTagCompound()

-						.hasKey("ingot")) {

-			NBTTagCompound ingotNBT = (NBTTagCompound) stack

-					.getTagCompound().getTag("ingot");

-			ItemStack ingot = new ItemStack(

-					Item.getItemById(0), 0, 0);

+		if (stack != null && stack != new ItemStack(Item.getItemById(0), 0, 0) && stack.hasTagCompound()

+				&& stack.getTagCompound().hasKey("ingot")) {

+			NBTTagCompound ingotNBT = (NBTTagCompound) stack.getTagCompound().getTag("ingot");

+			ItemStack ingot = new ItemStack(Item.getItemById(0), 0, 0);

 			ingot.readFromNBT(ingotNBT);

 			return ingot;

 		}

@@ -300,14 +262,9 @@ public class JewelryNBT {
 	 * @return

 	 */

 	public static int ingotColor(ItemStack stack) {

-		if (stack != null

-				&& stack != new ItemStack(

-						Item.getItemById(0), 0, 0)

-				&& stack.hasTagCompound()

-				&& stack.getTagCompound()

-						.hasKey("ingotColor"))

-			return stack.getTagCompound()

-					.getInteger("ingotColor");

+		if (stack != null && stack != new ItemStack(Item.getItemById(0), 0, 0) && stack.hasTagCompound()

+				&& stack.getTagCompound().hasKey("ingotColor"))

+			return stack.getTagCompound().getInteger("ingotColor");

 		return 16777215;

 	}

 

@@ -317,14 +274,9 @@ public class JewelryNBT {
 	 * @return

 	 */

 	public static int gemColor(ItemStack stack) {

-		if (stack != null

-				&& stack != new ItemStack(

-						Item.getItemById(0), 0, 0)

-				&& stack.hasTagCompound()

-				&& stack.getTagCompound()

-						.hasKey("gemColor"))

-			return stack.getTagCompound()

-					.getInteger("gemColor");

+		if (stack != null && stack != new ItemStack(Item.getItemById(0), 0, 0) && stack.hasTagCompound()

+				&& stack.getTagCompound().hasKey("gemColor"))

+			return stack.getTagCompound().getInteger("gemColor");

 		return 16777215;

 	}

 

diff --git a/src/main/java/darkknight/jewelrycraft/util/JewelrycraftUtil.java b/src/main/java/darkknight/jewelrycraft/util/JewelrycraftUtil.java
index 6d207ff..80dfdf1 100755
--- a/src/main/java/darkknight/jewelrycraft/util/JewelrycraftUtil.java
+++ b/src/main/java/darkknight/jewelrycraft/util/JewelrycraftUtil.java
@@ -7,11 +7,8 @@ import java.util.Iterator;
 import java.util.Random;

 

 import cpw.mods.fml.common.FMLCommonHandler;

-import cpw.mods.fml.common.Loader;

-import cpw.mods.fml.common.registry.GameData;

 import cpw.mods.fml.relauncher.Side;

 import cpw.mods.fml.relauncher.SideOnly;

-import darkknight.jewelrycraft.JewelrycraftMod;

 import darkknight.jewelrycraft.api.Curse;

 import darkknight.jewelrycraft.block.BlockList;

 import darkknight.jewelrycraft.item.ItemList;

@@ -29,13 +26,11 @@ import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;

 import net.minecraft.item.Item;

 import net.minecraft.item.ItemStack;

-import net.minecraft.item.crafting.FurnaceRecipes;

 import net.minecraft.nbt.NBTTagCompound;

 import net.minecraft.stats.Achievement;

 import net.minecraft.util.IIcon;

 import net.minecraft.util.ResourceLocation;

 import net.minecraft.world.World;

-import net.minecraftforge.oredict.OreDictionary;

 

 public class JewelrycraftUtil {

 	public static ArrayList<ItemStack> objects = new ArrayList<>();

@@ -48,8 +43,8 @@ public class JewelrycraftUtil {
 

 	public static ArrayList<ItemStack> ores = new ArrayList<>();

 

-	public static HashMap<ItemStack, ItemStack>	oreToIngot	= new HashMap<>();

-	public static HashMap<ItemStack, Integer>	colors		= new HashMap<>();

+	public static HashMap<ItemStack, ItemStack> oreToIngot = new HashMap<>();

+	public static HashMap<ItemStack, Integer> colors = new HashMap<>();

 

 	public static ArrayList<String> jamcraftPlayers = new ArrayList<>();

 

@@ -84,11 +79,11 @@ public class JewelrycraftUtil {
 		jewelry.add(new ItemStack(ItemList.bracelet));

 		jewelry.add(new ItemStack(ItemList.earrings));

 

-		for(ItemStack is : gem) {

+		for (ItemStack is : gem) {

 			objects.add(is.copy());

 		}

 

-		for(ItemStack is : metal) {

+		for (ItemStack is : metal) {

 			objects.add(is.copy());

 		}

 

@@ -100,8 +95,7 @@ public class JewelrycraftUtil {
 

 		// Structures

 		try {

-			for (Field f : Generation.class

-					.getDeclaredFields()) {

+			for (Field f : Generation.class.getDeclaredFields()) {

 				Object obj = f.get(null);

 				if (obj instanceof WorldGenStructure) {

 					structures.add((WorldGenStructure) obj);

@@ -113,24 +107,19 @@ public class JewelrycraftUtil {
 	}

 

 	private static boolean itemHasSubtypes(Object item) {

-		return ((Item) item).getHasSubtypes() && FMLCommonHandler

-				.instance().getSide() == Side.CLIENT;

+		return ((Item) item).getHasSubtypes() && FMLCommonHandler.instance().getSide() == Side.CLIENT;

 	}

 

 	@SideOnly(Side.CLIENT)

 	public static void generateColors() {

-		

+

 	}

 

 	@SideOnly(Side.CLIENT)

 	public static int getColor(ItemStack item) {

 		for (ItemStack stack : colors.keySet()) {

-			if (item != null && item.getItem() != null

-					&& stack.getItem() != null

-					&& item.getItem().equals(

-							stack.getItem())

-					&& item.getItemDamage() == stack

-							.getItemDamage()) {

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

+					&& item.getItem().equals(stack.getItem()) && item.getItemDamage() == stack.getItemDamage()) {

 				return colors.get(stack);

 			}

 		}

@@ -142,15 +131,11 @@ public class JewelrycraftUtil {
 	public static int color(ItemStack stack, int pass) {

 		if (stack != null) {

 			if (Item.getIdFromItem(stack.getItem()) > 0

-					&& stack.getItem()

-							.getColorFromItemStack(

-									stack,

-									pass) == 16777215) {

+					&& stack.getItem().getColorFromItemStack(stack, pass) == 16777215) {

 				return (int) Math.random() * 16777215;

 			}

 

-			return stack.getItem().getColorFromItemStack(stack,

-					pass);

+			return stack.getItem().getColorFromItemStack(stack, pass);

 		}

 

 		return (int) Math.random() * 16777215;

@@ -164,67 +149,46 @@ public class JewelrycraftUtil {
 		IIcon itemIcon = item.getItem().getIcon(item, 0);

 

 		if (isValidBlockFromItem(item)) {

-			itemIcon = Block.getBlockFromItem(item.getItem())

-					.getIcon(0, item.getItemDamage());

+			itemIcon = Block.getBlockFromItem(item.getItem()).getIcon(0, item.getItemDamage());

 		}

 

 		String iconName = itemIcon.getIconName();

 

-		if (iconName.substring(0,

-				iconName.indexOf(":") + 1) != "") {

-			domain = iconName

-					.substring(0, iconName.indexOf(":")

-							+ 1)

-					.replace(":", " ").trim();

+		if (iconName.substring(0, iconName.indexOf(":") + 1) != "") {

+			domain = iconName.substring(0, iconName.indexOf(":") + 1).replace(":", " ").trim();

 		} else {

 			domain = "minecraft";

 		}

 

-		texture = iconName.substring(iconName.lastIndexOf(":") + 1)

-				+ ".png";

+		texture = iconName.substring(iconName.lastIndexOf(":") + 1) + ".png";

 

 		ResourceLocation textureLocation = null;

 

-		TextureManager texturemanager = Minecraft.getMinecraft()

-				.getTextureManager();

+		TextureManager texturemanager = Minecraft.getMinecraft().getTextureManager();

 

-		if (texturemanager

-				.getResourceLocation(

-						item.getItemSpriteNumber())

-				.toString().contains("items")) {

-			textureLocation = new ResourceLocation(

-					domain.toLowerCase(),

-					"textures/items/" + texture);

+		if (texturemanager.getResourceLocation(item.getItemSpriteNumber()).toString().contains("items")) {

+			textureLocation = new ResourceLocation(domain.toLowerCase(), "textures/items/" + texture);

 		} else {

-			textureLocation = new ResourceLocation(

-					domain.toLowerCase(),

-					"textures/blocks/" + texture);

+			textureLocation = new ResourceLocation(domain.toLowerCase(), "textures/blocks/" + texture);

 		}

 

 		return textureLocation;

 	}

 

 	private static boolean isValidBlockFromItem(ItemStack item) {

-		return !(Block.getBlockFromItem(

-				item.getItem()) instanceof BlockAir)

-				&& !Block.getBlockFromItem(item.getItem())

-						.getIcon(0, item.getItemDamage())

-						.getIconName()

-						.equals("soul_sand");

+		return !(Block.getBlockFromItem(item.getItem()) instanceof BlockAir) && !Block.getBlockFromItem(item.getItem())

+				.getIcon(0, item.getItemDamage()).getIconName().equals("soul_sand");

 	}

 

 	/*

-	 * @SideOnly(Side.CLIENT) public static int getMostCommonColour(Map

-	 * map) { List list = new LinkedList(map.entrySet());

-	 * Collections.sort(list, new Comparator() { public int

-	 * compare(Object o1, Object o2) { return ((Comparable)

-	 * ((Map.Entry) o1).getValue()) .compareTo(((Map.Entry)

-	 * o2).getValue()); } }); Map.Entry me = (Map.Entry)

-	 * list.get(list.size() - 1); for (int i = 0; i < list.size(); i++)

-	 * { float alpha = Float

-	 * .valueOf(list.get(i).toString().split("=")[1]); if (alpha < 180)

-	 * me = (Map.Entry) list.get(i); } int rgb = (Integer) me.getKey();

-	 * return rgb; }

+	 * @SideOnly(Side.CLIENT) public static int getMostCommonColour(Map map) { List

+	 * list = new LinkedList(map.entrySet()); Collections.sort(list, new

+	 * Comparator() { public int compare(Object o1, Object o2) { return

+	 * ((Comparable) ((Map.Entry) o1).getValue()) .compareTo(((Map.Entry)

+	 * o2).getValue()); } }); Map.Entry me = (Map.Entry) list.get(list.size() - 1);

+	 * for (int i = 0; i < list.size(); i++) { float alpha = Float

+	 * .valueOf(list.get(i).toString().split("=")[1]); if (alpha < 180) me =

+	 * (Map.Entry) list.get(i); } int rgb = (Integer) me.getKey(); return rgb; }

 	 */

 

 	@SideOnly(Side.CLIENT)

@@ -238,17 +202,12 @@ public class JewelrycraftUtil {
 		return true;

 	}

 

-	public static WeightedRandomCurse[] getCurses(World world,

-			EntityPlayer player, Random random) {

-		WeightedRandomCurse[] curses = new WeightedRandomCurse[Curse.availableCurses

-				.size()];

+	public static WeightedRandomCurse[] getCurses(World world, EntityPlayer player, Random random) {

+		WeightedRandomCurse[] curses = new WeightedRandomCurse[Curse.availableCurses.size()];

 

 		for (int c = 0; c < Curse.availableCurses.size(); c++) {

-			curses[c] = new WeightedRandomCurse(

-					Curse.availableCurses.get(c),

-					Curse.availableCurses.get(c)

-							.weight(world, player,

-									random));

+			curses[c] = new WeightedRandomCurse(Curse.availableCurses.get(c),

+					Curse.availableCurses.get(c).weight(world, player, random));

 		}

 

 		return curses;

@@ -258,27 +217,21 @@ public class JewelrycraftUtil {
 	 * Adds curse points to a player

 	 * 

 	 * @param player

-	 *                the player to add the points to

+	 *            the player to add the points to

 	 * @param points

-	 *                amount of curse points

+	 *            amount of curse points

 	 */

-	public static void addCursePoints(EntityPlayer player,

-			int points) {

-		NBTTagCompound playerInfo = PlayerUtils

-				.getModPlayerPersistTag(player,

-						Variables.MODID);

+	public static void addCursePoints(EntityPlayer player, int points) {

+		NBTTagCompound playerInfo = PlayerUtils.getModPlayerPersistTag(player, Variables.MODID);

 

 		playerInfo.setInteger("cursePoints",

-				playerInfo.hasKey(

-						"cursePoints") ? (playerInfo.getInteger("cursePoints") + points) : points);

+				playerInfo.hasKey("cursePoints") ? (playerInfo.getInteger("cursePoints") + points) : points);

 

 		playerInfo.setBoolean("playerCursePointsChanged", true);

 	}

 

 	public static int getCursePoints(EntityPlayer player) {

-		NBTTagCompound playerInfo = PlayerUtils

-				.getModPlayerPersistTag(player,

-						Variables.MODID);

+		NBTTagCompound playerInfo = PlayerUtils.getModPlayerPersistTag(player, Variables.MODID);

 

 		return playerInfo.getInteger("cursePoints");

 	}

@@ -287,56 +240,37 @@ public class JewelrycraftUtil {
 	 * Adds the UUID's of the jamcrafters in a list (+ special people)

 	 */

 	public static void jamcrafters() {

-		jamcraftPlayers.add(

-				"d3214311-7550-4c9c-a372-d9292c10b8a6"); // allout58

-		jamcraftPlayers.add(

-				"a690119f-c4a2-4bd6-a99d-d63679abb328"); // ChewBaker

-		jamcraftPlayers.add(

-				"de7c9903-51fa-4a24-88cd-48faf122ca36"); // domi1819

-		jamcraftPlayers.add(

-				"70aeb298-3a7b-46da-a393-ab10df9359f2"); // founderio

-		jamcraftPlayers.add(

-				"6fbe603c-14bf-4085-afdd-abe592c26e7c"); // GerbShert

-		jamcraftPlayers.add(

-				"b0d21306-36bf-4d85-84df-a956d183c45a"); // isomgirls6

-		jamcraftPlayers.add(

-				"1733a31f-01f9-4f4d-82aa-7de30ca810d3"); // TH3N00B

-		jamcraftPlayers.add(

-				"4833eacf-1d94-49a7-9f89-4cf88d69dcf9"); // Joban

-		jamcraftPlayers.add(

-				"718cf671-9084-4e78-b91f-033e80aa11bf"); // KJ4IPS

-		jamcraftPlayers.add(

-				"bea5e0c4-85c4-454d-a081-e1eaae6895ee"); // Mitchellbrine

-		jamcraftPlayers.add(

-				"7ecf3e2f-fedf-4f7e-8d24-6731d078db4f"); // MrComputerGhost

-		jamcraftPlayers.add(

-				"1b11ad3a-f0ca-4695-a019-2d7e5d83a5fd"); // Resinresin

-		jamcraftPlayers.add(

-				"3ec9ac58-2f1b-4d3f-b4eb-3b875da877ae"); // sci4me

-		jamcraftPlayers.add(

-				"cf9fa23f-205e-4eed-aba3-9f2848cd6a4d"); // OnyxDarkKnight

-		jamcraftPlayers.add(

-				"91880caa-b032-48e3-bfe8-c2c7ed31824e"); // theminecoder

-		jamcraftPlayers.add(

-				"8d0b3804-f71c-4219-897b-8c315448ea7c"); // YSPilot

-		jamcraftPlayers.add(

-				"bbb87dbe-690f-4205-bdc5-72ffb8ebc29d"); // direwolf20

+		jamcraftPlayers.add("d3214311-7550-4c9c-a372-d9292c10b8a6"); // allout58

+		jamcraftPlayers.add("a690119f-c4a2-4bd6-a99d-d63679abb328"); // ChewBaker

+		jamcraftPlayers.add("de7c9903-51fa-4a24-88cd-48faf122ca36"); // domi1819

+		jamcraftPlayers.add("70aeb298-3a7b-46da-a393-ab10df9359f2"); // founderio

+		jamcraftPlayers.add("6fbe603c-14bf-4085-afdd-abe592c26e7c"); // GerbShert

+		jamcraftPlayers.add("b0d21306-36bf-4d85-84df-a956d183c45a"); // isomgirls6

+		jamcraftPlayers.add("1733a31f-01f9-4f4d-82aa-7de30ca810d3"); // TH3N00B

+		jamcraftPlayers.add("4833eacf-1d94-49a7-9f89-4cf88d69dcf9"); // Joban

+		jamcraftPlayers.add("718cf671-9084-4e78-b91f-033e80aa11bf"); // KJ4IPS

+		jamcraftPlayers.add("bea5e0c4-85c4-454d-a081-e1eaae6895ee"); // Mitchellbrine

+		jamcraftPlayers.add("7ecf3e2f-fedf-4f7e-8d24-6731d078db4f"); // MrComputerGhost

+		jamcraftPlayers.add("1b11ad3a-f0ca-4695-a019-2d7e5d83a5fd"); // Resinresin

+		jamcraftPlayers.add("3ec9ac58-2f1b-4d3f-b4eb-3b875da877ae"); // sci4me

+		jamcraftPlayers.add("cf9fa23f-205e-4eed-aba3-9f2848cd6a4d"); // OnyxDarkKnight

+		jamcraftPlayers.add("91880caa-b032-48e3-bfe8-c2c7ed31824e"); // theminecoder

+		jamcraftPlayers.add("8d0b3804-f71c-4219-897b-8c315448ea7c"); // YSPilot

+		jamcraftPlayers.add("bbb87dbe-690f-4205-bdc5-72ffb8ebc29d"); // direwolf20

 	}

 

 	/**

 	 * Adds a random amount of modifiers to a list

 	 * 

 	 * @param randValue

-	 *                maximum number of modifiers

+	 *            maximum number of modifiers

 	 * @return a list containing the random modifiers

 	 */

-	public static ArrayList<ItemStack> addRandomModifiers(

-			int randValue) {

+	public static ArrayList<ItemStack> addRandomModifiers(int randValue) {

 		ArrayList<ItemStack> list = new ArrayList<>();

 

 		for (int i = 0; i < 2 + randValue; i++) {

-			ItemStack item = objects.get(new Random()

-					.nextInt(objects.size()));

+			ItemStack item = objects.get(new Random().nextInt(objects.size()));

 

 			item.stackSize = 1 + new Random().nextInt(2);

 

@@ -357,7 +291,7 @@ public class JewelrycraftUtil {
 	 * Checks to see if the specified item is a gem

 	 * 

 	 * @param item

-	 *                ItemStack containing the item

+	 *            ItemStack containing the item

 	 * @return is the item a gem

 	 */

 	public static boolean isGem(ItemStack item) {

@@ -368,7 +302,7 @@ public class JewelrycraftUtil {
 	 * Checks to see if the specified item is a metal

 	 * 

 	 * @param item

-	 *                ItemStack containing the item

+	 *            ItemStack containing the item

 	 * @return is the item a metal

 	 */

 	public static boolean isMetal(ItemStack item) {

@@ -379,20 +313,17 @@ public class JewelrycraftUtil {
 	 * Checks to see if the specified item is a piece of jewelry

 	 * 

 	 * @param item

-	 *                ItemStack containing the item

+	 *            ItemStack containing the item

 	 * @return is the item a piece of jewelry

 	 */

 	public static boolean isJewelry(ItemStack item) {

 		return isItemStackIn(item, jewelry.iterator());

 	}

 

-	private static boolean isItemStackIn(ItemStack item,

-			Iterator<ItemStack> i) {

+	private static boolean isItemStackIn(ItemStack item, Iterator<ItemStack> i) {

 		while (i.hasNext()) {

 			ItemStack temp = i.next();

-			if (temp.getItem() == item.getItem()

-					&& temp.getItemDamage() == item

-							.getItemDamage()) {

+			if (temp.getItem() == item.getItem() && temp.getItemDamage() == item.getItemDamage()) {

 				return true;

 			}

 		}

@@ -404,7 +335,7 @@ public class JewelrycraftUtil {
 	 * Checks to see if the specified item is an ore

 	 * 

 	 * @param item

-	 *                ItemStack containing the item

+	 *            ItemStack containing the item

 	 * @return is the item an ore

 	 */

 	public static boolean isOre(ItemStack item) {

@@ -415,14 +346,12 @@ public class JewelrycraftUtil {
 	 * Gets the ingot from the ore

 	 * 

 	 * @param ore

-	 *                the ore

+	 *            the ore

 	 * @return the ingot

 	 */

 	public static ItemStack getIngotFromOre(ItemStack ore) {

 		for (ItemStack ors : JewelrycraftUtil.oreToIngot.keySet())

-			if (ors.getItem().equals(ore.getItem())

-					&& ors.getItemDamage() == ore

-							.getItemDamage()) {

+			if (ors.getItem().equals(ore.getItem()) && ors.getItemDamage() == ore.getItemDamage()) {

 				return oreToIngot.get(ors);

 			}

 

@@ -430,19 +359,16 @@ public class JewelrycraftUtil {
 	}

 

 	/**

-	 * This determines whether the player unlocked an achievement or

-	 * not.

+	 * This determines whether the player unlocked an achievement or not.

 	 * 

 	 * @param player

-	 *                The player to unlock the achievement

+	 *            The player to unlock the achievement

 	 * @param achievement

-	 *                The achievement to be unlocked

-	 * @return True or False depending if the player did unlock the

-	 *         achievement or not

+	 *            The achievement to be unlocked

+	 * @return True or False depending if the player did unlock the achievement or

+	 *         not

 	 */

-	public static boolean isAchievementUnlocked(EntityPlayer player,

-			Achievement achievement) {

-		return ((EntityPlayerMP) player).func_147099_x()

-				.hasAchievementUnlocked(achievement);

+	public static boolean isAchievementUnlocked(EntityPlayer player, Achievement achievement) {

+		return ((EntityPlayerMP) player).func_147099_x().hasAchievementUnlocked(achievement);

 	}

 }

diff --git a/src/main/java/darkknight/jewelrycraft/util/PlayerUtils.java b/src/main/java/darkknight/jewelrycraft/util/PlayerUtils.java
index 8a3abe3..90b507e 100755
--- a/src/main/java/darkknight/jewelrycraft/util/PlayerUtils.java
+++ b/src/main/java/darkknight/jewelrycraft/util/PlayerUtils.java
@@ -12,26 +12,22 @@ public class PlayerUtils {
 	 * Returns the NBTTag of the player
 	 * 
 	 * @param player
-	 *                the player
+	 *            the player
 	 * @param modName
-	 *                the mod name
+	 *            the mod name
 	 * @return appropriate NBTTag
 	 */
-	public static NBTTagCompound getModPlayerPersistTag(
-			EntityPlayer player, String modName) {
-		if (player.worldObj.isRemote
-				&& ScreenHandler.tagCache != null)
+	public static NBTTagCompound getModPlayerPersistTag(EntityPlayer player, String modName) {
+		if (player.worldObj.isRemote && ScreenHandler.tagCache != null)
 			return ScreenHandler.tagCache;
 
 		NBTTagCompound tag = player.getEntityData();
 		NBTTagCompound persistTag = null;
 		if (tag.hasKey(EntityPlayer.PERSISTED_NBT_TAG))
-			persistTag = tag.getCompoundTag(
-					EntityPlayer.PERSISTED_NBT_TAG);
+			persistTag = tag.getCompoundTag(EntityPlayer.PERSISTED_NBT_TAG);
 		else {
 			persistTag = new NBTTagCompound();
-			tag.setTag(EntityPlayer.PERSISTED_NBT_TAG,
-					persistTag);
+			tag.setTag(EntityPlayer.PERSISTED_NBT_TAG, persistTag);
 		}
 		NBTTagCompound modTag = null;
 		if (persistTag.hasKey(modName))
diff --git a/src/main/java/darkknight/jewelrycraft/util/Variables.java b/src/main/java/darkknight/jewelrycraft/util/Variables.java
index 8b853ef..f1537c6 100755
--- a/src/main/java/darkknight/jewelrycraft/util/Variables.java
+++ b/src/main/java/darkknight/jewelrycraft/util/Variables.java
@@ -5,23 +5,21 @@ import net.minecraft.util.ResourceLocation;
 public class Variables {

 	public static final int CURSE_POINTS_PER_LEVEL = 7000;

 

-	public static final String	MODID		= "jewelrycraft2";

-	public static final String	MODNAME		= "Jewelrycraft 2";

-	public static final String	VERSION		= "1.1.4";

-	public static final String	PACKET_CHANNEL	= "jewelrycraft2";

+	public static final String MODID = "jewelrycraft2";

+	public static final String MODNAME = "Jewelrycraft 2";

+	public static final String VERSION = "1.1.4";

+	public static final String PACKET_CHANNEL = "jewelrycraft2";

 

-	public static final String	CONFIG_GUI	= "darkknight.jewelrycraft.config.ConfigGuiFactory";

-	public static final String	CLIENT_PROXY	= "darkknight.jewelrycraft.proxy.ClientProxy";

-	public static final String	SERVER_PROXY	= "darkknight.jewelrycraft.proxy.CommonProxy";

+	public static final String CONFIG_GUI = "darkknight.jewelrycraft.config.ConfigGuiFactory";

+	public static final String CLIENT_PROXY = "darkknight.jewelrycraft.proxy.ClientProxy";

+	public static final String SERVER_PROXY = "darkknight.jewelrycraft.proxy.CommonProxy";

 

-	public static final ResourceLocation	PEDESTAL_TEXTURE	= new ResourceLocation(

-			Variables.MODID,

+	public static final ResourceLocation PEDESTAL_TEXTURE = new ResourceLocation(Variables.MODID,

 			"textures/tileentities/BricksPedestal.png");

-	public static final ResourceLocation	SHADOW_HAND_TEXTURE	= new ResourceLocation(

-			Variables.MODID,

+	public static final ResourceLocation SHADOW_HAND_TEXTURE = new ResourceLocation(Variables.MODID,

 			"textures/tileentities/ShadowHand.png");

-	public static final ResourceLocation	VILLAGER_TEXTURE	= new ResourceLocation(

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

-	public static final ResourceLocation	MISC_TEXTURE		= new ResourceLocation(

-			Variables.MODID, "textures/gui/hearts.png");

+	public static final ResourceLocation VILLAGER_TEXTURE = new ResourceLocation(Variables.MODID,

+			"textures/entities/jeweler.png");

+	public static final ResourceLocation MISC_TEXTURE = new ResourceLocation(Variables.MODID,

+			"textures/gui/hearts.png");

 }