From 5f50e4a36ec000657b0a1664784acf00275293c6 Mon Sep 17 00:00:00 2001 From: boubou19 Date: Sat, 1 Apr 2023 18:11:43 +0200 Subject: update spotless formatting (#1827) --- .../loaders/postload/GT_BookAndLootLoader.java | 15 +- .../loaders/postload/GT_CraftingRecipeLoader.java | 81 +- .../postload/GT_ItemMaxStacksizeLoader.java | 162 +- .../gregtech/loaders/postload/GT_PostLoad.java | 261 +- .../postload/GT_ProcessingArrayRecipeLoader.java | 145 +- .../postload/GT_RecyclerBlacklistLoader.java | 17 +- .../postload/chains/GT_PCBFactoryRecipes.java | 213 +- .../postload/recipes/AlloySmelterRecipes.java | 100 +- .../postload/recipes/ArcFurnaceRecipes.java | 792 +- .../loaders/postload/recipes/AssemblerRecipes.java | 9625 ++++++++++++-------- .../postload/recipes/AssemblyLineRecipes.java | 1304 +-- .../loaders/postload/recipes/AutoclaveRecipes.java | 353 +- .../loaders/postload/recipes/BenderRecipes.java | 451 +- .../postload/recipes/BlastFurnaceRecipes.java | 815 +- .../loaders/postload/recipes/BreweryRecipes.java | 689 +- .../loaders/postload/recipes/CannerRecipes.java | 76 +- .../postload/recipes/CentrifugeRecipes.java | 1292 ++- .../postload/recipes/ChemicalBathRecipes.java | 409 +- .../loaders/postload/recipes/ChemicalRecipes.java | 8486 ++++++++++------- .../postload/recipes/CircuitAssemblerRecipes.java | 394 +- .../postload/recipes/CompressorRecipes.java | 215 +- .../postload/recipes/CropProcessingRecipes.java | 44 +- .../loaders/postload/recipes/CuttingRecipes.java | 77 +- .../postload/recipes/DistilleryRecipes.java | 945 +- .../postload/recipes/ElectrolyzerRecipes.java | 405 +- .../recipes/ElectromagneticSeparatorRecipes.java | 13 +- .../loaders/postload/recipes/ExtractorRecipes.java | 10 +- .../loaders/postload/recipes/ExtruderRecipes.java | 22 +- .../loaders/postload/recipes/FermenterRecipes.java | 577 +- .../postload/recipes/FluidCannerRecipes.java | 108 +- .../postload/recipes/FluidExtractorRecipes.java | 855 +- .../postload/recipes/FluidHeaterRecipes.java | 113 +- .../postload/recipes/FluidSolidifierRecipes.java | 857 +- .../postload/recipes/ForgeHammerRecipes.java | 227 +- .../postload/recipes/FormingPressRecipes.java | 260 +- .../loaders/postload/recipes/FuelRecipes.java | 221 +- .../postload/recipes/FusionReactorRecipes.java | 523 +- .../recipes/ImplosionCompressorRecipes.java | 43 +- .../postload/recipes/LaserEngraverRecipes.java | 58 +- .../loaders/postload/recipes/LatheRecipes.java | 30 +- .../postload/recipes/MatterAmplifierRecipes.java | 22 +- .../loaders/postload/recipes/MixerRecipes.java | 2760 +++--- .../loaders/postload/recipes/PackagerRecipes.java | 53 +- .../postload/recipes/PlasmaForgeRecipes.java | 44 +- .../loaders/postload/recipes/PrinterRecipes.java | 70 +- .../loaders/postload/recipes/Pulverizer.java | 956 +- .../loaders/postload/recipes/PyrolyseRecipes.java | 156 +- .../loaders/postload/recipes/RecipeRemover.java | 32 +- .../loaders/postload/recipes/SifterRecipes.java | 50 +- .../loaders/postload/recipes/SlicerRecipes.java | 44 +- .../loaders/postload/recipes/SmelterRecipes.java | 10 +- .../postload/recipes/ThermalCentrifugeRecipes.java | 18 +- .../recipes/TranscendentPlasmaMixerRecipes.java | 128 +- .../postload/recipes/VacuumFreezerRecipes.java | 668 +- .../loaders/postload/recipes/WiremillRecipes.java | 260 +- 55 files changed, 23302 insertions(+), 13252 deletions(-) (limited to 'src/main/java/gregtech/loaders/postload') diff --git a/src/main/java/gregtech/loaders/postload/GT_BookAndLootLoader.java b/src/main/java/gregtech/loaders/postload/GT_BookAndLootLoader.java index d661fb4452..0e4051c798 100644 --- a/src/main/java/gregtech/loaders/postload/GT_BookAndLootLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_BookAndLootLoader.java @@ -49,11 +49,13 @@ public class GT_BookAndLootLoader implements Runnable { tChest.setMax(tChest.getMax() + 16); tChest.setMin(tChest.getMin() + 8); } - ChestGenHooks - .addItem("bonusChest", new WeightedRandomChestContent(ItemList.Bottle_Purple_Drink.get(1L), 8, 16, 2)); + ChestGenHooks.addItem( + "bonusChest", + new WeightedRandomChestContent(ItemList.Bottle_Purple_Drink.get(1L), 8, 16, 2)); - ChestGenHooks - .addItem("dungeonChest", new WeightedRandomChestContent(ItemList.Bottle_Holy_Water.get(1L), 4, 8, 20)); + ChestGenHooks.addItem( + "dungeonChest", + new WeightedRandomChestContent(ItemList.Bottle_Holy_Water.get(1L), 4, 8, 20)); ChestGenHooks.addItem( "dungeonChest", new WeightedRandomChestContent(ItemList.Bottle_Purple_Drink.get(1L), 8, 16, 80)); @@ -370,8 +372,9 @@ public class GT_BookAndLootLoader implements Runnable { 4, 1)); - ChestGenHooks - .addItem("villageBlacksmith", new WeightedRandomChestContent(ItemList.McGuffium_239.get(1L), 1, 1, 1)); + ChestGenHooks.addItem( + "villageBlacksmith", + new WeightedRandomChestContent(ItemList.McGuffium_239.get(1L), 1, 1, 1)); ChestGenHooks.addItem( "villageBlacksmith", new WeightedRandomChestContent( diff --git a/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java index c05002a14d..464b84d11b 100644 --- a/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java @@ -88,8 +88,16 @@ public class GT_CraftingRecipeLoader implements Runnable { } if (GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.recipereplacements, "Iron.Hopper", true)) { ItemStack tStack; - if (null != (tStack = GT_ModHandler - .removeRecipe(tMat, null, tMat, tMat, new ItemStack(Blocks.chest, 1, 0), tMat, null, tMat, null))) { + if (null != (tStack = GT_ModHandler.removeRecipe( + tMat, + null, + tMat, + tMat, + new ItemStack(Blocks.chest, 1, 0), + tMat, + null, + tMat, + null))) { GT_ModHandler.addCraftingRecipe( tStack, bits_no_remove_buffered | GT_ModHandler.RecipeBits.DELETE_ALL_OTHER_RECIPES, @@ -157,17 +165,18 @@ public class GT_CraftingRecipeLoader implements Runnable { GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getModItem("Forestry", "engine", 1L, 2)); GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getModItem("Forestry", "engine", 1L, 4)); - ItemStack tStack = GT_ModHandler - .removeRecipe(new ItemStack(Blocks.planks, 1, 0), null, null, new ItemStack(Blocks.planks, 1, 0)); + ItemStack tStack = GT_ModHandler.removeRecipe( + new ItemStack(Blocks.planks, 1, 0), + null, + null, + new ItemStack(Blocks.planks, 1, 0)); if (tStack != null) { - GT_ModHandler - .addCraftingRecipe( - GT_Utility.copyAmount( - GT_Mod.gregtechproxy.mNerfedWoodPlank ? tStack.stackSize - : tStack.stackSize * 5L / 4, - tStack), - bits_no_remove_buffered, - new Object[] { "s", "P", "P", 'P', OrePrefixes.plank.get(Materials.Wood) }); + GT_ModHandler.addCraftingRecipe( + GT_Utility.copyAmount( + GT_Mod.gregtechproxy.mNerfedWoodPlank ? tStack.stackSize : tStack.stackSize * 5L / 4, + tStack), + bits_no_remove_buffered, + new Object[] { "s", "P", "P", 'P', OrePrefixes.plank.get(Materials.Wood) }); GT_ModHandler.addCraftingRecipe( GT_Utility.copyAmount( GT_Mod.gregtechproxy.mNerfedWoodPlank ? tStack.stackSize / 2 : tStack.stackSize, @@ -739,9 +748,10 @@ public class GT_CraftingRecipeLoader implements Runnable { GT_OreDictUnificator.get( OrePrefixes.ingot, Materials.Bronze, - GregTech_API.sRecipeFile - .get(ConfigCategories.Recipes.disabledrecipes, "bronzeingotcrafting", true) ? 1L - : 2L))) { + GregTech_API.sRecipeFile.get( + ConfigCategories.Recipes.disabledrecipes, + "bronzeingotcrafting", + true) ? 1L : 2L))) { GT_Log.out.println("GT_Mod: Changed Forestrys Bronze Recipe"); } if (GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.disabledrecipes, "enchantmenttable", false)) { @@ -1600,13 +1610,13 @@ public class GT_CraftingRecipeLoader implements Runnable { if (GT_Mod.gregtechproxy.mDisableIC2Cables) { - List iToRemoveAndHide = Arrays - .stream( - new String[] { "copperCableItem", "insulatedCopperCableItem", "goldCableItem", - "insulatedGoldCableItem", "insulatedIronCableItem", "glassFiberCableItem", - "tinCableItem", "ironCableItem", "insulatedTinCableItem", "detectorCableItem", - "splitterCableItem", "electrolyzer", "cutter" }) - .map(x -> GT_ModHandler.getIC2Item(x, 1L)).collect(Collectors.toList()); + List iToRemoveAndHide = Arrays.stream( + new String[] { "copperCableItem", "insulatedCopperCableItem", "goldCableItem", + "insulatedGoldCableItem", "insulatedIronCableItem", "glassFiberCableItem", "tinCableItem", + "ironCableItem", "insulatedTinCableItem", "detectorCableItem", "splitterCableItem", + "electrolyzer", "cutter" }) + .map(x -> GT_ModHandler.getIC2Item(x, 1L)) + .collect(Collectors.toList()); if (NotEnoughItems.isModLoaded()) { iToRemoveAndHide.forEach(item -> { @@ -1622,7 +1632,8 @@ public class GT_CraftingRecipeLoader implements Runnable { "ovScanner", "solarHelmet", "staticBoots", "ecMeter", "obscurator", "overclockerUpgrade", "transformerUpgrade", "energyStorageUpgrade", "ejectorUpgrade", "suBattery", "frequencyTransmitter", "pullingUpgrade" }) - .map(x -> GT_ModHandler.getIC2Item(x, 1L)).forEach(GT_ModHandler::removeRecipeByOutputDelayed); + .map(x -> GT_ModHandler.getIC2Item(x, 1L)) + .forEach(GT_ModHandler::removeRecipeByOutputDelayed); GT_ModHandler.addCraftingRecipe( GT_ModHandler.getIC2Item("batBox", 1L), @@ -1817,28 +1828,44 @@ public class GT_CraftingRecipeLoader implements Runnable { new Object[] { "PPP", "GEC", "SBd", 'P', OrePrefixes.plate.get(Materials.Titanium), 'G', OrePrefixes.gemExquisite.get(Materials.Diamond), 'E', ItemList.Emitter_HV, 'C', OrePrefixes.circuit.get(Materials.Elite), 'S', OrePrefixes.screw.get(Materials.Titanium), - 'B', new ItemStack(Ic2Items.chargingEnergyCrystal.copy().getItem(), 1, GT_Values.W) }); + 'B', new ItemStack( + Ic2Items.chargingEnergyCrystal.copy() + .getItem(), + 1, + GT_Values.W) }); GT_ModHandler.addCraftingRecipe( Ic2Items.miningLaser.copy(), GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "PPP", "GEC", "SBd", 'P', OrePrefixes.plate.get(Materials.Titanium), 'G', OrePrefixes.gemExquisite.get(Materials.Ruby), 'E', ItemList.Emitter_HV, 'C', OrePrefixes.circuit.get(Materials.Elite), 'S', OrePrefixes.screw.get(Materials.Titanium), - 'B', new ItemStack(Ic2Items.chargingEnergyCrystal.copy().getItem(), 1, GT_Values.W) }); + 'B', new ItemStack( + Ic2Items.chargingEnergyCrystal.copy() + .getItem(), + 1, + GT_Values.W) }); GT_ModHandler.addCraftingRecipe( Ic2Items.miningLaser.copy(), GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "PPP", "GEC", "SBd", 'P', OrePrefixes.plate.get(Materials.Titanium), 'G', OrePrefixes.gemExquisite.get(Materials.Jasper), 'E', ItemList.Emitter_HV, 'C', OrePrefixes.circuit.get(Materials.Elite), 'S', OrePrefixes.screw.get(Materials.Titanium), - 'B', new ItemStack(Ic2Items.chargingEnergyCrystal.copy().getItem(), 1, GT_Values.W) }); + 'B', new ItemStack( + Ic2Items.chargingEnergyCrystal.copy() + .getItem(), + 1, + GT_Values.W) }); GT_ModHandler.addCraftingRecipe( Ic2Items.miningLaser.copy(), GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "PPP", "GEC", "SBd", 'P', OrePrefixes.plate.get(Materials.Titanium), 'G', OrePrefixes.gemExquisite.get(Materials.GarnetRed), 'E', ItemList.Emitter_HV, 'C', OrePrefixes.circuit.get(Materials.Elite), 'S', OrePrefixes.screw.get(Materials.Titanium), - 'B', new ItemStack(Ic2Items.chargingEnergyCrystal.copy().getItem(), 1, GT_Values.W) }); + 'B', new ItemStack( + Ic2Items.chargingEnergyCrystal.copy() + .getItem(), + 1, + GT_Values.W) }); } GT_ModHandler.removeRecipeDelayed(GT_ModHandler.getIC2Item("miningPipe", 8)); GT_ModHandler.addCraftingRecipe( diff --git a/src/main/java/gregtech/loaders/postload/GT_ItemMaxStacksizeLoader.java b/src/main/java/gregtech/loaders/postload/GT_ItemMaxStacksizeLoader.java index 655d1a06fd..c310a3501f 100644 --- a/src/main/java/gregtech/loaders/postload/GT_ItemMaxStacksizeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_ItemMaxStacksizeLoader.java @@ -15,7 +15,8 @@ public class GT_ItemMaxStacksizeLoader implements Runnable { public void run() { GT_Log.out.println("GT_Mod: Changing maximum Stacksizes if configured."); - ItemList.Upgrade_Overclocker.getItem().setMaxStackSize(GT_Mod.gregtechproxy.mUpgradeCount); + ItemList.Upgrade_Overclocker.getItem() + .setMaxStackSize(GT_Mod.gregtechproxy.mUpgradeCount); Items.cake.setMaxStackSize(64); Items.wooden_door.setMaxStackSize(8); Items.iron_door.setMaxStackSize(8); @@ -24,61 +25,114 @@ public class GT_ItemMaxStacksizeLoader implements Runnable { Items.snowball.setMaxStackSize(64); Items.mushroom_stew.setMaxStackSize(64); if (OrePrefixes.plank.mDefaultStackSize < 64) { - Item.getItemFromBlock(Blocks.wooden_slab).setMaxStackSize(OrePrefixes.plank.mDefaultStackSize); - Item.getItemFromBlock(Blocks.double_wooden_slab).setMaxStackSize(OrePrefixes.plank.mDefaultStackSize); - Item.getItemFromBlock(Blocks.oak_stairs).setMaxStackSize(OrePrefixes.plank.mDefaultStackSize); - Item.getItemFromBlock(Blocks.jungle_stairs).setMaxStackSize(OrePrefixes.plank.mDefaultStackSize); - Item.getItemFromBlock(Blocks.birch_stairs).setMaxStackSize(OrePrefixes.plank.mDefaultStackSize); - Item.getItemFromBlock(Blocks.spruce_stairs).setMaxStackSize(OrePrefixes.plank.mDefaultStackSize); - Item.getItemFromBlock(Blocks.acacia_stairs).setMaxStackSize(OrePrefixes.plank.mDefaultStackSize); - Item.getItemFromBlock(Blocks.dark_oak_stairs).setMaxStackSize(OrePrefixes.plank.mDefaultStackSize); + Item.getItemFromBlock(Blocks.wooden_slab) + .setMaxStackSize(OrePrefixes.plank.mDefaultStackSize); + Item.getItemFromBlock(Blocks.double_wooden_slab) + .setMaxStackSize(OrePrefixes.plank.mDefaultStackSize); + Item.getItemFromBlock(Blocks.oak_stairs) + .setMaxStackSize(OrePrefixes.plank.mDefaultStackSize); + Item.getItemFromBlock(Blocks.jungle_stairs) + .setMaxStackSize(OrePrefixes.plank.mDefaultStackSize); + Item.getItemFromBlock(Blocks.birch_stairs) + .setMaxStackSize(OrePrefixes.plank.mDefaultStackSize); + Item.getItemFromBlock(Blocks.spruce_stairs) + .setMaxStackSize(OrePrefixes.plank.mDefaultStackSize); + Item.getItemFromBlock(Blocks.acacia_stairs) + .setMaxStackSize(OrePrefixes.plank.mDefaultStackSize); + Item.getItemFromBlock(Blocks.dark_oak_stairs) + .setMaxStackSize(OrePrefixes.plank.mDefaultStackSize); } if (OrePrefixes.block.mDefaultStackSize < 64) { - Item.getItemFromBlock(Blocks.stone_slab).setMaxStackSize(OrePrefixes.block.mDefaultStackSize); - Item.getItemFromBlock(Blocks.double_stone_slab).setMaxStackSize(OrePrefixes.block.mDefaultStackSize); - Item.getItemFromBlock(Blocks.brick_stairs).setMaxStackSize(OrePrefixes.block.mDefaultStackSize); - Item.getItemFromBlock(Blocks.nether_brick_stairs).setMaxStackSize(OrePrefixes.block.mDefaultStackSize); - Item.getItemFromBlock(Blocks.sandstone_stairs).setMaxStackSize(OrePrefixes.block.mDefaultStackSize); - Item.getItemFromBlock(Blocks.stone_stairs).setMaxStackSize(OrePrefixes.block.mDefaultStackSize); - Item.getItemFromBlock(Blocks.stone_brick_stairs).setMaxStackSize(OrePrefixes.block.mDefaultStackSize); - Item.getItemFromBlock(Blocks.packed_ice).setMaxStackSize(OrePrefixes.block.mDefaultStackSize); - Item.getItemFromBlock(Blocks.ice).setMaxStackSize(OrePrefixes.block.mDefaultStackSize); - Item.getItemFromBlock(Blocks.soul_sand).setMaxStackSize(OrePrefixes.block.mDefaultStackSize); - Item.getItemFromBlock(Blocks.glowstone).setMaxStackSize(OrePrefixes.block.mDefaultStackSize); - Item.getItemFromBlock(Blocks.snow).setMaxStackSize(OrePrefixes.block.mDefaultStackSize); - Item.getItemFromBlock(Blocks.snow).setMaxStackSize(OrePrefixes.block.mDefaultStackSize); - Item.getItemFromBlock(Blocks.iron_block).setMaxStackSize(OrePrefixes.block.mDefaultStackSize); - Item.getItemFromBlock(Blocks.gold_block).setMaxStackSize(OrePrefixes.block.mDefaultStackSize); - Item.getItemFromBlock(Blocks.emerald_block).setMaxStackSize(OrePrefixes.block.mDefaultStackSize); - Item.getItemFromBlock(Blocks.lapis_block).setMaxStackSize(OrePrefixes.block.mDefaultStackSize); - Item.getItemFromBlock(Blocks.diamond_block).setMaxStackSize(OrePrefixes.block.mDefaultStackSize); - Item.getItemFromBlock(Blocks.clay).setMaxStackSize(OrePrefixes.block.mDefaultStackSize); - Item.getItemFromBlock(Blocks.redstone_lamp).setMaxStackSize(OrePrefixes.block.mDefaultStackSize); - Item.getItemFromBlock(Blocks.dirt).setMaxStackSize(OrePrefixes.block.mDefaultStackSize); - Item.getItemFromBlock(Blocks.grass).setMaxStackSize(OrePrefixes.block.mDefaultStackSize); - Item.getItemFromBlock(Blocks.mycelium).setMaxStackSize(OrePrefixes.block.mDefaultStackSize); - Item.getItemFromBlock(Blocks.gravel).setMaxStackSize(OrePrefixes.block.mDefaultStackSize); - Item.getItemFromBlock(Blocks.sand).setMaxStackSize(OrePrefixes.block.mDefaultStackSize); - Item.getItemFromBlock(Blocks.brick_block).setMaxStackSize(OrePrefixes.block.mDefaultStackSize); - Item.getItemFromBlock(Blocks.wool).setMaxStackSize(OrePrefixes.block.mDefaultStackSize); - Item.getItemFromBlock(Blocks.melon_block).setMaxStackSize(OrePrefixes.block.mDefaultStackSize); - Item.getItemFromBlock(Blocks.pumpkin).setMaxStackSize(OrePrefixes.block.mDefaultStackSize); - Item.getItemFromBlock(Blocks.lit_pumpkin).setMaxStackSize(OrePrefixes.block.mDefaultStackSize); - Item.getItemFromBlock(Blocks.dispenser).setMaxStackSize(OrePrefixes.block.mDefaultStackSize); - Item.getItemFromBlock(Blocks.obsidian).setMaxStackSize(OrePrefixes.block.mDefaultStackSize); - Item.getItemFromBlock(Blocks.piston).setMaxStackSize(OrePrefixes.block.mDefaultStackSize); - Item.getItemFromBlock(Blocks.sticky_piston).setMaxStackSize(OrePrefixes.block.mDefaultStackSize); - Item.getItemFromBlock(Blocks.crafting_table).setMaxStackSize(OrePrefixes.block.mDefaultStackSize); - Item.getItemFromBlock(Blocks.glass).setMaxStackSize(OrePrefixes.block.mDefaultStackSize); - Item.getItemFromBlock(Blocks.jukebox).setMaxStackSize(OrePrefixes.block.mDefaultStackSize); - Item.getItemFromBlock(Blocks.anvil).setMaxStackSize(OrePrefixes.block.mDefaultStackSize); - Item.getItemFromBlock(Blocks.chest).setMaxStackSize(OrePrefixes.block.mDefaultStackSize); - Item.getItemFromBlock(Blocks.trapped_chest).setMaxStackSize(OrePrefixes.block.mDefaultStackSize); - Item.getItemFromBlock(Blocks.noteblock).setMaxStackSize(OrePrefixes.block.mDefaultStackSize); - Item.getItemFromBlock(Blocks.mob_spawner).setMaxStackSize(OrePrefixes.block.mDefaultStackSize); - Item.getItemFromBlock(Blocks.bookshelf).setMaxStackSize(OrePrefixes.block.mDefaultStackSize); - Item.getItemFromBlock(Blocks.furnace).setMaxStackSize(OrePrefixes.block.mDefaultStackSize); - Item.getItemFromBlock(Blocks.lit_furnace).setMaxStackSize(OrePrefixes.block.mDefaultStackSize); + Item.getItemFromBlock(Blocks.stone_slab) + .setMaxStackSize(OrePrefixes.block.mDefaultStackSize); + Item.getItemFromBlock(Blocks.double_stone_slab) + .setMaxStackSize(OrePrefixes.block.mDefaultStackSize); + Item.getItemFromBlock(Blocks.brick_stairs) + .setMaxStackSize(OrePrefixes.block.mDefaultStackSize); + Item.getItemFromBlock(Blocks.nether_brick_stairs) + .setMaxStackSize(OrePrefixes.block.mDefaultStackSize); + Item.getItemFromBlock(Blocks.sandstone_stairs) + .setMaxStackSize(OrePrefixes.block.mDefaultStackSize); + Item.getItemFromBlock(Blocks.stone_stairs) + .setMaxStackSize(OrePrefixes.block.mDefaultStackSize); + Item.getItemFromBlock(Blocks.stone_brick_stairs) + .setMaxStackSize(OrePrefixes.block.mDefaultStackSize); + Item.getItemFromBlock(Blocks.packed_ice) + .setMaxStackSize(OrePrefixes.block.mDefaultStackSize); + Item.getItemFromBlock(Blocks.ice) + .setMaxStackSize(OrePrefixes.block.mDefaultStackSize); + Item.getItemFromBlock(Blocks.soul_sand) + .setMaxStackSize(OrePrefixes.block.mDefaultStackSize); + Item.getItemFromBlock(Blocks.glowstone) + .setMaxStackSize(OrePrefixes.block.mDefaultStackSize); + Item.getItemFromBlock(Blocks.snow) + .setMaxStackSize(OrePrefixes.block.mDefaultStackSize); + Item.getItemFromBlock(Blocks.snow) + .setMaxStackSize(OrePrefixes.block.mDefaultStackSize); + Item.getItemFromBlock(Blocks.iron_block) + .setMaxStackSize(OrePrefixes.block.mDefaultStackSize); + Item.getItemFromBlock(Blocks.gold_block) + .setMaxStackSize(OrePrefixes.block.mDefaultStackSize); + Item.getItemFromBlock(Blocks.emerald_block) + .setMaxStackSize(OrePrefixes.block.mDefaultStackSize); + Item.getItemFromBlock(Blocks.lapis_block) + .setMaxStackSize(OrePrefixes.block.mDefaultStackSize); + Item.getItemFromBlock(Blocks.diamond_block) + .setMaxStackSize(OrePrefixes.block.mDefaultStackSize); + Item.getItemFromBlock(Blocks.clay) + .setMaxStackSize(OrePrefixes.block.mDefaultStackSize); + Item.getItemFromBlock(Blocks.redstone_lamp) + .setMaxStackSize(OrePrefixes.block.mDefaultStackSize); + Item.getItemFromBlock(Blocks.dirt) + .setMaxStackSize(OrePrefixes.block.mDefaultStackSize); + Item.getItemFromBlock(Blocks.grass) + .setMaxStackSize(OrePrefixes.block.mDefaultStackSize); + Item.getItemFromBlock(Blocks.mycelium) + .setMaxStackSize(OrePrefixes.block.mDefaultStackSize); + Item.getItemFromBlock(Blocks.gravel) + .setMaxStackSize(OrePrefixes.block.mDefaultStackSize); + Item.getItemFromBlock(Blocks.sand) + .setMaxStackSize(OrePrefixes.block.mDefaultStackSize); + Item.getItemFromBlock(Blocks.brick_block) + .setMaxStackSize(OrePrefixes.block.mDefaultStackSize); + Item.getItemFromBlock(Blocks.wool) + .setMaxStackSize(OrePrefixes.block.mDefaultStackSize); + Item.getItemFromBlock(Blocks.melon_block) + .setMaxStackSize(OrePrefixes.block.mDefaultStackSize); + Item.getItemFromBlock(Blocks.pumpkin) + .setMaxStackSize(OrePrefixes.block.mDefaultStackSize); + Item.getItemFromBlock(Blocks.lit_pumpkin) + .setMaxStackSize(OrePrefixes.block.mDefaultStackSize); + Item.getItemFromBlock(Blocks.dispenser) + .setMaxStackSize(OrePrefixes.block.mDefaultStackSize); + Item.getItemFromBlock(Blocks.obsidian) + .setMaxStackSize(OrePrefixes.block.mDefaultStackSize); + Item.getItemFromBlock(Blocks.piston) + .setMaxStackSize(OrePrefixes.block.mDefaultStackSize); + Item.getItemFromBlock(Blocks.sticky_piston) + .setMaxStackSize(OrePrefixes.block.mDefaultStackSize); + Item.getItemFromBlock(Blocks.crafting_table) + .setMaxStackSize(OrePrefixes.block.mDefaultStackSize); + Item.getItemFromBlock(Blocks.glass) + .setMaxStackSize(OrePrefixes.block.mDefaultStackSize); + Item.getItemFromBlock(Blocks.jukebox) + .setMaxStackSize(OrePrefixes.block.mDefaultStackSize); + Item.getItemFromBlock(Blocks.anvil) + .setMaxStackSize(OrePrefixes.block.mDefaultStackSize); + Item.getItemFromBlock(Blocks.chest) + .setMaxStackSize(OrePrefixes.block.mDefaultStackSize); + Item.getItemFromBlock(Blocks.trapped_chest) + .setMaxStackSize(OrePrefixes.block.mDefaultStackSize); + Item.getItemFromBlock(Blocks.noteblock) + .setMaxStackSize(OrePrefixes.block.mDefaultStackSize); + Item.getItemFromBlock(Blocks.mob_spawner) + .setMaxStackSize(OrePrefixes.block.mDefaultStackSize); + Item.getItemFromBlock(Blocks.bookshelf) + .setMaxStackSize(OrePrefixes.block.mDefaultStackSize); + Item.getItemFromBlock(Blocks.furnace) + .setMaxStackSize(OrePrefixes.block.mDefaultStackSize); + Item.getItemFromBlock(Blocks.lit_furnace) + .setMaxStackSize(OrePrefixes.block.mDefaultStackSize); } } } diff --git a/src/main/java/gregtech/loaders/postload/GT_PostLoad.java b/src/main/java/gregtech/loaders/postload/GT_PostLoad.java index 70da4835d2..32470a7e7a 100644 --- a/src/main/java/gregtech/loaders/postload/GT_PostLoad.java +++ b/src/main/java/gregtech/loaders/postload/GT_PostLoad.java @@ -54,8 +54,8 @@ public class GT_PostLoad { GT_Mod.gregtechproxy.activateOreDictHandler(); // noinspection UnstableApiUsage// Stable enough for this project - GT_Mod.GT_FML_LOGGER - .info("Congratulations, you have been waiting long enough (" + stopwatch.stop() + "). Have a Cake."); + GT_Mod.GT_FML_LOGGER.info( + "Congratulations, you have been waiting long enough (" + stopwatch.stop() + "). Have a Cake."); GT_Log.out.println( "GT_Mod: List of Lists of Tool Recipes: " + GT_ModHandler.sSingleNonBlockDamagableRecipeList_list.toString()); @@ -75,18 +75,42 @@ public class GT_PostLoad { Stopwatch stopwatch = Stopwatch.createStarted(); // remove gemIridium exploit ItemStack iridiumOre = GT_ModHandler.getIC2Item("iridiumOre", 1); - aCompressorRecipeList.entrySet().parallelStream().filter( - e -> e.getKey().getInputs().size() == 1 && e.getKey().getInputs().get(0).isItemEqual(iridiumOre)) - .findAny().ifPresent(e -> aCompressorRecipeList.remove(e.getKey())); + aCompressorRecipeList.entrySet() + .parallelStream() + .filter( + e -> e.getKey() + .getInputs() + .size() == 1 && e.getKey() + .getInputs() + .get(0) + .isItemEqual(iridiumOre)) + .findAny() + .ifPresent(e -> aCompressorRecipeList.remove(e.getKey())); // Add default IC2 recipe to GT - GT_ModHandler - .addIC2RecipesToGT(aMaceratorRecipeList, GT_Recipe.GT_Recipe_Map.sMaceratorRecipes, true, true, true); - GT_ModHandler - .addIC2RecipesToGT(aCompressorRecipeList, GT_Recipe.GT_Recipe_Map.sCompressorRecipes, true, true, true); - GT_ModHandler - .addIC2RecipesToGT(aExtractorRecipeList, GT_Recipe.GT_Recipe_Map.sExtractorRecipes, true, true, true); - GT_ModHandler - .addIC2RecipesToGT(aOreWashingRecipeList, GT_Recipe.GT_Recipe_Map.sOreWasherRecipes, false, true, true); + GT_ModHandler.addIC2RecipesToGT( + aMaceratorRecipeList, + GT_Recipe.GT_Recipe_Map.sMaceratorRecipes, + true, + true, + true); + GT_ModHandler.addIC2RecipesToGT( + aCompressorRecipeList, + GT_Recipe.GT_Recipe_Map.sCompressorRecipes, + true, + true, + true); + GT_ModHandler.addIC2RecipesToGT( + aExtractorRecipeList, + GT_Recipe.GT_Recipe_Map.sExtractorRecipes, + true, + true, + true); + GT_ModHandler.addIC2RecipesToGT( + aOreWashingRecipeList, + GT_Recipe.GT_Recipe_Map.sOreWasherRecipes, + false, + true, + true); GT_ModHandler.addIC2RecipesToGT( aThermalCentrifugeRecipeList, GT_Recipe.GT_Recipe_Map.sThermalCentrifugeRecipes, @@ -101,8 +125,7 @@ public class GT_PostLoad { ItemStack iSData0 = new ItemStack(Items.potionitem, 1, 0); ItemStack iLData0 = ItemList.Bottle_Empty.get(1L); - for (FluidContainerRegistry.FluidContainerData tData : FluidContainerRegistry - .getRegisteredFluidContainerData()) { + for (FluidContainerRegistry.FluidContainerData tData : FluidContainerRegistry.getRegisteredFluidContainerData()) { if ((tData.filledContainer.getItem() == Items.potionitem) && (tData.filledContainer.getItemDamage() == 0)) { GT_Recipe.GT_Recipe_Map.sFluidCannerRecipes.addRecipe( true, @@ -223,7 +246,7 @@ public class GT_PostLoad { false, new ItemStack[] { Objects.requireNonNull( GT_ModHandler.getModItem(GalacticraftCore.modID, "item.schematic", 1, Short.MAX_VALUE)) - .setStackDisplayName("Any Schematic") }, + .setStackDisplayName("Any Schematic") }, new ItemStack[] { ItemList.Tool_DataStick.getWithName(1L, "Scanned Schematic") }, ItemList.Tool_DataStick.getWithName(1L, "Stick to save it to"), null, @@ -235,7 +258,7 @@ public class GT_PostLoad { false, new ItemStack[] { Objects.requireNonNull( GT_ModHandler.getModItem(GalacticraftMars.modID, "item.schematic", 1, Short.MAX_VALUE)) - .setStackDisplayName("Any Schematic") }, + .setStackDisplayName("Any Schematic") }, new ItemStack[] { ItemList.Tool_DataStick.getWithName(1L, "Scanned Schematic") }, ItemList.Tool_DataStick.getWithName(1L, "Stick to save it to"), null, @@ -248,7 +271,7 @@ public class GT_PostLoad { GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes.addFakeRecipe( false, new ItemStack[] { GT_ModHandler.getModItem("GalaxySpace", "item.SchematicTier" + i, 1) - .setStackDisplayName("Any Schematic") }, + .setStackDisplayName("Any Schematic") }, new ItemStack[] { ItemList.Tool_DataStick.getWithName(1L, "Scanned Schematic") }, ItemList.Tool_DataStick.getWithName(1L, "Stick to save it to"), null, @@ -259,64 +282,66 @@ public class GT_PostLoad { } } } - Materials.getMaterialsMap().values().forEach(tMaterial -> { - if ((tMaterial.mElement != null) && (!tMaterial.mElement.mIsIsotope) - && (tMaterial != Materials.Magic) - && (tMaterial.getMass() > 0L)) { - ItemStack tOutput = ItemList.Tool_DataOrb.get(1L); - Behaviour_DataOrb.setDataTitle(tOutput, "Elemental-Scan"); - Behaviour_DataOrb.setDataName(tOutput, tMaterial.mElement.name()); - ItemStack tInput = GT_OreDictUnificator.get(OrePrefixes.dust, tMaterial, 1L); - ItemStack[] iSMat0 = new ItemStack[] { tInput }; - ItemStack[] iSMat1 = new ItemStack[] { tOutput }; - if (tInput != null) { - GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes.addFakeRecipe( - false, - iSMat0, - iSMat1, - ItemList.Tool_DataOrb.get(1L), - null, - null, - (int) (tMaterial.getMass() * 8192L), - 30, - 0); - GT_Recipe.GT_Recipe_Map.sReplicatorFakeRecipes.addFakeRecipe( - false, - null, - iSMat0, - iSMat1, - new FluidStack[] { Materials.UUMatter.getFluid(tMaterial.getMass()) }, - null, - (int) (tMaterial.getMass() * 512L), - (int) VP[1], - 0); - } - tInput = GT_OreDictUnificator.get(OrePrefixes.cell, tMaterial, 1L); - iSMat0 = new ItemStack[] { tInput }; - if (tInput != null) { - GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes.addFakeRecipe( - false, - iSMat0, - iSMat1, - ItemList.Tool_DataOrb.get(1L), - null, - null, - (int) (tMaterial.getMass() * 8192L), - 30, - 0); - GT_Recipe.GT_Recipe_Map.sReplicatorFakeRecipes.addFakeRecipe( - false, - null, - iSMat0, - iSMat1, - new FluidStack[] { Materials.UUMatter.getFluid(tMaterial.getMass()) }, - null, - (int) (tMaterial.getMass() * 512L), - (int) VP[1], - 0); - } - } - }); + Materials.getMaterialsMap() + .values() + .forEach(tMaterial -> { + if ((tMaterial.mElement != null) && (!tMaterial.mElement.mIsIsotope) + && (tMaterial != Materials.Magic) + && (tMaterial.getMass() > 0L)) { + ItemStack tOutput = ItemList.Tool_DataOrb.get(1L); + Behaviour_DataOrb.setDataTitle(tOutput, "Elemental-Scan"); + Behaviour_DataOrb.setDataName(tOutput, tMaterial.mElement.name()); + ItemStack tInput = GT_OreDictUnificator.get(OrePrefixes.dust, tMaterial, 1L); + ItemStack[] iSMat0 = new ItemStack[] { tInput }; + ItemStack[] iSMat1 = new ItemStack[] { tOutput }; + if (tInput != null) { + GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes.addFakeRecipe( + false, + iSMat0, + iSMat1, + ItemList.Tool_DataOrb.get(1L), + null, + null, + (int) (tMaterial.getMass() * 8192L), + 30, + 0); + GT_Recipe.GT_Recipe_Map.sReplicatorFakeRecipes.addFakeRecipe( + false, + null, + iSMat0, + iSMat1, + new FluidStack[] { Materials.UUMatter.getFluid(tMaterial.getMass()) }, + null, + (int) (tMaterial.getMass() * 512L), + (int) VP[1], + 0); + } + tInput = GT_OreDictUnificator.get(OrePrefixes.cell, tMaterial, 1L); + iSMat0 = new ItemStack[] { tInput }; + if (tInput != null) { + GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes.addFakeRecipe( + false, + iSMat0, + iSMat1, + ItemList.Tool_DataOrb.get(1L), + null, + null, + (int) (tMaterial.getMass() * 8192L), + 30, + 0); + GT_Recipe.GT_Recipe_Map.sReplicatorFakeRecipes.addFakeRecipe( + false, + null, + iSMat0, + iSMat1, + new FluidStack[] { Materials.UUMatter.getFluid(tMaterial.getMass()) }, + null, + (int) (tMaterial.getMass() * 512L), + (int) VP[1], + 0); + } + } + }); if (!GT_MetaTileEntity_Massfabricator.sRequiresUUA) GT_Recipe.GT_Recipe_Map.sMassFabFakeRecipes.addFakeRecipe( false, @@ -410,13 +435,16 @@ public class GT_PostLoad { @SuppressWarnings("UnstableApiUsage") // Stable enough for this project Stopwatch stopwatch = Stopwatch.createStarted(); GT_Mod.GT_FML_LOGGER.info("Replacing Vanilla Materials in recipes, please wait."); - Set replaceVanillaItemsSet = GT_Mod.gregtechproxy.mUseGreatlyShrukenReplacementList ? Arrays - .stream(Materials.values()).filter(GT_RecipeRegistrator::hasVanillaRecipes).collect(Collectors.toSet()) + Set replaceVanillaItemsSet = GT_Mod.gregtechproxy.mUseGreatlyShrukenReplacementList + ? Arrays.stream(Materials.values()) + .filter(GT_RecipeRegistrator::hasVanillaRecipes) + .collect(Collectors.toSet()) : new HashSet<>(Arrays.asList(Materials.values())); @SuppressWarnings("deprecation") // stable API for MC 1.7.10 - ProgressManager.ProgressBar progressBar = ProgressManager - .push("Register materials", replaceVanillaItemsSet.size()); + ProgressManager.ProgressBar progressBar = ProgressManager.push( + "Register materials", + replaceVanillaItemsSet.size()); if (GT_Values.cls_enabled) { try { GT_CLS_Compat.doActualRegistrationCLS(progressBar, replaceVanillaItemsSet); @@ -437,7 +465,8 @@ public class GT_PostLoad { } public static void doActualRegistration(Materials m) { - String plateName = OrePrefixes.plate.get(m).toString(); + String plateName = OrePrefixes.plate.get(m) + .toString(); boolean noSmash = !m.contains(SubTag.NO_SMASHING); if ((m.mTypes & 2) != 0) GT_RecipeRegistrator.registerUsagesForMaterials(plateName, noSmash, m.getIngots(1)); if ((m.mTypes & 4) != 0) GT_RecipeRegistrator.registerUsagesForMaterials(plateName, noSmash, m.getGems(1)); @@ -464,28 +493,52 @@ public class GT_PostLoad { public void displayAllReleventItems(List aList) { for (int i = 0; i < 32766; i += 2) { - if (GT_MetaGenerated_Tool_01.INSTANCE - .getToolStats(new ItemStack(GT_MetaGenerated_Tool_01.INSTANCE, 1, i)) != null) { + if (GT_MetaGenerated_Tool_01.INSTANCE.getToolStats( + new ItemStack(GT_MetaGenerated_Tool_01.INSTANCE, 1, i)) != null) { ItemStack tStack = new ItemStack(GT_MetaGenerated_Tool_01.INSTANCE, 1, i); GT_MetaGenerated_Tool_01.INSTANCE.isItemStackUsable(tStack); aList.add( - GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(i, 1, Materials.Lead, Materials.Lead, null)); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + i, + 1, + Materials.Lead, + Materials.Lead, + null)); aList.add( - GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(i, 1, Materials.Nickel, Materials.Nickel, null)); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + i, + 1, + Materials.Nickel, + Materials.Nickel, + null)); aList.add( - GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(i, 1, Materials.Cobalt, Materials.Cobalt, null)); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + i, + 1, + Materials.Cobalt, + Materials.Cobalt, + null)); aList.add( - GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(i, 1, Materials.Osmium, Materials.Osmium, null)); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + i, + 1, + Materials.Osmium, + Materials.Osmium, + null)); aList.add( - GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(i, 1, Materials.Adamantium, Materials.Adamantium, null)); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + i, + 1, + Materials.Adamantium, + Materials.Adamantium, + null)); aList.add( - GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(i, 1, Materials.Neutronium, Materials.Neutronium, null)); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + i, + 1, + Materials.Neutronium, + Materials.Neutronium, + null)); } } super.displayAllReleventItems(aList); @@ -519,8 +572,8 @@ public class GT_PostLoad { GT_OreDictUnificator.get(ItemList.Block_MSSFUEL.get(1)), GT_OreDictUnificator.get(OrePrefixes.rod, Materials.Blaze, 1)); if (Thaumcraft.isModLoaded()) { - GT_Recipe.GT_Recipe_Map.sLargeBoilerFakeFuels - .addSolidRecipe(GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 1)); + GT_Recipe.GT_Recipe_Map.sLargeBoilerFakeFuels.addSolidRecipe( + GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 1)); } } @@ -528,9 +581,15 @@ public class GT_PostLoad { final String[] steamCandidates = { "steam", "ic2steam" }; final String[] superHeatedSteamCandidates = { "ic2superheatedsteam" }; - GT_ModHandler.sAnySteamFluidIDs = Arrays.stream(steamCandidates).map(FluidRegistry::getFluid) - .filter(Objects::nonNull).map(FluidRegistry::getFluidID).collect(Collectors.toList()); - GT_ModHandler.sSuperHeatedSteamFluidIDs = Arrays.stream(superHeatedSteamCandidates).map(FluidRegistry::getFluid) - .filter(Objects::nonNull).map(FluidRegistry::getFluidID).collect(Collectors.toList()); + GT_ModHandler.sAnySteamFluidIDs = Arrays.stream(steamCandidates) + .map(FluidRegistry::getFluid) + .filter(Objects::nonNull) + .map(FluidRegistry::getFluidID) + .collect(Collectors.toList()); + GT_ModHandler.sSuperHeatedSteamFluidIDs = Arrays.stream(superHeatedSteamCandidates) + .map(FluidRegistry::getFluid) + .filter(Objects::nonNull) + .map(FluidRegistry::getFluidID) + .collect(Collectors.toList()); } } diff --git a/src/main/java/gregtech/loaders/postload/GT_ProcessingArrayRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_ProcessingArrayRecipeLoader.java index b018e6bbf8..080330c7dd 100644 --- a/src/main/java/gregtech/loaders/postload/GT_ProcessingArrayRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_ProcessingArrayRecipeLoader.java @@ -10,12 +10,14 @@ public class GT_ProcessingArrayRecipeLoader { // Alloy Smelter GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.alloysmelter", GT_Recipe_Map.sAlloySmelterRecipes); - GT_ProcessingArray_Manager - .addSoundResourceToPA("basicmachine.alloysmelter", SoundResource.IC2_MACHINES_INDUCTION_LOOP); + GT_ProcessingArray_Manager.addSoundResourceToPA( + "basicmachine.alloysmelter", + SoundResource.IC2_MACHINES_INDUCTION_LOOP); // Arc Furnace GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.arcfurnace", GT_Recipe_Map.sArcFurnaceRecipes); - GT_ProcessingArray_Manager - .addSoundResourceToPA("basicmachine.arcfurnace", SoundResource.IC2_MACHINES_INDUCTION_LOOP); + GT_ProcessingArray_Manager.addSoundResourceToPA( + "basicmachine.arcfurnace", + SoundResource.IC2_MACHINES_INDUCTION_LOOP); // Assembler GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.assembler", GT_Recipe_Map.sAssemblerRecipes); GT_ProcessingArray_Manager.addSoundResourceToPA("basicmachine.assembler", SoundResource.NONE); @@ -24,8 +26,9 @@ public class GT_ProcessingArrayRecipeLoader { GT_ProcessingArray_Manager.addSoundResourceToPA("basicmachine.autoclave", SoundResource.NONE); // Bender GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.bender", GT_Recipe_Map.sBenderRecipes); - GT_ProcessingArray_Manager - .addSoundResourceToPA("basicmachine.bender", SoundResource.IC2_MACHINES_COMPRESSOR_OP); + GT_ProcessingArray_Manager.addSoundResourceToPA( + "basicmachine.bender", + SoundResource.IC2_MACHINES_COMPRESSOR_OP); // Boxinator GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.boxinator", GT_Recipe_Map.sBoxinatorRecipes); GT_ProcessingArray_Manager.addSoundResourceToPA("basicmachine.boxinator", SoundResource.NONE); @@ -36,63 +39,77 @@ public class GT_ProcessingArrayRecipeLoader { GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.canner", GT_Recipe_Map.sCannerRecipes); GT_ProcessingArray_Manager.addSoundResourceToPA("basicmachine.canner", SoundResource.IC2_MACHINES_EXTRACTOR_OP); // Centrifuge - GT_ProcessingArray_Manager - .addRecipeMapToPA("basicmachine.centrifuge", GT_Recipe_Map.sMultiblockCentrifugeRecipes); + GT_ProcessingArray_Manager.addRecipeMapToPA( + "basicmachine.centrifuge", + GT_Recipe_Map.sMultiblockCentrifugeRecipes); GT_ProcessingArray_Manager.addSoundResourceToPA("basicmachine.centrifuge", SoundResource.NONE); // Chemical Bath GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.chemicalbath", GT_Recipe_Map.sChemicalBathRecipes); GT_ProcessingArray_Manager.addSoundResourceToPA("basicmachine.chemicalbath", SoundResource.NONE); // Chemical Reactor - GT_ProcessingArray_Manager - .addRecipeMapToPA("basicmachine.chemicalreactor", GT_Recipe_Map.sMultiblockChemicalRecipes); - GT_ProcessingArray_Manager - .addSoundResourceToPA("basicmachine.chemicalreactor", SoundResource.IC2_MACHINES_EXTRACTOR_OP); + GT_ProcessingArray_Manager.addRecipeMapToPA( + "basicmachine.chemicalreactor", + GT_Recipe_Map.sMultiblockChemicalRecipes); + GT_ProcessingArray_Manager.addSoundResourceToPA( + "basicmachine.chemicalreactor", + SoundResource.IC2_MACHINES_EXTRACTOR_OP); // Circuit Assembler - GT_ProcessingArray_Manager - .addRecipeMapToPA("basicmachine.circuitassembler", GT_Recipe_Map.sCircuitAssemblerRecipes); + GT_ProcessingArray_Manager.addRecipeMapToPA( + "basicmachine.circuitassembler", + GT_Recipe_Map.sCircuitAssemblerRecipes); GT_ProcessingArray_Manager.addSoundResourceToPA("basicmachine.circuitassembler", SoundResource.NONE); // Compressor GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.compressor", GT_Recipe_Map.sCompressorRecipes); - GT_ProcessingArray_Manager - .addSoundResourceToPA("basicmachine.compressor", SoundResource.IC2_MACHINES_COMPRESSOR_OP); + GT_ProcessingArray_Manager.addSoundResourceToPA( + "basicmachine.compressor", + SoundResource.IC2_MACHINES_COMPRESSOR_OP); // Cutting Machine GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.cutter", GT_Recipe_Map.sCutterRecipes); GT_ProcessingArray_Manager.addSoundResourceToPA("basicmachine.cutter", SoundResource.NONE); // Distillery GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.distillery", GT_Recipe_Map.sDistilleryRecipes); - GT_ProcessingArray_Manager - .addSoundResourceToPA("basicmachine.distillery", SoundResource.GT_MACHINES_DISTILLERY_LOOP); + GT_ProcessingArray_Manager.addSoundResourceToPA( + "basicmachine.distillery", + SoundResource.GT_MACHINES_DISTILLERY_LOOP); // Electrolyzer - GT_ProcessingArray_Manager - .addRecipeMapToPA("basicmachine.electrolyzer", GT_Recipe_Map.sMultiblockElectrolyzerRecipes); - GT_ProcessingArray_Manager - .addSoundResourceToPA("basicmachine.electrolyzer", SoundResource.IC2_MACHINES_MAGNETIZER_LOOP); + GT_ProcessingArray_Manager.addRecipeMapToPA( + "basicmachine.electrolyzer", + GT_Recipe_Map.sMultiblockElectrolyzerRecipes); + GT_ProcessingArray_Manager.addSoundResourceToPA( + "basicmachine.electrolyzer", + SoundResource.IC2_MACHINES_MAGNETIZER_LOOP); // Extractor GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.extractor", GT_Recipe_Map.sExtractorRecipes); - GT_ProcessingArray_Manager - .addSoundResourceToPA("basicmachine.extractor", SoundResource.IC2_MACHINES_EXTRACTOR_OP); + GT_ProcessingArray_Manager.addSoundResourceToPA( + "basicmachine.extractor", + SoundResource.IC2_MACHINES_EXTRACTOR_OP); // Extruder GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.extruder", GT_Recipe_Map.sExtruderRecipes); - GT_ProcessingArray_Manager - .addSoundResourceToPA("basicmachine.extruder", SoundResource.IC2_MACHINES_INDUCTION_LOOP); + GT_ProcessingArray_Manager.addSoundResourceToPA( + "basicmachine.extruder", + SoundResource.IC2_MACHINES_INDUCTION_LOOP); // Fermenter GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.fermenter", GT_Recipe_Map.sFermentingRecipes); GT_ProcessingArray_Manager.addSoundResourceToPA("basicmachine.fermenter", SoundResource.NONE); // Fluid Canner GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.fluidcanner", GT_Recipe_Map.sFluidCannerRecipes); - GT_ProcessingArray_Manager - .addSoundResourceToPA("basicmachine.fluidcanner", SoundResource.IC2_MACHINES_EXTRACTOR_OP); + GT_ProcessingArray_Manager.addSoundResourceToPA( + "basicmachine.fluidcanner", + SoundResource.IC2_MACHINES_EXTRACTOR_OP); // Fluid Extractor - GT_ProcessingArray_Manager - .addRecipeMapToPA("basicmachine.fluidextractor", GT_Recipe_Map.sFluidExtractionRecipes); - GT_ProcessingArray_Manager - .addSoundResourceToPA("basicmachine.fluidextractor", SoundResource.IC2_MACHINES_EXTRACTOR_OP); + GT_ProcessingArray_Manager.addRecipeMapToPA( + "basicmachine.fluidextractor", + GT_Recipe_Map.sFluidExtractionRecipes); + GT_ProcessingArray_Manager.addSoundResourceToPA( + "basicmachine.fluidextractor", + SoundResource.IC2_MACHINES_EXTRACTOR_OP); // Fluid Heater GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.fluidheater", GT_Recipe_Map.sFluidHeaterRecipes); GT_ProcessingArray_Manager.addSoundResourceToPA("basicmachine.fluidheater", SoundResource.NONE); // Fluid Solidifier - GT_ProcessingArray_Manager - .addRecipeMapToPA("basicmachine.fluidsolidifier", GT_Recipe_Map.sFluidSolidficationRecipes); + GT_ProcessingArray_Manager.addRecipeMapToPA( + "basicmachine.fluidsolidifier", + GT_Recipe_Map.sFluidSolidficationRecipes); GT_ProcessingArray_Manager.addSoundResourceToPA("basicmachine.fluidsolidifier", SoundResource.NONE); // Forge Hammer GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.hammer", GT_Recipe_Map.sHammerRecipes); @@ -102,15 +119,17 @@ public class GT_ProcessingArrayRecipeLoader { GT_ProcessingArray_Manager.addSoundResourceToPA("basicmachine.press", SoundResource.IC2_MACHINES_COMPRESSOR_OP); // Laser Engraver GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.laserengraver", GT_Recipe_Map.sLaserEngraverRecipes); - GT_ProcessingArray_Manager - .addSoundResourceToPA("basicmachine.laserengraver", SoundResource.IC2_MACHINES_MAGNETIZER_LOOP); + GT_ProcessingArray_Manager.addSoundResourceToPA( + "basicmachine.laserengraver", + SoundResource.IC2_MACHINES_MAGNETIZER_LOOP); // Lathe GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.lathe", GT_Recipe_Map.sLatheRecipes); GT_ProcessingArray_Manager.addSoundResourceToPA("basicmachine.lathe", SoundResource.NONE); // Macerator GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.macerator", GT_Recipe_Map.sMaceratorRecipes); - GT_ProcessingArray_Manager - .addSoundResourceToPA("basicmachine.macerator", SoundResource.IC2_MACHINES_MACERATOR_OP); + GT_ProcessingArray_Manager.addSoundResourceToPA( + "basicmachine.macerator", + SoundResource.IC2_MACHINES_MACERATOR_OP); // Magnetic Separator GT_ProcessingArray_Manager.addRecipeMapToPA( "basicmachine.electromagneticseparator", @@ -120,12 +139,14 @@ public class GT_ProcessingArrayRecipeLoader { SoundResource.IC2_MACHINES_MAGNETIZER_LOOP); // Matter Amplifier GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.amplifab", GT_Recipe_Map.sAmplifiers); - GT_ProcessingArray_Manager - .addSoundResourceToPA("basicmachine.amplifab", SoundResource.IC2_MACHINES_EXTRACTOR_OP); + GT_ProcessingArray_Manager.addSoundResourceToPA( + "basicmachine.amplifab", + SoundResource.IC2_MACHINES_EXTRACTOR_OP); // Microwave GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.microwave", GT_Recipe_Map.sMicrowaveRecipes); - GT_ProcessingArray_Manager - .addSoundResourceToPA("basicmachine.microwave", SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP); + GT_ProcessingArray_Manager.addSoundResourceToPA( + "basicmachine.microwave", + SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP); // Mixer GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.mixer", GT_Recipe_Map.sMultiblockMixerRecipes); GT_ProcessingArray_Manager.addSoundResourceToPA("basicmachine.mixer", SoundResource.NONE); @@ -133,26 +154,32 @@ public class GT_ProcessingArrayRecipeLoader { GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.orewasher", GT_Recipe_Map.sOreWasherRecipes); GT_ProcessingArray_Manager.addSoundResourceToPA("basicmachine.orewasher", SoundResource.NONE); // Plasma Arc Furnace - GT_ProcessingArray_Manager - .addRecipeMapToPA("basicmachine.plasmaarcfurnace", GT_Recipe_Map.sPlasmaArcFurnaceRecipes); - GT_ProcessingArray_Manager - .addSoundResourceToPA("basicmachine.plasmaarcfurnace", SoundResource.IC2_MACHINES_INDUCTION_LOOP); + GT_ProcessingArray_Manager.addRecipeMapToPA( + "basicmachine.plasmaarcfurnace", + GT_Recipe_Map.sPlasmaArcFurnaceRecipes); + GT_ProcessingArray_Manager.addSoundResourceToPA( + "basicmachine.plasmaarcfurnace", + SoundResource.IC2_MACHINES_INDUCTION_LOOP); // Polarizer GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.polarizer", GT_Recipe_Map.sPolarizerRecipes); - GT_ProcessingArray_Manager - .addSoundResourceToPA("basicmachine.polarizer", SoundResource.IC2_MACHINES_MAGNETIZER_LOOP); + GT_ProcessingArray_Manager.addSoundResourceToPA( + "basicmachine.polarizer", + SoundResource.IC2_MACHINES_MAGNETIZER_LOOP); // Printer GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.printer", GT_Recipe_Map.sPrinterRecipes); - GT_ProcessingArray_Manager - .addSoundResourceToPA("basicmachine.printer", SoundResource.IC2_MACHINES_COMPRESSOR_OP); + GT_ProcessingArray_Manager.addSoundResourceToPA( + "basicmachine.printer", + SoundResource.IC2_MACHINES_COMPRESSOR_OP); // Recycler GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.recycler", GT_Recipe_Map.sRecyclerRecipes); - GT_ProcessingArray_Manager - .addSoundResourceToPA("basicmachine.recycler", SoundResource.IC2_MACHINES_RECYCLER_OP); + GT_ProcessingArray_Manager.addSoundResourceToPA( + "basicmachine.recycler", + SoundResource.IC2_MACHINES_RECYCLER_OP); // Scanner GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.scanner", GT_Recipe_Map.sScannerFakeRecipes); - GT_ProcessingArray_Manager - .addSoundResourceToPA("basicmachine.scanner", SoundResource.IC2_MACHINES_MAGNETIZER_LOOP); + GT_ProcessingArray_Manager.addSoundResourceToPA( + "basicmachine.scanner", + SoundResource.IC2_MACHINES_MAGNETIZER_LOOP); // Sifter GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.sifter", GT_Recipe_Map.sSifterRecipes); GT_ProcessingArray_Manager.addSoundResourceToPA("basicmachine.sifter", SoundResource.NONE); @@ -160,15 +187,17 @@ public class GT_ProcessingArrayRecipeLoader { GT_