diff options
author | Draknyte1 <Draknyte1@hotmail.com> | 2017-03-04 12:58:47 +1000 |
---|---|---|
committer | Draknyte1 <Draknyte1@hotmail.com> | 2017-03-04 12:58:47 +1000 |
commit | ae21012d216df71f31aed6fbc9d76215fc24ceed (patch) | |
tree | cc89accbe6ce5c04b72ed3c5e46b2a185f88be6a /src/Java/gtPlusPlus/core/util/item | |
parent | ba89972a22a316030f8c3bd99974f915b1d7aefc (diff) | |
download | GT5-Unofficial-ae21012d216df71f31aed6fbc9d76215fc24ceed.tar.gz GT5-Unofficial-ae21012d216df71f31aed6fbc9d76215fc24ceed.tar.bz2 GT5-Unofficial-ae21012d216df71f31aed6fbc9d76215fc24ceed.zip |
+ New texture for the slow builders ring.
+ Added the Alkalus Disk.
$ Fixed Frame Box Assembler Recipes.
$ Fixed Missing 7Li material.
$ Fixed Tiered Tanks not showing their capacity in the tooltip.
$ Fixed tooltips for alloys containing Bronze or Steel.
$ Fixed Clay Pipe Extruder Recipes.
- Removed a handful of Plasma cells for misc. materials.
% Changed the Industrial Coke Oven's tooltip, to better describe the input/output requirements.
% Cleaned up The Entire Project.
Diffstat (limited to 'src/Java/gtPlusPlus/core/util/item')
-rw-r--r-- | src/Java/gtPlusPlus/core/util/item/ItemUtils.java | 285 |
1 files changed, 145 insertions, 140 deletions
diff --git a/src/Java/gtPlusPlus/core/util/item/ItemUtils.java b/src/Java/gtPlusPlus/core/util/item/ItemUtils.java index 83a8fff751..8fe80ff184 100644 --- a/src/Java/gtPlusPlus/core/util/item/ItemUtils.java +++ b/src/Java/gtPlusPlus/core/util/item/ItemUtils.java @@ -1,5 +1,9 @@ package gtPlusPlus.core.util.item; +import java.util.ArrayList; +import java.util.List; + +import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_ModHandler; @@ -10,6 +14,7 @@ import gtPlusPlus.core.item.base.dusts.BaseItemDust; import gtPlusPlus.core.item.base.dusts.BaseItemDustUnique; import gtPlusPlus.core.item.base.dusts.decimal.BaseItemCentidust; import gtPlusPlus.core.item.base.dusts.decimal.BaseItemDecidust; +import gtPlusPlus.core.item.base.plates.BaseItemPlate_OLD; import gtPlusPlus.core.item.tool.staballoy.MultiPickaxeBase; import gtPlusPlus.core.item.tool.staballoy.MultiSpadeBase; import gtPlusPlus.core.lib.CORE; @@ -20,179 +25,175 @@ import gtPlusPlus.core.util.array.Pair; import gtPlusPlus.core.util.materials.MaterialUtils; import gtPlusPlus.core.util.reflect.ReflectionUtils; import gtPlusPlus.core.util.wrapper.var; - -import java.util.ArrayList; -import java.util.List; - import net.minecraft.block.Block; -import net.minecraft.item.*; +import net.minecraft.item.Item; import net.minecraft.item.Item.ToolMaterial; +import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.oredict.OreDictionary; -import cpw.mods.fml.common.registry.GameRegistry; public class ItemUtils { - public static ItemStack getSimpleStack(Item x){ + public static ItemStack getSimpleStack(final Item x){ return getSimpleStack(x, 1); } - public static ItemStack getSimpleStack(Block x){ + public static ItemStack getSimpleStack(final Block x){ return getSimpleStack(Item.getItemFromBlock(x), 1); } - public static ItemStack getSimpleStack(Item x, int i){ + public static ItemStack getSimpleStack(final Item x, final int i){ try { - ItemStack r = new ItemStack(x, i); + final ItemStack r = new ItemStack(x, i); return r; - } catch(Throwable e){ + } catch(final Throwable e){ return null; } } - public static ItemStack getSimpleStack(ItemStack x, int i){ + public static ItemStack getSimpleStack(final ItemStack x, final int i){ try { - ItemStack r = x.copy(); + final ItemStack r = x.copy(); r.stackSize = i; return r; - } catch(Throwable e){ + } catch(final Throwable e){ return null; } } - public static ItemStack getIC2Cell(String S){ - ItemStack moreTemp = ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cell"+S, 1); + public static ItemStack getIC2Cell(final String S){ + final ItemStack moreTemp = ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cell"+S, 1); if (moreTemp == null){ - int cellID = 0; - ItemStack temp =GT_ModHandler.getModItem("IC2", "itemCellEmpty", 1L, cellID); + final int cellID = 0; + final ItemStack temp =GT_ModHandler.getModItem("IC2", "itemCellEmpty", 1L, cellID); return temp != null ? temp : null; } return moreTemp; } - public static ItemStack getIC2Cell(int meta){ - ItemStack temp = GT_ModHandler.getModItem("IC2", "itemCellEmpty", 1L, meta); + public static ItemStack getIC2Cell(final int meta){ + final ItemStack temp = GT_ModHandler.getModItem("IC2", "itemCellEmpty", 1L, meta); return temp != null ? temp : null; } - public static void getItemForOreDict(String FQRN, String oreDictName, String itemName, int meta){ + public static void getItemForOreDict(final String FQRN, final String oreDictName, final String itemName, final int meta){ try { - Item em = null; - Item em1 = getItem(FQRN); + Item em = null; + final Item em1 = getItem(FQRN); //Utils.LOG_WARNING("Found: "+em1.getUnlocalizedName()+":"+meta); if (em1 != null){ em = em1; } if (em != null){ - ItemStack metaStack = new ItemStack(em,1,meta); + final ItemStack metaStack = new ItemStack(em,1,meta); GT_OreDictUnificator.registerOre(oreDictName, metaStack); /*ItemStack itemStackWithMeta = new ItemStack(em,1,meta); GT_OreDictUnificator.registerOre(oreDictName, new ItemStack(itemStackWithMeta.getItem()));*/ } - } catch (NullPointerException e) { + } catch (final NullPointerException e) { Utils.LOG_ERROR(itemName+" not found. [NULL]"); } } - public static void addItemToOreDictionary(ItemStack stack, String oreDictName){ + public static void addItemToOreDictionary(final ItemStack stack, final String oreDictName){ try { GT_OreDictUnificator.registerOre(oreDictName, stack); - } catch (NullPointerException e) { + } catch (final NullPointerException e) { Utils.LOG_ERROR(stack.getDisplayName()+" not registered. [NULL]"); } } - public static ItemStack getItemStackWithMeta(boolean MOD, String FQRN, String itemName, int meta, int itemstackSize){ + public static ItemStack getItemStackWithMeta(final boolean MOD, final String FQRN, final String itemName, final int meta, final int itemstackSize){ if (MOD){ try { - Item em = null; - Item em1 = getItem(FQRN); + Item em = null; + final Item em1 = getItem(FQRN); //Utils.LOG_WARNING("Found: "+em1.getUnlocalizedName()+":"+meta); if (em1 != null){ if (null == em){ em = em1; } if (em != null){ - ItemStack metaStack = new ItemStack(em,itemstackSize,meta); + final ItemStack metaStack = new ItemStack(em,itemstackSize,meta); return metaStack; } } return null; - } catch (NullPointerException e) { + } catch (final NullPointerException e) { Utils.LOG_ERROR(itemName+" not found. [NULL]"); return null; - } + } } return null; } - public static ItemStack simpleMetaStack(String FQRN, int meta, int itemstackSize){ + public static ItemStack simpleMetaStack(final String FQRN, final int meta, final int itemstackSize){ try { - Item em = null; - Item em1 = getItem(FQRN); + Item em = null; + final Item em1 = getItem(FQRN); //Utils.LOG_WARNING("Found: "+em1.getUnlocalizedName()+":"+meta); if (em1 != null){ if (null == em){ em = em1; } if (em != null){ - ItemStack metaStack = new ItemStack(em,itemstackSize,meta); + final ItemStack metaStack = new ItemStack(em,itemstackSize,meta); return metaStack; } } return null; - } catch (NullPointerException e) { + } catch (final NullPointerException e) { Utils.LOG_ERROR(FQRN+" not found. [NULL]"); return null; - } + } } @SuppressWarnings("unused") - public static ItemStack simpleMetaStack(Item item, int meta, int itemstackSize){ + public static ItemStack simpleMetaStack(final Item item, final int meta, final int itemstackSize){ try { if (item == null){ return null; - } - Item em = item; - Item em1 = item; + } + Item em = item; + final Item em1 = item; Utils.LOG_WARNING("Found: "+em1.getUnlocalizedName()+":"+meta); if (em1 != null){ if (null == em){ em = em1; } if (em != null){ - ItemStack metaStack = new ItemStack(em,itemstackSize,meta); + final ItemStack metaStack = new ItemStack(em,itemstackSize,meta); return metaStack; } } return null; - } catch (NullPointerException e) { + } catch (final NullPointerException e) { //Utils.LOG_ERROR(item.getUnlocalizedName()+" not found. [NULL]"); return null; - } + } } - public static ItemStack getCorrectStacktype(String fqrn, int stackSize){ - String oreDict = "ore:"; + public static ItemStack getCorrectStacktype(final String fqrn, final int stackSize){ + final String oreDict = "ore:"; ItemStack temp; if (fqrn.toLowerCase().contains(oreDict.toLowerCase())){ - String sanitizedName = fqrn.replace(oreDict, ""); + final String sanitizedName = fqrn.replace(oreDict, ""); temp = ItemUtils.getItemStack(sanitizedName, stackSize); return temp; } - String[] fqrnSplit = fqrn.split(":"); + final String[] fqrnSplit = fqrn.split(":"); String temp1; String temp2; temp1 = fqrnSplit[1]; if (fqrnSplit.length < 3){temp2 = "0";} else {temp2 = fqrnSplit[2];} temp = ItemUtils.getItemStackWithMeta(LoadedMods.MiscUtils, fqrn, temp1, Integer.parseInt(temp2), stackSize); - return temp; - } + return temp; + } - public static ItemStack getCorrectStacktype(Object item_Input, int stackSize) { + public static ItemStack getCorrectStacktype(final Object item_Input, final int stackSize) { if (item_Input instanceof String){ return getItemStackOfAmountFromOreDictNoBroken((String) item_Input, stackSize); } @@ -205,91 +206,95 @@ public class ItemUtils { return null; } - public static Item getItem(String fqrn) // fqrn = fully qualified resource name + public static Item getItem(final String fqrn) // fqrn = fully qualified resource name { - String[] fqrnSplit = fqrn.split(":"); + final String[] fqrnSplit = fqrn.split(":"); return GameRegistry.findItem(fqrnSplit[0], fqrnSplit[1]); } - public static ItemStack getItemStack(String fqrn, int Size) // fqrn = fully qualified resource name + public static ItemStack getItemStack(final String fqrn, final int Size) // fqrn = fully qualified resource name { - String[] fqrnSplit = fqrn.split(":"); + final String[] fqrnSplit = fqrn.split(":"); return GameRegistry.findItemStack(fqrnSplit[0], fqrnSplit[1], Size); } - public static void generateSpawnEgg(String entityModID, String parSpawnName, int colourEgg, int colourOverlay){ - Item itemSpawnEgg = new BasicSpawnEgg(entityModID, parSpawnName, colourEgg, colourOverlay).setUnlocalizedName("spawn_egg_"+parSpawnName.toLowerCase()).setTextureName(CORE.MODID+":spawn_egg"); + public static void generateSpawnEgg(final String entityModID, final String parSpawnName, final int colourEgg, final int colourOverlay){ + final Item itemSpawnEgg = new BasicSpawnEgg(entityModID, parSpawnName, colourEgg, colourOverlay).setUnlocalizedName("spawn_egg_"+parSpawnName.toLowerCase()).setTextureName(CORE.MODID+":spawn_egg"); GameRegistry.registerItem(itemSpawnEgg, "spawnEgg"+parSpawnName); } - public static ItemStack[] validItemsForOreDict(String oredictName){ - List<?> validNames = MaterialUtils.oreDictValuesForEntry(oredictName); - ItemStack[] inputs = new ItemStack[validNames.size()]; + public static ItemStack[] validItemsForOreDict(final String oredictName){ + final List<?> validNames = MaterialUtils.oreDictValuesForEntry(oredictName); + final ItemStack[] inputs = new ItemStack[validNames.size()]; for (int i=0; i<validNames.size();i++){ inputs[i] = (ItemStack) validNames.get(i); } - return inputs; + return inputs; } - public static ItemStack getItemStackOfAmountFromOreDict(String oredictName, int amount){ - ArrayList<ItemStack> oreDictList = OreDictionary.getOres(oredictName); + public static ItemStack getItemStackOfAmountFromOreDict(final String oredictName, final int amount){ + final ArrayList<ItemStack> oreDictList = OreDictionary.getOres(oredictName); if (!oreDictList.isEmpty()){ - ItemStack returnValue = oreDictList.get(0).copy(); + final ItemStack returnValue = oreDictList.get(0).copy(); returnValue.stackSize = amount; return returnValue; } return getSimpleStack(ModItems.AAA_Broken, amount); } - public static ItemStack getItemStackOfAmountFromOreDictNoBroken(String oredictName, int amount){ + public static ItemStack getItemStackOfAmountFromOreDictNoBroken(final String oredictName, final int amount){ if (CORE.DEBUG){ Utils.LOG_INFO("Looking up: "+oredictName+" - from method: "+ReflectionUtils.getMethodName(1)); Utils.LOG_INFO("Looking up: "+oredictName+" - from method: "+ReflectionUtils.getMethodName(2)); Utils.LOG_INFO("Looking up: "+oredictName+" - from method: "+ReflectionUtils.getMethodName(3)); Utils.LOG_INFO("Looking up: "+oredictName+" - from method: "+ReflectionUtils.getMethodName(4)); - Utils.LOG_INFO("Looking up: "+oredictName+" - from method: "+ReflectionUtils.getMethodName(5)); + Utils.LOG_INFO("Looking up: "+oredictName+" - from method: "+ReflectionUtils.getMethodName(5)); } - ItemStack returnValue = getItemStackOfAmountFromOreDict(oredictName, amount); - if (returnValue.getItem().getClass() != ModItems.AAA_Broken.getClass() || returnValue.getItem() != ModItems.AAA_Broken){ - return returnValue; + final ItemStack returnValue = getItemStackOfAmountFromOreDict(oredictName, amount); + if ((returnValue.getItem().getClass() != ModItems.AAA_Broken.getClass()) || (returnValue.getItem() != ModItems.AAA_Broken)){ + return returnValue.copy(); } - Utils.LOG_INFO(oredictName+" was not valid."); + Utils.LOG_INFO(oredictName+" was not valid."); return null; } - public static ItemStack getGregtechDust(Materials material, int amount){ - ItemStack returnValue = GT_OreDictUnificator.get(OrePrefixes.dust, material, 1L); + public static ItemStack getGregtechDust(final Materials material, final int amount){ + final ItemStack returnValue = GT_OreDictUnificator.get(OrePrefixes.dust, material, 1L); if (returnValue != null){ - if (returnValue.getItem().getClass() != ModItems.AAA_Broken.getClass() || returnValue.getItem() != ModItems.AAA_Broken){ - return returnValue; + if ((returnValue.getItem().getClass() != ModItems.AAA_Broken.getClass()) || (returnValue.getItem() != ModItems.AAA_Broken)){ + return returnValue.copy(); } } - Utils.LOG_INFO(material+" was not valid."); + Utils.LOG_INFO(material+" was not valid."); return null; } - public static Item[] generateDusts(String unlocalizedName, String materialName, int materialTier, Material matInfo, int Colour){ - int radioactive = getRadioactivityLevel(materialName); - Item[] output = { + public static Item[] generateDusts(final String unlocalizedName, final String materialName, final int materialTier, final Material matInfo, final int Colour){ + final int radioactive = getRadioactivityLevel(materialName); + final Item[] output = { new BaseItemDust("itemDust"+unlocalizedName, materialName, matInfo, Colour, "Dust", materialTier, radioactive), new BaseItemDust("itemDustSmall"+unlocalizedName, materialName, matInfo, Colour, "Small", materialTier, radioactive), new BaseItemDust("itemDustTiny"+unlocalizedName, materialName, matInfo, Colour, "Tiny", materialTier, radioactive)}; return output; } - public static Item[] generateSpecialUseDusts(String unlocalizedName, String materialName, int Colour){ - Item[] output = { + public static Item[] generateSpecialUseDusts(final String unlocalizedName, final String materialName, final int Colour){ + final Item[] output = { new BaseItemDustUnique("itemDust"+unlocalizedName, materialName, Colour, "Dust"), new BaseItemDustUnique("itemDustSmall"+unlocalizedName, materialName, Colour, "Small"), new BaseItemDustUnique("itemDustTiny"+unlocalizedName, materialName, Colour, "Tiny")}; return output; } + + public static Item generateSpecialUsePlate(String internalName, String displayName, short[] rgb, int radioactivity){ + return new BaseItemPlate_OLD(internalName, displayName, Utils.rgbtoHexValue(rgb[0], rgb[1], rgb[2]), radioactivity); + } - public static Item[] generateSpecialUseDusts(Material material, boolean onlyLargeDust){ - String materialName = material.getLocalizedName(); - String unlocalizedName = Utils.sanitizeString(materialName); - int Colour = material.getRgbAsHex(); + public static Item[] generateSpecialUseDusts(final Material material, final boolean onlyLargeDust){ + final String materialName = material.getLocalizedName(); + final String unlocalizedName = Utils.sanitizeString(materialName); + final int Colour = material.getRgbAsHex(); Item[] output = null; if (onlyLargeDust == false){ output = new Item[]{ @@ -304,20 +309,20 @@ public class ItemUtils { return output; } - public static MultiPickaxeBase generateMultiPick(boolean GT_Durability, Materials material){ - ToolMaterial customMaterial = Utils.generateToolMaterialFromGT(material); - Object enchant = new Pair(material.mEnchantmentTools, material.mEnchantmentToolsLevel); + public static MultiPickaxeBase generateMultiPick(final boolean GT_Durability, final Materials material){ + final ToolMaterial customMaterial = Utils.generateToolMaterialFromGT(material); + final Object enchant = new Pair(material.mEnchantmentTools, material.mEnchantmentToolsLevel); return generateMultiPick(GT_Durability, customMaterial, material.mDefaultLocalName, material.mDurability, material.mRGBa, enchant); } - public static MultiPickaxeBase generateMultiPick(Material material){ - ToolMaterial customMaterial = Utils.generateToolMaterial(material); + public static MultiPickaxeBase generateMultiPick(final Material material){ + final ToolMaterial customMaterial = Utils.generateToolMaterial(material); return generateMultiPick(true, customMaterial, material.getLocalizedName(), (int) material.vDurability, material.getRGBA(), null); } - public static MultiPickaxeBase generateMultiPick(boolean GT_Durability, ToolMaterial customMaterial, String name, int durability, short[] rgba, Object enchantment){ + public static MultiPickaxeBase generateMultiPick(final boolean GT_Durability, final ToolMaterial customMaterial, final String name, final int durability, final short[] rgba, final Object enchantment){ Utils.LOG_INFO("Generating a Multi-Pick out of "+name); - short[] rgb = rgba; + final short[] rgb = rgba; int dur = customMaterial.getMaxUses(); Utils.LOG_WARNING("Determined durability for "+name+" is "+dur); if (GT_Durability){ @@ -342,8 +347,8 @@ public class ItemUtils { else { enchant = null; } - - MultiPickaxeBase MP_Redstone = new MultiPickaxeBase( + + final MultiPickaxeBase MP_Redstone = new MultiPickaxeBase( name+" Multipick", (customMaterial), dur, @@ -352,7 +357,7 @@ public class ItemUtils { if (MP_Redstone.isValid){ return MP_Redstone; - } + } Utils.LOG_INFO("Pickaxe was not valid."); return null; } @@ -362,19 +367,19 @@ public class ItemUtils { - public static MultiSpadeBase generateMultiShovel(boolean GT_Durability, Materials material){ - ToolMaterial customMaterial = Utils.generateToolMaterialFromGT(material); + public static MultiSpadeBase generateMultiShovel(final boolean GT_Durability, final Materials material){ + final ToolMaterial customMaterial = Utils.generateToolMaterialFromGT(material); return generateMultiShovel(GT_Durability, customMaterial, material.mDefaultLocalName, material.mDurability, material.mRGBa); } - public static MultiSpadeBase generateMultiShovel(Material material){ - ToolMaterial customMaterial = Utils.generateToolMaterial(material); + public static MultiSpadeBase generateMultiShovel(final Material material){ + final ToolMaterial customMaterial = Utils.generateToolMaterial(material); return generateMultiShovel(true, customMaterial, material.getLocalizedName(), (int) material.vDurability, material.getRGBA()); } - public static MultiSpadeBase generateMultiShovel(boolean GT_Durability, ToolMaterial customMaterial, String name, int durability, short[] rgba){ + public static MultiSpadeBase generateMultiShovel(final boolean GT_Durability, final ToolMaterial customMaterial, final String name, final int durability, final short[] rgba){ Utils.LOG_WARNING("Generating a Multi-Spade out of "+name); - short[] rgb = rgba; + final short[] rgb = rgba; int dur = customMaterial.getMaxUses(); Utils.LOG_WARNING("Determined durability for "+name+" is "+dur); if (GT_Durability){ @@ -389,7 +394,7 @@ public class ItemUtils { Utils.LOG_WARNING("Still too low, "+name+" will now go unused."); return null; } - MultiSpadeBase MP_Redstone = new MultiSpadeBase( + final MultiSpadeBase MP_Redstone = new MultiSpadeBase( name+" Multispade", (customMaterial), dur, @@ -398,7 +403,7 @@ public class ItemUtils { if (MP_Redstone.isValid){ return MP_Redstone; - } + } return null; } @@ -413,44 +418,44 @@ public class ItemUtils { - public static BaseItemDecidust generateDecidust(Materials material){ + public static BaseItemDecidust generateDecidust(final Materials material){ if (GT_OreDictUnificator.get(OrePrefixes.dust, material, 1L) != null){ - Material placeholder = MaterialUtils.generateMaterialFromGtENUM(material); + final Material placeholder = MaterialUtils.generateMaterialFromGtENUM(material); if (placeholder != null) { generateDecidust(placeholder); - } - } + } + } return null; } - public static BaseItemDecidust generateDecidust(Material material){ - if (material.getDust(1) != null && MaterialUtils.hasValidRGBA(material.getRGBA())){ - BaseItemDecidust Decidust = new BaseItemDecidust(material); - return Decidust; + public static BaseItemDecidust generateDecidust(final Material material){ + if ((material.getDust(1) != null) && MaterialUtils.hasValidRGBA(material.getRGBA())){ + final BaseItemDecidust Decidust = new BaseItemDecidust(material); + return Decidust; } return null; } - public static BaseItemCentidust generateCentidust(Materials material){ + public static BaseItemCentidust generateCentidust(final Materials material){ if (GT_OreDictUnificator.get(OrePrefixes.dust, material, 1L) != null){ - Material placeholder = MaterialUtils.generateMaterialFromGtENUM(material); + final Material placeholder = MaterialUtils.generateMaterialFromGtENUM(material); if (placeholder != null) { generateCentidust(placeholder); - } - } + } + } return null; } - public static BaseItemCentidust generateCentidust(Material material){ - if (material.getDust(1) != null && MaterialUtils.hasValidRGBA(material.getRGBA())){ - BaseItemCentidust Centidust = new BaseItemCentidust(material); - return Centidust; + public static BaseItemCentidust generateCentidust(final Material material){ + if ((material.getDust(1) != null) && MaterialUtils.hasValidRGBA(material.getRGBA())){ + final BaseItemCentidust Centidust = new BaseItemCentidust(material); + return Centidust; } return null; } - public static boolean isRadioactive(String materialName){ - int sRadiation = 0; + public static boolean isRadioactive(final String materialName){ + int sRadiation = 0; if (materialName.toLowerCase().contains("uranium")){ sRadiation = 2; } @@ -466,8 +471,8 @@ public class ItemUtils { return false; } - public static int getRadioactivityLevel(String materialName){ - int sRadiation = 0; + public static int getRadioactivityLevel(final String materialName){ + int sRadiation = 0; if (materialName.toLowerCase().contains("uranium")){ sRadiation = 2; } @@ -480,16 +485,16 @@ public class ItemUtils { return sRadiation; } - public static String getArrayStackNames(ItemStack[] aStack){ + public static String getArrayStackNames(final ItemStack[] aStack){ String itemNames = "Item Array: "; - for (ItemStack alph : aStack){ + for (final ItemStack alph : aStack){ if (alph != null){ - String temp = itemNames; - itemNames = temp + ", " + alph.getDisplayName() + " x" + alph.stackSize; + final String temp = itemNames; + itemNames = temp + ", " + alph.getDisplayName() + " x" + alph.stackSize; } else { - String temp = itemNames; + final String temp = itemNames; itemNames = temp + ", " + "null" + " x" + "0"; } } @@ -497,10 +502,10 @@ public class ItemUtils { } - public static String[] getArrayStackNamesAsArray(ItemStack[] aStack){ - String[] itemNames = {}; + public static String[] getArrayStackNamesAsArray(final ItemStack[] aStack){ + final String[] itemNames = {}; int arpos = 0; - for (ItemStack alph : aStack){ + for (final ItemStack alph : aStack){ itemNames[arpos] = alph.getDisplayName(); arpos++; } @@ -508,29 +513,29 @@ public class ItemUtils { } - public static String getFluidArrayStackNames(FluidStack[] aStack){ + public static String getFluidArrayStackNames(final FluidStack[] aStack){ String itemNames = "Fluid Array: "; - for (FluidStack alph : aStack){ - String temp = itemNames; + for (final FluidStack alph : aStack){ + final String temp = itemNames; itemNames = temp + ", " + alph.getFluid().getName() + " x" + alph.amount; } return itemNames; } - public static ItemStack getGregtechCircuit(int Meta){ + public static ItemStack getGregtechCircuit(final int Meta){ return ItemUtils.getItemStackWithMeta(LoadedMods.Gregtech, "gregtech:gt.integrated_circuit", "Gregtech Circuit", Meta, 0); } - public static ItemStack[] getBlockDrops(ArrayList<ItemStack> blockDrops) { + public static ItemStack[] getBlockDrops(final ArrayList<ItemStack> blockDrops) { if (blockDrops == null){ return null; } if (blockDrops.isEmpty()){ return null; } - ItemStack[] outputs = new ItemStack[blockDrops.size()]; - short forCounter = 0; - for (ItemStack I : blockDrops){ + final ItemStack[] outputs = new ItemStack[blockDrops.size()]; + final short forCounter = 0; + for (final ItemStack I : blockDrops){ outputs[forCounter] = I; } return outputs; |