From 8ac58626bd4caa9e49f58acc6b97ac031f6c2107 Mon Sep 17 00:00:00 2001 From: Raven Szewczyk Date: Mon, 10 Apr 2023 17:49:16 +0100 Subject: Update spotless config to 0.2.2 --- .../loaders/postload/GT_BookAndLootLoader.java | 802 +- .../loaders/postload/GT_CraftingRecipeLoader.java | 3396 +++-- .../gregtech/loaders/postload/GT_CropLoader.java | 1943 ++- .../loaders/postload/GT_FakeRecipeLoader.java | 12 +- .../postload/GT_ItemMaxStacksizeLoader.java | 2 +- .../loaders/postload/GT_MachineRecipeLoader.java | 2 +- .../gregtech/loaders/postload/GT_PostLoad.java | 660 +- .../postload/GT_ProcessingArrayRecipeLoader.java | 155 +- .../postload/GT_RecyclerBlacklistLoader.java | 100 +- .../loaders/postload/GT_Worldgenloader.java | 4202 +++--- .../gregtech/loaders/postload/PartP2PGTPower.java | 2 +- .../postload/chains/GT_BauxiteRefineChain.java | 432 +- .../loaders/postload/chains/GT_NaniteChain.java | 260 +- .../postload/chains/GT_PCBFactoryRecipes.java | 769 +- .../postload/recipes/AlloySmelterRecipes.java | 172 +- .../postload/recipes/ArcFurnaceRecipes.java | 996 +- .../loaders/postload/recipes/AssemblerRecipes.java | 14226 +++++++++---------- .../postload/recipes/AssemblyLineRecipes.java | 1390 +- .../loaders/postload/recipes/AutoclaveRecipes.java | 464 +- .../loaders/postload/recipes/BenderRecipes.java | 712 +- .../postload/recipes/BlastFurnaceRecipes.java | 1166 +- .../loaders/postload/recipes/BreweryRecipes.java | 838 +- .../loaders/postload/recipes/CannerRecipes.java | 100 +- .../postload/recipes/CentrifugeRecipes.java | 1774 ++- .../postload/recipes/ChemicalBathRecipes.java | 502 +- .../loaders/postload/recipes/ChemicalRecipes.java | 10433 +++++++------- .../postload/recipes/CircuitAssemblerRecipes.java | 486 +- .../postload/recipes/CompressorRecipes.java | 290 +- .../postload/recipes/CropProcessingRecipes.java | 59 +- .../loaders/postload/recipes/CuttingRecipes.java | 357 +- .../postload/recipes/DistilleryRecipes.java | 2214 ++- .../postload/recipes/ElectrolyzerRecipes.java | 464 +- .../recipes/ElectromagneticSeparatorRecipes.java | 16 +- .../loaders/postload/recipes/ExtractorRecipes.java | 30 +- .../loaders/postload/recipes/ExtruderRecipes.java | 28 +- .../loaders/postload/recipes/FermenterRecipes.java | 788 +- .../postload/recipes/FluidCannerRecipes.java | 112 +- .../postload/recipes/FluidExtractorRecipes.java | 1210 +- .../postload/recipes/FluidHeaterRecipes.java | 128 +- .../postload/recipes/FluidSolidifierRecipes.java | 1026 +- .../postload/recipes/ForgeHammerRecipes.java | 312 +- .../postload/recipes/FormingPressRecipes.java | 334 +- .../loaders/postload/recipes/FuelRecipes.java | 366 +- .../postload/recipes/FusionReactorRecipes.java | 498 +- .../recipes/ImplosionCompressorRecipes.java | 96 +- .../postload/recipes/LaserEngraverRecipes.java | 64 +- .../loaders/postload/recipes/LatheRecipes.java | 36 +- .../postload/recipes/MatterAmplifierRecipes.java | 28 +- .../loaders/postload/recipes/MixerRecipes.java | 3288 +++-- .../loaders/postload/recipes/NEIHiding.java | 16 +- .../postload/recipes/OreDictUnification.java | 10 +- .../loaders/postload/recipes/PackagerRecipes.java | 68 +- .../postload/recipes/PlasmaForgeRecipes.java | 46 +- .../loaders/postload/recipes/PrinterRecipes.java | 76 +- .../loaders/postload/recipes/Pulverizer.java | 1158 +- .../loaders/postload/recipes/PyrolyseRecipes.java | 184 +- .../loaders/postload/recipes/RecipeRemover.java | 138 +- .../loaders/postload/recipes/SifterRecipes.java | 56 +- .../loaders/postload/recipes/SlicerRecipes.java | 56 +- .../loaders/postload/recipes/SmelterRecipes.java | 39 +- .../postload/recipes/ThaumcraftRecipes.java | 1643 ++- .../postload/recipes/ThermalCentrifugeRecipes.java | 20 +- .../recipes/TranscendentPlasmaMixerRecipes.java | 164 +- .../postload/recipes/VacuumFreezerRecipes.java | 755 +- .../loaders/postload/recipes/WiremillRecipes.java | 356 +- 65 files changed, 30947 insertions(+), 31578 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 0e4051c798..71c8d67741 100644 --- a/src/main/java/gregtech/loaders/postload/GT_BookAndLootLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_BookAndLootLoader.java @@ -49,459 +49,385 @@ 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_Purple_Drink.get(1L), 8, 16, 80)); - ChestGenHooks.addItem( - "dungeonChest", - new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Silver, 1L), - 1, - 6, - 120)); - ChestGenHooks.addItem( - "dungeonChest", - new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Lead, 1L), - 1, - 6, - 30)); - ChestGenHooks.addItem( - "dungeonChest", - new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 1L), - 1, - 6, - 60)); - ChestGenHooks.addItem( - "dungeonChest", - new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Bronze, 1L), - 1, - 6, - 60)); - ChestGenHooks.addItem( - "dungeonChest", - new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Manganese, 1L), - 1, - 6, - 60)); - ChestGenHooks.addItem( - "dungeonChest", - new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.DamascusSteel, 1L), - 1, - 6, - 10)); - ChestGenHooks.addItem( - "dungeonChest", - new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Emerald, 1L), - 1, - 6, - 20)); - ChestGenHooks.addItem( - "dungeonChest", - new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Ruby, 1L), - 1, - 6, - 20)); - ChestGenHooks.addItem( - "dungeonChest", - new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Sapphire, 1L), - 1, - 6, - 20)); - ChestGenHooks.addItem( - "dungeonChest", - new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.GreenSapphire, 1L), - 1, - 6, - 20)); - ChestGenHooks.addItem( - "dungeonChest", - new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Olivine, 1L), - 1, - 6, - 20)); - ChestGenHooks.addItem( - "dungeonChest", - new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.GarnetRed, 1L), - 1, - 6, - 40)); - ChestGenHooks.addItem( - "dungeonChest", - new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.GarnetYellow, 1L), - 1, - 6, - 40)); - ChestGenHooks.addItem( - "dungeonChest", - new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Neodymium, 1L), - 1, - 6, - 40)); - ChestGenHooks.addItem( - "dungeonChest", - new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chrome, 1L), - 1, - 3, - 40)); + 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)); + ChestGenHooks.addItem( + "dungeonChest", + new WeightedRandomChestContent( + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Silver, 1L), + 1, + 6, + 120)); + ChestGenHooks.addItem( + "dungeonChest", + new WeightedRandomChestContent(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Lead, 1L), 1, 6, 30)); + ChestGenHooks.addItem( + "dungeonChest", + new WeightedRandomChestContent(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 1L), 1, 6, 60)); + ChestGenHooks.addItem( + "dungeonChest", + new WeightedRandomChestContent( + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Bronze, 1L), + 1, + 6, + 60)); + ChestGenHooks.addItem( + "dungeonChest", + new WeightedRandomChestContent( + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Manganese, 1L), + 1, + 6, + 60)); + ChestGenHooks.addItem( + "dungeonChest", + new WeightedRandomChestContent( + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.DamascusSteel, 1L), + 1, + 6, + 10)); + ChestGenHooks.addItem( + "dungeonChest", + new WeightedRandomChestContent(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Emerald, 1L), 1, 6, 20)); + ChestGenHooks.addItem( + "dungeonChest", + new WeightedRandomChestContent(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Ruby, 1L), 1, 6, 20)); + ChestGenHooks.addItem( + "dungeonChest", + new WeightedRandomChestContent( + GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Sapphire, 1L), + 1, + 6, + 20)); + ChestGenHooks.addItem( + "dungeonChest", + new WeightedRandomChestContent( + GT_OreDictUnificator.get(OrePrefixes.gem, Materials.GreenSapphire, 1L), + 1, + 6, + 20)); + ChestGenHooks.addItem( + "dungeonChest", + new WeightedRandomChestContent(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Olivine, 1L), 1, 6, 20)); + ChestGenHooks.addItem( + "dungeonChest", + new WeightedRandomChestContent( + GT_OreDictUnificator.get(OrePrefixes.gem, Materials.GarnetRed, 1L), + 1, + 6, + 40)); + ChestGenHooks.addItem( + "dungeonChest", + new WeightedRandomChestContent( + GT_OreDictUnificator.get(OrePrefixes.gem, Materials.GarnetYellow, 1L), + 1, + 6, + 40)); + ChestGenHooks.addItem( + "dungeonChest", + new WeightedRandomChestContent( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Neodymium, 1L), + 1, + 6, + 40)); + ChestGenHooks.addItem( + "dungeonChest", + new WeightedRandomChestContent(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chrome, 1L), 1, 3, 40)); ChestGenHooks.addItem( - "pyramidDesertyChest", - new WeightedRandomChestContent(ItemList.Bottle_Holy_Water.get(1L), 4, 8, 2)); - ChestGenHooks.addItem( - "pyramidDesertyChest", - new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Silver, 1L), - 4, - 16, - 12)); - ChestGenHooks.addItem( - "pyramidDesertyChest", - new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Platinum, 1L), - 2, - 8, - 4)); - ChestGenHooks.addItem( - "pyramidDesertyChest", - new WeightedRandomChestContent(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Ruby, 1L), 2, 8, 2)); - ChestGenHooks.addItem( - "pyramidDesertyChest", - new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Sapphire, 1L), - 2, - 8, - 2)); - ChestGenHooks.addItem( - "pyramidDesertyChest", - new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.GreenSapphire, 1L), - 2, - 8, - 2)); - ChestGenHooks.addItem( - "pyramidDesertyChest", - new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Olivine, 1L), - 2, - 8, - 2)); - ChestGenHooks.addItem( - "pyramidDesertyChest", - new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.GarnetRed, 1L), - 2, - 8, - 4)); - ChestGenHooks.addItem( - "pyramidDesertyChest", - new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.GarnetYellow, 1L), - 2, - 8, - 4)); + "pyramidDesertyChest", + new WeightedRandomChestContent(ItemList.Bottle_Holy_Water.get(1L), 4, 8, 2)); + ChestGenHooks.addItem( + "pyramidDesertyChest", + new WeightedRandomChestContent( + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Silver, 1L), + 4, + 16, + 12)); + ChestGenHooks.addItem( + "pyramidDesertyChest", + new WeightedRandomChestContent( + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Platinum, 1L), + 2, + 8, + 4)); + ChestGenHooks.addItem( + "pyramidDesertyChest", + new WeightedRandomChestContent(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Ruby, 1L), 2, 8, 2)); + ChestGenHooks.addItem( + "pyramidDesertyChest", + new WeightedRandomChestContent(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Sapphire, 1L), 2, 8, 2)); + ChestGenHooks.addItem( + "pyramidDesertyChest", + new WeightedRandomChestContent( + GT_OreDictUnificator.get(OrePrefixes.gem, Materials.GreenSapphire, 1L), + 2, + 8, + 2)); + ChestGenHooks.addItem( + "pyramidDesertyChest", + new WeightedRandomChestContent(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Olivine, 1L), 2, 8, 2)); + ChestGenHooks.addItem( + "pyramidDesertyChest", + new WeightedRandomChestContent( + GT_OreDictUnificator.get(OrePrefixes.gem, Materials.GarnetRed, 1L), + 2, + 8, + 4)); + ChestGenHooks.addItem( + "pyramidDesertyChest", + new WeightedRandomChestContent( + GT_OreDictUnificator.get(OrePrefixes.gem, Materials.GarnetYellow, 1L), + 2, + 8, + 4)); ChestGenHooks.addItem( - "pyramidJungleChest", - new WeightedRandomChestContent(ItemList.Coin_Gold_Ancient.get(1L), 16, 64, 10)); - ChestGenHooks.addItem( - "pyramidJungleChest", - new WeightedRandomChestContent(ItemList.ZPM.getWithCharge(1L, 2147483647), 1, 1, 1)); - ChestGenHooks.addItem( - "pyramidJungleChest", - new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Bronze, 1L), - 4, - 16, - 12)); - ChestGenHooks.addItem( - "pyramidJungleChest", - new WeightedRandomChestContent(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Ruby, 1L), 2, 8, 2)); - ChestGenHooks.addItem( - "pyramidJungleChest", - new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Sapphire, 1L), - 2, - 8, - 2)); - ChestGenHooks.addItem( - "pyramidJungleChest", - new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.GreenSapphire, 1L), - 2, - 8, - 2)); - ChestGenHooks.addItem( - "pyramidJungleChest", - new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Olivine, 1L), - 2, - 8, - 2)); - ChestGenHooks.addItem( - "pyramidJungleChest", - new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.GarnetRed, 1L), - 2, - 8, - 4)); - ChestGenHooks.addItem( - "pyramidJungleChest", - new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.GarnetYellow, 1L), - 2, - 8, - 4)); + "pyramidJungleChest", + new WeightedRandomChestContent(ItemList.Coin_Gold_Ancient.get(1L), 16, 64, 10)); + ChestGenHooks.addItem( + "pyramidJungleChest", + new WeightedRandomChestContent(ItemList.ZPM.getWithCharge(1L, 2147483647), 1, 1, 1)); + ChestGenHooks.addItem( + "pyramidJungleChest", + new WeightedRandomChestContent( + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Bronze, 1L), + 4, + 16, + 12)); + ChestGenHooks.addItem( + "pyramidJungleChest", + new WeightedRandomChestContent(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Ruby, 1L), 2, 8, 2)); + ChestGenHooks.addItem( + "pyramidJungleChest", + new WeightedRandomChestContent(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Sapphire, 1L), 2, 8, 2)); + ChestGenHooks.addItem( + "pyramidJungleChest", + new WeightedRandomChestContent( + GT_OreDictUnificator.get(OrePrefixes.gem, Materials.GreenSapphire, 1L), + 2, + 8, + 2)); + ChestGenHooks.addItem( + "pyramidJungleChest", + new WeightedRandomChestContent(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Olivine, 1L), 2, 8, 2)); + ChestGenHooks.addItem( + "pyramidJungleChest", + new WeightedRandomChestContent( + GT_OreDictUnificator.get(OrePrefixes.gem, Materials.GarnetRed, 1L), + 2, + 8, + 4)); + ChestGenHooks.addItem( + "pyramidJungleChest", + new WeightedRandomChestContent( + GT_OreDictUnificator.get(OrePrefixes.gem, Materials.GarnetYellow, 1L), + 2, + 8, + 4)); ChestGenHooks.addItem( - "pyramidJungleDispenser", - new WeightedRandomChestContent(new ItemStack(Items.fire_charge, 1), 2, 8, 30)); + "pyramidJungleDispenser", + new WeightedRandomChestContent(new ItemStack(Items.fire_charge, 1), 2, 8, 30)); ChestGenHooks.addItem( - "pyramidJungleDispenser", - new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.arrowGtWood, Materials.DamascusSteel, 1L), - 8, - 16, - 20)); + "pyramidJungleDispenser", + new WeightedRandomChestContent( + GT_OreDictUnificator.get(OrePrefixes.arrowGtWood, Materials.DamascusSteel, 1L), + 8, + 16, + 20)); ChestGenHooks.addItem( - "mineshaftCorridor", - new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Silver, 1L), - 1, - 4, - 12)); - ChestGenHooks.addItem( - "mineshaftCorridor", - new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Lead, 1L), - 1, - 4, - 3)); - ChestGenHooks.addItem( - "mineshaftCorridor", - new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 1L), - 1, - 4, - 6)); - ChestGenHooks.addItem( - "mineshaftCorridor", - new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Bronze, 1L), - 1, - 4, - 6)); - ChestGenHooks.addItem( - "mineshaftCorridor", - new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Sapphire, 1L), - 1, - 4, - 2)); - ChestGenHooks.addItem( - "mineshaftCorridor", - new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.GreenSapphire, 1L), - 1, - 4, - 2)); - ChestGenHooks.addItem( - "mineshaftCorridor", - new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Olivine, 1L), - 1, - 4, - 2)); - ChestGenHooks.addItem( - "mineshaftCorridor", - new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.GarnetRed, 1L), - 1, - 4, - 4)); - ChestGenHooks.addItem( - "mineshaftCorridor", - new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.GarnetYellow, 1L), - 1, - 4, - 4)); - ChestGenHooks.addItem( - "mineshaftCorridor", - new WeightedRandomChestContent(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Ruby, 1L), 1, 4, 2)); - ChestGenHooks.addItem( - "mineshaftCorridor", - new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Emerald, 1L), - 1, - 4, - 2)); - ChestGenHooks.addItem( - "mineshaftCorridor", - new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.toolHeadPickaxe, Materials.DamascusSteel, 1L), - 1, - 4, - 1)); - ChestGenHooks.addItem( - "mineshaftCorridor", - new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.toolHeadShovel, Materials.DamascusSteel, 1L), - 1, - 4, - 1)); + "mineshaftCorridor", + new WeightedRandomChestContent( + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Silver, 1L), + 1, + 4, + 12)); + ChestGenHooks.addItem( + "mineshaftCorridor", + new WeightedRandomChestContent(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Lead, 1L), 1, 4, 3)); + ChestGenHooks.addItem( + "mineshaftCorridor", + new WeightedRandomChestContent(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 1L), 1, 4, 6)); + ChestGenHooks.addItem( + "mineshaftCorridor", + new WeightedRandomChestContent(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Bronze, 1L), 1, 4, 6)); + ChestGenHooks.addItem( + "mineshaftCorridor", + new WeightedRandomChestContent(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Sapphire, 1L), 1, 4, 2)); + ChestGenHooks.addItem( + "mineshaftCorridor", + new WeightedRandomChestContent( + GT_OreDictUnificator.get(OrePrefixes.gem, Materials.GreenSapphire, 1L), + 1, + 4, + 2)); + ChestGenHooks.addItem( + "mineshaftCorridor", + new WeightedRandomChestContent(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Olivine, 1L), 1, 4, 2)); + ChestGenHooks.addItem( + "mineshaftCorridor", + new WeightedRandomChestContent( + GT_OreDictUnificator.get(OrePrefixes.gem, Materials.GarnetRed, 1L), + 1, + 4, + 4)); + ChestGenHooks.addItem( + "mineshaftCorridor", + new WeightedRandomChestContent( + GT_OreDictUnificator.get(OrePrefixes.gem, Materials.GarnetYellow, 1L), + 1, + 4, + 4)); + ChestGenHooks.addItem( + "mineshaftCorridor", + new WeightedRandomChestContent(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Ruby, 1L), 1, 4, 2)); + ChestGenHooks.addItem( + "mineshaftCorridor", + new WeightedRandomChestContent(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Emerald, 1L), 1, 4, 2)); + ChestGenHooks.addItem( + "mineshaftCorridor", + new WeightedRandomChestContent( + GT_OreDictUnificator.get(OrePrefixes.toolHeadPickaxe, Materials.DamascusSteel, 1L), + 1, + 4, + 1)); + ChestGenHooks.addItem( + "mineshaftCorridor", + new WeightedRandomChestContent( + GT_OreDictUnificator.get(OrePrefixes.toolHeadShovel, Materials.DamascusSteel, 1L), + 1, + 4, + 1)); - ChestGenHooks.addItem( - "villageBlacksmith", - new WeightedRandomChestContent(ItemList.McGuffium_239.get(1L), 1, 1, 1)); - ChestGenHooks.addItem( - "villageBlacksmith", - new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chrome, 1L), - 1, - 4, - 6)); - ChestGenHooks.addItem( - "villageBlacksmith", - new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Neodymium, 1L), - 2, - 8, - 6)); - ChestGenHooks.addItem( - "villageBlacksmith", - new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Manganese, 1L), - 2, - 8, - 12)); - ChestGenHooks.addItem( - "villageBlacksmith", - new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 1L), - 4, - 12, - 12)); - ChestGenHooks.addItem( - "villageBlacksmith", - new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Bronze, 1L), - 4, - 12, - 12)); - ChestGenHooks.addItem( - "villageBlacksmith", - new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Brass, 1L), - 4, - 12, - 12)); - ChestGenHooks.addItem( - "villageBlacksmith", - new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.DamascusSteel, 1L), - 4, - 12, - 1)); + ChestGenHooks + .addItem("villageBlacksmith", new WeightedRandomChestContent(ItemList.McGuffium_239.get(1L), 1, 1, 1)); + ChestGenHooks.addItem( + "villageBlacksmith", + new WeightedRandomChestContent(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chrome, 1L), 1, 4, 6)); + ChestGenHooks.addItem( + "villageBlacksmith", + new WeightedRandomChestContent( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Neodymium, 1L), + 2, + 8, + 6)); + ChestGenHooks.addItem( + "villageBlacksmith", + new WeightedRandomChestContent( + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Manganese, 1L), + 2, + 8, + 12)); + ChestGenHooks.addItem( + "villageBlacksmith", + new WeightedRandomChestContent( + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 1L), + 4, + 12, + 12)); + ChestGenHooks.addItem( + "villageBlacksmith", + new WeightedRandomChestContent( + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Bronze, 1L), + 4, + 12, + 12)); + ChestGenHooks.addItem( + "villageBlacksmith", + new WeightedRandomChestContent( + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Brass, 1L), + 4, + 12, + 12)); + ChestGenHooks.addItem( + "villageBlacksmith", + new WeightedRandomChestContent( + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.DamascusSteel, 1L), + 4, + 12, + 1)); - ChestGenHooks.addItem( - "strongholdCrossing", - new WeightedRandomChestContent(ItemList.Bottle_Holy_Water.get(1L), 4, 8, 6)); - ChestGenHooks.addItem( - "strongholdCrossing", - new WeightedRandomChestContent(ItemList.McGuffium_239.get(1L), 1, 1, 10)); + ChestGenHooks + .addItem("strongholdCrossing", new WeightedRandomChestContent(ItemList.Bottle_Holy_Water.get(1L), 4, 8, 6)); + ChestGenHooks + .addItem("strongholdCrossing", new WeightedRandomChestContent(ItemList.McGuffium_239.get(1L), 1, 1, 10)); ChestGenHooks.addItem( - "strongholdCrossing", - new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.crateGtIngot, Materials.DamascusSteel, 1L), - 4, - 8, - 6)); - ChestGenHooks.addItem( - "strongholdCrossing", - new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.crateGtIngot, Materials.Steel, 1L), - 8, - 16, - 12)); - ChestGenHooks.addItem( - "strongholdCrossing", - new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.crateGtIngot, Materials.Bronze, 1L), - 8, - 16, - 12)); - ChestGenHooks.addItem( - "strongholdCrossing", - new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.crateGtIngot, Materials.Manganese, 1L), - 4, - 8, - 12)); - ChestGenHooks.addItem( - "strongholdCrossing", - new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.crateGtDust, Materials.Neodymium, 1L), - 4, - 8, - 6)); - ChestGenHooks.addItem( - "strongholdCrossing", - new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.crateGtDust, Materials.Chrome, 1L), - 2, - 4, - 6)); + "strongholdCrossing", + new WeightedRandomChestContent( + GT_OreDictUnificator.get(OrePrefixes.crateGtIngot, Materials.DamascusSteel, 1L), + 4, + 8, + 6)); + ChestGenHooks.addItem( + "strongholdCrossing", + new WeightedRandomChestContent( + GT_OreDictUnificator.get(OrePrefixes.crateGtIngot, Materials.Steel, 1L), + 8, + 16, + 12)); + ChestGenHooks.addItem( + "strongholdCrossing", + new WeightedRandomChestContent( + GT_OreDictUnificator.get(OrePrefixes.crateGtIngot, Materials.Bronze, 1L), + 8, + 16, + 12)); + ChestGenHooks.addItem( + "strongholdCrossing", + new WeightedRandomChestContent( + GT_OreDictUnificator.get(OrePrefixes.crateGtIngot, Materials.Manganese, 1L), + 4, + 8, + 12)); + ChestGenHooks.addItem( + "strongholdCrossing", + new WeightedRandomChestContent( + GT_OreDictUnificator.get(OrePrefixes.crateGtDust, Materials.Neodymium, 1L), + 4, + 8, + 6)); + ChestGenHooks.addItem( + "strongholdCrossing", + new WeightedRandomChestContent( + GT_OreDictUnificator.get(OrePrefixes.crateGtDust, Materials.Chrome, 1L), + 2, + 4, + 6)); ChestGenHooks.addItem( - "strongholdCorridor", - new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.toolHeadSword, Materials.DamascusSteel, 1L), - 1, - 4, - 6)); - ChestGenHooks.addItem( - "strongholdCorridor", - new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.toolHeadAxe, Materials.DamascusSteel, 1L), - 1, - 4, - 6)); - ChestGenHooks.addItem( - "strongholdCorridor", - new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.arrowGtWood, Materials.DamascusSteel, 1L), - 16, - 48, - 6)); - ChestGenHooks.addItem( - "strongholdCorridor", - new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.arrowGtWood, Materials.SterlingSilver, 1L), - 8, - 24, - 6)); + "strongholdCorridor", + new WeightedRandomChestContent( + GT_OreDictUnificator.get(OrePrefixes.toolHeadSword, Materials.DamascusSteel, 1L), + 1, + 4, + 6)); + ChestGenHooks.addItem( + "strongholdCorridor", + new WeightedRandomChestContent( + GT_OreDictUnificator.get(OrePrefixes.toolHeadAxe, Materials.DamascusSteel, 1L), + 1, + 4, + 6)); + ChestGenHooks.addItem( + "strongholdCorridor", + new WeightedRandomChestContent( + GT_OreDictUnificator.get(OrePrefixes.arrowGtWood, Materials.DamascusSteel, 1L), + 16, + 48, + 6)); + ChestGenHooks.addItem( + "strongholdCorridor", + new WeightedRandomChestContent( + GT_OreDictUnificator.get(OrePrefixes.arrowGtWood, Materials.SterlingSilver, 1L), + 8, + 24, + 6)); } } diff --git a/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java index 5cf6a56ce4..cf646eaddc 100644 --- a/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java @@ -36,74 +36,65 @@ public class GT_CraftingRecipeLoader implements Runnable { private static final String aTextIron1 = "X X"; private static final String aTextIron2 = "XXX"; private static final long bits_no_remove_buffered = GT_ModHandler.RecipeBits.NOT_REMOVABLE - | GT_ModHandler.RecipeBits.BUFFERED; + | GT_ModHandler.RecipeBits.BUFFERED; private static final long bits = GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE - | GT_ModHandler.RecipeBits.BUFFERED; + | GT_ModHandler.RecipeBits.BUFFERED; private static final String aTextPlateWrench = "PwP"; @Override public void run() { GT_Log.out.println("GT_Mod: Adding nerfed Vanilla Recipes."); GT_ModHandler.addCraftingRecipe( - new ItemStack(Items.bucket, 1), - bits_no_remove_buffered | GT_ModHandler.RecipeBits.DELETE_ALL_OTHER_SHAPED_RECIPES, - new Object[] { "XhX", " X ", 'X', OrePrefixes.plate.get(Materials.AnyIron) }); + new ItemStack(Items.bucket, 1), + bits_no_remove_buffered | GT_ModHandler.RecipeBits.DELETE_ALL_OTHER_SHAPED_RECIPES, + new Object[] { "XhX", " X ", 'X', OrePrefixes.plate.get(Materials.AnyIron) }); if (!GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.recipereplacements, "Iron.Bucket", true)) { GT_ModHandler.addCraftingRecipe( - new ItemStack(Items.bucket, 1), - bits_no_remove_buffered, - new Object[] { aTextIron1, " X ", 'X', OrePrefixes.ingot.get(Materials.AnyIron) }); + new ItemStack(Items.bucket, 1), + bits_no_remove_buffered, + new Object[] { aTextIron1, " X ", 'X', OrePrefixes.ingot.get(Materials.AnyIron) }); } ItemStack tMat = new ItemStack(Items.iron_ingot); if (GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.recipereplacements, "Iron.PressurePlate", true)) { ItemStack tStack; if (null != (tStack = GT_ModHandler.removeRecipe(tMat, tMat, null, null, null, null, null, null, null))) { GT_ModHandler.addCraftingRecipe( - tStack, - bits_no_remove_buffered | GT_ModHandler.RecipeBits.DELETE_ALL_OTHER_RECIPES, - new Object[] { "ShS", "XZX", "SdS", 'X', OrePrefixes.plate.get(Materials.AnyIron), 'S', - OrePrefixes.screw.get(Materials.Steel), 'Z', OrePrefixes.spring.get(Materials.Steel) }); + tStack, + bits_no_remove_buffered | GT_ModHandler.RecipeBits.DELETE_ALL_OTHER_RECIPES, + new Object[] { "ShS", "XZX", "SdS", 'X', OrePrefixes.plate.get(Materials.AnyIron), 'S', + OrePrefixes.screw.get(Materials.Steel), 'Z', OrePrefixes.spring.get(Materials.Steel) }); } } if (GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.recipereplacements, "Iron.Door", true)) { ItemStack tStack; if (null != (tStack = GT_ModHandler.removeRecipe(tMat, tMat, null, tMat, tMat, null, tMat, tMat, null))) { GT_ModHandler.addCraftingRecipe( - tStack, - bits_no_remove_buffered | GT_ModHandler.RecipeBits.DELETE_ALL_OTHER_RECIPES, - new Object[] { "XX ", "XXh", "XX ", 'X', OrePrefixes.plate.get(Materials.AnyIron), 'S', - OrePrefixes.stick.get(Materials.Wood), 'I', OrePrefixes.ingot.get(Materials.AnyIron) }); + tStack, + bits_no_remove_buffered | GT_ModHandler.RecipeBits.DELETE_ALL_OTHER_RECIPES, + new Object[] { "XX ", "XXh", "XX ", 'X', OrePrefixes.plate.get(Materials.AnyIron), 'S', + OrePrefixes.stick.get(Materials.Wood), 'I', OrePrefixes.ingot.get(Materials.AnyIron) }); } } if (GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.recipereplacements, "Iron.Cauldron", true)) { ItemStack tStack; if (null != (tStack = GT_ModHandler.removeRecipe(tMat, null, tMat, tMat, null, tMat, tMat, tMat, tMat))) { GT_ModHandler.addCraftingRecipe( - tStack, - bits_no_remove_buffered | GT_ModHandler.RecipeBits.DELETE_ALL_OTHER_RECIPES, - new Object[] { aTextIron1, "XhX", aTextIron2, 'X', OrePrefixes.plate.get(Materials.AnyIron), - 'S', OrePrefixes.stick.get(Materials.Wood), 'I', - OrePrefixes.ingot.get(Materials.AnyIron) }); + tStack, + bits_no_remove_buffered | GT_ModHandler.RecipeBits.DELETE_ALL_OTHER_RECIPES, + new Object[] { aTextIron1, "XhX", aTextIron2, 'X', OrePrefixes.plate.get(Materials.AnyIron), 'S', + OrePrefixes.stick.get(Materials.Wood), 'I', OrePrefixes.ingot.get(Materials.AnyIron) }); } } 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, - new Object[] { "XwX", "XCX", " X ", 'X', OrePrefixes.plate.get(Materials.AnyIron), 'S', - OrePrefixes.stick.get(Materials.Wood), 'I', OrePrefixes.ingot.get(Materials.AnyIron), - 'C', "craftingChest" }); + tStack, + bits_no_remove_buffered | GT_ModHandler.RecipeBits.DELETE_ALL_OTHER_RECIPES, + new Object[] { "XwX", "XCX", " X ", 'X', OrePrefixes.plate.get(Materials.AnyIron), 'S', + OrePrefixes.stick.get(Materials.Wood), 'I', OrePrefixes.ingot.get(Materials.AnyIron), 'C', + "craftingChest" }); } } if (GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.recipereplacements, "Iron.Bars", true)) { @@ -111,28 +102,27 @@ public class GT_CraftingRecipeLoader implements Runnable { if (null != (tStack = GT_ModHandler.removeRecipe(tMat, tMat, tMat, tMat, tMat, tMat, null, null, null))) { tStack.stackSize /= 2; GT_ModHandler.addCraftingRecipe( - tStack, - bits_no_remove_buffered | GT_ModHandler.RecipeBits.DELETE_ALL_OTHER_RECIPES, - new Object[] { " w ", aTextIron2, aTextIron2, 'X', OrePrefixes.stick.get(Materials.AnyIron), - 'S', OrePrefixes.stick.get(Materials.Wood), 'I', - OrePrefixes.ingot.get(Materials.AnyIron) }); + tStack, + bits_no_remove_buffered | GT_ModHandler.RecipeBits.DELETE_ALL_OTHER_RECIPES, + new Object[] { " w ", aTextIron2, aTextIron2, 'X', OrePrefixes.stick.get(Materials.AnyIron), 'S', + OrePrefixes.stick.get(Materials.Wood), 'I', OrePrefixes.ingot.get(Materials.AnyIron) }); } } GT_ModHandler.addCraftingRecipe( - GT_ModHandler.getIC2Item("ironFence", 6L), - bits_no_remove_buffered | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { aTextIron2, aTextIron2, " w ", 'X', OrePrefixes.stick.get(Materials.AnyIron), 'S', - OrePrefixes.stick.get(Materials.Wood), 'I', OrePrefixes.ingot.get(Materials.AnyIron) }); + GT_ModHandler.getIC2Item("ironFence", 6L), + bits_no_remove_buffered | GT_ModHandler.RecipeBits.REVERSIBLE, + new Object[] { aTextIron2, aTextIron2, " w ", 'X', OrePrefixes.stick.get(Materials.AnyIron), 'S', + OrePrefixes.stick.get(Materials.Wood), 'I', OrePrefixes.ingot.get(Materials.AnyIron) }); tMat = new ItemStack(Items.gold_ingot); if (GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.recipereplacements, "Gold.PressurePlate", true)) { ItemStack tStack; if (null != (tStack = GT_ModHandler.removeRecipe(tMat, tMat, null, null, null, null, null, null, null))) { GT_ModHandler.addCraftingRecipe( - tStack, - bits_no_remove_buffered | GT_ModHandler.RecipeBits.DELETE_ALL_OTHER_RECIPES, - new Object[] { "ShS", "XZX", "SdS", 'X', OrePrefixes.plate.get(Materials.Gold), 'S', - OrePrefixes.screw.get(Materials.Steel), 'Z', OrePrefixes.spring.get(Materials.Steel) }); + tStack, + bits_no_remove_buffered | GT_ModHandler.RecipeBits.DELETE_ALL_OTHER_RECIPES, + new Object[] { "ShS", "XZX", "SdS", 'X', OrePrefixes.plate.get(Materials.Gold), 'S', + OrePrefixes.screw.get(Materials.Steel), 'Z', OrePrefixes.spring.get(Materials.Steel) }); } } tMat = GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Rubber, 1L); @@ -140,9 +130,9 @@ public class GT_CraftingRecipeLoader implements Runnable { ItemStack tStack; if (null != (tStack = GT_ModHandler.removeRecipe(tMat, tMat, tMat, tMat, tMat, tMat, null, null, null))) { GT_ModHandler.addCraftingRecipe( - tStack, - bits_no_remove_buffered | GT_ModHandler.RecipeBits.DELETE_ALL_OTHER_RECIPES, - new Object[] { aTextIron2, aTextIron2, 'X', OrePrefixes.plate.get(Materials.Rubber) }); + tStack, + bits_no_remove_buffered | GT_ModHandler.RecipeBits.DELETE_ALL_OTHER_RECIPES, + new Object[] { aTextIron2, aTextIron2, 'X', OrePrefixes.plate.get(Materials.Rubber) }); } } GT_ModHandler.removeRecipeByOutputDelayed(ItemList.Bottle_Empty.get(1L)); @@ -165,1445 +155,1416 @@ public class GT_CraftingRecipeLoader implements Runnable { GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getModItem(Forestry.ID, "engine", 1L, 2)); GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getModItem(Forestry.ID, "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_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, - tStack), - bits_no_remove_buffered, - new Object[] { "P", "P", 'P', OrePrefixes.plank.get(Materials.Wood) }); + GT_Utility.copyAmount( + GT_Mod.gregtechproxy.mNerfedWoodPlank ? tStack.stackSize / 2 : tStack.stackSize, + tStack), + bits_no_remove_buffered, + new Object[] { "P", "P", 'P', OrePrefixes.plank.get(Materials.Wood) }); } GT_ModHandler.addCraftingRecipe( - new ItemStack(Blocks.stone_button, 2, 0), - bits_no_remove_buffered, - new Object[] { "S", "S", 'S', OrePrefixes.stone }); + new ItemStack(Blocks.stone_button, 2, 0), + bits_no_remove_buffered, + new Object[] { "S", "S", 'S', OrePrefixes.stone }); GT_ModHandler.addShapelessCraftingRecipe( - new ItemStack(Blocks.stone_button, 1, 0), - bits_no_remove_buffered, - new Object[] { OrePrefixes.stone }); + new ItemStack(Blocks.stone_button, 1, 0), + bits_no_remove_buffered, + new Object[] { OrePrefixes.stone }); GT_Log.out.println("GT_Mod: Adding Vanilla Convenience Recipes."); GT_ModHandler.addCraftingRecipe( - new ItemStack(Blocks.stonebrick, 1, 3), - bits_no_remove_buffered, - new Object[] { "f", "X", 'X', new ItemStack(Blocks.double_stone_slab, 1, 8) }); + new ItemStack(Blocks.stonebrick, 1, 3), + bits_no_remove_buffered, + new Object[] { "f", "X", 'X', new ItemStack(Blocks.double_stone_slab, 1, 8) }); GT_ModHandler.addCraftingRecipe( - new ItemStack(Blocks.gravel, 1, 0), - bits_no_remove_buffered, - new Object[] { "h", "X", 'X', new ItemStack(Blocks.cobblestone, 1, 0) }); + new ItemStack(Blocks.gravel, 1, 0), + bits_no_remove_buffered, + new Object[] { "h", "X", 'X', new ItemStack(Blocks.cobblestone, 1, 0) }); GT_ModHandler.addCraftingRecipe( - new ItemStack(Blocks.sand, 1, 0), - bits_no_remove_buffered, - new Object[] { "h", "X", 'X', new ItemStack(Blocks.gravel, 1, 0) }); + new ItemStack(Blocks.sand, 1, 0), + bits_no_remove_buffered, + new Object[] { "h", "X", 'X', new ItemStack(Blocks.gravel, 1, 0) }); GT_ModHandler.addCraftingRecipe( - new ItemStack(Blocks.cobblestone, 1, 0), - bits_no_remove_buffered, - new Object[] { "h", "X", 'X', new ItemStack(Blocks.stone, 1, 0) }); + new ItemStack(Blocks.cobblestone, 1, 0), + bits_no_remove_buffered, + new Object[] { "h", "X", 'X', new ItemStack(Blocks.stone, 1, 0) }); GT_ModHandler.addCraftingRecipe( - new ItemStack(Blocks.stonebrick, 1, 2), - bits_no_remove_buffered, - new Object[] { "h", "X", 'X', new ItemStack(Blocks.stonebrick, 1, 0) }); + new ItemStack(Blocks.stonebrick, 1, 2), + bits_no_remove_buffered, + new Object[] { "h", "X", 'X', new ItemStack(Blocks.stonebrick, 1, 0) }); GT_ModHandler.addShapelessCraftingRecipe( - new ItemStack(Blocks.double_stone_slab, 1, 8), - bits_no_remove_buffered, - new Object[] { new ItemStack(Blocks.double_stone_slab, 1, 0) }); + new ItemStack(Blocks.double_stone_slab, 1, 8), + bits_no_remove_buffered, + new Object[] { new ItemStack(Blocks.double_stone_slab, 1, 0) }); GT_ModHandler.addShapelessCraftingRecipe( - new ItemStack(Blocks.double_stone_slab, 1, 0), - bits_no_remove_buffered, - new Object[] { new ItemStack(Blocks.double_stone_slab, 1, 8) }); + new ItemStack(Blocks.double_stone_slab, 1, 0), + bits_no_remove_buffered, + new Object[] { new ItemStack(Blocks.double_stone_slab, 1, 8) }); GT_ModHandler.addCraftingRecipe( - new ItemStack(Blocks.double_stone_slab, 1, 0), - bits_no_remove_buffered, - new Object[] { "B", "B", 'B', new ItemStack(Blocks.stone_slab, 1, 0) }); + new ItemStack(Blocks.double_stone_slab, 1, 0), + bits_no_remove_buffered, + new Object[] { "B", "B", 'B', new ItemStack(Blocks.stone_slab, 1, 0) }); GT_ModHandler.addCraftingRecipe( - new ItemStack(Blocks.cobblestone, 1, 0), - bits_no_remove_buffered, - new Object[] { "B", "B", 'B', new ItemStack(Blocks.stone_slab, 1, 3) }); + new ItemStack(Blocks.cobblestone, 1, 0), + bits_no_remove_buffered, + new Object[] { "B", "B", 'B', new ItemStack(Blocks.stone_slab, 1, 3) }); GT_ModHandler.addCraftingRecipe( - new ItemStack(Blocks.brick_block, 1, 0), - bits_no_remove_buffered, - new Object[] { "B", "B", 'B', new ItemStack(Blocks.stone_slab, 1, 4) }); + new ItemStack(Blocks.brick_block, 1, 0), + bits_no_remove_buffered, + new Object[] { "B", "B", 'B', new ItemStack(Blocks.stone_slab, 1, 4) }); GT_ModHandler.addCraftingRecipe( - new ItemStack(Blocks.stonebrick, 1, 0), - bits_no_remove_buffered, - new Object[] { "B", "B", 'B', new ItemStack(Blocks.stone_slab, 1, 5) }); + new ItemStack(Blocks.stonebrick, 1, 0), + bits_no_remove_buffered, + new Object[] { "B", "B", 'B', new ItemStack(Blocks.stone_slab, 1, 5) }); GT_ModHandler.addCraftingRecipe( - new ItemStack(Blocks.nether_brick, 1, 0), - bits_no_remove_buffered, - new Object[] { "B", "B", 'B', new ItemStack(Blocks.stone_slab, 1, 6) }); + new ItemStack(Blocks.nether_brick, 1, 0), + bits_no_remove_buffered, + new Object[] { "B", "B", 'B', new ItemStack(Blocks.stone_slab, 1, 6) }); GT_ModHandler.addCraftingRecipe( - new ItemStack(Blocks.quartz_block, 1, 0), - bits_no_remove_buffered, - new Object[] { "B", "B", 'B', new ItemStack(Blocks.stone_slab, 1, 7) }); + new ItemStack(Blocks.quartz_block, 1, 0), + bits_no_remove_buffered, + new Object[] { "B", "B", 'B', new ItemStack(Blocks.stone_slab, 1, 7) }); GT_ModHandler.addCraftingRecipe( - new ItemStack(Blocks.double_stone_slab, 1, 8), - bits_no_remove_buffered, - new Object[] { "B", "B", 'B', new ItemStack(Blocks.stone_slab, 1, 8) }); + new ItemStack(Blocks.double_stone_slab, 1, 8), + bits_no_remove_buffered, + new Object[] { "B", "B", 'B', new ItemStack(Blocks.stone_slab, 1, 8) }); GT_ModHandler.addCraftingRecipe( - new ItemStack(Blocks.planks, 1, 0), - bits_no_remove_buffered, - new Object[] { "B", "B", 'B', new ItemStack(Blocks.wooden_slab, 1, 0) }); + new ItemStack(Blocks.planks, 1, 0), + bits_no_remove_buffered, + new Object[] { "B", "B", 'B', new ItemStack(Blocks.wooden_slab, 1, 0) }); GT_ModHandler.addCraftingRecipe( - new ItemStack(Blocks.planks, 1, 1), - bits_no_remove_buffered, - new Object[] { "B", "B", 'B', new ItemStack(Blocks.wooden_slab, 1, 1) }); + new ItemStack(Blocks.planks, 1, 1), + bits_no_remove_buffered, + new Object[] { "B", "B", 'B', new ItemStack(Blocks.wooden_slab, 1, 1) }); GT_ModHandler.addCraftingRecipe( - new ItemStack(Blocks.planks, 1, 2), - bits_no_remove_buffered, - new Object[] { "B", "B", 'B', new ItemStack(Blocks.wooden_slab, 1, 2) }); + new ItemStack(Blocks.planks, 1, 2), + bits_no_remove_buffered, + new Object[] { "B", "B", 'B', new ItemStack(Blocks.wooden_slab, 1, 2) }); GT_ModHandler.addCraftingRecipe( - new ItemStack(Blocks.planks, 1, 3), - bits_no_remove_buffered, - new Object[] { "B", "B", 'B', new ItemStack(Blocks.wooden_slab, 1, 3) }); + new ItemStack(Blocks.planks, 1, 3), + bits_no_remove_buffered, + new Object[] { "B", "B", 'B', new ItemStack(Blocks.wooden_slab, 1, 3) }); GT_ModHandler.addCraftingRecipe( - new ItemStack(Blocks.planks, 1, 4), - bits_no_remove_buffered, - new Object[] { "B", "B", 'B', new ItemStack(Blocks.wooden_slab, 1, 4) }); + new ItemStack(Blocks.planks, 1, 4), + bits_no_remove_buffered, + new Object[] { "B", "B", 'B', new ItemStack(Blocks.wooden_slab, 1, 4) }); GT_ModHandler.addCraftingRecipe( - new ItemStack(Blocks.planks, 1, 5), - bits_no_remove_buffered, - new Object[] { "B", "B", 'B', new ItemStack(Blocks.wooden_slab, 1, 5) }); + new ItemStack(Blocks.planks, 1, 5), + bits_no_remove_buffered, + new Object[] { "B", "B", 'B', new ItemStack(Blocks.wooden_slab, 1, 5) }); GT_ModHandler.addCraftingRecipe( - new ItemStack(Blocks.planks, 1, 6), - bits_no_remove_buffered, - new Object[] { "B", "B", 'B', new ItemStack(Blocks.wooden_slab, 1, 6) }); + new ItemStack(Blocks.planks, 1, 6), + bits_no_remove_buffered, + new Object[] { "B", "B", 'B', new ItemStack(Blocks.wooden_slab, 1, 6) }); GT_ModHandler.addCraftingRecipe( - new ItemStack(Blocks.planks, 1, 7), - bits_no_remove_buffered, - new Object[] { "B", "B", 'B', new ItemStack(Blocks.wooden_slab, 1, 7) }); + new ItemStack(Blocks.planks, 1, 7), + bits_no_remove_buffered, + new Object[] { "B", "B", 'B', new ItemStack(Blocks.wooden_slab, 1, 7) }); GT_ModHandler.addCraftingRecipe( - new ItemStack(Items.stick, 2, 0), - bits_no_remove_buffered, - new Object[] { "s", "X", 'X', new ItemStack(Blocks.deadbush, 1, 32767) }); + new ItemStack(Items.stick, 2, 0), + bits_no_remove_buffered, + new Object[] { "s", "X", 'X', new ItemStack(Blocks.deadbush, 1, 32767) }); GT_ModHandler.addCraftingRecipe( - new ItemStack(Items.stick, 2, 0), - bits_no_remove_buffered, - new Object[] { "s", "X", 'X', new ItemStack(Blocks.tallgrass, 1, 0) }); + new ItemStack(Items.stick, 2, 0), + bits_no_remove_buffered, + new Object[] { "s", "X", 'X', new ItemStack(Blocks.tallgrass, 1, 0) }); GT_ModHandler.addCraftingRecipe( - new ItemStack(Items.stick, 1, 0), - bits_no_remove_buffered, - new Object[] { "s", "X", 'X', OrePrefixes.treeSapling }); + new ItemStack(Items.stick, 1, 0), + bits_no_remove_buffered, + new Object[] { "s", "X", 'X', OrePrefixes.treeSapling }); GT_ModHandler.addCraftingRecipe( - new ItemStack(Items.comparator, 1, 0), - bits_no_remove_buffered, - new Object[] { " T ", "TQT", "SSS", 'Q', OreDictNames.craftingQuartz, 'S', OrePrefixes.stoneSmooth, 'T', - OreDictNames.craftingRedstoneTorch }); + new ItemStack(Items.comparator, 1, 0), + bits_no_remove_buffered, + new Object[] { " T ", "TQT", "SSS", 'Q', OreDictNames.craftingQuartz, 'S', OrePrefixes.stoneSmooth, 'T', + OreDictNames.craftingRedstoneTorch }); GT_Log.out.println("GT_Mod: Adding Tool Recipes."); GT_ModHandler.addCrafti