From 69ce418e29e22391f60cdd55815727762a78c33a Mon Sep 17 00:00:00 2001 From: Raven Szewczyk Date: Fri, 24 May 2024 19:04:17 +0100 Subject: Apply updated GT5u spotless configs --- src/main/java/gtPlusPlus/core/item/ModItems.java | 379 +++++----- .../core/item/base/BaseItemBurnable.java | 2 +- .../core/item/base/BaseItemColourable.java | 14 +- .../core/item/base/BaseItemComponent.java | 120 +-- .../core/item/base/BaseItemDamageable.java | 18 +- .../gtPlusPlus/core/item/base/BaseItemTCShard.java | 6 +- .../core/item/base/BaseItemTickable.java | 26 +- .../gtPlusPlus/core/item/base/BasicSpawnEgg.java | 18 +- .../java/gtPlusPlus/core/item/base/CoreItem.java | 106 +-- .../core/item/base/cell/BaseItemCell.java | 6 +- .../core/item/base/cell/BaseItemPlasmaCell.java | 2 +- .../core/item/base/dusts/BaseItemDust.java | 2 +- .../core/item/base/dusts/BaseItemDustUnique.java | 38 +- .../core/item/base/ingots/BaseItemIngotHot.java | 15 +- .../core/item/base/ingots/BaseItemIngot_OLD.java | 21 +- .../core/item/base/itemblock/ItemBlockGtBlock.java | 15 +- .../core/item/base/itemblock/ItemBlockOre.java | 31 +- .../core/item/base/misc/BaseItemMisc.java | 13 +- .../core/item/base/misc/BaseItemParticle.java | 20 +- .../core/item/base/ore/BaseOreComponent.java | 35 +- .../core/item/base/plates/BaseItemPlate.java | 12 +- .../core/item/base/plates/BaseItemPlate_OLD.java | 9 +- .../gtPlusPlus/core/item/bauble/BaseBauble.java | 10 +- .../core/item/bauble/BatteryPackBaseBauble.java | 62 +- .../core/item/bauble/ElectricBaseBauble.java | 59 +- .../core/item/bauble/FireProtectionBauble.java | 4 +- .../core/item/chemistry/AgriculturalChem.java | 251 ++++--- .../gtPlusPlus/core/item/chemistry/CoalTar.java | 291 ++++---- .../core/item/chemistry/GenericChem.java | 824 +++++++++++---------- .../core/item/chemistry/IonParticles.java | 24 +- .../core/item/chemistry/MilledOreProcessing.java | 700 ++++++++--------- .../core/item/chemistry/NuclearChem.java | 77 +- .../core/item/chemistry/RocketFuels.java | 525 ++++++------- .../core/item/chemistry/StandardBaseParticles.java | 47 +- .../chemistry/general/ItemGenericChemBase.java | 32 +- .../item/circuit/GTPP_IntegratedCircuit_Item.java | 56 +- .../core/item/crafting/ItemDummyResearch.java | 12 +- .../core/item/food/BaseItemMetaFood.java | 211 +++--- .../gtPlusPlus/core/item/general/BufferCore.java | 18 +- .../core/item/general/ItemBlueprint.java | 46 +- .../core/item/general/ItemCloakingDevice.java | 30 +- .../core/item/general/ItemGenericToken.java | 44 +- .../core/item/general/ItemHalfCompleteCasings.java | 2 +- .../core/item/general/ItemHealingDevice.java | 124 ++-- .../core/item/general/ItemLavaFilter.java | 18 +- .../core/item/general/ItemMagicFeather.java | 35 +- .../core/item/general/books/ItemBaseBook.java | 19 +- .../item/general/chassis/ItemDehydratorCoil.java | 2 +- .../general/chassis/ItemDehydratorCoilWire.java | 2 +- .../item/general/spawn/ItemCustomSpawnEgg.java | 39 +- .../core/item/materials/DustDecayable.java | 2 +- .../core/item/tool/misc/GregtechPump.java | 212 +++--- .../core/item/wearable/armour/ArmourLoader.java | 2 +- .../wearable/armour/tinfoil/ArmourTinFoilHat.java | 16 +- .../core/item/wearable/base/BaseItemWearable.java | 4 +- .../item/wearable/hazmat/ItemArmorHazmatEx.java | 8 +- 56 files changed, 2430 insertions(+), 2286 deletions(-) (limited to 'src/main/java/gtPlusPlus/core/item') diff --git a/src/main/java/gtPlusPlus/core/item/ModItems.java b/src/main/java/gtPlusPlus/core/item/ModItems.java index cbd149fbdf..0fabf375a2 100644 --- a/src/main/java/gtPlusPlus/core/item/ModItems.java +++ b/src/main/java/gtPlusPlus/core/item/ModItems.java @@ -220,10 +220,10 @@ public final class ModItems { // Default item used when recipes fail, handy for debugging. Let's make sure they exist when this class is // called upon. AAA_Broken = new BaseItemIngot_OLD( - "AAA_Broken", - "Errors - Tell Alkalus", - Utils.rgbtoHexValue(128, 128, 128), - 0); + "AAA_Broken", + "Errors - Tell Alkalus", + Utils.rgbtoHexValue(128, 128, 128), + 0); ZZZ_Empty = new ItemEmpty(); } @@ -232,15 +232,15 @@ public final class ModItems { itemMagicFeather = new ItemMagicFeather(); itemAlkalusDisk = new BaseItemDamageable( - "itemAlkalusDisk", - AddToCreativeTab.tabMisc, - 1, - 0, - "Unknown Use", - EnumRarity.rare, - EnumChatFormatting.AQUA, - false, - null); + "itemAlkalusDisk", + AddToCreativeTab.tabMisc, + 1, + 0, + "Unknown Use", + EnumRarity.rare, + EnumChatFormatting.AQUA, + false, + null); itemGenericToken = new ItemGenericToken(); itemDummyResearch = new ItemDummyResearch(); @@ -258,15 +258,15 @@ public final class ModItems { itemBlueprintBase = new ItemBlueprint("itemBlueprint"); itemHalfCompleteCasings = new ItemHalfCompleteCasings( - "itemHalfCompleteCasings", - AddToCreativeTab.tabMisc, - 32, - 0, - "This isn't quite finished yet.", - EnumRarity.common, - EnumChatFormatting.GRAY, - false, - Utils.rgbtoHexValue(255, 255, 255)).setTextureName(GregTech.ID + ":" + "gt.metaitem.01/" + "761"); + "itemHalfCompleteCasings", + AddToCreativeTab.tabMisc, + 32, + 0, + "This isn't quite finished yet.", + EnumRarity.common, + EnumChatFormatting.GRAY, + false, + Utils.rgbtoHexValue(255, 255, 255)).setTextureName(GregTech.ID + ":" + "gt.metaitem.01/" + "761"); // Start meta Item Generation ItemsFoods.load(); @@ -490,17 +490,17 @@ public final class ModItems { shardAqua = new BaseItemTCShard("Aqua", Utils.rgbtoHexValue(5, 5, 255)); } else { shardAer = ItemUtils - .getItemStackWithMeta(Thaumcraft.isModLoaded(), "Thaumcraft:ItemShard", "Air Shard", 0, 1) - .getItem(); + .getItemStackWithMeta(Thaumcraft.isModLoaded(), "Thaumcraft:ItemShard", "Air Shard", 0, 1) + .getItem(); shardIgnis = ItemUtils - .getItemStackWithMeta(Thaumcraft.isModLoaded(), "Thaumcraft:ItemShard", "Fire Shard", 1, 1) - .getItem(); + .getItemStackWithMeta(Thaumcraft.isModLoaded(), "Thaumcraft:ItemShard", "Fire Shard", 1, 1) + .getItem(); shardAqua = ItemUtils - .getItemStackWithMeta(Thaumcraft.isModLoaded(), "Thaumcraft:ItemShard", "Warer Shard", 2, 1) - .getItem(); + .getItemStackWithMeta(Thaumcraft.isModLoaded(), "Thaumcraft:ItemShard", "Warer Shard", 2, 1) + .getItem(); shardTerra = ItemUtils - .getItemStackWithMeta(Thaumcraft.isModLoaded(), "Thaumcraft:ItemShard", "Earth Shard", 3, 1) - .getItem(); + .getItemStackWithMeta(Thaumcraft.isModLoaded(), "Thaumcraft:ItemShard", "Earth Shard", 3, 1) + .getItem(); } // Generates a set of four special dusts to be used in my recipes. dustAer = ItemUtils.generateSpecialUseDusts(ELEMENT.getInstance().AER, true)[0]; @@ -509,64 +509,64 @@ public final class ModItems { dustAqua = ItemUtils.generateSpecialUseDusts(ELEMENT.getInstance().AQUA, true)[0]; ItemUtils.generateSpecialUseDusts(MISC_MATERIALS.WOODS_GLASS, false); - cellHydrogenChlorideMix = MISC_MATERIALS.HYDROGEN_CHLORIDE_MIX.getCell(1).getItem(); + cellHydrogenChlorideMix = MISC_MATERIALS.HYDROGEN_CHLORIDE_MIX.getCell(1) + .getItem(); // Nuclear Fuel Dusts dustLithiumCarbonate = ItemUtils.generateSpecialUseDusts( - "LithiumCarbonate", - "Lithium Carbonate", - "Li2CO3", - Utils.rgbtoHexValue(240, 240, 240))[0]; // https://en.wikipedia.org/wiki/Lithium_carbonate + "LithiumCarbonate", + "Lithium Carbonate", + "Li2CO3", + Utils.rgbtoHexValue(240, 240, 240))[0]; // https://en.wikipedia.org/wiki/Lithium_carbonate dustLithiumPeroxide = ItemUtils.generateSpecialUseDusts( - "LithiumPeroxide", - "Lithium Peroxide", - "Li2O2", - Utils.rgbtoHexValue(250, 250, 250))[0]; // https://en.wikipedia.org/wiki/Lithium_peroxide + "LithiumPeroxide", + "Lithium Peroxide", + "Li2O2", + Utils.rgbtoHexValue(250, 250, 250))[0]; // https://en.wikipedia.org/wiki/Lithium_peroxide dustLithiumHydroxide = ItemUtils.generateSpecialUseDusts( - "LithiumHydroxide", - "Lithium Hydroxide", - "LiOH", - Utils.rgbtoHexValue(250, 250, 250))[0]; // https://en.wikipedia.org/wiki/Lithium_hydroxide + "LithiumHydroxide", + "Lithium Hydroxide", + "LiOH", + Utils.rgbtoHexValue(250, 250, 250))[0]; // https://en.wikipedia.org/wiki/Lithium_hydroxide if (!ItemUtils.checkForInvalidItems(ItemUtils.getItemStackOfAmountFromOreDict("dustQuicklime", 1))) { dustQuicklime = ItemUtils - .generateSpecialUseDusts("Quicklime", "Quicklime", "CaO", Utils.rgbtoHexValue(255, 255, 175))[0]; // https://en.wikipedia.org/wiki/Calcium_oxide + .generateSpecialUseDusts("Quicklime", "Quicklime", "CaO", Utils.rgbtoHexValue(255, 255, 175))[0]; // https://en.wikipedia.org/wiki/Calcium_oxide } dustCalciumHydroxide = ItemUtils.generateSpecialUseDusts( - "CalciumHydroxide", - "Hydrated Lime", - "Ca(OH)2", - Utils.rgbtoHexValue(255, 255, 255))[0]; // https://en.wikipedia.org/wiki/Calcium_hydroxide + "CalciumHydroxide", + "Hydrated Lime", + "Ca(OH)2", + Utils.rgbtoHexValue(255, 255, 255))[0]; // https://en.wikipedia.org/wiki/Calcium_hydroxide dustCalciumCarbonate = ItemUtils.generateSpecialUseDusts( - "CalciumCarbonate", - "Calcium Carbonate", - "CaCO3", - Utils.rgbtoHexValue(255, 255, 255))[0]; // https://en.wikipedia.org/wiki/Calcium_carbonate + "CalciumCarbonate", + "Calcium Carbonate", + "CaCO3", + Utils.rgbtoHexValue(255, 255, 255))[0]; // https://en.wikipedia.org/wiki/Calcium_carbonate if ((ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustGypsum", 1) == null) - || (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustCalciumSulfate", 1) == null)) { + || (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustCalciumSulfate", 1) == null)) { dustCalciumSulfate = ItemUtils.generateSpecialUseDusts( - "Gypsum", - "Calcium Sulfate (Gypsum)", - "CaSO4", - Utils.rgbtoHexValue(255, 255, 255))[0]; // https://en.wikipedia.org/wiki/Calcium_sulfate + "Gypsum", + "Calcium Sulfate (Gypsum)", + "CaSO4", + Utils.rgbtoHexValue(255, 255, 255))[0]; // https://en.wikipedia.org/wiki/Calcium_sulfate GT_OreDictUnificator.registerOre("dustCalciumSulfate", ItemUtils.getSimpleStack(dustCalciumSulfate)); } else { - GT_OreDictUnificator.registerOre( - "dustCalciumSulfate", - ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustGypsum", 1)); + GT_OreDictUnificator + .registerOre("dustCalciumSulfate", ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustGypsum", 1)); } dustLi2CO3CaOH2 = ItemUtils.generateSpecialUseDusts( - "Li2CO3CaOH2", - "Li2CO3 + Ca(OH)2 Compound", - "Li2CO3CaOH2", - Utils.rgbtoHexValue(255, 255, 255))[0]; // https://en.wikipedia.org/wiki/Calcium_carbonate + "Li2CO3CaOH2", + "Li2CO3 + Ca(OH)2 Compound", + "Li2CO3CaOH2", + Utils.rgbtoHexValue(255, 255, 255))[0]; // https://en.wikipedia.org/wiki/Calcium_carbonate MaterialUtils.generateSpecialDustAndAssignToAMaterial(FLUORIDES.SODIUM_FLUORIDE, false); // FLiBe Fuel Compounds dustLi2BeF4 = ItemUtils.generateSpecialUseDusts( - "Li2BeF4", - "Lithium Tetrafluoroberyllate Fuel Compound", - "Li2BeF4", - Utils.rgbtoHexValue(255, 255, 255))[0]; // https://en.wikipedia.org/wiki/FLiBe + "Li2BeF4", + "Lithium Tetrafluoroberyllate Fuel Compound", + "Li2BeF4", + Utils.rgbtoHexValue(255, 255, 255))[0]; // https://en.wikipedia.org/wiki/FLiBe Material.registerComponentForMaterial(NUCLIDE.Li2BeF4, OrePrefixes.dust, ItemUtils.getSimpleStack(dustLi2BeF4)); // fluidFLiBeSalt = ("Li2BeF4", "Li2BeF4", 7430, new short[]{255, 255, 255, 100}, 0); // fluidFLiBeSalt = FluidUtils.addGTFluidNoPrefix("Li2BeF4", "Lithium Tetrafluoroberyllate", new short[]{255, @@ -585,28 +585,28 @@ public final class ModItems { // 800, null, CI.emptyCells(1), 1000, true); // LFTR Blanket Fluid Processing fluidNuclearWaste = FluidUtils.addGTFluidNoPrefix( - "nuclear.waste", - "Nuclear Waste", - new short[] { 10, 250, 10, 100 }, - 0, - 1000, - null, - CI.emptyCells(1), - 1000, - true); + "nuclear.waste", + "Nuclear Waste", + new short[] { 10, 250, 10, 100 }, + 0, + 1000, + null, + CI.emptyCells(1), + 1000, + true); // LFTR Control Circuit itemCircuitLFTR = new CoreItem( - "itemCircuitLFTR", - "" + EnumChatFormatting.GREEN + "Control Circuit", - AddToCreativeTab.tabMisc, - 1, - 0, - new String[] { "Keeps Multiblocks Stable" }, - EnumRarity.epic, - EnumChatFormatting.DARK_GREEN, - false, - null); + "itemCircuitLFTR", + "" + EnumChatFormatting.GREEN + "Control Circuit", + AddToCreativeTab.tabMisc, + 1, + 0, + new String[] { "Keeps Multiblocks Stable" }, + EnumRarity.epic, + EnumChatFormatting.DARK_GREEN, + false, + null); if (CORE.ConfigSwitches.enableMachine_Pollution) { itemBasicTurbine = new ItemBasicScrubberTurbine(); @@ -615,14 +615,14 @@ public final class ModItems { // Zirconium // Cinter Pellet. itemZirconiumChlorideCinterPellet = new CoreItem( - "itemZirconiumPellet", - "Zirconium Pellet [" + StringUtils.subscript("ZrCl4") + "]", - tabMisc).setTextureName(GTPlusPlus.ID + ":itemShard"); + "itemZirconiumPellet", + "Zirconium Pellet [" + StringUtils.subscript("ZrCl4") + "]", + tabMisc).setTextureName(GTPlusPlus.ID + ":itemShard"); GT_OreDictUnificator.registerOre("pelletZirconium", new ItemStack(itemZirconiumChlorideCinterPellet)); // Zirconium Chloride dustZrCl4 = ItemUtils.generateSpecialUseDusts("ZrCl4", "ZrCl4", "ZrCl4", Utils.rgbtoHexValue(180, 180, 180))[0]; // http://www.iaea.org/inis/collection/NCLCollectionStore/_Public/39/036/39036750.pdf dustCookedZrCl4 = ItemUtils - .generateSpecialUseDusts("CookedZrCl4", "Cooked ZrCl4", "ZrCl4", Utils.rgbtoHexValue(180, 180, 180))[0]; // http://www.iaea.org/inis/collection/NCLCollectionStore/_Public/39/036/39036750.pdf + .generateSpecialUseDusts("CookedZrCl4", "Cooked ZrCl4", "ZrCl4", Utils.rgbtoHexValue(180, 180, 180))[0]; // http://www.iaea.org/inis/collection/NCLCollectionStore/_Public/39/036/39036750.pdf // Zirconium Tetrafluoride /* @@ -632,10 +632,10 @@ public final class ModItems { * ItemUtils.getItemStackOfAmountFromOreDict("dustZirconiumTetrafluoride", 1)); */ fluidZrF4 = FluidUtils.generateFluidNoPrefix( - "ZirconiumTetrafluoride", - "Zirconium Tetrafluoride", - 500, - new short[] { 170, 170, 140, 100 }); // https://en.wikipedia.org/wiki/Zirconium_tetrafluoride + "ZirconiumTetrafluoride", + "Zirconium Tetrafluoride", + 500, + new short[] { 170, 170, 140, 100 }); // https://en.wikipedia.org/wiki/Zirconium_tetrafluoride FLUORIDES.ZIRCONIUM_TETRAFLUORIDE.setFluid(fluidZrF4); // Coolant Salt @@ -646,9 +646,9 @@ public final class ModItems { // Load Tree Farmer if (CORE.ConfigSwitches.enableMultiblock_TreeFarmer) { // https://en.wikipedia.org/wiki/UAN dustFertUN18 = ItemUtils - .generateSpecialUseDusts("UN18Fertiliser", "UN-18 Fertiliser", Utils.rgbtoHexValue(60, 155, 60))[0]; + .generateSpecialUseDusts("UN18Fertiliser", "UN-18 Fertiliser", Utils.rgbtoHexValue(60, 155, 60))[0]; dustFertUN32 = ItemUtils - .generateSpecialUseDusts("UN32Fertiliser", "UN-32 Fertiliser", Utils.rgbtoHexValue(55, 190, 55))[0]; + .generateSpecialUseDusts("UN32Fertiliser", "UN-32 Fertiliser", Utils.rgbtoHexValue(55, 190, 55))[0]; ItemStack temp1 = ItemUtils.getCorrectStacktype("IC2:itemFertilizer", 1); ItemStack temp2 = null; @@ -658,32 +658,36 @@ public final class ModItems { } if (temp1 != null) { fluidFertBasic = FluidUtils.generateFluidNonMolten( - "Fertiliser", - "Fertiliser", - 32, - new short[] { 45, 170, 45, 100 }, - temp1, - null, - true); - GT_Values.RA.stdBuilder().itemInputs(temp2).fluidOutputs(new FluidStack(fluidFertBasic, 36)) - .duration(5 * TICKS).eut(16).addTo(fluidExtractionRecipes); - } - fluidFertUN32 = FluidUtils.generateFluidNonMolten( - "UN32Fertiliser", - "UN-32 Fertiliser", - 24, - new short[] { 55, 190, 55, 100 }, - null, + "Fertiliser", + "Fertiliser", + 32, + new short[] { 45, 170, 45, 100 }, + temp1, null, true); + GT_Values.RA.stdBuilder() + .itemInputs(temp2) + .fluidOutputs(new FluidStack(fluidFertBasic, 36)) + .duration(5 * TICKS) + .eut(16) + .addTo(fluidExtractionRecipes); + } + fluidFertUN32 = FluidUtils.generateFluidNonMolten( + "UN32Fertiliser", + "UN-32 Fertiliser", + 24, + new short[] { 55, 190, 55, 100 }, + null, + null, + true); fluidFertUN18 = FluidUtils.generateFluidNonMolten( - "UN18Fertiliser", - "UN-18 Fertiliser", - 22, - new short[] { 60, 155, 60, 100 }, - null, - null, - true); + "UN18Fertiliser", + "UN-18 Fertiliser", + 22, + new short[] { 60, 155, 60, 100 }, + null, + null, + true); /* * GT_Values.RA.addMixerRecipe( arg0, //Item In arg1, arg2, arg3, arg4, //Fluid in arg5, //Fluid Out arg6, @@ -694,14 +698,14 @@ public final class ModItems { // Juice FluidUtils.generateFluidNonMolten( - "RaisinJuice", - "Raisin Juice", - 2, - new short[] { 51, 0, 51, 100 }, - ItemUtils.getItemStackOfAmountFromOreDictNoBroken("foodRaisins", 1), - ItemUtils.getItemStackOfAmountFromOreDictNoBroken("fruitRaisins", 1), - 50, - true); + "RaisinJuice", + "Raisin Juice", + 2, + new short[] { 51, 0, 51, 100 }, + ItemUtils.getItemStackOfAmountFromOreDictNoBroken("foodRaisins", 1), + ItemUtils.getItemStackOfAmountFromOreDictNoBroken("fruitRaisins", 1), + 50, + true); // Test items toolGregtechPump = new GregtechPump(); @@ -716,49 +720,52 @@ public final class ModItems { } dustNeptunium238 = new DustDecayable( - "dustNeptunium238", - Utils.rgbtoHexValue(175, 240, 75), - 50640, - new String[] { StringUtils.superscript("238Np"), - "Result: Plutonium 238 (" + StringUtils.superscript("238Pu") + ")" }, - ELEMENT.getInstance().PLUTONIUM238.getDust(1).getItem(), - 5); + "dustNeptunium238", + Utils.rgbtoHexValue(175, 240, 75), + 50640, + new String[] { StringUtils.superscript("238Np"), + "Result: Plutonium 238 (" + StringUtils.superscript("238Pu") + ")" }, + ELEMENT.getInstance().PLUTONIUM238.getDust(1) + .getItem(), + 5); dustDecayedRadium226 = ItemUtils.generateSpecialUseDusts( - "DecayedRadium226", - "Decayed Radium-226", - "Contains Radon (" + StringUtils.superscript("222Rn") + ")", - ELEMENT.getInstance().RADIUM.getRgbAsHex())[0]; + "DecayedRadium226", + "Decayed Radium-226", + "Contains Radon (" + StringUtils.superscript("222Rn") + ")", + ELEMENT.getInstance().RADIUM.getRgbAsHex())[0]; dustRadium226 = new DustDecayable( - "dustRadium226", - ELEMENT.getInstance().RADIUM.getRgbAsHex(), - 90000, - new String[] { StringUtils.superscript("226Ra"), - "Result: Radon (" + StringUtils.superscript("222Rn") + ")" }, - ItemUtils.getSimpleStack(dustDecayedRadium226).getItem(), - 5); + "dustRadium226", + ELEMENT.getInstance().RADIUM.getRgbAsHex(), + 90000, + new String[] { StringUtils.superscript("226Ra"), + "Result: Radon (" + StringUtils.superscript("222Rn") + ")" }, + ItemUtils.getSimpleStack(dustDecayedRadium226) + .getItem(), + 5); dustProtactinium233 = new DustDecayable( - "dustProtactinium233", - ELEMENT.getInstance().PROTACTINIUM.getRgbAsHex(), - 32000, - new String[] { StringUtils.superscript("233Pa"), - "Result: Uranium 233(" + StringUtils.superscript("233U") + ")" }, - ELEMENT.getInstance().URANIUM233.getDust(1).getItem(), - 6); + "dustProtactinium233", + ELEMENT.getInstance().PROTACTINIUM.getRgbAsHex(), + 32000, + new String[] { StringUtils.superscript("233Pa"), + "Result: Uranium 233(" + StringUtils.superscript("233U") + ")" }, + ELEMENT.getInstance().URANIUM233.getDust(1) + .getItem(), + 6); dustMolybdenum99 = new DustDecayable( - "dustMolybdenum99", - ELEMENT.getInstance().MOLYBDENUM.getRgbAsHex(), - 16450, - new String[] { StringUtils.superscript("99Mo"), - "Result: Technicium 99ᵐ (" + StringUtils.superscript("99ᵐTc") + ")" }, - dustTechnetium99M, - 4); + "dustMolybdenum99", + ELEMENT.getInstance().MOLYBDENUM.getRgbAsHex(), + 16450, + new String[] { StringUtils.superscript("99Mo"), + "Result: Technicium 99ᵐ (" + StringUtils.superscript("99ᵐTc") + ")" }, + dustTechnetium99M, + 4); itemIonParticleBase = new IonParticles(); itemStandarParticleBase = new StandardBaseParticles(); Item a8kFlask = VolumetricFlaskHelper.generateNewFlask("Volumetric_Flask_8k", "Large Volumetric Flask", 8000); Item a64kFlask = VolumetricFlaskHelper - .generateNewFlask("Volumetric_Flask_32k", "Gigantic Volumetric Flask", 32000); + .generateNewFlask("Volumetric_Flask_32k", "Gigantic Volumetric Flask", 32000); GregtechItemList.VOLUMETRIC_FLASK_8k.set(a8kFlask); GregtechItemList.VOLUMETRIC_FLASK_32k.set(a64kFlask); @@ -827,34 +834,34 @@ public final class ModItems { */ if (!ItemUtils.checkForInvalidItems(ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustGadolinium", 1))) { ItemUtils.generateSpecialUseDusts( - "Gadolinium", - "Gadolinium", - Materials.Gadolinium.mElement.name(), - Utils.rgbtoHexValue(226, 172, 9)); + "Gadolinium", + "Gadolinium", + Materials.Gadolinium.mElement.name(), + Utils.rgbtoHexValue(226, 172, 9)); } if (!ItemUtils.checkForInvalidItems(ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustYtterbium", 1))) { ItemUtils.generateSpecialUseDusts( - "Ytterbium", - "Ytterbium", - Materials.Ytterbium.mElement.name(), - Utils.rgbtoHexValue( - Materials.Yttrium.mRGBa[0] - 60, - Materials.Yttrium.mRGBa[1] - 60, - Materials.Yttrium.mRGBa[2] - 60)); + "Ytterbium", + "Ytterbium", + Materials.Ytterbium.mElement.name(), + Utils.rgbtoHexValue( + Materials.Yttrium.mRGBa[0] - 60, + Materials.Yttrium.mRGBa[1] - 60, + Materials.Yttrium.mRGBa[2] - 60)); } if (!ItemUtils.checkForInvalidItems(ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustSamarium", 1))) { ItemUtils.generateSpecialUseDusts( - "Samarium", - "Samarium", - Materials.Samarium.mElement.name(), - Utils.rgbtoHexValue(161, 168, 114)); + "Samarium", + "Samarium", + Materials.Samarium.mElement.name(), + Utils.rgbtoHexValue(161, 168, 114)); } if (!ItemUtils.checkForInvalidItems(ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustLanthanum", 1))) { ItemUtils.generateSpecialUseDusts( - "Lanthanum", - "Lanthanum", - Materials.Lanthanum.mElement.name(), - Utils.rgbtoHexValue(106, 127, 163)); + "Lanthanum", + "Lanthanum", + Materials.Lanthanum.mElement.name(), + Utils.rgbtoHexValue(106, 127, 163)); } // Just an unusual plate needed for some black magic. @@ -877,7 +884,7 @@ public final class ModItems { // Krypton Processing if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("ingotHotTitanium", 1) == null) { itemHotTitaniumIngot = ItemUtils - .getSimpleStack(new BaseItemIngot(ELEMENT.getInstance().TITANIUM, ComponentTypes.HOTINGOT)); + .getSimpleStack(new BaseItemIngot(ELEMENT.getInstance().TITANIUM, ComponentTypes.HOTINGOT)); } else { itemHotTitaniumIngot = ItemUtils.getItemStackOfAmountFromOreDictNoBroken("ingotHotTitanium", 1); } @@ -889,7 +896,7 @@ public final class ModItems { // Springs MaterialUtils - .generateComponentAndAssignToAMaterial(ComponentTypes.SPRING, ELEMENT.STANDALONE.CELESTIAL_TUNGSTEN); + .generateComponentAndAssignToAMaterial(ComponentTypes.SPRING, ELEMENT.STANDALONE.CELESTIAL_TUNGSTEN); MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.SPRING, ELEMENT.STANDALONE.WHITE_METAL); MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.SPRING, ALLOY.NITINOL_60); MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.SPRING, ALLOY.AQUATIC_STEEL); @@ -913,7 +920,7 @@ public final class ModItems { MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FINEWIRE, ALLOY.QUANTUM); MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FINEWIRE, ELEMENT.STANDALONE.HYPOGEN); MaterialUtils - .generateComponentAndAssignToAMaterial(ComponentTypes.FINEWIRE, ELEMENT.STANDALONE.CHRONOMATIC_GLASS); + .generateComponentAndAssignToAMaterial(ComponentTypes.FINEWIRE, ELEMENT.STANDALONE.CHRONOMATIC_GLASS); // Foil MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, ALLOY.BLACK_TITANIUM); @@ -966,16 +973,16 @@ public final class ModItems { // A plate of Europium. if ((ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateEuropium", 1) == null) - && CORE.ConfigSwitches.enableCustom_Pipes) { + && CORE.ConfigSwitches.enableCustom_Pipes) { itemPlateEuropium = new BaseItemPlate(ELEMENT.getInstance().EUROPIUM); } if ((ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateDoubleEuropium", 1) == null) - && CORE.ConfigSwitches.enableCustom_Pipes) { + && CORE.ConfigSwitches.enableCustom_Pipes) { itemDoublePlateEuropium = new BaseItemPlateDouble(ELEMENT.getInstance().EUROPIUM); } // Tumbaga Mix (For Simple Crafting) dustTumbagaMix = ItemUtils - .generateSpecialUseDusts("MixTumbaga", "Tumbaga Mix", "Au2Cu", Utils.rgbtoHexValue(255, 150, 80))[0]; + .generateSpecialUseDusts("MixTumbaga", "Tumbaga Mix", "Au2Cu", Utils.rgbtoHexValue(255, 150, 80))[0]; } } diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseItemBurnable.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemBurnable.java index 3b22db5b6f..8bbc5a3b08 100644 --- a/src/main/java/gtPlusPlus/core/item/base/BaseItemBurnable.java +++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemBurnable.java @@ -12,7 +12,7 @@ public class BaseItemBurnable extends CoreItem { protected final int meta; public BaseItemBurnable(String unlocalizedName, String displayName, CreativeTabs creativeTab, int stackSize, - int maxDmg, String description, String oredictName, int burnTime, int meta) { + int maxDmg, String description, String oredictName, int burnTime, int meta) { super(unlocalizedName, creativeTab, stackSize, maxDmg, description); this.itemName = displayName; this.meta = meta; diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseItemColourable.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemColourable.java index e846603070..d391207a56 100644 --- a/src/main/java/gtPlusPlus/core/item/base/BaseItemColourable.java +++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemColourable.java @@ -33,8 +33,8 @@ public class BaseItemColourable extends Item { * Name, Tab, Stack, Dmg, Description, Rarity, Text Colour, Effect */ public BaseItemColourable(final String unlocalizedName, final CreativeTabs creativeTab, final int stackSize, - final int maxDmg, final String description, final EnumRarity regRarity, final EnumChatFormatting colour, - final boolean Effect, int rgb) { + final int maxDmg, final String description, final EnumRarity regRarity, final EnumChatFormatting colour, + final boolean Effect, int rgb) { this.setUnlocalizedName(unlocalizedName); this.setTextureName(GTPlusPlus.ID + ":" + unlocalizedName); this.setCreativeTab(creativeTab); @@ -54,8 +54,8 @@ public class BaseItemColourable extends Item { * Name, Tab, Stack, Dmg, Description, Rarity, Text Colour, Effect */ public BaseItemColourable(final String unlocalizedName, final String displayName, final CreativeTabs creativeTab, - final int stackSize, final int maxDmg, final String description, final EnumRarity regRarity, - final EnumChatFormatting colour, final boolean Effect, int rgb) { + final int stackSize, final int maxDmg, final String description, final EnumRarity regRarity, + final EnumChatFormatting colour, final boolean Effect, int rgb) { this.setUnlocalizedName(unlocalizedName); GT_LanguageManager.addStringLocalization("gtplusplus." + this.getUnlocalizedName() + ".name", displayName); this.setTextureName(GTPlusPlus.ID + ":" + unlocalizedName); @@ -74,8 +74,8 @@ public class BaseItemColourable extends Item { @Override public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) { list.add( - this.descColour - + GT_LanguageManager.getTranslation("gtplusplus." + this.getUnlocalizedName() + ".tooltip")); + this.descColour + + GT_LanguageManager.getTranslation("gtplusplus." + this.getUnlocalizedName() + ".tooltip")); // super.addInformation(stack, aPlayer, list, bool); } @@ -93,7 +93,7 @@ public class BaseItemColourable extends Item { @Override public String getItemStackDisplayName(final ItemStack tItem) { if (!("gtplusplus." + this.getUnlocalizedName() + ".name") - .equals(GT_LanguageManager.getTranslation("gtplusplus." + this.getUnlocalizedName() + ".name"))) { + .equals(GT_LanguageManager.getTranslation("gtplusplus." + this.getUnlocalizedName() + ".name"))) { return GT_LanguageManager.getTranslation("gtplusplus." + this.getUnlocalizedName() + ".name"); } else return super.getItemStackDisplayName(tItem); } diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java index dea21a97c4..6846f8febb 100644 --- a/src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java +++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java @@ -72,8 +72,8 @@ public class BaseItemComponent extends Item { // if (componentType != ComponentTypes.DUST) GT_OreDictUnificator.registerOre( - componentType.getOreDictName() + material.getUnlocalizedName(), - ItemUtils.getSimpleStack(this)); + componentType.getOreDictName() + material.getUnlocalizedName(), + ItemUtils.getSimpleStack(this)); if (componentType == ComponentTypes.GEAR) { GT_OreDictUnificator.registerOre("gear" + material.getUnlocalizedName(), ItemUtils.getSimpleStack(this)); } @@ -97,7 +97,9 @@ public class BaseItemComponent extends Item { this.componentMaterial = aTempMaterial; this.unlocalName = "itemCell" + aFormattedNameForFluids; this.materialName = localName; - this.translatedMaterialName = getFluidName("fluid." + this.materialName.toLowerCase().replace(" ", "")); + this.translatedMaterialName = getFluidName( + "fluid." + this.materialName.toLowerCase() + .replace(" ", "")); this.componentType = ComponentTypes.CELL; this.setCreativeTab(AddToCreativeTab.tabMisc); this.setUnlocalizedName(aFormattedNameForFluids); @@ -108,16 +110,17 @@ public class BaseItemComponent extends Item { this.setTextureName(GTPlusPlus.ID + ":" + "item" + ComponentTypes.CELL.COMPONENT_NAME); GameRegistry.registerItem(this, aFormattedNameForFluids); GT_OreDictUnificator.registerOre( - ComponentTypes.CELL.getOreDictName() + Utils.sanitizeStringKeepBrackets(localName), - ItemUtils.getSimpleStack(this)); + ComponentTypes.CELL.getOreDictName() + Utils.sanitizeStringKeepBrackets(localName), + ItemUtils.getSimpleStack(this)); registerComponent(); GT_LanguageManager - .addStringLocalization("gtplusplus.item." + this.unlocalName + ".name", getFormattedLangName()); + .addStringLocalization("gtplusplus.item." + this.unlocalName + ".name", getFormattedLangName()); } private String getFormattedLangName() { - return componentType.getName().replace("@", "%material"); + return componentType.getName() + .replace("@", "%material"); } public boolean registerComponent() { @@ -129,32 +132,33 @@ public class BaseItemComponent extends Item { if (aMap == null) { aMap = new HashMap<>(); } - String aKey = componentType.getGtOrePrefix().name(); + String aKey = componentType.getGtOrePrefix() + .name(); ItemStack x = aMap.get(aKey); if (x == null) { aMap.put(aKey, ItemUtils.getSimpleStack(this)); Logger.MATERIALS( - "Registering a material component. Item: [" + componentMaterial.getUnlocalizedName() - + "] Map: [" - + aKey - + "]"); + "Registering a material component. Item: [" + componentMaterial.getUnlocalizedName() + + "] Map: [" + + aKey + + "]"); Material.mComponentMap.put(componentMaterial.getUnlocalizedName(), aMap); if (componentType == ComponentTypes.PLATE) { GregTech_API.registerCover( - componentMaterial.getPlate(1), - new GT_RenderedTexture( - componentMaterial.getTextureSet().mTextures[71], - componentMaterial.getRGBA(), - false), - null); + componentMaterial.getPlate(1), + new GT_RenderedTexture( + componentMaterial.getTextureSet().mTextures[71], + componentMaterial.getRGBA(), + false), + null); } else if (componentType == ComponentTypes.PLATEDOUBLE) { GregTech_API.registerCover( - componentMaterial.getPlateDouble(1), - new GT_RenderedTexture( - componentMaterial.getTextureSet().mTextures[72], - componentMaterial.getRGBA(), - false), - null); + componentMaterial.getPlateDouble(1), + new GT_RenderedTexture( + componentMaterial.getTextureSet().mTextures[72], + componentMaterial.getRGBA(), + false), + null); } return true; } else { @@ -200,20 +204,23 @@ public class BaseItemComponent extends Item { trans = GT_LanguageManager.getTranslation(aKey); if (!trans.equals(aKey)) return trans; return GT_LanguageManager.addStringLocalization( - "gtplusplus.fluid." + this.materialName.toLowerCase().replace(" ", ""), - this.materialName); + "gtplusplus.fluid." + this.materialName.toLowerCase() + .replace(" ", ""), + this.materialName); } @Override public String getItemStackDisplayName(ItemStack stack) { - return GT_LanguageManager.getTranslation("gtplusplus.item." + unlocalName + ".name").replace("%s", "%temp") - .replace("%material", translatedMaterialName).replace("%temp", "%s"); + return GT_LanguageManager.getTranslation("gtplusplus.item." + unlocalName + ".name") + .replace("%s", "%temp") + .replace("%material", translatedMaterialName) + .replace("%temp", "%s"); } @SuppressWarnings({ "unchecked", "rawtypes" }) @Override public final void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, - final boolean bool) { + final boolean bool) { try { @@ -224,8 +231,8 @@ public class BaseItemComponent extends Item { } if ((this.materialName != null) && (this.materialName != "") - && !this.materialName.equals("") - && (this.componentMaterial != null)) { + && !this.materialName.equals("") + && (this.componentMaterial != null)) { if (this.componentMaterial != null) { if (!this.componentMaterial.vChemicalFormula.contains("?")) { @@ -248,14 +255,15 @@ public class BaseItemComponent extends Item { if (this.componentType == ComponentTypes.INGOT || this.componentType == ComponentTypes.HOTINGOT) { if ((this.materialName != null) && (this.materialName != "") - && !this.materialName.equals("") - && this.unlocalName.toLowerCase().contains("hot")) { + && !this.materialName.equals("") + && this.unlocalName.toLowerCase() + .contains("hot")) { list.add( - EnumChatFormatting.GRAY + "Warning: " - + EnumChatFormatting.RED - + "Very hot! " - + EnumChatFormatting.GRAY - + " Avoid direct handling.."); + EnumChatFormatting.GRAY + "Warning: " + + EnumChatFormatting.RED + + "Very hot! " + + EnumChatFormatting.GRAY + + " Avoid direct handling.."); } } } else { @@ -269,16 +277,18 @@ public class BaseItemComponent extends Item { if (KeyboardUtils.isCtrlKeyDown()) { if (this.componentMaterial != null) { String type = this.componentMaterial.getTextureSet().mSetName; - String output = type.substring(0, 1).toUpperCase() + type.substring(1); + String output = type.substring(0, 1) + .toUpperCase() + type.substring(1); list.add(EnumChatFormatting.GRAY + "Material Type: " + output + "."); list.add( - EnumChatFormatting.GRAY + "Material State: " - + this.componentMaterial.getState().name() - + "."); + EnumChatFormatting.GRAY + "Material State: " + + this.componentMaterial.getState() + .name() + + "."); list.add( - EnumChatFormatting.GRAY + "Radioactivity Level: " - + this.componentMaterial.vRadiationLevel - + "."); + EnumChatFormatting.GRAY + "Radioactivity Level: " + + this.componentMaterial.vRadiationLevel + + "."); } } else { list.add(EnumChatFormatting.DARK_GRAY + "Hold Ctrl to show additional info."); @@ -292,15 +302,15 @@ public class BaseItemComponent extends Item { @SuppressWarnings("unchecked") @Override public void onUpdate(final ItemStack iStack, final World world, final Entity entityHolding, final int p_77663_4_, - final boolean p_77663_5_) { + final boolean p_77663_5_) { if (this.componentMaterial != null) { if (entityHolding instanceof EntityPlayer) { if (!((EntityPlayer) entityHolding).capabilities.isCreativeMode) { EntityUtils.applyRadiationDamageToEntity( - iStack.stackSize, - this.componentMaterial.vRadiationLevel, - world, - entityHolding); + iStack.stackSize, + this.componentMaterial.vRadiationLevel, + world, + entityHolding); } } } @@ -349,11 +359,11 @@ public class BaseItemComponent extends Item { // 4 sec cycle, 200 control point. 20ms interval. int currentFrame = (int) ((System.nanoTime() % 4_000_000_000L) / 20_000_000L); int value = currentFrame < 50 ? currentFrame + 1 - : currentFrame < 100 ? 50 : currentFrame < 150 ? 149 - currentFrame : 0; + : currentFrame < 100 ? 50 : currentFrame < 150 ? 149 - currentFrame : 0; return Utils.rgbtoHexValue( - Math.min(255, Math.max(componentMaterial.getRGBA()[0] + value, 0)), - Math.min(255, Math.max(componentMaterial.getRGBA()[1] + value, 0)), - Math.min(255, Math.max(componentMaterial.getRGBA()[2] + value, 0))); + Math.min(255, Math.max(componentMaterial.getRGBA()[0] + value, 0)), + Math.min(255, Math.max(componentMaterial.getRGBA()[1] + value, 0)), + Math.min(255, Math.max(componentMaterial.getRGBA()[2] + value, 0))); } // Rainbow Hue Cycle @@ -423,7 +433,7 @@ public class BaseItemComponent extends Item { private final OrePrefixes a_GT_EQUAL; private ComponentTypes(final String LocalName, final String DisplayName, final String OreDictName, - final OrePrefixes aPrefix) { + final OrePrefixes aPrefix) { this.COMPONENT_NAME = LocalName; this.DISPLAY_NAME = DisplayName; this.OREDICT_NAME = OreDictName; diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseItemDamageable.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemDamageable.java index 8fbc005ce8..9a4109a1de 100644 --- a/src/main/java/gtPlusPlus/core/item/base/BaseItemDamageable.java +++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemDamageable.java @@ -25,8 +25,8 @@ public class BaseItemDamageable extends Item { private final boolean hasEffect; public BaseItemDamageable(final String unlocalizedName, final CreativeTabs creativeTab, final int stackSize, - final int maxDmg, final String description, final EnumRarity regRarity, final EnumChatFormatting colour, - final boolean Effect, final ItemStack OverrideItem) { + final int maxDmg, final String description, final EnumRarity regRarity, final EnumChatFormatting colour, + final boolean Effect, final ItemStack OverrideItem) { this.setUnlocalizedName(unlocalizedName); this.setTextureName(GTPlusPlus.ID + ":" + unlocalizedName); this.setCreativeTab(creativeTab); @@ -52,16 +52,16 @@ public class BaseItemDamageable extends Item { } if (dmg > 3 && dmg <= 25) { list.add( - EnumChatFormatting.GRAY - + "You have discovered that smashing this against valuable stones has some function.."); + EnumChatFormatting.GRAY + + "You have discovered that smashing this against valuable stones has some function.."); } else if (dmg > 0) { int maxDamage = 250; list.add( - EnumChatFormatting.GRAY + "" - + (maxDamage - getItemDamage(stack)) - + "/" - + maxDamage - + " gems remaining."); + EnumChatFormatting.GRAY + "" + + (maxDamage - getItemDamage(stack)) + + "/" + + maxDamage + + " gems remaining."); } } diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseItemTCShard.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemTCShard.java index 40163e29ec..3ecb6960d6 100644 --- a/src/main/java/gtPlusPlus/core/item/base/BaseItemTCShard.java +++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemTCShard.java @@ -36,7 +36,7 @@ public class BaseItemTCShard extends Item { if (Description != null) { for (int i = 0; i < Description.length; i++) { GT_LanguageManager - .addStringLocalization("gtplusplus." + getUnlocalizedName() + ".tooltip." + i, Description[i]); + .addStringLocalization("gtplusplus." + getUnlocalizedName() + ".tooltip." + i, Description[i]); } } this.setMaxStackSize(64); @@ -51,7 +51,7 @@ public class BaseItemTCShard extends Item { public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) { for (int i = 0;; i++) { String tooltip = GT_LanguageManager - .getTranslation("gtplusplus." + this.getUnlocalizedName() + ".tooltip" + "." + i); + .getTranslation("gtplusplus." + this.getUnlocalizedName() + ".tooltip" + "." + i); if (!("gtplusplus." + this.getUnlocalizedName() + ".tooltip" + "." + i).equals(tooltip)) { list.add(tooltip); } else break; @@ -65,5 +65,5 @@ public class BaseItemTCShard extends Item { @Override public void onUpdate(final ItemStack iStack, final World world, final Entity entityHolding, final int p_77663_4_, - final boolean p_77663_5_) {} + final boolean p_77663_5_) {} } diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseItemTickable.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemTickable.java index 77af625213..8417eba3d1 100644 --- a/src/main/java/gtPlusPlus/core/item/base/BaseItemTickable.java +++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemTickable.java @@ -35,22 +35,22 @@ public class BaseItemTickable extends CoreItem { } public BaseItemTickable(boolean containerTick, boolean twoPass, final String unlocalName, final int colour, - final int maxTicks) { + final int maxTicks) { this(containerTick, twoPass, unlocalName, colour, maxTicks, new String[] {}); } public BaseItemTickable(boolean containerTick, boolean twoPass, final String unlocalName, final int colour, - final int maxTicks, final String[] Description) { + final int maxTicks, final String[] Description) { super( - unlocalName, - AddToCreativeTab.tabMisc, - 1, - 999999999, - Description, - EnumRarity.epic, - EnumChatFormatting.DARK_RED, - true, - null); + unlocalName, + AddToCreativeTab.tabMisc, + 1, + 999999999, + Description, + EnumRarity.epic, + EnumChatFormatting.DARK_RED, + true, + null); this.itemColour = colour; this.descriptionString = Description; this.maxTicks = maxTicks; @@ -62,7 +62,7 @@ public class BaseItemTickable extends CoreItem { @Override public void onUpdate(final ItemStack iStack, final World world, final Entity entityHolding, final int p_77663_4_, - final boolean p_77663_5_) { + final boolean p_77663_5_) { if (world == null || iStack == null) { return; } @@ -292,7 +292,7 @@ public class BaseItemTickable extends CoreItem { @SuppressWarnings("unchecked") @Override public void addInformation(ItemStack stack, EntityPlayer player, @SuppressWarnings("rawtypes") List list, - boolean bool) { + boolean bool) { World world = player.getEntityWorld(); if (this.descriptionString.length > 0) { list.add(EnumChatFormatting.GRAY + this.descriptionString[0]); diff --git a/src/main/java/gtPlusPlus/core/item/base/BasicSpawnEgg.java b/src/main/java/gtPlusPlus/core/item/base/BasicSpawnEgg.java index 80284495b9..b564d60424 100644 --- a/src/main/java/gtPlusPlus/core/item/base/BasicSpawnEgg.java +++ b/src/main/java/gtPlusPlus/core/item/base/BasicSpawnEgg.java @@ -43,7 +43,7 @@ public class BasicSpawnEgg extends ItemMonsterPlacer { } public BasicSpawnEgg(final String MODID, final String parEntityToSpawnName, final int parPrimaryColor, - final int parSecondaryColor) { + final int parSecondaryColor) { this.setHasSubtypes(false); this.maxStackSize = 64; this.setCreativeTab(AddToCreativeTab.tabOther); @@ -63,7 +63,7 @@ public class BasicSpawnEgg extends ItemMonsterPlacer { */ @Override public boolean onItemUse(final ItemStack par1ItemStack, final EntityPlayer par2EntityPlayer, final World par3World, - int par4, int par5, int par6, final int par7, final float par8, final float par9, final float par10) { + int par4, int par5, int par6, final int par7, final float par8, final float par9, final float par10) { if (par3World.isRemote) { return true; } @@ -99,12 +99,12 @@ public class BasicSpawnEgg extends ItemMonsterPlacer { */ @Override public ItemStack onItemRightClick(final ItemStack par1ItemStack, final World par2World, - final EntityPlayer par3EntityPlayer) { + final EntityPlayer par3EntityPlayer) { if (par2World.isRemote) { return par1ItemStack; } final MovingObjectPosition movingobjectposition = this - .getMovingObjectPositionFromPlayer(par2World, par3EntityPlayer, true); + .getMovingObjectPositionFromPlayer(par2World, par3EntityPlayer, true); if (movingobjectposition == null) { return par1ItemStack; @@ -155,11 +155,11 @@ public class BasicSpawnEgg extends ItemMonsterPlacer { this.entityToSpawn = (EntityLiving) EntityList.createEntityByName(this.entityToSpawnNameFull, parWorld); this.entityToSpawn.setLocationAndAngles( - parX, - parY, - parZ, - MathHelper.wrapAngleTo180_float(parWorld.rand.nextFloat() * 360.0F), - 0.0F); + parX, + parY, + parZ, + MathHelper.wrapAngleTo180_float(parWorld.rand.nextFloat() * 360.0F), + 0.0F); parWorld.spawnEntityInWorld(this.entityToSpawn); this.entityToSpawn.onSpawnWithEgg((IEntityLivingData) null); diff --git a/src/main/java/gtPlusPlus/core/item/base/CoreItem.java b/src/main/java/gtPlusPlus/core/item/base/CoreItem.java index f328479b70..4745fda281 100644 --- a/src/main/java/gtPlusPlus/core/item/base/CoreItem.java +++ b/src/main/java/gtPlusPlus/core/item/base/CoreItem.java @@ -53,16 +53,16 @@ public class CoreItem extends Item { */ public CoreItem(final String unlocalizedName, final CreativeTabs creativeTab, final ItemStack OverrideItem) { this( - unlocalizedName, - creativeTab, - 64, - 0, - new String[] { - "This item will be replaced by another when held by a player, it is old and should not be used in recipes." }, - EnumRarity.uncommon, - EnumChatFormatting.UNDERLINE, - false, - OverrideItem); // Calls 5 + unlocalizedName, + creativeTab, + 64, + 0, + new String[] { + "This item will be replaced by another when held by a player, it is old and should not be used in recipes." }, + EnumRarity.uncommon, + EnumChatFormatting.UNDERLINE, + false, + OverrideItem); // Calls 5 } // 0.1 @@ -70,18 +70,18 @@ public class CoreItem extends Item { * Name, Tab - 64 Stack, 0 Dmg */ public CoreItem(final String unlocalizedName, final String displayName, final CreativeTabs creativeTab, - final ItemStack OverrideItem) { + final ItemStack OverrideItem) { this( - unlocalizedName, - creativeTab, - 64, - 0, - new String[] { - "This item will be replaced by another when held by a player, it is old and should not be used in recipes." }, - EnumRarity.uncommon, - EnumChatFormatting.UNDERLINE, - false, - OverrideItem); // Calls 5 + unlocalizedName, + creativeTab, + 64, + 0, + new String[] { + "This item will be replaced by another when held by a player, it is old and should not be used in recipes." }, + EnumRarity.uncommon, + EnumChatFormatting.UNDERLINE, + false, + OverrideItem); // Calls 5 this.itemName = displayName; } @@ -98,7 +98,7 @@ public class CoreItem extends Item { * Name, Tab, Stack, Description - 0 Dmg */ public CoreItem(final String unlocalizedName, final CreativeTabs creativeTab, final int stackSize, - final String[] description) { + final String[] description) { this(unlocalizedName, creativeTab, stackSize, 0, description); // Calls 4 } @@ -111,7 +111,7 @@ public class CoreItem extends Item { } public CoreItem(final String unlocalizedName, final CreativeTabs creativeTab, final int stackSize, - final int maxDmg) { + final int maxDmg) { this(unlocalizedName, creativeTab, stackSize, maxDmg, new String[] {}); // Calls 4 } @@ -124,17 +124,17 @@ public class CoreItem extends Item { } public CoreItem(final String unlocalizedName, final CreativeTabs creativeTab, final int stackSize, final int maxDmg, - final String[] description) { + final String[] description) { this( - unlocalizedName, - creativeTab, - stackSize, - maxDmg, - description, - EnumRarity.common, - EnumChatFormatting.GRAY, - false, - null); // Calls 4.5 + unlocalizedName, + creativeTab, + stackSize, + maxDmg, + description, + EnumRarity.common, + EnumChatFormatting.GRAY, + false, + null); // Calls 4.5 } // 4.5 @@ -142,7 +142,7 @@ public class CoreItem extends Item { * Name, Tab, Stack, Dmg, Description, Text Colour - Common */ public CoreItem(final String unlocalizedName, final CreativeTabs creativeTab, final int stackSize, final int maxDmg, - final String[] description, final EnumChatFormatting colour) { + final String[] description, final EnumChatFormatting colour) { this(unlocalizedName, creativeTab, stackSize, maxDmg, description, EnumRarity.common, colour, false, null); // Calls // 5 } @@ -152,22 +152,22 @@ public class CoreItem extends Item { * Name, Tab, Stack, Dmg, Description, Rarity - Gray text */ public CoreItem(String unlocalizedName, CreativeTabs creativeTab, int stackSize, int maxDmg, String string, - EnumRarity uncommon) { + EnumRarity uncommon) { this(unlocalizedName, creativeTab, stackSize, maxDmg, new String[] { string }, uncommon); } public CoreItem(final String unlocalizedName, final CreativeTabs creativeTab, final int stackSize, final int maxDmg, - final String[] description, final EnumRarity rarity) { + final String[] description, final EnumRarity rarity) { this( - unlocalizedName, - creativeTab, - stackSize, - maxDmg, - description, - rarity, - EnumChatFormatting.GRAY, - false, - null); // Calls 5 + unlocalizedName, + creativeTab, + stackSize, + maxDmg, + description, + rarity, + EnumChatFormatting.GRAY, + false, + null); // Calls 5 } // 5 @@ -175,8 +175,8 @@ public class CoreItem extends Item { * Name, Tab, Stack, Dmg, Description, Rarity, Text Colour, Effect */ public CoreItem(final String unlocalizedName, final CreativeTabs creativeTab, final int stackSize, final int maxDmg, - final String[] description, final EnumRarity regRarity, final EnumChatFormatting colour, - final boolean Effect, final ItemStack OverrideItem) { + final String[] description, final EnumRarity regRarity, final EnumChatFormatting colour, final boolean Effect, + final ItemStack OverrideItem) { this.setUnlocalizedName(unlocalizedName); this.setTextureName(GTPlusPlus.ID + ":" + unlocalizedName); this.setCreativeTab(creativeTab); @@ -195,8 +195,8 @@ public class CoreItem extends Item { * Name, Tab, Stack, Dmg, Description, Rarity, Text Colour, Effect */ public CoreItem(final String unlocalizedName, final String displayName, final CreativeTabs creativeTab, - final int stackSize, final int maxDmg, final String[] description, final EnumRarity regRarity, - final EnumChatFormatting colour, final boolean Effect, final ItemStack OverrideItem) { + final int stackSize, final int maxDmg, final String[] description, final EnumRarity regRarity, + final EnumChatFormatting colour, final boolean Effect, final ItemStack OverrideItem) { this.setUnlocalizedName(unlocalizedName); this.itemName = displayName; this.setTextureName(GTPlusPlus.ID + ":" + unlocalizedName); @@ -216,7 +216,7 @@ public class CoreItem extends Item { public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) { for (int i = 0;; i++) { String tooltip = GT_LanguageManager - .getTranslation("gtplusplus." + this.getUnlocalizedName() + ".tooltip" + "." + i); + .getTranslation("gtplusplus." + this.getUnlocalizedName() + ".tooltip" + "." + i); if (!("gtplusplus." + this.getUnlocalizedName() + ".tooltip" + "." + i).equals(tooltip)) { list.add(tooltip); } else break; @@ -236,7 +236,7 @@ public class CoreItem extends Item { @Override public void onU