From 0d9aab72aa570f13dc3e32e0d32b3f3a95f95e0a Mon Sep 17 00:00:00 2001 From: Jason Mitchell Date: Mon, 30 Jan 2023 10:56:42 -0800 Subject: [ci skip] spotlessApply with the new settings --- .../loaders/postload/GT_BlockResistanceLoader.java | 7 +- .../loaders/postload/GT_BookAndLootLoader.java | 327 +- .../loaders/postload/GT_CraftingRecipeLoader.java | 3925 +++++++------------- .../gregtech/loaders/postload/GT_CropLoader.java | 232 +- .../postload/GT_ExtremeDieselFuelLoader.java | 1 + .../loaders/postload/GT_FakeRecipeLoader.java | 1 + .../postload/GT_ItemMaxStacksizeLoader.java | 8 +- .../loaders/postload/GT_MinableRegistrator.java | 4 +- .../postload/GT_PCBFactoryMaterialLoader.java | 1 + .../gregtech/loaders/postload/GT_PostLoad.java | 324 +- .../postload/GT_ProcessingArrayRecipeLoader.java | 35 +- .../postload/GT_RecyclerBlacklistLoader.java | 105 +- .../loaders/postload/GT_ScrapboxDropLoader.java | 8 +- .../loaders/postload/GT_UUMRecipeLoader.java | 1 + .../loaders/postload/GT_Worldgenloader.java | 894 ++++- .../gregtech/loaders/postload/PartP2PGTPower.java | 17 +- .../postload/chains/GT_BauxiteRefineChain.java | 59 +- .../loaders/postload/chains/GT_NaniteChain.java | 178 +- .../postload/chains/GT_PCBFactoryRecipes.java | 571 ++- .../postload/recipes/AlloySmelterRecipes.java | 161 +- .../postload/recipes/ArcFurnaceRecipes.java | 252 +- .../loaders/postload/recipes/AssemblerRecipes.java | 2776 ++++++-------- .../postload/recipes/AssemblyLineRecipes.java | 940 ++--- .../loaders/postload/recipes/AutoclaveRecipes.java | 14 +- .../loaders/postload/recipes/BenderRecipes.java | 11 +- .../postload/recipes/BlastFurnaceRecipes.java | 44 +- .../loaders/postload/recipes/BreweryRecipes.java | 74 +- .../loaders/postload/recipes/CannerRecipes.java | 1 + .../postload/recipes/CentrifugeRecipes.java | 58 +- .../postload/recipes/ChemicalBathRecipes.java | 22 +- .../loaders/postload/recipes/ChemicalRecipes.java | 1487 +++----- .../postload/recipes/CircuitAssemblerRecipes.java | 298 +- .../postload/recipes/CompressorRecipes.java | 63 +- .../postload/recipes/CropProcessingRecipes.java | 46 +- .../loaders/postload/recipes/CuttingRecipes.java | 171 +- .../postload/recipes/DistilleryRecipes.java | 776 ++-- .../postload/recipes/ElectrolyzerRecipes.java | 12 +- .../recipes/ElectromagneticSeparatorRecipes.java | 3 +- .../loaders/postload/recipes/ExtractorRecipes.java | 95 +- .../loaders/postload/recipes/ExtruderRecipes.java | 7 +- .../loaders/postload/recipes/FermenterRecipes.java | 204 +- .../postload/recipes/FluidCannerRecipes.java | 1 + .../postload/recipes/FluidExtractorRecipes.java | 129 +- .../postload/recipes/FluidHeaterRecipes.java | 7 +- .../postload/recipes/FluidSolidifierRecipes.java | 46 +- .../postload/recipes/ForgeHammerRecipes.java | 47 +- .../postload/recipes/FormingPressRecipes.java | 8 +- .../loaders/postload/recipes/FuelRecipes.java | 6 +- .../postload/recipes/FusionReactorRecipes.java | 5 +- .../recipes/ImplosionCompressorRecipes.java | 1 + .../postload/recipes/LaserEngraverRecipes.java | 38 +- .../loaders/postload/recipes/LatheRecipes.java | 8 +- .../postload/recipes/MatterAmplifierRecipes.java | 1 + .../loaders/postload/recipes/MixerRecipes.java | 89 +- .../loaders/postload/recipes/NEIHiding.java | 4 +- .../postload/recipes/OreDictUnification.java | 1 + .../loaders/postload/recipes/PackagerRecipes.java | 7 +- .../postload/recipes/PlasmaForgeRecipes.java | 36 +- .../loaders/postload/recipes/PrinterRecipes.java | 6 +- .../loaders/postload/recipes/Pulverizer.java | 322 +- .../loaders/postload/recipes/PyrolyseRecipes.java | 28 +- .../loaders/postload/recipes/RecipeRemover.java | 80 +- .../loaders/postload/recipes/SifterRecipes.java | 34 +- .../loaders/postload/recipes/SlicerRecipes.java | 1 + .../loaders/postload/recipes/SmelterRecipes.java | 17 +- .../postload/recipes/ThaumcraftRecipes.java | 820 ++-- .../postload/recipes/ThermalCentrifugeRecipes.java | 5 +- .../postload/recipes/VacuumFreezerRecipes.java | 84 +- .../loaders/postload/recipes/WiremillRecipes.java | 10 +- 69 files changed, 7180 insertions(+), 8874 deletions(-) (limited to 'src/main/java/gregtech/loaders/postload') diff --git a/src/main/java/gregtech/loaders/postload/GT_BlockResistanceLoader.java b/src/main/java/gregtech/loaders/postload/GT_BlockResistanceLoader.java index 39f6830555..2045172eec 100644 --- a/src/main/java/gregtech/loaders/postload/GT_BlockResistanceLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_BlockResistanceLoader.java @@ -1,14 +1,17 @@ package gregtech.loaders.postload; -import gregtech.GT_Mod; -import gregtech.api.util.GT_Utility; import java.util.Set; + import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; import net.minecraft.item.ItemAxe; import net.minecraft.item.ItemPickaxe; +import gregtech.GT_Mod; +import gregtech.api.util.GT_Utility; + public class GT_BlockResistanceLoader implements Runnable { + @Override public void run() { if (GT_Mod.gregtechproxy.mHardRock) { diff --git a/src/main/java/gregtech/loaders/postload/GT_BookAndLootLoader.java b/src/main/java/gregtech/loaders/postload/GT_BookAndLootLoader.java index c518dea6fa..d661fb4452 100644 --- a/src/main/java/gregtech/loaders/postload/GT_BookAndLootLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_BookAndLootLoader.java @@ -1,17 +1,19 @@ package gregtech.loaders.postload; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraft.util.WeightedRandomChestContent; +import net.minecraftforge.common.ChestGenHooks; + import gregtech.GT_Mod; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_Log; import gregtech.api.util.GT_OreDictUnificator; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraft.util.WeightedRandomChestContent; -import net.minecraftforge.common.ChestGenHooks; public class GT_BookAndLootLoader implements Runnable { + @Override public void run() { GT_Log.out.println("GT_Mod: Adding worldgenerated Chest Content."); @@ -47,140 +49,227 @@ 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)); + "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)); + 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)); + 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)); + 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)); + 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)); + 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)); + 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)); + 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)); + 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)); + 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)); + 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)); + 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)); + 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)); + 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)); + 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)); + 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)); + "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)); + 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)); + 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)); + 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)); + 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)); + 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)); + 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)); + 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)); + "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)); + 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)); + 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)); + 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)); + 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)); + 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)); + GT_OreDictUnificator.get(OrePrefixes.gem, Materials.GarnetYellow, 1L), + 2, + 8, + 4)); ChestGenHooks.addItem( "pyramidJungleDispenser", @@ -188,136 +277,228 @@ public class GT_BookAndLootLoader implements Runnable { ChestGenHooks.addItem( "pyramidJungleDispenser", new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.arrowGtWood, Materials.DamascusSteel, 1L), 8, 16, 20)); + 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)); + 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)); + 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)); + 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)); + 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)); + 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)); + 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)); + 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)); + 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)); + 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)); + 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)); + 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)); + 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(ItemList.McGuffium_239.get(1L), 1, 1, 1)); ChestGenHooks.addItem( "villageBlacksmith", new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chrome, 1L), 1, 4, 6)); + 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)); + 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)); + 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)); + 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)); + 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)); + 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)); + 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)); + "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)); + "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)); + 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)); + 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)); + 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)); + 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)); + 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)); + 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)); + 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)); + 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)); + 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)); + 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 c81d4d7a0f..7a5b960b3a 100644 --- a/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java @@ -1,5 +1,16 @@ package gregtech.loaders.postload; +import java.util.Arrays; +import java.util.List; +import java.util.stream.Collectors; + +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; + import cpw.mods.fml.common.Loader; import gregtech.GT_Mod; import gregtech.api.GregTech_API; @@ -16,23 +27,14 @@ import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; import ic2.core.Ic2Items; -import java.util.Arrays; -import java.util.List; -import java.util.stream.Collectors; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; 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; - private static final long bits = GT_ModHandler.RecipeBits.NOT_REMOVABLE - | GT_ModHandler.RecipeBits.REVERSIBLE + private static final long bits_no_remove_buffered = GT_ModHandler.RecipeBits.NOT_REMOVABLE + | GT_ModHandler.RecipeBits.BUFFERED; + private static final long bits = GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED; private static final String aTextPlateWrench = "PwP"; @@ -42,11 +44,12 @@ public class GT_CraftingRecipeLoader implements Runnable { 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 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) - }); + GT_ModHandler.addCraftingRecipe( + 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)) { @@ -55,17 +58,8 @@ public class GT_CraftingRecipeLoader implements Runnable { 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) - }); + 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)) { @@ -74,17 +68,8 @@ public class GT_CraftingRecipeLoader implements Runnable { 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) - }); + 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)) { @@ -93,40 +78,21 @@ public class GT_CraftingRecipeLoader implements Runnable { 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) - }); + 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" - }); + 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)) { @@ -136,33 +102,16 @@ public class GT_CraftingRecipeLoader implements Runnable { 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) - }); + 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) - }); + 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)) { @@ -171,17 +120,8 @@ public class GT_CraftingRecipeLoader implements Runnable { 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) - }); + 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); @@ -191,7 +131,7 @@ public class GT_CraftingRecipeLoader implements Runnable { 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)}); + new Object[] { aTextIron2, aTextIron2, 'X', OrePrefixes.plate.get(Materials.Rubber) }); } } GT_ModHandler.removeRecipeByOutputDelayed(ItemList.Bottle_Empty.get(1L)); @@ -214,623 +154,588 @@ 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 * 5 / 4, tStack), bits_no_remove_buffered, - new Object[] {"s", "P", "P", 'P', OrePrefixes.plank.get(Materials.Wood)}); + 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), + GT_Mod.gregtechproxy.mNerfedWoodPlank ? tStack.stackSize / 2 : tStack.stackSize, + tStack), bits_no_remove_buffered, - new Object[] {"P", "P", 'P', OrePrefixes.plank.get(Materials.Wood)}); + 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 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) - }); - GT_ModHandler.addCraftingRecipe(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) - }); - GT_ModHandler.addCraftingRecipe(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) - }); + 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) }); + GT_ModHandler.addCraftingRecipe( + 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) }); + GT_ModHandler.addCraftingRecipe( + 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) }); 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 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 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)}); - 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) - }); - 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) - }); - 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 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) }); + 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) }); + 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) }); 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 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 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)}); - 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) - }); - 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) - }); - 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) - }); - 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) - }); - 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) - }); - 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) - }); - 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) - }); - 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) - }); - - GT_ModHandler.addCraftingRecipe(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) - }); - GT_ModHandler.addCraftingRecipe(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 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) }); + 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) }); + 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) }); + 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) }); + 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) }); + 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) }); + 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) }); + 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) }); + + GT_ModHandler.addCraftingRecipe( + 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) }); + GT_ModHandler.addCraftingRecipe( + 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 }); GT_Log.out.println("GT_Mod: Adding Tool Recipes."); GT_ModHandler.addCraftingRecipe( new ItemStack(Items.minecart, 1), bits_no_remove_buffered | GT_ModHandler.RecipeBits.DELETE_ALL_OTHER_SHAPED_RECIPES, - new Object[] { - " h ", - "PwP", - "WPW", - 'P', - OrePrefixes.plate.get(Materials.AnyIron), - 'W', - ItemList.Component_Minecart_Wheels_Iron - }); - GT_ModHandler.addCraftingRecipe(new ItemStack(Items.minecart, 1), bits_no_remove_buffered, new Object[] { - " h ", - "PwP", - "WPW", - 'P', - OrePrefixes.plate.get(Materials.Steel), - 'W', - ItemList.Component_Minecart_Wheels_Steel - }); + new Object[] { " h ", "PwP", "WPW", 'P', OrePrefixes.plate.get(Materials.AnyIron), 'W', + ItemList.Component_Minecart_Wheels_Iron }); + GT_ModHandler.addCraftingRecipe( + new ItemStack(Items.minecart, 1), + bits_no_remove_buffered, + new Object[] { " h ", "PwP", "WPW", 'P', OrePrefixes.plate.get(Materials.Steel), 'W', + ItemList.Component_Minecart_Wheels_Steel }); GT_ModHandler.addCraftingRecipe( new ItemStack(Items.chest_minecart, 1), - bits_no_remove_buffered - | GT_ModHandler.RecipeBits.REVERSIBLE + bits_no_remove_buffered | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.DELETE_ALL_OTHER_SHAPED_RECIPES, - new Object[] {"X", "C", 'C', new ItemStack(Items.minecart, 1), 'X', OreDictNames.craftingChest}); + new Object[] { "X", "C", 'C', new ItemStack(Items.minecart, 1), 'X', OreDictNames.craftingChest }); GT_ModHandler.addCraftingRecipe( new ItemStack(Items.furnace_minecart, 1), - bits_no_remove_buffered - | GT_ModHandler.RecipeBits.REVERSIBLE + bits_no_remove_buffered | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.DELETE_ALL_OTHER_SHAPED_RECIPES, - new Object[] {"X", "C", 'C', new ItemStack(Items.minecart, 1), 'X', OreDictNames.craftingFurnace}); + new Object[] { "X", "C", 'C', new ItemStack(Items.minecart, 1), 'X', OreDictNames.craftingFurnace }); GT_ModHandler.addCraftingRecipe( new ItemStack(Items.hopper_minecart, 1), - bits_no_remove_buffered - | GT_ModHandler.RecipeBits.REVERSIBLE + bits_no_remove_buffered | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.DELETE_ALL_OTHER_SHAPED_RECIPES, - new Object[] { - "X", "C", 'C', new ItemStack(Items.minecart, 1), 'X', new ItemStack(Blocks.hopper, 1, 32767) - }); + new Object[] { "X", "C", 'C', new ItemStack(Items.minecart, 1), 'X', + new ItemStack(Blocks.hopper, 1, 32767) }); GT_ModHandler.addCraftingRecipe( new ItemStack(Items.tnt_minecart, 1), - bits_no_remove_buffered - | GT_ModHandler.RecipeBits.REVERSIBLE + bits_no_remove_buffered | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.DELETE_ALL_OTHER_SHAPED_RECIPES, - new Object[] {"X", "C", 'C', new ItemStack(Items.minecart, 1), 'X', new ItemStack(Blocks.tnt, 1, 32767) - }); + new Object[] { "X", "C", 'C', new ItemStack(Items.minecart, 1), 'X', + new ItemStack(Blocks.tnt, 1, 32767) }); GT_ModHandler.addCraftingRecipe( new ItemStack(Items.chainmail_helmet, 1), - bits_no_remove_buffered - | GT_ModHandler.RecipeBits.REVERSIBLE + bits_no_remove_buffered | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.DELETE_ALL_OTHER_SHAPED_RECIPES, - new Object[] {"RRR", "RhR", 'R', OrePrefixes.ring.get(Materials.Steel)}); + new Object[] { "RRR", "RhR", 'R', OrePrefixes.ring.get(Materials.Steel) }); GT_ModHandler.addCraftingRecipe( new ItemStack(Items.chainmail_chestplate, 1), - bits_no_remove_buffered - | GT_ModHandler.RecipeBits.REVERSIBLE + bits_no_remove_buffered | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.DELETE_ALL_OTHER_SHAPED_RECIPES, - new Object[] {"RhR", "RRR", "RRR", 'R', OrePrefixes.ring.get(Materials.Steel)}); + new Object[] { "RhR", "RRR", "RRR", 'R', OrePrefixes.ring.get(Materials.Steel) }); GT_ModHandler.addCraftingRecipe( new ItemStack(Items.chainmail_leggings, 1), - bits_no_remove_buffered - | GT_ModHandler.RecipeBits.REVERSIBLE + bits_no_remove_buffered | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.DELETE_ALL_OTHER_SHAPED_RECIPES, - new Object[] {"RRR", "RhR", "R R", 'R', OrePrefixes.ring.get(Materials.Steel)}); + new Object[] { "RRR", "RhR", "R R", 'R', OrePrefixes.ring.get(Materials.Steel) }); GT_ModHandler.addCraftingRecipe( new ItemStack(Items.chainmail_boots, 1), - bits_no_remove_buffered - | GT_ModHandler.RecipeBits.REVERSIBLE + bits_no_remove_buffered | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.DELETE_ALL_OTHER_SHAPED_RECIPES, - new Object[] {"R R", "RhR", 'R', OrePrefixes.ring.get(Materials.Steel)}); + new Object[] { "R R", "RhR", 'R', OrePrefixes.ring.get(Materials.Steel) }); GT_Log.out.println("GT_Mod: Adding Wool and