Format/import cleanup

1 files changed, 40 insertions, 88 deletions

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;

 	}