From 9a4d1e95ea7784f0f98ea2913701a3a3c28aefaa Mon Sep 17 00:00:00 2001 From: bculkin2442 Date: Thu, 24 May 2018 16:03:42 -0400 Subject: Formatting pass --- .../darkknight/jewelrycraft/util/JewelryNBT.java | 98 ++++++++++++++-------- 1 file changed, 62 insertions(+), 36 deletions(-) (limited to 'src/main/java/darkknight/jewelrycraft/util/JewelryNBT.java') diff --git a/src/main/java/darkknight/jewelrycraft/util/JewelryNBT.java b/src/main/java/darkknight/jewelrycraft/util/JewelryNBT.java index 7b74403..320497b 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,9 +67,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 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 modifier) { @@ -84,9 +84,11 @@ 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()); } } @@ -146,8 +148,10 @@ 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; } @@ -162,7 +166,8 @@ public class JewelryNBT { if (modifier(stack) != null) { ArrayList list = modifier(stack); for (int i = 0; i < list.size(); i++) - if (list.get(i).getItem() == modifier.getItem() + if (list.get(i).getItem() == modifier + .getItem() && list.get(i).getItemDamage() == modifier .getItemDamage()) return true; @@ -170,11 +175,13 @@ public class JewelryNBT { return false; } - public static int modifierSize(ItemStack stack, ItemStack modifier) { + public static int modifierSize(ItemStack stack, + ItemStack modifier) { if (modifier(stack) != null) { ArrayList list = modifier(stack); for (int i = 0; i < list.size(); i++) - if (list.get(i).getItem() == modifier.getItem() + if (list.get(i).getItem() == modifier + .getItem() && list.get(i).getItemDamage() == modifier .getItemDamage()) return list.get(i).stackSize; @@ -195,8 +202,10 @@ public class JewelryNBT { */ public static boolean isIngotX(ItemStack stack, ItemStack ingot) { if (ingot(stack) != null - && ingot(stack).getItem() == ingot.getItem() - && ingot(stack).getItemDamage() == ingot.getItemDamage()) + && ingot(stack).getItem() == ingot + .getItem() + && ingot(stack).getItemDamage() == ingot + .getItemDamage()) return true; return false; } @@ -204,12 +213,15 @@ public class JewelryNBT { // TODO Return components based on NBT public static ItemStack item(ItemStack stack) { if (stack != null - && stack != new ItemStack(Item.getItemById(0), 0, 0) + && stack != new ItemStack( + Item.getItemById(0), 0, 0) && stack.hasTagCompound() - && stack.getTagCompound().hasKey("target")) { + && stack.getTagCompound() + .hasKey("target")) { NBTTagCompound itemNBT = (NBTTagCompound) stack .getTagCompound().getTag("target"); - ItemStack target = new ItemStack(Item.getItemById(0), 0, 0); + ItemStack target = new ItemStack( + Item.getItemById(0), 0, 0); target.readFromNBT(itemNBT); return target; } @@ -222,12 +234,14 @@ public class JewelryNBT { */ public static ItemStack gem(ItemStack stack) { if (stack != null - && stack != new ItemStack(Item.getItemById(0), 0, 0) + && 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; } @@ -240,15 +254,18 @@ public class JewelryNBT { */ public static ArrayList modifier(ItemStack stack) { if (stack != null - && stack != new ItemStack(Item.getItemById(0), 0, 0) + && stack != new ItemStack( + Item.getItemById(0), 0, 0) && stack.hasTagCompound()) { - int size = stack.getTagCompound().getInteger("modifierSize"); + int size = stack.getTagCompound() + .getInteger("modifierSize"); ArrayList list = new ArrayList<>(); for (int i = 0; i < size; i++) { - ItemStack modifier = - new ItemStack(Item.getItemById(0), 0, 0); + ItemStack modifier = new ItemStack( + Item.getItemById(0), 0, 0); NBTTagCompound modifierNBT = (NBTTagCompound) stack - .getTagCompound().getTag("modifier" + i); + .getTagCompound() + .getTag("modifier" + i); modifier.readFromNBT(modifierNBT); list.add(modifier); } @@ -263,12 +280,15 @@ public class JewelryNBT { */ public static ItemStack ingot(ItemStack stack) { if (stack != null - && stack != new ItemStack(Item.getItemById(0), 0, 0) + && stack != new ItemStack( + Item.getItemById(0), 0, 0) && stack.hasTagCompound() - && stack.getTagCompound().hasKey("ingot")) { + && stack.getTagCompound() + .hasKey("ingot")) { NBTTagCompound ingotNBT = (NBTTagCompound) stack .getTagCompound().getTag("ingot"); - ItemStack ingot = new ItemStack(Item.getItemById(0), 0, 0); + ItemStack ingot = new ItemStack( + Item.getItemById(0), 0, 0); ingot.readFromNBT(ingotNBT); return ingot; } @@ -281,10 +301,13 @@ public class JewelryNBT { */ public static int ingotColor(ItemStack stack) { if (stack != null - && stack != new ItemStack(Item.getItemById(0), 0, 0) + && stack != new ItemStack( + Item.getItemById(0), 0, 0) && stack.hasTagCompound() - && stack.getTagCompound().hasKey("ingotColor")) - return stack.getTagCompound().getInteger("ingotColor"); + && stack.getTagCompound() + .hasKey("ingotColor")) + return stack.getTagCompound() + .getInteger("ingotColor"); return 16777215; } @@ -295,10 +318,13 @@ public class JewelryNBT { */ public static int gemColor(ItemStack stack) { if (stack != null - && stack != new ItemStack(Item.getItemById(0), 0, 0) + && stack != new ItemStack( + Item.getItemById(0), 0, 0) && stack.hasTagCompound() - && stack.getTagCompound().hasKey("gemColor")) - return stack.getTagCompound().getInteger("gemColor"); + && stack.getTagCompound() + .hasKey("gemColor")) + return stack.getTagCompound() + .getInteger("gemColor"); return 16777215; } -- cgit v1.2.3