diff options
| author | boubou19 <miisterunknown@gmail.com> | 2023-04-01 18:11:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-01 18:11:43 +0200 |
| commit | 5f50e4a36ec000657b0a1664784acf00275293c6 (patch) | |
| tree | 5ef81441032735438c9fd9c620224ca58e46e537 /src/main/java/gregtech/common/items | |
| parent | 6b77557e0e87cf5afd9ebd3985323ff1249e615c (diff) | |
| download | GT5-Unofficial-5f50e4a36ec000657b0a1664784acf00275293c6.tar.gz GT5-Unofficial-5f50e4a36ec000657b0a1664784acf00275293c6.tar.bz2 GT5-Unofficial-5f50e4a36ec000657b0a1664784acf00275293c6.zip | |
update spotless formatting (#1827)
Diffstat (limited to 'src/main/java/gregtech/common/items')
29 files changed, 487 insertions, 302 deletions
diff --git a/src/main/java/gregtech/common/items/CombType.java b/src/main/java/gregtech/common/items/CombType.java index 479f6fe82f..c646652e44 100644 --- a/src/main/java/gregtech/common/items/CombType.java +++ b/src/main/java/gregtech/common/items/CombType.java @@ -236,7 +236,10 @@ public enum CombType { this.color = new int[] { color1, color2 }; this.localizedName = GT_LanguageManager.addStringLocalization( "comb." + this.name, - this.name.substring(0, 1).toUpperCase() + this.name.substring(1) + " Comb"); + this.name.substring(0, 1) + .toUpperCase() + + this.name.substring(1) + + " Comb"); } public void setHidden() { @@ -265,7 +268,10 @@ public enum CombType { private static final CombType[] VALUES; static { - int biggestId = Arrays.stream(CombType.values()).mapToInt(CombType::getId).max().getAsInt(); + int biggestId = Arrays.stream(CombType.values()) + .mapToInt(CombType::getId) + .max() + .getAsInt(); VALUES = new CombType[biggestId + 1]; Arrays.fill(VALUES, _NULL); for (CombType type : CombType.values()) { diff --git a/src/main/java/gregtech/common/items/DropType.java b/src/main/java/gregtech/common/items/DropType.java index 3195e9ecbd..3573978e21 100644 --- a/src/main/java/gregtech/common/items/DropType.java +++ b/src/main/java/gregtech/common/items/DropType.java @@ -36,7 +36,10 @@ public enum DropType { return GT_LanguageManager.addStringLocalization( "drop." + this.name, - this.name.substring(0, 1).toUpperCase() + this.name.substring(1) + " Drop"); + this.name.substring(0, 1) + .toUpperCase() + + this.name.substring(1) + + " Drop"); } public int[] getColours() { diff --git a/src/main/java/gregtech/common/items/GT_FluidDisplayItem.java b/src/main/java/gregtech/common/items/GT_FluidDisplayItem.java index 624e326268..95a6474c17 100644 --- a/src/main/java/gregtech/common/items/GT_FluidDisplayItem.java +++ b/src/main/java/gregtech/common/items/GT_FluidDisplayItem.java @@ -68,8 +68,10 @@ public class GT_FluidDisplayItem extends GT_Generic_Item { + " K" + EnumChatFormatting.GRAY); aList.add( - EnumChatFormatting.GREEN + String - .format(transItem("018", "State: %s"), aNBT.getBoolean("mFluidState") ? "Gas" : "Liquid") + EnumChatFormatting.GREEN + + String.format( + transItem("018", "State: %s"), + aNBT.getBoolean("mFluidState") ? "Gas" : "Liquid") + EnumChatFormatting.GRAY); } } @@ -80,8 +82,12 @@ public class GT_FluidDisplayItem extends GT_Generic_Item { @Override public IIcon getIconFromDamage(int aMetaData) { - return Stream.of(FluidRegistry.getFluid(aMetaData), FluidRegistry.WATER).filter(Objects::nonNull) - .map(Fluid::getStillIcon).filter(Objects::nonNull).findFirst().orElseThrow(IllegalStateException::new); + return Stream.of(FluidRegistry.getFluid(aMetaData), FluidRegistry.WATER) + .filter(Objects::nonNull) + .map(Fluid::getStillIcon) + .filter(Objects::nonNull) + .findFirst() + .orElseThrow(IllegalStateException::new); } @Override @@ -168,8 +174,10 @@ public class GT_FluidDisplayItem extends GT_Generic_Item { for (int tOreDict : OreDictionary.getOreIDs(tItemStack)) { String tOreDictName = OreDictionary.getOreName(tOreDict); if (tOreDictName.startsWith("cell")) { - return Materials - .getRealMaterial(tOreDictName.replace("cell", "").replace("Molten", "").replace("Plasma", "")); + return Materials.getRealMaterial( + tOreDictName.replace("cell", "") + .replace("Molten", "") + .replace("Plasma", "")); } } return Materials._NULL; diff --git a/src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java b/src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java index 3fa06018f0..65cd24c116 100644 --- a/src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java +++ b/src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java @@ -195,15 +195,21 @@ public class GT_IntegratedCircuit_Item extends GT_Generic_Item implements INetwo super.addAdditionalToolTips(aList, aStack, aPlayer); aList.add( GT_LanguageManager.addStringLocalization( - new StringBuilder().append(getUnlocalizedName()).append(".configuration").toString(), + new StringBuilder().append(getUnlocalizedName()) + .append(".configuration") + .toString(), "Configuration: ") + getConfigurationString(getDamage(aStack))); aList.add( GT_LanguageManager.addStringLocalization( - new StringBuilder().append(getUnlocalizedName()).append(".tooltip.0").toString(), + new StringBuilder().append(getUnlocalizedName()) + .append(".tooltip.0") + .toString(), "Right click to reconfigure")); aList.add( GT_LanguageManager.addStringLocalization( - new StringBuilder().append(getUnlocalizedName()).append(".tooltip.1").toString(), + new StringBuilder().append(getUnlocalizedName()) + .append(".tooltip.1") + .toString(), "Needs a screwdriver or circuit programming tool")); } @@ -223,8 +229,8 @@ public class GT_IntegratedCircuit_Item extends GT_Generic_Item implements INetwo public void registerIcons(IIconRegister aIconRegister) { super.registerIcons(aIconRegister); for (int i = 0; i < mIconDamage.length; i++) { - mIconDamage[i] = aIconRegister - .registerIcon(RES_PATH_ITEM + (GT_Config.troll ? "troll" : getUnlocalizedName() + "/" + i)); + mIconDamage[i] = aIconRegister.registerIcon( + RES_PATH_ITEM + (GT_Config.troll ? "troll" : getUnlocalizedName() + "/" + i)); } if (GregTech_API.sPostloadFinished) { GT_Log.out.println("GT_Mod: Starting Item Icon Load Phase"); @@ -258,7 +264,8 @@ public class GT_IntegratedCircuit_Item extends GT_Generic_Item implements INetwo if (toolIndex == null) return true; ItemStack[] mainInventory = player.inventory.mainInventory; - mainInventory[toolIndex.getKey()] = toolIndex.getValue().apply(mainInventory[toolIndex.getKey()], player); + mainInventory[toolIndex.getKey()] = toolIndex.getValue() + .apply(mainInventory[toolIndex.getKey()], player); } stack.setItemDamage(meta); @@ -324,9 +331,10 @@ public class GT_IntegratedCircuit_Item extends GT_Generic_Item implements INetwo if (!GT_Utility.isStackValid(toolStack)) continue; - for (Map.Entry<Predicate<ItemStack>, BiFunction<ItemStack, EntityPlayerMP, ItemStack>> p : GregTech_API.sCircuitProgrammerList - .entrySet()) - if (p.getKey().test(toolStack)) return Pair.of(j, p.getValue()); + for (Map.Entry<Predicate<ItemStack>, BiFunction<ItemStack, EntityPlayerMP, ItemStack>> p : GregTech_API.sCircuitProgrammerList.entrySet()) + if (p.getKey() + .test(toolStack)) + return Pair.of(j, p.getValue()); } return null; } diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java index 9950b2581f..7165702f98 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java @@ -50,8 +50,9 @@ import gregtech.common.items.behaviors.*; public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { public static GT_MetaGenerated_Item_01 INSTANCE; - private final String mToolTipPurify = GT_LanguageManager - .addStringLocalization("metaitem.01.tooltip.purify", "Throw into Cauldron to get clean Dust"); + private final String mToolTipPurify = GT_LanguageManager.addStringLocalization( + "metaitem.01.tooltip.purify", + "Throw into Cauldron to get clean Dust"); private static final String aTextArrow = " A"; private static final String aTextStick = " S "; private static final String aTextFeather = "F "; @@ -679,8 +680,8 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { ItemList.Shape_Mold_Plate.set(addItem(tLastID = 301, "Mold (Plate)", "Mold for making Plates")); ItemList.Shape_Mold_Casing.set(addItem(tLastID = 302, "Mold (Casing)", "Mold for making Item Casings")); ItemList.Shape_Mold_Gear.set(addItem(tLastID = 303, "Mold (Gear)", "Mold for making Gears")); - ItemList.Shape_Mold_Credit - .set(addItem(tLastID = 304, "Mold (Coinage)", "Secure Mold for making Coins (Don't lose it!)")); + ItemList.Shape_Mold_Credit.set( + addItem(tLastID = 304, "Mold (Coinage)", "Secure Mold for making Coins (Don't lose it!)")); ItemList.Shape_Mold_Bottle.set(addItem(tLastID = 305, "Mold (Bottle)", "Mold for making Bottles")); ItemList.Shape_Mold_Ingot.set(addItem(tLastID = 306, "Mold (Ingot)", "Mold for making Ingots")); ItemList.Shape_Mold_Ball.set(addItem(tLastID = 307, "Mold (Ball)", "Mold for making Balls")); @@ -691,8 +692,8 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { ItemList.Shape_Mold_Baguette.set(addItem(tLastID = 312, "Mold (Baguette)", "Mold for shaping Baguettes")); ItemList.Shape_Mold_Cylinder.set(addItem(tLastID = 313, "Mold (Cylinder)", "Mold for shaping Cylinders")); ItemList.Shape_Mold_Anvil.set(addItem(tLastID = 314, "Mold (Anvil)", "Mold for shaping Anvils")); - ItemList.Shape_Mold_Name - .set(addItem(tLastID = 315, "Mold (Name)", "Mold for naming Items (rename Mold with Anvil)")); + ItemList.Shape_Mold_Name.set( + addItem(tLastID = 315, "Mold (Name)", "Mold for naming Items (rename Mold with Anvil)")); ItemList.Shape_Mold_Arrow.set(addItem(tLastID = 316, "Mold (Arrow Head)", "Mold for making Arrow Heads")); ItemList.Shape_Mold_Gear_Small.set(addItem(tLastID = 317, "Mold (Small Gear)", "Mold for making small Gears")); ItemList.Shape_Mold_Rod.set(addItem(tLastID = 318, "Mold (Rod)", "Mold for making Rods")); @@ -702,16 +703,16 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { ItemList.Shape_Mold_Ring.set(addItem(tLastID = 322, "Mold (Ring)", "Mold for making Rings")); ItemList.Shape_Mold_Rod_Long.set(addItem(tLastID = 323, "Mold (Long Rod)", "Mold for making Long Rods")); ItemList.Shape_Mold_Rotor.set(addItem(tLastID = 324, "Mold (Rotor)", "Mold for making a Rotor")); - ItemList.Shape_Mold_Turbine_Blade - .set(addItem(tLastID = 325, "Mold (Turbine Blade)", "Mold for making a Turbine Blade")); + ItemList.Shape_Mold_Turbine_Blade.set( + addItem(tLastID = 325, "Mold (Turbine Blade)", "Mold for making a Turbine Blade")); ItemList.Shape_Mold_Pipe_Tiny.set(addItem(tLastID = 326, "Mold (Tiny Pipe)", "Mold for making tiny Pipes")); ItemList.Shape_Mold_Pipe_Small.set(addItem(tLastID = 327, "Mold (Small Pipe)", "Mold for making small Pipes")); ItemList.Shape_Mold_Pipe_Medium.set(addItem(tLastID = 328, "Mold (Normal Pipe)", "Mold for making Pipes")); ItemList.Shape_Mold_Pipe_Large.set(addItem(tLastID = 329, "Mold (Large Pipe)", "Mold for making large Pipes")); - ItemList.Shape_Mold_Pipe_Huge - .set(addItem(tLastID = 330, "Mold (Huge Pipe)", "Mold for making full Block Pipes")); - ItemList.Shape_Mold_ToolHeadDrill - .set(addItem(tLastID = 331, "Mold (Drill Head)", "Mold for making Drill Heads")); + ItemList.Shape_Mold_Pipe_Huge.set( + addItem(tLastID = 330, "Mold (Huge Pipe)", "Mold for making full Block Pipes")); + ItemList.Shape_Mold_ToolHeadDrill.set( + addItem(tLastID = 331, "Mold (Drill Head)", "Mold for making Drill Heads")); GT_ModHandler.removeRecipe( new ItemStack(Blocks.glass), null, @@ -719,69 +720,69 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { null, new ItemStack(Blocks.glass)); - ItemList.Shape_Extruder_Plate - .set(addItem(tLastID = 350, "Extruder Shape (Plate)", "Extruder Shape for making Plates")); - ItemList.Shape_Extruder_Rod - .set(addItem(tLastID = 351, "Extruder Shape (Rod)", "Extruder Shape for making Rods")); - ItemList.Shape_Extruder_Bolt - .set(addItem(tLastID = 352, "Extruder Shape (Bolt)", "Extruder Shape for making Bolts")); - ItemList.Shape_Extruder_Ring - .set(addItem(tLastID = 353, "Extruder Shape (Ring)", "Extruder Shape for making Rings")); - ItemList.Shape_Extruder_Cell - .set(addItem(tLastID = 354, "Extruder Shape (Cell)", "Extruder Shape for making Cells")); + ItemList.Shape_Extruder_Plate.set( + addItem(tLastID = 350, "Extruder Shape (Plate)", "Extruder Shape for making Plates")); + ItemList.Shape_Extruder_Rod.set( + addItem(tLastID = 351, "Extruder Shape (Rod)", "Extruder Shape for making Rods")); + ItemList.Shape_Extruder_Bolt.set( + addItem(tLastID = 352, "Extruder Shape (Bolt)", "Extruder Shape for making Bolts")); + ItemList.Shape_Extruder_Ring.set( + addItem(tLastID = 353, "Extruder Shape (Ring)", "Extruder Shape for making Rings")); + ItemList.Shape_Extruder_Cell.set( + addItem(tLastID = 354, "Extruder Shape (Cell)", "Extruder Shape for making Cells")); ItemList.Shape_Extruder_Ingot.set( addItem( tLastID = 355, "Extruder Shape (Ingot)", "Extruder Shape for, wait, can't we just use a Furnace?")); - ItemList.Shape_Extruder_Wire - .set(addItem(tLastID = 356, "Extruder Shape (Wire)", "Extruder Shape for making Wires")); - ItemList.Shape_Extruder_Casing - .set(addItem(tLastID = 357, "Extruder Shape (Casing)", "Extruder Shape for making Item Casings")); - ItemList.Shape_Extruder_Pipe_Tiny - .set(addItem(tLastID = 358, "Extruder Shape (Tiny Pipe)", "Extruder Shape for making tiny Pipes")); - ItemList.Shape_Extruder_Pipe_Small - .set(addItem(tLastID = 359, "Extruder Shape (Small Pipe)", "Extruder Shape for making small Pipes")); - ItemList.Shape_Extruder_Pipe_Medium - .set(addItem(tLastID = 360, "Extruder Shape (Normal Pipe)", "Extruder Shape for making Pipes")); - ItemList.Shape_Extruder_Pipe_Large - .set(addItem(tLastID = 361, "Extruder Shape (Large Pipe)", "Extruder Shape for making large Pipes")); + ItemList.Shape_Extruder_Wire.set( + addItem(tLastID = 356, "Extruder Shape (Wire)", "Extruder Shape for making Wires")); + ItemList.Shape_Extruder_Casing.set( + addItem(tLastID = 357, "Extruder Shape (Casing)", "Extruder Shape for making Item Casings")); + ItemList.Shape_Extruder_Pipe_Tiny.set( + addItem(tLastID = 358, "Extruder Shape (Tiny Pipe)", "Extruder Shape for making tiny Pipes")); + ItemList.Shape_Extruder_Pipe_Small.set( + addItem(tLastID = 359, "Extruder Shape (Small Pipe)", "Extruder Shape for making small Pipes")); + ItemList.Shape_Extruder_Pipe_Medium.set( + addItem(tLastID = 360, "Extruder Shape (Normal Pipe)", "Extruder Shape for making Pipes")); + ItemList.Shape_Extruder_Pipe_Large.set( + addItem(tLastID = 361, "Extruder Shape (Large Pipe)", "Extruder Shape for making large Pipes")); ItemList.Shape_Extruder_Pipe_Huge.set( addItem(tLastID = 362, "Extruder Shape (Huge Pipe)", "Extruder Shape for making full Block Pipes")); - ItemList.Shape_Extruder_Block - .set(addItem(tLastID = 363, "Extruder Shape (Block)", "Extruder Shape for making Blocks")); - ItemList.Shape_Extruder_Sword - .set(addItem(tLastID = 364, "Extruder Shape (Sword Blade)", "Extruder Shape for making Swords")); - ItemList.Shape_Extruder_Pickaxe - .set(addItem(tLastID = 365, "Extruder Shape (Pickaxe Head)", "Extruder Shape for making Pickaxes")); - ItemList.Shape_Extruder_Shovel - .set(addItem(tLastID = 366, "Extruder Shape (Shovel Head)", "Extruder Shape for making Shovels")); - ItemList.Shape_Extruder_Axe - .set(addItem(tLastID = 367, "Extruder Shape (Axe Head)", "Extruder Shape for making Axes")); - ItemList.Shape_Extruder_Hoe - .set(addItem(tLastID = 368, "Extruder Shape (Hoe Head)", "Extruder Shape for making Hoes")); - ItemList.Shape_Extruder_Hammer - .set(addItem(tLastID = 369, "Extruder Shape (Hammer Head)", "Extruder Shape for making Hammers")); - ItemList.Shape_Extruder_File - .set(addItem(tLastID = 370, "Extruder Shape (File Head)", "Extruder Shape for making Files")); - ItemList.Shape_Extruder_Saw - .set(addItem(tLastID = 371, "Extruder Shape (Saw Blade)", "Extruder Shape for making Saws")); - ItemList.Shape_Extruder_Gear - .set(addItem(tLastID = 372, "Extruder Shape (Gear)", "Extruder Shape for making Gears")); - ItemList.Shape_Extruder_Bottle - .set(addItem(tLastID = 373, "Extruder Shape (Bottle)", "Extruder Shape for making Bottles")); - ItemList.Shape_Extruder_Rotor - .set(addItem(tLastID = 374, "Extruder Shape (Rotor)", "Extruder Shape for a Rotor")); - ItemList.Shape_Extruder_Small_Gear - .set(addItem(tLastID = 375, "Extruder Shape (Small Gear)", "Extruder Shape for a Small Gear")); - ItemList.Shape_Extruder_Turbine_Blade - .set(addItem(tLastID = 376, "Extruder Shape (Turbine Blade)", "Extruder Shape for a Turbine Blade")); - ItemList.Shape_Extruder_ToolHeadDrill - .set(addItem(tLastID = 377, "Extruder Shape (Drill Head)", "Extruder Shape for a Drill Head")); + ItemList.Shape_Extruder_Block.set( + addItem(tLastID = 363, "Extruder Shape (Block)", "Extruder Shape for making Blocks")); + ItemList.Shape_Extruder_Sword.set( + addItem(tLastID = 364, "Extruder Shape (Sword Blade)", "Extruder Shape for making Swords")); + ItemList.Shape_Extruder_Pickaxe.set( + addItem(tLastID = 365, "Extruder Shape (Pickaxe Head)", "Extruder Shape for making Pickaxes")); + ItemList.Shape_Extruder_Shovel.set( + addItem(tLastID = 366, "Extruder Shape (Shovel Head)", "Extruder Shape for making Shovels")); + ItemList.Shape_Extruder_Axe.set( + addItem(tLastID = 367, "Extruder Shape (Axe Head)", "Extruder Shape for making Axes")); + ItemList.Shape_Extruder_Hoe.set( + addItem(tLastID = 368, "Extruder Shape (Hoe Head)", "Extruder Shape for making Hoes")); + ItemList.Shape_Extruder_Hammer.set( + addItem(tLastID = 369, "Extruder Shape (Hammer Head)", "Extruder Shape for making Hammers")); + ItemList.Shape_Extruder_File.set( + addItem(tLastID = 370, "Extruder Shape (File Head)", "Extruder Shape for making Files")); + ItemList.Shape_Extruder_Saw.set( + addItem(tLastID = 371, "Extruder Shape (Saw Blade)", "Extruder Shape for making Saws")); + ItemList.Shape_Extruder_Gear.set( + addItem(tLastID = 372, "Extruder Shape (Gear)", "Extruder Shape for making Gears")); + ItemList.Shape_Extruder_Bottle.set( + addItem(tLastID = 373, "Extruder Shape (Bottle)", "Extruder Shape for making Bottles")); + ItemList.Shape_Extruder_Rotor.set( + addItem(tLastID = 374, "Extruder Shape (Rotor)", "Extruder Shape for a Rotor")); + ItemList.Shape_Extruder_Small_Gear.set( + addItem(tLastID = 375, "Extruder Shape (Small Gear)", "Extruder Shape for a Small Gear")); + ItemList.Shape_Extruder_Turbine_Blade.set( + addItem(tLastID = 376, "Extruder Shape (Turbine Blade)", "Extruder Shape for a Turbine Blade")); + ItemList.Shape_Extruder_ToolHeadDrill.set( + addItem(tLastID = 377, "Extruder Shape (Drill Head)", "Extruder Shape for a Drill Head")); ItemList.Shape_Slicer_Flat.set(addItem(tLastID = 398, "Slicer Blade (Flat)", "Slicer Blade for cutting Flat")); - ItemList.Shape_Slicer_Stripes - .set(addItem(tLastID = 399, "Slicer Blade (Stripes)", "Slicer Blade for cutting Stripes")); + ItemList.Shape_Slicer_Stripes.set( + addItem(tLastID = 399, "Slicer Blade (Stripes)", "Slicer Blade for cutting Stripes")); GT_ModHandler.addCraftingRecipe( ItemList.Shape_Slicer_Flat.get(1L), @@ -1178,8 +1179,12 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { ItemList.Tool_MatchBox_Full.get(1L), 64, 16); - GT_Values.RA - .addUnboxingRecipe(ItemList.Tool_MatchBox_Full.get(1L), ItemList.Tool_Matches.get(16L), null, 32, 16); + GT_Values.RA.addUnboxingRecipe( + ItemList.Tool_MatchBox_Full.get(1L), + ItemList.Tool_Matches.get(16L), + null, + 32, + 16); ItemList.Tool_Lighter_Invar_Empty.set( addItem( @@ -1269,12 +1274,12 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { 256); if (GalacticraftMars.isModLoaded()) { - ItemList.Ingot_Heavy1 - .set(addItem(tLastID = 462, "Heavy Duty Alloy Ingot T1", "Used to make Heavy Duty Plates T1")); - ItemList.Ingot_Heavy2 - .set(addItem(tLastID = 463, "Heavy Duty Alloy Ingot T2", "Used to make Heavy Duty Plates T2")); - ItemList.Ingot_Heavy3 - .set(addItem(tLastID = 464, "Heavy Duty Alloy Ingot T3", "Used to make Heavy Duty Plates T3")); + ItemList.Ingot_Heavy1.set( + addItem(tLastID = 462, "Heavy Duty Alloy Ingot T1", "Used to make Heavy Duty Plates T1")); + ItemList.Ingot_Heavy2.set( + addItem(tLastID = 463, "Heavy Duty Alloy Ingot T2", "Used to make Heavy Duty Plates T2")); + ItemList.Ingot_Heavy3.set( + addItem(tLastID = 464, "Heavy Duty Alloy Ingot T3", "Used to make Heavy Duty Plates T3")); // GT_ModHandler.addCraftingRecipe(ItemList.Ingot_Heavy1.get(1L, new Object[0]), // GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{"BhB", "CAS", "B B", 'B', @@ -1705,14 +1710,17 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { setElectricStats(32000 + tLastID, 800000L, GT_Values.V[3], 3L, -3L, true); registerTieredTooltip(ItemList.Battery_RE_HV_Sodium.get(1), HV); - GT_ModHandler - .addExtractionRecipe(ItemList.Battery_SU_LV_SulfuricAcid.get(1L), ItemList.Battery_Hull_LV.get(1L)); + GT_ModHandler.addExtractionRecipe( + ItemList.Battery_SU_LV_SulfuricAcid.get(1L), + ItemList.Battery_Hull_LV.get(1L)); GT_ModHandler.addExtractionRecipe(ItemList.Battery_SU_LV_Mercury.get(1L), ItemList.Battery_Hull_LV.get(1L)); - GT_ModHandler - .addExtractionRecipe(ItemList.Battery_SU_MV_SulfuricAcid.get(1L), ItemList.Battery_Hull_MV.get(1L)); + GT_ModHandler.addExtractionRecipe( + ItemList.Battery_SU_MV_SulfuricAcid.get(1L), + ItemList.Battery_Hull_MV.get(1L)); GT_ModHandler.addExtractionRecipe(ItemList.Battery_SU_MV_Mercury.get(1L), ItemList.Battery_Hull_MV.get(1L)); - GT_ModHandler - .addExtractionRecipe(ItemList.Battery_SU_HV_SulfuricAcid.get(1L), ItemList.Battery_Hull_HV.get(1L)); + GT_ModHandler.addExtractionRecipe( + ItemList.Battery_SU_HV_SulfuricAcid.get(1L), + ItemList.Battery_Hull_HV.get(1L)); GT_ModHandler.addExtractionRecipe(ItemList.Battery_SU_HV_Mercury.get(1L), ItemList.Battery_Hull_HV.get(1L)); GT_ModHandler.addExtractionRecipe(ItemList.Battery_RE_LV_Cadmium.get(1L), ItemList.Battery_Hull_LV.get(1L)); GT_ModHandler.addExtractionRecipe(ItemList.Battery_RE_LV_Lithium.get(1L), ItemList.Battery_Hull_LV.get(1L)); @@ -2565,8 +2573,8 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { TextureFactory.of(MACHINE_CASINGS[5][0], TextureFactory.of(OVERLAY_VALVE)), new GT_Cover_SteamValve(16384, TextureFactory.of(OVERLAY_VALVE))); - ItemList.FluidRegulator_LV - .set(addItem(tLastID = 660, "Fluid Regulator (LV)", FRText1 + GT_Utility.formatNumbers(640) + FRText2)); + ItemList.FluidRegulator_LV.set( + addItem(tLastID = 660, "Fluid Regulator (LV)", FRText1 + GT_Utility.formatNumbers(640) + FRText2)); ItemList.FluidRegulator_MV.set( addItem(tLastID = 661, "Fluid Regulator (MV)", FRText1 + GT_Utility.formatNumbers(2560) + FRText2)); ItemList.FluidRegulator_HV.set( @@ -2615,8 +2623,8 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { TextureFactory.of(MACHINE_CASINGS[8][0], TextureFactory.of(OVERLAY_PUMP)), new GT_Cover_FluidRegulator(524288, TextureFactory.of(OVERLAY_PUMP))); - ItemList.FluidFilter - .set(addItem(669, "Fluid Filter Cover", "Set with Fluid Container to only accept one Fluid Type")); + ItemList.FluidFilter.set( + addItem(669, "Fluid Filter Cover", "Set with Fluid Container to only accept one Fluid Type")); GregTech_API.registerCover( ItemList.FluidFilter.get(1L), TextureFactory.of(MACHINE_CASINGS[1][0], TextureFactory.of(OVERLAY_SHUTTER)), @@ -2639,8 +2647,8 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { ItemList.ItemFilter_Import.get(1L), TextureFactory.of(MACHINE_CASINGS[5][0], TextureFactory.of(OVERLAY_CONVEYOR)), new GT_Cover_ItemFilter(false, TextureFactory.of(OVERLAY_CONVEYOR))); - ItemList.Cover_FluidLimiter - .set(addItem(272, "Fluid Limiter Cover", "Limits fluid input depending on fill level")); + ItemList.Cover_FluidLimiter.set( + addItem(272, "Fluid Limiter Cover", "Limits fluid input depending on fill level")); GregTech_API.registerCover( ItemList.Cover_FluidLimiter.get(1L), TextureFactory.of(MACHINE_CASINGS[1][0], TextureFactory.of(OVERLAY_SHUTTER)), @@ -3561,15 +3569,15 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { ItemList.Circuit_Board_Coated.set(ItemList.Circuit_Board_Basic.get(1)); ItemList.Circuit_Board_Advanced.set(addItem(tLastID = 711, "Epoxy Circuit Board", "An Advanced Board")); ItemList.Circuit_Board_Epoxy.set(ItemList.Circuit_Board_Advanced.get(1)); - ItemList.Circuit_Board_Elite - .set(addItem(tLastID = 712, "Multilayer Fiber-Reinforced Circuit Board", "An Elite Board")); + ItemList.Circuit_Board_Elite.set( + addItem(tLastID = 712, "Multilayer Fiber-Reinforced Circuit Board", "An Elite Board")); ItemList.Circuit_Board_Multifiberglass.set(ItemList.Circuit_Board_Elite.get(1)); - ItemList.Circuit_Parts_Crystal_Chip_Elite - .set(addItem(tLastID = 713, "Engraved Crystal Chip", "Needed for Circuits")); - ItemList.Circuit_Parts_Crystal_Chip_Master - .set(addItem(tLastID = 714, "Engraved Lapotron Chip", "Needed for Circuits")); - ItemList.Circuit_Parts_Crystal_Chip_Wetware - .set(addItem(tLastID = 668, "Living Crystal Chip", "Needed for Circuits")); + ItemList.Circuit_Parts_Crystal_Chip_Elite.set( + addItem(tLastID = 713, "Engraved Crystal Chip", "Needed for Circuits")); + ItemList.Circuit_Parts_Crystal_Chip_Master.set( + addItem(tLastID = 714, "Engraved Lapotron Chip", "Needed for Circuits")); + ItemList.Circuit_Parts_Crystal_Chip_Wetware.set( + addItem(tLastID = 668, "Living Crystal Chip", "Needed for Circuits")); ItemList.Circuit_Parts_Advanced.set(addItem(tLastID = 715, "Diode", "Basic Electronic Component")); ItemList.Circuit_Parts_Diode.set(ItemList.Circuit_Parts_Advanced.get(1)); ItemList.Circuit_Parts_Wiring_Basic.set(addItem(tLastID = 716, "Resistor", "Basic Electronic Component")); @@ -3793,7 +3801,10 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { final ITexture doesWorkCoverTexture = TextureFactory.of( TextureFactory.of(OVERLAY_ACTIVITYDETECTOR), - TextureFactory.builder().addIcon(OVERLAY_ACTIVITYDETECTOR_GLOW).glow().build()); + TextureFactory.builder() + .addIcon(OVERLAY_ACTIVITYDETECTOR_GLOW) + .glow() + .build()); GregTech_API.registerCover( ItemList.Cover_ActivityDetector.get(1L), TextureFactory.of(MACHINE_CASINGS[2][0], doesWorkCoverTexture), @@ -3813,7 +3824,10 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { final ITexture playerDectectorCoverTexture = TextureFactory.of( TextureFactory.of(OVERLAY_ACTIVITYDETECTOR), - TextureFactory.builder().addIcon(OVERLAY_ACTIVITYDETECTOR_GLOW).glow().build()); + TextureFactory.builder() + .addIcon(OVERLAY_ACTIVITYDETECTOR_GLOW) + .glow() + .build()); GregTech_API.registerCover( ItemList.Cover_PlayerDetector.get(1L), TextureFactory.of(MACHINE_CASINGS[2][0], playerDectectorCoverTexture), @@ -3942,7 +3956,10 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { final ITexture screenCoverTexture = TextureFactory.of( TextureFactory.of(OVERLAY_SCREEN), - TextureFactory.builder().addIcon(OVERLAY_SCREEN_GLOW).glow().build()); + TextureFactory.builder() + .addIcon(OVERLAY_SCREEN_GLOW) + .glow() + .build()); GregTech_API.registerCover( ItemList.Cover_Screen.get(1L), TextureFactory.of(MACHINE_CASINGS[2][0], screenCoverTexture), @@ -4370,7 +4387,8 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { @Override public boolean onEntityItemUpdate(EntityItem aItemEntity) { - int aDamage = aItemEntity.getEntityItem().getItemDamage(); + int aDamage = aItemEntity.getEntityItem() + .getItemDamage(); if ((aDamage < 32000) && (aDamage >= 0) && (!aItemEntity.worldObj.isRemote)) { Materials aMaterial = GregTech_API.sGeneratedMaterials[(aDamage % 1000)]; if ((aMaterial != null) && (aMaterial != Materials.Empty) && (aMaterial != Materials._NULL)) { @@ -4386,8 +4404,10 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { aMaterial = cauldronRemap.getOrDefault(aMaterial, aMaterial); aItemEntity.setEntityItemStack( - GT_OreDictUnificator - .get(OrePrefixes.dust, aMaterial, aItemEntity.getEntityItem().stackSize)); + GT_OreDictUnificator.get( + OrePrefixes.dust, + aMaterial, + aItemEntity.getEntityItem().stackSize)); aItemEntity.worldObj.setBlockMetadataWithNotify(tX, tY, tZ, tMetaData - 1, 3); return true; } @@ -4437,10 +4457,12 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { if (aPrefix == OrePrefixes.cellPlasma && aMaterial.getPlasma(1L) != null) { // Materials has a plasma fluid for (GT_Recipe recipe : fusionRecipes) { // Loop through fusion recipes if (recipe.getFluidOutput(0) != null) { // Make sure fluid output can't be null (not sure if possible) - if (recipe.getFluidOutput(0).isFluidEqual(aMaterial.getPlasma(1L))) return true; // Fusion recipe - // output matches - // current plasma - // cell fluid + if (recipe.getFluidOutput(0) + .isFluidEqual(aMaterial.getPlasma(1L))) + return true; // Fusion recipe + // output matches + // current plasma + // cell fluid } } } diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java index c52255ce3a..7300e59b14 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java @@ -1679,7 +1679,8 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { tLastID = 414 + i, Dyes.get(i).mName + " Dye", "", - Dyes.get(i).name(), + Dyes.get(i) + .name(), new TC_Aspects.TC_AspectStack(TC_Aspects.SENSUS, 1L))); } ItemList.Plank_Oak.set( @@ -2816,16 +2817,20 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Tin, 1L)); GT_ModHandler.addCompressionRecipe(ItemList.Crop_Drop_Coppon.get(4L), new ItemStack(Blocks.wool, 1, 1)); - GT_ModHandler - .addCompressionRecipe(ItemList.Crop_Drop_Plumbilia.get(4L), ItemList.IC2_PlantballCompressed.get(1L)); - GT_ModHandler - .addCompressionRecipe(ItemList.Crop_Drop_Argentia.get(4L), ItemList.IC2_PlantballCompressed.get(1L)); + GT_ModHandler.addCompressionRecipe( + ItemList.Crop_Drop_Plumbilia.get(4L), + ItemList.IC2_PlantballCompressed.get(1L)); + GT_ModHandler.addCompressionRecipe( + ItemList.Crop_Drop_Argentia.get(4L), + ItemList.IC2_PlantballCompressed.get(1L)); GT_ModHandler.addCompressionRecipe(ItemList.Crop_Drop_Indigo.get(4L), ItemList.IC2_PlantballCompressed.get(1L)); GT_ModHandler.addCompressionRecipe(ItemList.Crop_Drop_Ferru.get(4L), ItemList.IC2_PlantballCompressed.get(1L)); - GT_ModHandler - .addCompressionRecipe(ItemList.Crop_Drop_Aurelia.get(4L), ItemList.IC2_PlantballCompressed.get(1L)); - GT_ModHandler - .addCompressionRecipe(ItemList.Crop_Drop_OilBerry.get(4L), ItemList.IC2_PlantballCompressed.get(1L)); + GT_ModHandler.addCompressionRecipe( + ItemList.Crop_Drop_Aurelia.get(4L), + ItemList.IC2_PlantballCompressed.get(1L)); + GT_ModHandler.addCompressionRecipe( + ItemList.Crop_Drop_OilBerry.get(4L), + ItemList.IC2_PlantballCompressed.get(1L)); GT_ModHandler.addCompressionRecipe( ItemList.Crop_Drop_BobsYerUncleRanks.get(4L), ItemList.IC2_PlantballCompressed.get(1L)); @@ -2898,9 +2903,9 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { try { ic2.api.crops.CropCard tCrop; GT_Utility.getField(tCrop = ic2.api.crops.Crops.instance.getCropList()[13], "mDrop") - .set(tCrop, ItemList.Crop_Drop_Ferru.get(1L)); + .set(tCrop, ItemList.Crop_Drop_Ferru.get(1L)); GT_Utility.getField(tCrop = ic2.api.crops.Crops.instance.getCropList()[14], "mDrop") - .set(tCrop, ItemList.Crop_Drop_Aurelia.get(1L)); + .set(tCrop, ItemList.Crop_Drop_Aurelia.get(1L)); } catch (Throwable e) { if (GT_Values.D1) { e.printStackTrace(GT_Log.err); @@ -2953,8 +2958,13 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { int aDamage = aStack.getItemDamage(); if ((aDamage >= 25000) && (aDamage < 27000)) { if (aDamage >= 26000) { - return Behaviour_Arrow.DEFAULT_PLASTIC - .getProjectile(this, aProjectileType, aStack, aWorld, aEntity, aSpeed); + return Behaviour_Arrow.DEFAULT_PLASTIC.getProjectile( + this, + aProjectileType, + aStack, + aWorld, + aEntity, + aSpeed); } return Behaviour_Arrow.DEFAULT_WOODEN.getProjectile(this, aProjectileType, aStack, aWorld, aEntity, aSpeed); } @@ -2982,7 +2992,8 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { @Override public boolean doesShowInCreative(OrePrefixes aPrefix, Materials aMaterial, boolean aDoShowAllItems) { - return (aDoShowAllItems) || (!aPrefix.name().startsWith("toolHead")); + return (aDoShowAllItems) || (!aPrefix.name() + .startsWith("toolHead")); } @Override diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java index 79c9ccc164..f2ea20a174 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java @@ -35,8 +35,8 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { * copper foil + sulfuric acid fiberglass circuit board (simple + multilayer) / glass + plastic + electrum foil * + sulfurci acid wetware lifesupport board / fiberglass CB + teflon + */ - ItemList.Circuit_Board_Wetware - .set(addItem(tLastID = 6, "Wetware Lifesupport Circuit Board", "The Board that keeps life", o)); + ItemList.Circuit_Board_Wetware.set( + addItem(tLastID = 6, "Wetware Lifesupport Circuit Board", "The Board that keeps life", o)); ItemList.Circuit_Board_Plastic.set(addItem(tLastID = 7, "Plastic Circuit Board", "A Good Board", o)); ItemList.Circuit_Board_Bio.set(addItem(tLastID = 8, "Bio Circuit Board", "Bio genetic mutated Board", o)); @@ -74,28 +74,28 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { "Electronic Component", OrePrefixes.componentCircuit.get(Materials.Capacitor), SubTag.NO_UNIFICATION)); - ItemList.Circuit_Parts_GlassFiber - .set(addItem(tLastID = 21, "Glass Fiber", Materials.BorosilicateGlass.mChemicalFormula, o)); + ItemList.Circuit_Parts_GlassFiber.set( + addItem(tLastID = 21, "Glass Fiber", Materials.BorosilicateGlass.mChemicalFormula, o)); ItemList.Circuit_Parts_PetriDish.set(addItem(tLastID = 22, "Petri Dish", "For cultivating cells", o)); ItemList.Circuit_Parts_Reinforced_Glass_Tube.set(addItem(tLastID = 23, "Reinforced Glass Tube", "", o)); - ItemList.Circuit_Parts_ResistorASMD - .set(addItem(tLastID = 24, "Advanced SMD Resistor", "Advanced Electronic Component", o)); - ItemList.Circuit_Parts_DiodeASMD - .set(addItem(tLastID = 25, "Advanced SMD Diode", "Advanced Electronic Component", o)); - ItemList.Circuit_Parts_TransistorASMD - .set(addItem(tLastID = 26, "Advanced SMD Transistor", "Advanced Electronic Component", o)); - ItemList.Circuit_Parts_CapacitorASMD - .set(addItem(tLastID = 27, "Advanced SMD Capacitor", "Advanced Electronic Component", o)); + ItemList.Circuit_Parts_ResistorASMD.set( + addItem(tLastID = 24, "Advanced SMD Resistor", "Advanced Electronic Component", o)); + ItemList.Circuit_Parts_DiodeASMD.set( + addItem(tLastID = 25, "Advanced SMD Diode", "Advanced Electronic Component", o)); + ItemList.Circuit_Parts_TransistorASMD.set( + addItem(tLastID = 26, "Advanced SMD Transistor", "Advanced Electronic Component", o)); + ItemList.Circuit_Parts_CapacitorASMD.set( + addItem(tLastID = 27, "Advanced SMD Capacitor", "Advanced Electronic Component", o)); - ItemList.Circuit_Parts_ResistorXSMD - .set(addItem(tLastID = 178, "Optical SMD Resistor", "Highly Advanced Electronic Component", o)); - ItemList.Circuit_Parts_DiodeXSMD - .set(addItem(tLastID = 179, "Optical SMD Diode", "Highly Advanced Electronic Component", o)); - ItemList.Circuit_Parts_TransistorXSMD - .set(addItem(tLastID = 180, "Optical SMD Transistor", "Highly Advanced Electronic Component", o)); - ItemList.Circuit_Parts_CapacitorXSMD - .set(addItem(tLastID = 181, "Optical SMD Capacitor", "Highly Advanced Electronic Component", o)); + ItemList.Circuit_Parts_ResistorXSMD.set( + addItem(tLastID = 178, "Optical SMD Resistor", "Highly Advanced Electronic Component", o)); + ItemList.Circuit_Parts_DiodeXSMD.set( + addItem(tLastID = 179, "Optical SMD Diode", "Highly Advanced Electronic Component", o)); + ItemList.Circuit_Parts_TransistorXSMD.set( + addItem(tLastID = 180, "Optical SMD Transistor", "Highly Advanced Electronic Component", o)); + ItemList.Circuit_Parts_CapacitorXSMD.set( + addItem(tLastID = 181, "Optical SMD Capacitor", "Highly Advanced Electronic Component", o)); ItemList.Circuit_Parts_InductorSMD.set( addItem( @@ -104,19 +104,25 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { "Electronic Component", OrePrefixes.componentCircuit.get(Materials.Inductor), SubTag.NO_UNIFICATION)); - ItemList.Circuit_Parts_InductorASMD - .set(addItem(tLastID = 183, "Advanced SMD Inductor", "Advanced Electronic Component", o)); - ItemList.Circuit_Parts_InductorXSMD - .set(addItem(tLastID = 184, "Optical SMD Inductor", "Highly Advanced Electronic Component", o)); + ItemList.Circuit_Parts_InductorASMD.set( + addItem(tLastID = 183, "Advanced SMD Inductor", "Advanced Electronic Component", o)); + ItemList.Circuit_Parts_InductorXSMD.set( + addItem(tLastID = 184, "Optical SMD Inductor", "Highly Advanced Electronic Component", o)); - GT_OreDictUnificator - .set(OrePrefixes.componentCircuit, Materials.Resistor, ItemList.Circuit_Parts_Resistor.get(1L)); + GT_OreDictUnificator.set( + OrePrefixes.componentCircuit, + Materials.Resistor, + ItemList.Circuit_Parts_Resistor.get(1L)); GT_OreDictUnificator.set(OrePrefixes.componentCircuit, Materials.Diode, ItemList.Circuit_Parts_Diode.get(1L)); - GT_OreDictUnificator - .set(OrePrefixes.componentCircuit, Materials.Transistor, ItemList.Circuit_Parts_Transistor.get(1L)); + GT_OreDictUnificator.set( + OrePrefixes.componentCircuit, + Materials.Transistor, + ItemList.Circuit_Parts_Transistor.get(1L)); GT_OreDictUnificator.set(OrePrefixes.componentCircuit, Materials.Inductor, ItemList.Circuit_Parts_Coil.get(1L)); - GT_OreDictUnificator - .set(OrePrefixes.componentCircuit, Materials.Capacitor, ItemList.Circuit_Parts_Capacitor.get(1L)); + GT_OreDictUnificator.set( + OrePrefixes.componentCircuit, + Materials.Capacitor, + ItemList.Circuit_Parts_Capacitor.get(1L)); GT_OreDictUnificator.addAssociation( OrePrefixes.componentCircuit, @@ -157,16 +163,16 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { * quantum chips */ ItemList.Circuit_Silicon_Ingot.set(addItem(tLastID = 30, "Monocrystalline Silicon Boule", "Raw Circuit", o)); - ItemList.Circuit_Silicon_Ingot2 - .set(addItem(tLastID = 31, "Phosphorus doped Monocrystalline Silicon Boule", "Raw Circuit", o)); - ItemList.Circuit_Silicon_Ingot3 - .set(addItem(tLastID = 32, "Naquadah doped Monocrystalline Silicon Boule", "Raw Circuit", o)); - ItemList.Circuit_Silicon_Ingot4 - .set(addItem(tLastID = 150, "Europium doped Monocrystalline Silicon Boule", "Raw Circuit", o)); - ItemList.Circuit_Silicon_Ingot5 - .set(addItem(tLastID = 152, "Americium doped Monocrystalline Silicon Boule", "Raw Circuit", o)); - ItemList.Circuit_Silicon_Ingot6 - .set(addItem(tLastID = 721, "Optically Enriched Crystalline Boule", "Raw Circuit", o)); + ItemList.Circuit_Silicon_Ingot2.set( + addItem(tLastID = 31, "Phosphorus doped Monocrystalline Silicon Boule", "Raw Circuit", o)); + ItemList.Circuit_Silicon_Ingot3.set( + addItem(tLastID = 32, "Naquadah doped Monocrystalline Silicon Boule", "Raw Circuit", o)); + ItemList.Circuit_Silicon_Ingot4.set( + addItem(tLastID = 150, "Europium doped Monocrystalline Silicon Boule", "Raw Circuit", o)); + ItemList.Circuit_Silicon_Ingot5.set( + addItem(tLastID = 152, "Americium doped Monocrystalline Silicon Boule", "Raw Circuit", o)); + ItemList.Circuit_Silicon_Ingot6.set( + addItem(tLastID = 721, "Optically Enriched Crystalline Boule", "Raw Circuit", o)); ItemList.Circuit_Silicon_Wafer.set(addItem(tLastID = 33, "Wafer", "Raw Circuit", o)); ItemList.Circuit_Silicon_Wafer2.set(addItem(tLastID = 34, "Phosphorus doped Wafer", "Raw Circuit", o)); @@ -204,8 +210,8 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { ItemList.Circuit_Chip_HPIC.set(addItem(tLastID = 53, "High Power IC", "High Power Circuit", o)); ItemList.Circuit_Wafer_NanoCPU.set(addItem(tLastID = 54, "NanoCPU Wafer", "Raw Circuit", o)); - ItemList.Circuit_Chip_NanoCPU - .set(addItem(tLastID = 55, "Nanocomponent Central Processing Unit", "Power Circuit", o)); + ItemList.Circuit_Chip_NanoCPU.set( + addItem(tLastID = 55, "Nanocomponent Central Processing Unit", "Power Circuit", o)); ItemList.Circuit_Wafer_QuantumCPU.set(addItem(tLastID = 56, "QBit Wafer", "Raw Circuit", o)); ItemList.Circuit_Chip_QuantumCPU.set(addItem(tLastID = 57, "QBit Processing Unit", "Quantum CPU", o)); @@ -233,10 +239,10 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { /** * Engraved Crystal Chip Engraved Lapotron Chip Crystal CPU SoCrystal stem cells (disassemble eggs) */ - ItemList.Circuit_Chip_CrystalSoC2 - .set(addItem(tLastID = 68, "Raw Advanced Crystal Chip", "Raw Advanced Crystal Processor", o)); - ItemList.Circuit_Parts_RawCrystalChip - .set(addItem(tLastID = 69, "Raw Crystal Chip", "Raw Crystal Processor", o)); + ItemList.Circuit_Chip_CrystalSoC2.set( + addItem(tLastID = 68, "Raw Advanced Crystal Chip", "Raw Advanced Crystal Processor", o)); + ItemList.Circuit_Parts_RawCrystalChip.set( + addItem(tLastID = 69, "Raw Crystal Chip", "Raw Crystal Processor", o)); ItemList.Circuit_Chip_CrystalCPU.set(addItem(tLastID = 70, "Crystal Processing Unit", "Crystal CPU", o)); // Crystal // chip // elite @@ -244,8 +250,8 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { ItemList.Circuit_Chip_CrystalSoC.set(addItem(tLastID = 71, "Crystal SoC", "Crystal System on a Chip", o)); ItemList.Circuit_Chip_NeuroCPU.set(addItem(tLastID = 72, "Neuro Processing Unit", "Neuro CPU", o)); ItemList.Circuit_Chip_Stemcell.set(addItem(tLastID = 73, "Stemcells", "Raw inteligence", o)); - ItemList.Circuit_Parts_RawCrystalParts - .set(addItem(tLastID = 74, "Raw Crystal Chip Parts", "Raw Crystal Processor Parts", o)); + ItemList.Circuit_Parts_RawCrystalParts.set( + addItem(tLastID = 74, "Raw Crystal Chip Parts", "Raw Crystal Processor Parts", o)); ItemList.Circuit_Chip_Biocell.set(addItem(tLastID = 76, "Biocells", "Mutated Raw inteligence", o)); ItemList.Circuit_Chip_BioCPU.set(addItem(tLastID = 77, "Bio Processing Unit", "Bio CPU", o)); ItemList.Circuit_Chip_Optical.set(addItem(tLastID = 724, "Raw Exposed Optical Chip", "Raw Optical Chip", o)); @@ -462,21 +468,21 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { registerTieredTooltip(ItemList.Circuit_Biomainframe.get(1), UEV); ItemList.Circuit_Board_Coated_Basic.set(addItem(tLastID = 100, "Circuit Board", "A basic Circuit Board", o)); - ItemList.Circuit_Board_Phenolic_Good - .set(addItem(tLastID = 101, "Good Circuit Board", "A good Circuit Board", o)); - ItemList.Circuit_Board_Epoxy_Advanced - .set(addItem(tLastID = 102, "Advanced Circuit Board", "A advanced Circuit Board", o)); - ItemList.Circuit_Board_Fiberglass_Advanced - .set(addItem(tLastID = 103, "More Advanced Circuit Board", "A more advanced Circuit Board", o)); - ItemList.Circuit_Board_Multifiberglass_Elite - .set(addItem(tLastID = 104, "Elite Circuit Board", "A elite Circuit Board", o)); + ItemList.Circuit_Board_Phenolic_Good.set( + addItem(tLastID = 101, "Good Circuit Board", "A good Circuit Board", o)); + ItemList.Circuit_Board_Epoxy_Advanced.set( + addItem(tLastID = 102, "Advanced Circuit Board", "A advanced Circuit Board", o)); + ItemList.Circuit_Board_Fiberglass_Advanced.set( + addItem(tLastID = 103, "More Advanced Circuit Board", "A more advanced Circuit Board", o)); + ItemList.Circuit_Board_Multifiberglass_Elite.set( + addItem(tLastID = 104, "Elite Circuit Board", "A elite Circuit Board", o)); ItemList.Circuit_Board_Wetware_Extreme.set( addItem(tLastID = 105, "Extreme Wetware Lifesupport Circuit Board", "The Board that keeps life", o)); ItemList.Circuit_Board_Plastic_Advanced.set(addItem(tLastID = 106, "Plastic Circuit Board", "A good Board", o)); - ItemList.Circuit_Board_Bio_Ultra - .set(addItem(tLastID = 107, "Ultra Bio Mutated Circuit Board", "Bio genetic mutated Board", o)); - ItemList.Circuit_Board_Optical - .set(addItem(tLastID = 728, "Optical Circuit Board", "Optically Infused Board", o)); + ItemList.Circuit_Board_Bio_Ultra.set( + addItem(tLastID = 107, "Ultra Bio Mutated Circuit Board", "Bio genetic mutated Board", o)); + ItemList.Circuit_Board_Optical.set( + addItem(tLastID = 728, "Optical Circuit Board", "Optically Infused Board", o)); // Optical circuits ItemList.Circuit_OpticalProcessor.set( @@ -666,8 +672,8 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { ItemList.UHV_Coil.set(addItem(tLastID = 149, "Highly Ultimate Voltage Coil", "Infinite Coil", o)); ItemList.GalliumArsenideCrystal.set(addItem(tLastID = 190, "Gallium Arsenide Crystal", "For making boules", o)); - ItemList.GalliumArsenideCrystalSmallPart - .set(addItem(tLastID = 191, "Small Gallium Arsenide Crystal", "For making boules", o)); + ItemList.GalliumArsenideCrystalSmallPart.set( + addItem(tLastID = 191, "Small Gallium Arsenide Crystal", "For making boules", o)); ItemList.KevlarFiber.set(addItem(tLastID = 192, "Kevlar Fiber", "For make Kevlar Plates", o)); ItemList.WovenKevlar.set(addItem(tLastID = 193, "Woven Kevlar", "For make Kevlar Plates", o)); ItemList.Spinneret.set(addItem(tLastID = 194, "Spinneret", "For make Kevlar Fiber", o)); @@ -900,11 +906,11 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { "BY THE POWERS OF NAUGHTINESS, I COMMAND THIS PARTICULAR STAR, TO BE REALLY, REALLY HOT", SubTag.NO_UNIFICATION)); - ItemList.Optical_Cpu_Containment_Housing - .set(addItem(tLastID = 727, "Optical CPU Containment Housing", "CPU Housing", o)); + ItemList.Optical_Cpu_Containment_Housing.set( + addItem(tLastID = 727, "Optical CPU Containment Housing", "CPU Housing", o)); ItemList.Optically_Perfected_CPU.set(addItem(tLastID = 726, "Optically Perfected CPU", "Perfected CPU!", o)); - ItemList.Optically_Compatible_Memory - .set(addItem(tLastID = 725, "Optically Compatible Memory", "Its in the name!", o)); + ItemList.Optically_Compatible_Memory.set( + addItem(tLastID = 725, "Optically Compatible Memory", "Its in the name!", o)); int whiteDwarfIDs = 729; ItemList.White_Dwarf_Shape_Extruder_Plate.set( @@ -1051,6 +1057,8 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { @Override public boolean doesShowInCreative(OrePrefixes aPrefix, Materials aMaterial, boolean aDoShowAllItems) { - return aDoShowAllItems || (aPrefix.toString().toLowerCase().contains("nanite")); + return aDoShowAllItems || (aPrefix.toString() + .toLowerCase() + .contains("nanite")); } } diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_98.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_98.java index 7e50bd4556..8bd30912fc 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_98.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_98.java @@ -313,8 +313,11 @@ public class GT_MetaGenerated_Item_98 extends GT_MetaGenerated_Item { @Override @SideOnly(Side.CLIENT) public void getSubItems(Item aItem, CreativeTabs aCreativeTab, List aList) { - Arrays.stream(FluidCell.values()).filter(fluid -> FluidRegistry.getFluid(fluid.getFluidName()) != null) - .map(FluidCell::get).filter(Objects::nonNull).forEach(aList::add); + Arrays.stream(FluidCell.values()) + .filter(fluid -> FluidRegistry.getFluid(fluid.getFluidName()) != null) + .map(FluidCell::get) + .filter(Objects::nonNull) + .forEach(aList::add); } @Override diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_99.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_99.java index 51d8405107..4186b607f8 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_99.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_99.java @@ -178,7 +178,9 @@ public class GT_MetaGenerated_Item_99 extends GT_MetaGenerated_Item { @Override @SideOnly(Side.CLIENT) public void getSubItems(Item aItem, CreativeTabs aCreativeTab, List aList) { - enabled.stream().mapToObj(i -> new ItemStack(this, 1, i)).forEach(aList::add); + enabled.stream() + .mapToObj(i -> new ItemStack(this, 1, i)) + .forEach(aList::add); } @Override diff --git a/src/main/java/gregtech/common/items/GT_NeutronReflector_Item.java b/src/main/java/gregtech/common/items/GT_NeutronReflector_Item.java index cfcedaa8b6..9365677773 100644 --- a/src/main/java/gregtech/common/items/GT_NeutronReflector_Item.java +++ b/src/main/java/gregtech/common/items/GT_NeutronReflector_Item.java @@ -18,8 +18,15 @@ public class GT_NeutronReflector_Item extends GT_Generic_Item implements IReacto public boolean acceptUraniumPulse(IReactor reactor, ItemStack yourStack, ItemStack pulsingStack, int youX, int youY, int pulseX, int pulseY, boolean heatrun) { if (!heatrun) { - ((IReactorComponent) pulsingStack.getItem()) - .acceptUraniumPulse(reactor, pulsingStack, yourStack, pulseX, pulseY, youX, youY, heatrun); + ((IReactorComponent) pulsingStack.getItem()).acceptUraniumPulse( + reactor, + pulsingStack, + yourStack, + pulseX, + pulseY, + youX, + youY, + heatrun); } return true; } diff --git a/src/main/java/gregtech/common/items/GT_VolumetricFlask.java b/src/main/java/gregtech/common/items/GT_VolumetricFlask.java index db2efa4d81..1787875100 100644 --- a/src/main/java/gregtech/common/items/GT_VolumetricFlask.java +++ b/src/main/java/gregtech/common/items/GT_VolumetricFlask.java @@ -228,7 +228,8 @@ public class GT_VolumetricFlask extends GT_Generic_Item implements IFluidContain @SideOnly(Side.CLIENT) public void getSubItems(Item item, CreativeTabs creativeTabs, List itemList) { itemList.add(new ItemStack(this)); - for (Fluid fluid : FluidRegistry.getRegisteredFluids().values()) { + for (Fluid fluid : FluidRegistry.getRegisteredFluids() + .values()) { if (fluid != null) { ItemStack stack = new ItemStack(this); setCapacity(stack, getMaxCapacity()); @@ -339,11 +340,14 @@ public class GT_VolumetricFlask extends GT_Generic_Item implements IFluidContain textField.setText( String.valueOf(((GT_VolumetricFlask) getCurrentItem().getItem()).getCapacity(getCurrentItem()))); builder.widget( - textField.setNumbers(() -> 1, () -> maxCapacity).setPattern(BaseTextFieldWidget.NATURAL_NUMS) - .setTextAlignment(Alignment.CenterLeft).setTextColor(Color.WHITE.dark(1)) - .setFocusOnGuiOpen(true) - .setBackground(GT_UITextures.BACKGROUND_TEXT_FIELD_LIGHT_GRAY.withOffset(-1, -1, 2, 2)) - .setPos(60, 55).setSize(59, 12)); + textField.setNumbers(() -> 1, () -> maxCapacity) + .setPattern(BaseTextFieldWidget.NATURAL_NUMS) + .setTextAlignment(Alignment.CenterLeft) + .setTextColor(Color.WHITE.dark(1)) + .setFocusOnGuiOpen(true) + .setBackground(GT_UITextures.BACKGROUND_TEXT_FIELD_LIGHT_GRAY.withOffset(-1, -1, 2, 2)) + .setPos(60, 55) + .setSize(59, 12)); addChangeAmountButton(builder, "+1", new Pos2d(20, 26), new Size(22, 20), val -> val + 1); addChangeAmountButton(builder, "+10", new Pos2d(48, 26), new Size(28, 20), val -> val + 10); @@ -355,26 +359,34 @@ public class GT_VolumetricFlask extends GT_Generic_Item implements IFluidContain addChangeAmountButton(builder, "-1000", new Pos2d(120, 75), new Size(38, 20), val -> val - 1000); builder.widget( new VanillaButtonWidget().setDisplayString("Accept") - .setClickableGetter(() -> MathExpression.parseMathExpression(textField.getText()) > 0) - .setOnClick((clickData, widget) -> { - if (widget.isClient()) { - textField.onRemoveFocus(); - } else { - widget.getWindow().tryClose(); - } - }).setPos(128, 51).setSize(38, 20)); + .setClickableGetter( + () -> MathExpression.parseMathExpression(textField.getText()) > 0) + .setOnClick((clickData, widget) -> { + if (widget.isClient()) { + textField.onRemoveFocus(); + } else { + widget.getWindow() + .tryClose(); + } + }) + .setPos(128, 51) + .setSize(38, 20)); return builder.build(); } private void addChangeAmountButton(ModularWindow.Builder builder, String text, Pos2d pos, Size size, Function<Integer, Integer> function) { - builder.widget(new VanillaButtonWidget().setDisplayString(text).setOnClick((clickData, widget) -> { - String currentText = textField.getText(); - int amount = (int) MathExpression.parseMathExpression(currentText, 1); - amount = Math.min(maxCapacity, Math.max(1, function.apply(amount))); - textField.setText(String.valueOf(amount)); - }).setPos(pos).setSize(size)); + builder.widget( + new VanillaButtonWidget().setDisplayString(text) + .setOnClick((clickData, widget) -> { + String currentText = textField.getText(); + int amount = (int) MathExpression.parseMathExpression(currentText, 1); + amount = Math.min(maxCapacity, Math.max(1, function.apply(amount))); + textField.setText(String.valueOf(amount)); + }) + .setPos(pos) + .setSize(size)); } private ItemStack getCurrentItem() { diff --git a/src/main/java/gregtech/common/items/ItemComb.java b/src/main/java/gregtech/common/items/ItemComb.java index b1146e8db6..70a89d3c17 100644 --- a/src/main/java/gregtech/common/items/ItemComb.java +++ b/src/main/java/gregtech/common/items/ItemComb.java @@ -98,7 +98,8 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer { @Override public String getItemStackDisplayName(ItemStack stack) { - return CombType.valueOf(stack.getItemDamage()).getName(); + return CombType.valueOf(stack.getItemDamage()) + .getName(); } @Override @@ -1597,7 +1598,12 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer { null, fluid, 100 * 100, - (fluid.getFluid().getDensity() * 128 > 0 ? (int) (fluid.getFluid().getDensity() * 100) : 128), + (fluid.getFluid() + .getDensity() * 128 > 0 + ? (int) (fluid.getFluid() + .getDensity() + * 100) + : 128), volt.getSimpleEnergy() / 2); } diff --git a/src/main/java/gregtech/common/items/PollenType.java b/src/main/java/gregtech/common/items/PollenType.java index b8cccb70b6..782bed9f64 100644 --- a/src/main/java/gregtech/common/items/PollenType.java +++ b/src/main/java/gregtech/common/items/PollenType.java @@ -25,7 +25,10 @@ public enum PollenType { public String getName() { return GT_LanguageManager.addStringLocalization( "pollen." + this.name, - this.name.substring(0, 1).toUpperCase() + this.name.substring(1) + " Pollen"); + this.name.substring(0, 1) + .toUpperCase() + + this.name.substring(1) + + " Pollen"); } public int[] getColours() { diff --git a/src/main/java/gregtech/common/items/PropolisType.java b/src/main/java/gregtech/common/items/PropolisType.java index 15f4a2400b..88a1a3faa8 100644 --- a/src/main/java/gregtech/common/items/PropolisType.java +++ b/src/main/java/gregtech/common/items/PropolisType.java @@ -36,7 +36,10 @@ public enum PropolisType { // return "gt.comb."+this.name; return GT_LanguageManager.addStringLocalization( "propolis." + this.name, - this.name.substring(0, 1).toUpperCase() + this.name.substring(1) + " Propolis"); + this.name.substring(0, 1) + .toUpperCase() + + this.name.substring(1) + + " Propolis"); } public int getColours() { diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Cover_Tool.java b/src/main/java/gregtech/common/items/behaviors/Behaviour_Cover_Tool.java index 4a7beb453c..57e0750335 100644 --- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Cover_Tool.java +++ b/src/main/java/gregtech/common/items/behaviors/Behaviour_Cover_Tool.java @@ -23,8 +23,9 @@ import gregtech.api.util.*; public class Behaviour_Cover_Tool extends Behaviour_None { public static final IItemBehaviour<GT_MetaBase_Item> INSTANCE = new Behaviour_Cover_Tool(); - private final String mTooltip = GT_LanguageManager - .addStringLocalization("gt.behaviour.cover_copy_paste", "Can copy/paste cover data."); + private final String mTooltip = GT_LanguageManager.addStringLocalization( + "gt.behaviour.cover_copy_paste", + "Can copy/paste cover data."); private ISerializableObject mStoredData = GregTech_API.sNoBehavior.createDataObject(); private int mCoverType; @@ -113,11 +114,13 @@ public class Behaviour_Cover_Tool extends Behaviour_None { mCoverType = tCoverable.getCoverIDAtSide((byte) tSide); aList.add( "Block Side: " + EnumChatFormatting.AQUA - + ForgeDirection.getOrientation(tSide).name() + + ForgeDirection.getOrientation(tSide) + .name() + EnumChatFormatting.RESET); aList.add( "Cover Type: " + EnumChatFormatting.GREEN - + tCoverable.getCoverItemAtSide((byte) tSide).getDisplayName() + + tCoverable.getCoverItemAtSide((byte) tSide) + .getDisplayName() + EnumChatFormatting.RESET); } else { mStoredData = GregTech_API.sNoBehavior.createDataObject(); diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_DataStick.java b/src/main/java/gregtech/common/items/behaviors/Behaviour_DataStick.java index 1dbcd4691d..84b6513563 100644 --- a/src/main/java/gregtech/common/items/behaviors/Behaviour_DataStick.java +++ b/src/main/java/gregtech/common/items/behaviors/Behaviour_DataStick.java @@ -32,7 +32,8 @@ public class Behaviour_DataStick extends Behaviour_None { aList.add(tString.substring(i, Math.min(i + 64, j))); } } - short sTier = GT_Utility.ItemNBT.getNBT(aStack).getShort("rocket_tier"); + short sTier = GT_Utility.ItemNBT.getNBT(aStack) + .getShort("rocket_tier"); if (sTier > 0 && sTier < 100) { aList.add("Rocket Schematic Tier: " + sTier); } else if (sTier >= 100) { @@ -51,7 +52,8 @@ public class Behaviour_DataStick extends Behaviour_None { } } } - long lastUpdate = GT_Utility.ItemNBT.getNBT(aStack).getLong("lastUpdate"); + long lastUpdate = GT_Utility.ItemNBT.getNBT(aStack) + .getLong("lastUpdate"); if (lastUpdate != 0) aList.add(String.format("Last update at: %tc", lastUpdate)); return aList; diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Hoe.java b/src/main/java/gregtech/common/items/behaviors/Behaviour_Hoe.java index 933f30acb7..a66cba699d 100644 --- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Hoe.java +++ b/src/main/java/gregtech/common/items/behaviors/Behaviour_Hoe.java @@ -45,11 +45,14 @@ public class Behaviour_Hoe extends Behaviour_None { Block aBlock = aWorld.getBlock(aX, aY, aZ); if ((aSide != 0) && (GT_Utility.isBlockAir(aWorld, aX, aY + 1, aZ)) && ((aBlock == Blocks.grass) || (aBlock == Blocks.dirt))) { - new WorldSpawnedEventBuilder.SoundEventBuilder() - .setVolume((Blocks.farmland.stepSound.getVolume() + 1.0F) / 2.0F) - .setPitch(Blocks.farmland.stepSound.getPitch() * 0.8F) - .setIdentifier(Blocks.farmland.stepSound.getStepResourcePath()) - .setPosition(aX + 0.5F, aY + 0.5F, aZ + 0.5F).setWorld(aWorld).run(); + new WorldSpawnedEventBuilder.SoundEventBuilder().setVolume( + (Blocks.farmland.stepSound.getVolume() + 1.0F) / 2.0F) + .setPitch(Blocks.farmland.stepSound.getPitch() * 0.8F) + .setIdentifier( + Blocks.farmland.stepSound.getStepResourcePath()) + .setPosition(aX + 0.5F, aY + 0.5F, aZ + 0.5F) + .setWorld(aWorld) + .run(); if (aWorld.isRemote) { return true; } diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Lighter.java b/src/main/java/gregtech/common/items/behaviors/Behaviour_Lighter.java index b1357a0777..1e232d4988 100644 --- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Lighter.java +++ b/src/main/java/gregtech/common/items/behaviors/Behaviour_Lighter.java @@ -24,12 +24,15 @@ public class Behaviour_Lighter extends Behaviour_None { private final ItemStack mUsedLighter; private final ItemStack mFullLighter; private final long mFuelAmount; - private final String mTooltip = GT_LanguageManager - .addStringLocalization("gt.behaviour.lighter.tooltip", "Can light things on Fire"); - private final String mTooltipUses = GT_LanguageManager - .addStringLocalization("gt.behaviour.lighter.uses", "Remaining Uses:"); - private final String mTooltipUnstackable = GT_LanguageManager - .addStringLocalization("gt.behaviour.unstackable", "Not usable when stacked!"); + private final String mTooltip = GT_LanguageManager.addStringLocalization( + "gt.behaviour.lighter.tooltip", + "Can light things on Fire"); + private final String mTooltipUses = GT_LanguageManager.addStringLocalization( + "gt.behaviour.lighter.uses", + "Remaining Uses:"); + private final String mTooltipUnstackable = GT_LanguageManager.addStringLocalization( + "gt.behaviour.unstackable", + "Not usable when stacked!"); public Behaviour_Lighter(ItemStack aEmptyLighter, ItemStack aUsedLighter, ItemStack aFullLighter, long aFuelAmount) { diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Plunger_Essentia.java b/src/main/java/gregtech/common/items/behaviors/Behaviour_Plunger_Essentia.java index c164695c36..0023511846 100644 --- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Plunger_Essentia.java +++ b/src/main/java/gregtech/common/items/behaviors/Behaviour_Plunger_Essentia.java @@ -18,8 +18,9 @@ import gregtech.api.util.GT_Utility; public class Behaviour_Plunger_Essentia extends Behaviour_None { private final int mCosts; - private final String mTooltip = GT_LanguageManager - .addStringLocalization("gt.behaviour.plunger.essentia", "Clears Essentia from Containers and Tubes"); + private final String mTooltip = GT_LanguageManager.addStringLocalization( + "gt.behaviour.plunger.essentia", + "Clears Essentia from Containers and Tubes"); public Behaviour_Plunger_Essentia(int aCosts) { this.mCosts = aCosts; diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Plunger_Fluid.java b/src/main/java/gregtech/common/items/behaviors/Behaviour_Plunger_Fluid.java index e0d0f91e48..737caf9f5b 100644 --- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Plunger_Fluid.java +++ b/src/main/java/gregtech/common/items/behaviors/Behaviour_Plunger_Fluid.java @@ -21,8 +21,9 @@ import gregtech.api.util.GT_Utility; public class Behaviour_Plunger_Fluid extends Behaviour_None { private final int mCosts; - private final String mTooltip = GT_LanguageManager - .addStringLocalization("gt.behaviour.plunger.fluid", "Clears 1000 Liters of Fluid from Tanks"); + private final String mTooltip = GT_LanguageManager.addStringLocalization( + "gt.behaviour.plunger.fluid", + "Clears 1000 Liters of Fluid from Tanks"); public Behaviour_Plunger_Fluid(int aCosts) { this.mCosts = aCosts; @@ -61,8 +62,14 @@ public class Behaviour_Plunger_Fluid extends Behaviour_None { GT_MetaTileEntity_BasicTank machine = (GT_MetaTileEntity_BasicTank) mTileEntity; if (machine.mFluid != null && machine.mFluid.amount > 0) machine.mFluid.amount = machine.mFluid.amount - Math.min(machine.mFluid.amount, 1000); - GT_Utility - .sendSoundToPlayers(aWorld, SoundResource.IC2_TOOLS_RUBBER_TRAMPOLINE, 1.0F, -1.0F, aX, aY, aZ); + GT_Utility.sendSoundToPlayers( + aWorld, + SoundResource.IC2_TOOLS_RUBBER_TRAMPOLINE, + 1.0F, + -1.0F, + aX, + aY, + aZ); return true; } } diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Plunger_Item.java b/src/main/java/gregtech/common/items/behaviors/Behaviour_Plunger_Item.java index 1aeafc62fe..e4f0c3012d 100644 --- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Plunger_Item.java +++ b/src/main/java/gregtech/common/items/behaviors/Behaviour_Plunger_Item.java @@ -21,8 +21,9 @@ import gregtech.api.util.GT_Utility; public class Behaviour_Plunger_Item extends Behaviour_None { private final int mCosts; - private final String mTooltip = GT_LanguageManager - .addStringLocalization("gt.behaviour.plunger.item", "Clears Items from Pipes"); + private final String mTooltip = GT_LanguageManager.addStringLocalization( + "gt.behaviour.plunger.item", + "Clears Items from Pipes"); public Behaviour_Plunger_Item(int aCosts) { this.mCosts = aCosts; @@ -39,9 +40,13 @@ public class Behaviour_Plunger_Item extends Behaviour_None { IMetaTileEntity tMetaTileEntity = ((IGregTechTileEntity) aTileEntity).getMetaTileEntity(); if ((tMetaTileEntity instanceof IMetaTileEntityItemPipe)) { for (IMetaTileEntityItemPipe tTileEntity : GT_Utility.sortMapByValuesAcending( - IMetaTileEntityItemPipe.Util - .scanPipes((IMetaTileEntityItemPipe) tMetaTileEntity, new HashMap<>(), 0L, false, true)) - .keySet()) { + IMetaTileEntityItemPipe.Util.scanPipes( + (IMetaTileEntityItemPipe) tMetaTileEntity, + new HashMap<>(), + 0L, + false, + true)) + .keySet()) { int i = 0; for (int j = tTileEntity.getSizeInventory(); i < j; i++) { if (tTileEntity.isValidSlot(i)) { diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Prospecting.java b/src/main/java/gregtech/common/items/behaviors/Behaviour_Prospecting.java index 1374a33f7d..c007473df1 100644 --- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Prospecting.java +++ b/src/main/java/gregtech/common/items/behaviors/Behaviour_Prospecting.java @@ -31,8 +31,9 @@ public class Behaviour_Prospecting extends Behaviour_None { private final int mVanillaCosts; private final int mEUCosts; - private final String mTooltip = GT_LanguageManager - .addStringLocalization("gt.behaviour.prospecting", "Usable for Prospecting"); + private final String mTooltip = GT_LanguageManager.addStringLocalization( + "gt.behaviour.prospecting", + "Usable for Prospecting"); public Behaviour_Prospecting(int aVanillaCosts, int aEUCosts) { this.mVanillaCosts = aVanillaCosts; @@ -54,7 +55,8 @@ public class Behaviour_Prospecting extends Behaviour_None { ItemData tAssociation = GT_OreDictUnificator.getAssociation(new ItemStack(aBlock, 1, aMeta)); if (tAssociation != null && tAssociation.mPrefix != null && tAssociation.mMaterial != null - && tAssociation.mPrefix.toString().startsWith("ore")) { + && tAssociation.mPrefix.toString() + .startsWith("ore")) { GT_Utility.sendChatToPlayer( aPlayer, GT_Utility.trans("100", "This is ") + tAssociation.mMaterial.mMaterial.mDefaultLocalName @@ -85,8 +87,9 @@ public class Behaviour_Prospecting extends Behaviour_None { tBlock = aWorld.getBlock(tX, tY, tZ); if (tBlock == Blocks.lava || tBlock == Blocks.flowing_lava) { - GT_Utility - .sendChatToPlayer(aPlayer, GT_Utility.trans("102", "There is Lava behind this Rock.")); + GT_Utility.sendChatToPlayer( + aPlayer, + GT_Utility.trans("102", "There is Lava behind this Rock.")); break; } if (tBlock instanceof BlockLiquid || tBlock instanceof IFluidBlock) { @@ -133,7 +136,8 @@ public class Behaviour_Prospecting extends Behaviour_None { tAssociation = GT_OreDictUnificator.getAssociation(new ItemStack(tBlock, 1, tMetaID)); if (tAssociation != null && tAssociation.mPrefix != null && tAssociation.mMaterial != null - && tAssociation.mPrefix.toString().startsWith("ore")) { + && tAssociation.mPrefix.toString() + .startsWith("ore")) { GT_Utility.sendChatToPlayer( aPlayer, GT_Utility.trans("106", "Found traces of ") diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Scanner.java b/src/main/java/gregtech/common/items/behaviors/Behaviour_Scanner.java index ad8d99f6fb..d82585184d 100644 --- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Scanner.java +++ b/src/main/java/gregtech/common/items/behaviors/Behaviour_Scanner.java @@ -19,8 +19,9 @@ import gregtech.api.util.GT_Utility; public class Behaviour_Scanner extends Behaviour_None { public static final IItemBehaviour<GT_MetaBase_Item> INSTANCE = new Behaviour_Scanner(); - private final String mTooltip = GT_LanguageManager - .addStringLocalization("gt.behaviour.scanning", "Can scan Blocks in World"); + private final String mTooltip = GT_LanguageManager.addStringLocalization( + "gt.behaviour.scanning", + "Can scan Blocks in World"); @Override public boolean onItemUseFirst(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Scoop.java b/src/main/java/gregtech/common/items/behaviors/Behaviour_Scoop.java index 83d5ffffa3..51723469d6 100644 --- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Scoop.java +++ b/src/main/java/gregtech/common/items/behaviors/Behaviour_Scoop.java @@ -17,8 +17,9 @@ import gregtech.api.util.GT_LanguageManager; public class Behaviour_Scoop extends Behaviour_None { private final int mCosts; - private final String mTooltip = GT_LanguageManager - .addStringLocalization("gt.behaviour.scoop", "Catches Butterflies on Leftclick"); + private final String mTooltip = GT_LanguageManager.addStringLocalization( + "gt.behaviour.scoop", + "Catches Butterflies on Leftclick"); public Behaviour_Scoop(int aCosts) { this.mCosts = aCosts; @@ -33,18 +34,23 @@ public class Behaviour_Scoop extends Behaviour_None { if ((aPlayer.capabilities.isCreativeMode) || (((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts))) { Object tButterfly = ((IEntityButterfly) aEntity).getButterfly(); - ((IButterfly) tButterfly).getGenome().getPrimary().getRoot() - .getBreedingTracker(aEntity.worldObj, aPlayer.getGameProfile()) - .registerCatch((IButterfly) tButterfly); + ((IButterfly) tButterfly).getGenome() + .getPrimary() + .getRoot() + .getBreedingTracker(aEntity.worldObj, aPlayer.getGameProfile()) + .registerCatch((IButterfly) tButterfly); aPlayer.worldObj.spawnEntityInWorld( new EntityItem( aPlayer.worldObj, aEntity.posX, aEntity.posY, aEntity.posZ, - ((IButterfly) tButterfly).getGenome().getPrimary().getRoot().getMemberStack( - ((IButterfly) tButterfly).copy(), - EnumFlutterType.BUTTERFLY.ordinal()))); + ((IButterfly) tButterfly).getGenome() + .getPrimary() + .getRoot() + .getMemberStack( + ((IButterfly) tButterfly).copy(), + EnumFlutterType.BUTTERFLY.ordinal()))); aEntity.setDead(); } return true; diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Sense.java b/src/main/java/gregtech/common/items/behaviors/Behaviour_Sense.java index 75b4d9e431..949b57e581 100644 --- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Sense.java +++ b/src/main/java/gregtech/common/items/behaviors/Behaviour_Sense.java @@ -15,8 +15,9 @@ import ic2.api.crops.ICropTile; public class Behaviour_Sense extends Behaviour_None { private final int mCosts; - private final String mTooltip = GT_LanguageManager - .addStringLocalization("gt.behaviour.sense", "Rightclick to harvest Crop Sticks"); + private final String mTooltip = GT_LanguageManager.addStringLocalization( + "gt.behaviour.sense", + "Rightclick to harvest Crop Sticks"); public Behaviour_Sense(int aCosts) { this.mCosts = aCosts; diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_SoftHammer.java b/src/main/java/gregtech/common/items/behaviors/Behaviour_SoftHammer.java index 7c5780c42d..75f3afb4fc 100644 --- a/src/main/java/gregtech/common/items/behaviors/Behaviour_SoftHammer.java +++ b/src/main/java/gregtech/common/items/behaviors/Behaviour_SoftHammer.java @@ -17,8 +17,9 @@ import gregtech.api.util.GT_Utility; public class Behaviour_SoftHammer extends Behaviour_None { private final int mCosts; - private final String mTooltip = GT_LanguageManager - .addStringLocalization("gt.behaviour.softhammer", "Activates and Deactivates Machines"); + private final String mTooltip = GT_LanguageManager.addStringLocalization( + "gt.behaviour.softhammer", + "Activates and Deactivates Machines"); public Behaviour_SoftHammer(int aCosts) { this.mCosts = aCosts; @@ -41,8 +42,14 @@ public class Behaviour_SoftHammer extends Behaviour_None { aWorld.isRemote = true; aWorld.setBlock(aX, aY, aZ, Blocks.redstone_lamp, 0, 0); aWorld.isRemote = false; - GT_Utility - .sendSoundToPlayers(aWorld, SoundResource.IC2_TOOLS_RUBBER_TRAMPOLINE, 1.0F, -1.0F, aX, aY, aZ); + GT_Utility.sendSoundToPlayers( + aWorld, + SoundResource.IC2_TOOLS_RUBBER_TRAMPOLINE, + 1.0F, + -1.0F, + aX, + aY, + aZ); } return true; } @@ -52,8 +59,14 @@ public class Behaviour_SoftHammer extends Behaviour_None { aWorld.isRemote = true; aWorld.setBlock(aX, aY, aZ, Blocks.lit_redstone_lamp, 0, 0); aWorld.isRemote = false; - GT_Utility - .sendSoundToPlayers(aWorld, SoundResource.IC2_TOOLS_RUBBER_TRAMPOLINE, 1.0F, -1.0F, aX, aY, aZ); + GT_Utility.sendSoundToPlayers( + aWorld, + SoundResource.IC2_TOOLS_RUBBER_TRAMPOLINE, + 1.0F, + -1.0F, + aX, + aY, + aZ); } return true; } @@ -63,8 +76,14 @@ public class Behaviour_SoftHammer extends Behaviour_None { aWorld.isRemote = true; aWorld.setBlock(aX, aY, aZ, aBlock, (aMeta + 8) % 16, 0); aWorld.isRemote = false; - GT_Utility - .sendSoundToPlayers(aWorld, SoundResource.IC2_TOOLS_RUBBER_TRAMPOLINE, 1.0F, -1.0F, aX, aY, aZ); + GT_Utility.sendSoundToPlayers( + aWorld, + SoundResource.IC2_TOOLS_RUBBER_TRAMPOLINE, + 1.0F, + -1.0F, + aX, + aY, + aZ); } return true; } @@ -74,8 +93,14 @@ public class Behaviour_SoftHammer extends Behaviour_None { aWorld.isRemote = true; aWorld.setBlock(aX, aY, aZ, aBlock, (aMeta + 8) % 16, 0); aWorld.isRemote = false; - GT_Utility - .sendSoundToPlayers(aWorld, SoundResource.IC2_TOOLS_RUBBER_TRAMPOLINE, 1.0F, -1.0F, aX, aY, aZ); + GT_Utility.sendSoundToPlayers( + aWorld, + SoundResource.IC2_TOOLS_RUBBER_TRAMPOLINE, + 1.0F, + -1.0F, + aX, + aY, + aZ); } return true; } @@ -92,8 +117,14 @@ public class Behaviour_SoftHammer extends Behaviour_None { if ((aPlayer.capabilities.isCreativeMode) || (((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts))) { aWorld.setBlockMetadataWithNotify(aX, aY, aZ, (aMeta + 1) % 6, 3); - GT_Utility - .sendSoundToPlayers(aWorld, SoundResource.IC2_TOOLS_RUBBER_TRAMPOLINE, 1.0F, -1.0F, aX, aY, aZ); + GT_Utility.sendSoundToPlayers( + aWorld, + SoundResource.IC2_TOOLS_RUBBER_TRAMPOLINE, + 1.0F, + -1.0F, + aX, + aY, + aZ); } return true; } @@ -105,8 +136,14 @@ public class Behaviour_SoftHammer extends Behaviour_None { if ((aPlayer.capabilities.isCreativeMode) || (((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts))) { aWorld.setBlockMetadataWithNotify(aX, aY, aZ, (aMeta - 1) % 4 + 2, 3); - GT_Utility - .sendSoundToPlayers(aWorld, SoundResource.IC2_TOOLS_RUBBER_TRAMPOLINE, 1.0F, -1.0F, aX, aY, aZ); + GT_Utility.sendSoundToPlayers( + aWorld, + SoundResource.IC2_TOOLS_RUBBER_TRAMPOLINE, + 1.0F, + -1.0F, + aX, + aY, + aZ); } return true; } @@ -114,8 +151,14 @@ public class Behaviour_SoftHammer extends Behaviour_None { if ((aPlayer.capabilities.isCreativeMode) || (((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts))) { aWorld.setBlockMetadataWithNotify(aX, aY, aZ, (aMeta + 1) % 6 != 1 ? (aMeta + 1) % 6 : 2, 3); - GT_Utility - .sendSoundToPlayers(aWorld, SoundResource.IC2_TOOLS_RUBBER_TRAMPOLINE, 1.0F, -1.0F, aX, aY, aZ); + GT_Utility.sendSoundToPlayers( + aWorld, + SoundResource.IC2_TOOLS_RUBBER_TRAMPOLINE, + 1.0F, + -1.0F, + aX, + aY, + aZ); } return true; } diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Spray_Color.java b/src/main/java/gregtech/common/items/behaviors/Behaviour_Spray_Color.java index f5b4615a21..3365d44d11 100644 --- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Spray_Color.java +++ b/src/main/java/gregtech/common/items/behaviors/Behaviour_Spray_Color.java @@ -37,10 +37,12 @@ public class Behaviour_Spray_Color extends Behaviour_None { Blocks.hardened_clay, ItemList.TE_Rockwool.getBlock()); private final String mTooltip; - private final String mTooltipUses = GT_LanguageManager - .addStringLocalization("gt.behaviour.paintspray.uses", "Remaining Uses:"); - private final String mTooltipUnstackable = GT_LanguageManager - .addStringLocalization("gt.behaviour.unstackable", "Not usable when stacked!"); + private final String mTooltipUses = GT_LanguageManager.addStringLocalization( + "gt.behaviour.paintspray.uses", + "Remaining Uses:"); + private final String mTooltipUnstackable = GT_LanguageManager.addStringLocalization( + "gt.behaviour.unstackable", + "Not usable when stacked!"); public Behaviour_Spray_Color(ItemStack aEmpty, ItemStack aUsed, ItemStack aFull, long aUses, int aColor) { this.mEmpty = aEmpty; diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Wrench.java b/src/main/java/gregtech/common/items/behaviors/Behaviour_Wrench.java index 64d2660c53..a04593a1b8 100644 --- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Wrench.java +++ b/src/main/java/gregtech/common/items/behaviors/Behaviour_Wrench.java @@ -23,8 +23,9 @@ import ic2.api.tile.IWrenchable; public class Behaviour_Wrench extends Behaviour_None { private final int mCosts; - private final String mTooltip = GT_LanguageManager - .addStringLocalization("gt.behaviour.wrench", "Rotates Blocks on Rightclick"); + private final String mTooltip = GT_LanguageManager.addStringLocalization( + "gt.behaviour.wrench", + "Rotates Blocks on Rightclick"); public Behaviour_Wrench(int aCosts) { this.mCosts = aCosts; @@ -165,7 +166,7 @@ public class Behaviour_Wrench extends Behaviour_None { } } if ((Arrays.asList(aBlock.getValidRotations(aWorld, aX, aY, aZ)) - .contains(ForgeDirection.getOrientation(aTargetSide))) + .contains(ForgeDirection.getOrientation(aTargetSide))) && ((aPlayer.capabilities.isCreativeMode) || (!GT_ModHandler.isElectricItem(aStack)) || (GT_ModHandler.canUseElectricItem(aStack, this.mCosts))) && (aBlock.rotateBlock(aWorld, aX, aY, aZ, ForgeDirection.getOrientation(aTargetSide)))) { diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_WrittenBook.java b/src/main/java/gregtech/common/items/behaviors/Behaviour_WrittenBook.java index 947442ad8e..65ba5199ee 100644 --- a/src/main/java/gregtech/common/items/behaviors/Behaviour_WrittenBook.java +++ b/src/main/java/gregtech/common/items/behaviors/Behaviour_WrittenBook.java @@ -22,7 +22,8 @@ public class Behaviour_WrittenBook extends Behaviour_None { int aY, int aZ, int aSide, float hitX, float hitY, float hitZ) { if ((GT_Utility.isStringValid(GT_Utility.ItemNBT.getBookTitle(aStack))) && ((aPlayer instanceof EntityPlayerSP))) { - Minecraft.getMinecraft().displayGuiScreen(new GuiScreenBook(aPlayer, aStack, false)); + Minecraft.getMinecraft() + .displayGuiScreen(new GuiScreenBook(aPlayer, aStack, false)); } return true; } |