From 6f31720697bcc351421a4d86ba3bf749375dd12c Mon Sep 17 00:00:00 2001 From: Raven Szewczyk Date: Sat, 27 Aug 2022 10:19:57 +0100 Subject: Update buildscript & apply spotless (#1306) * Update dependencies * Update buildscript, apply spotless --- src/main/java/gregtech/loaders/ExtraIcons.java | 12 +- .../java/gregtech/loaders/load/GT_FuelLoader.java | 140 +- .../gregtech/loaders/load/GT_ItemIterator.java | 329 +- .../gregtech/loaders/load/GT_SonictronLoader.java | 3 +- .../materialprocessing/ProcessingConfig.java | 33 +- .../materialprocessing/ProcessingModSupport.java | 14 +- .../gregtech/loaders/misc/GT_Achievements.java | 302 +- .../gregtech/loaders/misc/GT_BeeDefinition.java | 2815 +- src/main/java/gregtech/loaders/misc/GT_Bees.java | 60 +- .../gregtech/loaders/misc/GT_BranchDefinition.java | 61 +- .../java/gregtech/loaders/misc/GT_CoverLoader.java | 32 +- .../loaders/oreprocessing/ProcessingAll.java | 9 +- .../loaders/oreprocessing/ProcessingArrows.java | 101 +- .../loaders/oreprocessing/ProcessingBeans.java | 6 +- .../loaders/oreprocessing/ProcessingBlock.java | 77 +- .../loaders/oreprocessing/ProcessingBolt.java | 11 +- .../loaders/oreprocessing/ProcessingCell.java | 129 +- .../loaders/oreprocessing/ProcessingCircuit.java | 31 +- .../oreprocessing/ProcessingCompressed.java | 8 +- .../loaders/oreprocessing/ProcessingCrafting.java | 408 +- .../loaders/oreprocessing/ProcessingCrate.java | 91 +- .../loaders/oreprocessing/ProcessingCrop.java | 73 +- .../oreprocessing/ProcessingCrushedOre.java | 112 +- .../oreprocessing/ProcessingCrystallized.java | 16 +- .../loaders/oreprocessing/ProcessingDirty.java | 134 +- .../loaders/oreprocessing/ProcessingDust.java | 431 +- .../loaders/oreprocessing/ProcessingDye.java | 56 +- .../loaders/oreprocessing/ProcessingFineWire.java | 27 +- .../loaders/oreprocessing/ProcessingFoil.java | 12 +- .../loaders/oreprocessing/ProcessingFood.java | 63 +- .../loaders/oreprocessing/ProcessingGear.java | 91 +- .../loaders/oreprocessing/ProcessingGem.java | 267 +- .../loaders/oreprocessing/ProcessingIngot.java | 186 +- .../loaders/oreprocessing/ProcessingItem.java | 14 +- .../loaders/oreprocessing/ProcessingLens.java | 38 +- .../loaders/oreprocessing/ProcessingLog.java | 293 +- .../loaders/oreprocessing/ProcessingNugget.java | 41 +- .../loaders/oreprocessing/ProcessingOre.java | 197 +- .../loaders/oreprocessing/ProcessingOrePoor.java | 29 +- .../oreprocessing/ProcessingOreSmelting.java | 132 +- .../loaders/oreprocessing/ProcessingPipe.java | 133 +- .../loaders/oreprocessing/ProcessingPlank.java | 130 +- .../loaders/oreprocessing/ProcessingPlate.java | 382 +- .../loaders/oreprocessing/ProcessingPure.java | 23 +- .../loaders/oreprocessing/ProcessingRecycling.java | 15 +- .../loaders/oreprocessing/ProcessingRotor.java | 59 +- .../loaders/oreprocessing/ProcessingRound.java | 25 +- .../loaders/oreprocessing/ProcessingSand.java | 25 +- .../loaders/oreprocessing/ProcessingSaplings.java | 17 +- .../loaders/oreprocessing/ProcessingScrew.java | 15 +- .../loaders/oreprocessing/ProcessingShaping.java | 448 +- .../loaders/oreprocessing/ProcessingSlab.java | 18 +- .../loaders/oreprocessing/ProcessingStick.java | 54 +- .../loaders/oreprocessing/ProcessingStickLong.java | 36 +- .../loaders/oreprocessing/ProcessingStone.java | 178 +- .../oreprocessing/ProcessingStoneCobble.java | 32 +- .../oreprocessing/ProcessingStoneVarious.java | 21 +- .../loaders/oreprocessing/ProcessingToolHead.java | 1845 +- .../loaders/oreprocessing/ProcessingToolOther.java | 177 +- .../oreprocessing/ProcessingTransforming.java | 103 +- .../loaders/oreprocessing/ProcessingWax.java | 6 +- .../loaders/oreprocessing/ProcessingWire.java | 424 +- .../loaders/postload/GT_BlockResistanceLoader.java | 4 +- .../loaders/postload/GT_BookAndLootLoader.java | 336 +- .../loaders/postload/GT_CraftingRecipeLoader.java | 3840 ++- .../gregtech/loaders/postload/GT_CropLoader.java | 1424 +- .../loaders/postload/GT_MachineRecipeLoader.java | 26888 ++++++++++++++++--- .../gregtech/loaders/postload/GT_PostLoad.java | 392 +- .../postload/GT_ProcessingArrayRecipeLoader.java | 180 +- .../postload/GT_RecyclerBlacklistLoader.java | 59 +- .../loaders/postload/GT_UUMRecipeLoader.java | 3 +- .../loaders/postload/GT_Worldgenloader.java | 1756 +- .../gregtech/loaders/postload/PartP2PGTPower.java | 26 +- .../loaders/preload/GT_Loader_ItemData.java | 452 +- .../preload/GT_Loader_Item_Block_And_Fluid.java | 3195 ++- .../preload/GT_Loader_MetaTileEntities.java | 15834 ++++++++++- .../preload/GT_Loader_MultiTileEntities.java | 47 +- .../loaders/preload/GT_Loader_OreDictionary.java | 353 +- .../loaders/preload/GT_Loader_OreProcessing.java | 3 +- .../java/gregtech/loaders/preload/GT_PreLoad.java | 884 +- 80 files changed, 56070 insertions(+), 10656 deletions(-) (limited to 'src/main/java/gregtech/loaders') diff --git a/src/main/java/gregtech/loaders/ExtraIcons.java b/src/main/java/gregtech/loaders/ExtraIcons.java index ec50a7c3e2..ff867cce25 100644 --- a/src/main/java/gregtech/loaders/ExtraIcons.java +++ b/src/main/java/gregtech/loaders/ExtraIcons.java @@ -1,12 +1,12 @@ package gregtech.loaders; +import static gregtech.api.enums.GT_Values.RES_PATH_ITEM; + import cpw.mods.fml.common.eventhandler.SubscribeEvent; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.util.IIcon; import net.minecraftforge.client.event.TextureStitchEvent; -import static gregtech.api.enums.GT_Values.RES_PATH_ITEM; - public class ExtraIcons { public static IIcon steelLargeCellInner; public static IIcon aluminiumLargeCellInner; @@ -21,11 +21,13 @@ public class ExtraIcons { @SubscribeEvent public void regIcons(TextureStitchEvent.Pre event) { TextureMap reg = event.map; - if (reg.getTextureType() == 1) {// are for items + if (reg.getTextureType() == 1) { // are for items steelLargeCellInner = reg.registerIcon(RES_PATH_ITEM + "large_fluid_cell_custom/steel_inner"); aluminiumLargeCellInner = reg.registerIcon(RES_PATH_ITEM + "large_fluid_cell_custom/aluminium_inner"); - stainlesssteelLargeCellInner = reg.registerIcon(RES_PATH_ITEM + "large_fluid_cell_custom/stainlesssteel_inner"); - tungstensteelLargeCellInner = reg.registerIcon(RES_PATH_ITEM + "large_fluid_cell_custom/tungstensteel_inner"); + stainlesssteelLargeCellInner = + reg.registerIcon(RES_PATH_ITEM + "large_fluid_cell_custom/stainlesssteel_inner"); + tungstensteelLargeCellInner = + reg.registerIcon(RES_PATH_ITEM + "large_fluid_cell_custom/tungstensteel_inner"); titaniumLargeCellInner = reg.registerIcon(RES_PATH_ITEM + "large_fluid_cell_custom/titanium_inner"); chromiumLargeCellInner = reg.registerIcon(RES_PATH_ITEM + "large_fluid_cell_custom/chromium_inner"); iridiumLargeCellInner = reg.registerIcon(RES_PATH_ITEM + "large_fluid_cell_custom/iridium_inner"); diff --git a/src/main/java/gregtech/loaders/load/GT_FuelLoader.java b/src/main/java/gregtech/loaders/load/GT_FuelLoader.java index 8cea2d25b7..463f2fff63 100644 --- a/src/main/java/gregtech/loaders/load/GT_FuelLoader.java +++ b/src/main/java/gregtech/loaders/load/GT_FuelLoader.java @@ -17,31 +17,135 @@ public class GT_FuelLoader implements Runnable { @Override public void run() { GT_Log.out.println("GT_Mod: Initializing various Fuels."); - ItemList.sBlueVitriol = GT_Mod.gregtechproxy.addFluid("solution.bluevitriol", "Blue Vitriol water solution", null, 1, 295); - ItemList.sNickelSulfate = GT_Mod.gregtechproxy.addFluid("solution.nickelsulfate", "Nickel sulfate water solution", null, 1, 295); - ItemList.sIndiumConcentrate = GT_Mod.gregtechproxy.addFluid("indiumconcentrate", "Indium Concentrate", null, 1, 295);//TODO CHECK NEW x3 - ItemList.sLeadZincSolution = GT_Mod.gregtechproxy.addFluid("leadzincsolution", "Lead-Zinc solution", null, 1, 295); + ItemList.sBlueVitriol = + GT_Mod.gregtechproxy.addFluid("solution.bluevitriol", "Blue Vitriol water solution", null, 1, 295); + ItemList.sNickelSulfate = + GT_Mod.gregtechproxy.addFluid("solution.nickelsulfate", "Nickel sulfate water solution", null, 1, 295); + ItemList.sIndiumConcentrate = GT_Mod.gregtechproxy.addFluid( + "indiumconcentrate", "Indium Concentrate", null, 1, 295); // TODO CHECK NEW x3 + ItemList.sLeadZincSolution = + GT_Mod.gregtechproxy.addFluid("leadzincsolution", "Lead-Zinc solution", null, 1, 295); ItemList.sRocketFuel = GT_Mod.gregtechproxy.addFluid("rocket_fuel", "Rocket Fuel", null, 1, 295); - new GT_Recipe(new ItemStack(Items.lava_bucket), new ItemStack(Blocks.obsidian), GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Copper, 1L), GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Tin, 1L), GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Electrum, 1L), 30, 2); + new GT_Recipe( + new ItemStack(Items.lava_bucket), + new ItemStack(Blocks.obsidian), + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Copper, 1L), + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Tin, 1L), + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Electrum, 1L), + 30, + 2); - GT_Recipe.GT_Recipe_Map.sSmallNaquadahReactorFuels.addRecipe(true, new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.NaquadahEnriched, 1L)}, new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Naquadah, 1L)}, null, null, null, 0, 0, 50000); - GT_Recipe.GT_Recipe_Map.sLargeNaquadahReactorFuels.addRecipe(true, new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.stick, Materials.NaquadahEnriched, 1L)}, new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Naquadah, 1L)}, null, null, null, 0, 0, 250000); - GT_Recipe.GT_Recipe_Map.sHugeNaquadahReactorFuels.addRecipe(true, new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.NaquadahEnriched, 1L)}, new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Naquadah, 1L)}, null, null, null, 0, 0, 500000); - GT_Recipe.GT_Recipe_Map.sExtremeNaquadahReactorFuels.addRecipe(true, new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Naquadria, 1L)}, new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Naquadah, 1L)}, null, null, null, 0, 0, 250000); - GT_Recipe.GT_Recipe_Map.sUltraHugeNaquadahReactorFuels.addRecipe(true, new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Naquadria, 1L)}, new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Naquadah, 1L)}, null, null, null, 0, 0, 1000000); - GT_Recipe.GT_Recipe_Map.sFluidNaquadahReactorFuels.addRecipe(true, new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.cell, Materials.NaquadahEnriched, 1L)}, new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Naquadah, 1L)}, null, null, null, 0, 0, 1400000); + GT_Recipe.GT_Recipe_Map.sSmallNaquadahReactorFuels.addRecipe( + true, + new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.NaquadahEnriched, 1L)}, + new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Naquadah, 1L)}, + null, + null, + null, + 0, + 0, + 50000); + GT_Recipe.GT_Recipe_Map.sLargeNaquadahReactorFuels.addRecipe( + true, + new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.stick, Materials.NaquadahEnriched, 1L)}, + new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Naquadah, 1L)}, + null, + null, + null, + 0, + 0, + 250000); + GT_Recipe.GT_Recipe_Map.sHugeNaquadahReactorFuels.addRecipe( + true, + new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.NaquadahEnriched, 1L)}, + new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Naquadah, 1L)}, + null, + null, + null, + 0, + 0, + 500000); + GT_Recipe.GT_Recipe_Map.sExtremeNaquadahReactorFuels.addRecipe( + true, + new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Naquadria, 1L)}, + new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Naquadah, 1L)}, + null, + null, + null, + 0, + 0, + 250000); + GT_Recipe.GT_Recipe_Map.sUltraHugeNaquadahReactorFuels.addRecipe( + true, + new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Naquadria, 1L)}, + new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Naquadah, 1L)}, + null, + null, + null, + 0, + 0, + 1000000); + GT_Recipe.GT_Recipe_Map.sFluidNaquadahReactorFuels.addRecipe( + true, + new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.cell, Materials.NaquadahEnriched, 1L)}, + new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Naquadah, 1L)}, + null, + null, + null, + 0, + 0, + 1400000); - //BloodMagic - GT_Recipe.GT_Recipe_Map.sMagicFuels.addRecipe(true, new ItemStack[]{GT_ModHandler.getModItem("AWWayofTime","reinforcedSlate",1L)}, new ItemStack[]{GT_ModHandler.getModItem("AWWayofTime","blankSlate",1L)}, null, null, null, 0, 0, 400); - GT_Recipe.GT_Recipe_Map.sMagicFuels.addRecipe(true, new ItemStack[]{GT_ModHandler.getModItem("AWWayofTime","imbuedSlate",1L)}, new ItemStack[]{GT_ModHandler.getModItem("AWWayofTime","reinforcedSlate",1L)}, null, null, null, 0, 0, 1000); - GT_Recipe.GT_Recipe_Map.sMagicFuels.addRecipe(true, new ItemStack[]{GT_ModHandler.getModItem("AWWayofTime","demonicSlate",1L)}, new ItemStack[]{GT_ModHandler.getModItem("AWWayofTime","imbuedSlate",1L)}, null, null, null, 0, 0, 8000); - GT_Recipe.GT_Recipe_Map.sMagicFuels.addRecipe(true, new ItemStack[]{GT_ModHandler.getModItem("AWWayofTime","bloodMagicBaseItems",1L,27)}, new ItemStack[]{GT_ModHandler.getModItem("AWWayofTime","demonicSlate",1L)}, null, null, null, 0, 0, 20000); + // BloodMagic + GT_Recipe.GT_Recipe_Map.sMagicFuels.addRecipe( + true, + new ItemStack[] {GT_ModHandler.getModItem("AWWayofTime", "reinforcedSlate", 1L)}, + new ItemStack[] {GT_ModHandler.getModItem("AWWayofTime", "blankSlate", 1L)}, + null, + null, + null, + 0, + 0, + 400); + GT_Recipe.GT_Recipe_Map.sMagicFuels.addRecipe( + true, + new ItemStack[] {GT_ModHandler.getModItem("AWWayofTime", "imbuedSlate", 1L)}, + new ItemStack[] {GT_ModHandler.getModItem("AWWayofTime", "reinforcedSlate", 1L)}, + null, + null, + null, + 0, + 0, + 1000); + GT_Recipe.GT_Recipe_Map.sMagicFuels.addRecipe( + true, + new ItemStack[] {GT_ModHandler.getModItem("AWWayofTime", "demonicSlate", 1L)}, + new ItemStack[] {GT_ModHandler.getModItem("AWWayofTime", "imbuedSlate", 1L)}, + null, + null, + null, + 0, + 0, + 8000); + GT_Recipe.GT_Recipe_Map.sMagicFuels.addRecipe( + true, + new ItemStack[] {GT_ModHandler.getModItem("AWWayofTime", "bloodMagicBaseItems", 1L, 27)}, + new ItemStack[] {GT_ModHandler.getModItem("AWWayofTime", "demonicSlate", 1L)}, + null, + null, + null, + 0, + 0, + 20000); GT_Values.RA.addFuel(GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 1L, 4), null, 4, 5); GT_Values.RA.addFuel(new ItemStack(Items.experience_bottle, 1), null, 10, 5); GT_Values.RA.addFuel(new ItemStack(Items.ghast_tear, 1), null, 50, 5); - GT_Values.RA.addFuel(new ItemStack(Blocks.beacon, 1), null, Materials.NetherStar.mFuelPower * 2, Materials.NetherStar.mFuelType); + GT_Values.RA.addFuel( + new ItemStack(Blocks.beacon, 1), + null, + Materials.NetherStar.mFuelPower * 2, + Materials.NetherStar.mFuelType); GT_Values.RA.addFuel(GT_ModHandler.getModItem("EnderIO", "bucketRocket_fuel", 1), null, 250, 1); - } } diff --git a/src/main/java/gregtech/loaders/load/GT_ItemIterator.java b/src/main/java/gregtech/loaders/load/GT_ItemIterator.java index 9e483b05c8..3e1cf72c06 100644 --- a/src/main/java/gregtech/loaders/load/GT_ItemIterator.java +++ b/src/main/java/gregtech/loaders/load/GT_ItemIterator.java @@ -29,32 +29,117 @@ public class GT_ItemIterator implements Runnable { GT_Log.out.println("GT_Mod: Scanning for certain kinds of compatible Machineblocks."); ItemStack tStack2; ItemStack tStack; - if (null != (tStack = GT_ModHandler.getRecipeOutput(tStack2 = GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Bronze, 1L), tStack2, tStack2, tStack2, null, tStack2, tStack2, tStack2, tStack2))) { - GT_ModHandler.addPulverisationRecipe(tStack, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Bronze, 8L), null, 0, false); + if (null + != (tStack = GT_ModHandler.getRecipeOutput( + tStack2 = GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Bronze, 1L), + tStack2, + tStack2, + tStack2, + null, + tStack2, + tStack2, + tStack2, + tStack2))) { + GT_ModHandler.addPulverisationRecipe( + tStack, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Bronze, 8L), null, 0, false); GT_ModHandler.addSmeltingRecipe(tStack, GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Bronze, 8L)); } - if (null != (tStack = GT_ModHandler.getRecipeOutput(tStack2 = GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Bronze, 1L), tStack2, tStack2, tStack2, null, tStack2, tStack2, tStack2, tStack2))) { + if (null + != (tStack = GT_ModHandler.getRecipeOutput( + tStack2 = GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Bronze, 1L), + tStack2, + tStack2, + tStack2, + null, + tStack2, + tStack2, + tStack2, + tStack2))) { GT_OreDictUnificator.registerOre(OreDictNames.craftingRawMachineTier00, tStack); - GT_ModHandler.addPulverisationRecipe(tStack, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Bronze, 8L), null, 0, false); + GT_ModHandler.addPulverisationRecipe( + tStack, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Bronze, 8L), null, 0, false); GT_ModHandler.addSmeltingRecipe(tStack, GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Bronze, 8L)); } ItemStack tStack3; - if (null != (tStack = GT_ModHandler.getRecipeOutput(tStack2 = GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Iron, 1L), tStack3 = new ItemStack(Blocks.glass, 1, 0), tStack2, tStack3, GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Gold, 1L), tStack3, tStack2, tStack3, tStack2))) { - GT_ModHandler.addPulverisationRecipe(tStack, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 4L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gold, 1L), 0, false); + if (null + != (tStack = GT_ModHandler.getRecipeOutput( + tStack2 = GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Iron, 1L), + tStack3 = new ItemStack(Blocks.glass, 1, 0), + tStack2, + tStack3, + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Gold, 1L), + tStack3, + tStack2, + tStack3, + tStack2))) { + GT_ModHandler.addPulverisationRecipe( + tStack, + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 4L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gold, 1L), + 0, + false); } - if (null != (tStack = GT_ModHandler.getRecipeOutput(tStack2 = GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 1L), tStack3 = new ItemStack(Blocks.glass, 1, 0), tStack2, tStack3, GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Gold, 1L), tStack3, tStack2, tStack3, tStack2))) { - GT_ModHandler.addPulverisationRecipe(tStack, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 4L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gold, 1L), 0, false); + if (null + != (tStack = GT_ModHandler.getRecipeOutput( + tStack2 = GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 1L), + tStack3 = new ItemStack(Blocks.glass, 1, 0), + tStack2, + tStack3, + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Gold, 1L), + tStack3, + tStack2, + tStack3, + tStack2))) { + GT_ModHandler.addPulverisationRecipe( + tStack, + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 4L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gold, 1L), + 0, + false); } GT_Log.out.println("GT_Mod: Registering various Tools to be usable on GregTech Machines"); - GregTech_API.registerScrewdriver(GT_ModHandler.getRecipeOutput(null, new ItemStack(Items.iron_ingot, 1), null, new ItemStack(Items.stick, 1))); - GregTech_API.registerScrewdriver(GT_ModHandler.getRecipeOutput(new ItemStack(Items.iron_ingot, 1), null, null, null, new ItemStack(Items.stick, 1))); + GregTech_API.registerScrewdriver(GT_ModHandler.getRecipeOutput( + null, new ItemStack(Items.iron_ingot, 1), null, new ItemStack(Items.stick, 1))); + GregTech_API.registerScrewdriver(GT_ModHandler.getRecipeOutput( + new ItemStack(Items.iron_ingot, 1), null, null, null, new ItemStack(Items.stick, 1))); - GT_Log.out.println("GT_Mod: Adding Food Recipes to the Automatic Canning Machine. (also during the following Item Iteration)"); - GT_Values.RA.addCannerRecipe(new ItemStack(Items.rotten_flesh, 2, 32767), ItemList.IC2_Food_Can_Empty.get(1L), ItemList.IC2_Food_Can_Spoiled.get(1L), null, 200, 1); - GT_Values.RA.addCannerRecipe(new ItemStack(Items.spider_eye, 2, 32767), ItemList.IC2_Food_Can_Empty.get(1L), ItemList.IC2_Food_Can_Spoiled.get(1L), null, 100, 1); - GT_Values.RA.addCannerRecipe(ItemList.Food_Poisonous_Potato.get(2L), ItemList.IC2_Food_Can_Empty.get(1L), ItemList.IC2_Food_Can_Spoiled.get(1L), null, 100, 1); - GT_Values.RA.addCannerRecipe(new ItemStack(Items.cake, 1, 32767), ItemList.IC2_Food_Can_Empty.get(12L), ItemList.IC2_Food_Can_Filled.get(12L), null, 600, 1); - GT_Values.RA.addCannerRecipe(new ItemStack(Items.mushroom_stew, 1, 32767), ItemList.IC2_Food_Can_Empty.get(6L), ItemList.IC2_Food_Can_Filled.get(6L), new ItemStack(Items.bowl, 1), 300, 1); + GT_Log.out.println( + "GT_Mod: Adding Food Recipes to the Automatic Canning Machine. (also during the following Item Iteration)"); + GT_Values.RA.addCannerRecipe( + new ItemStack(Items.rotten_flesh, 2, 32767), + ItemList.IC2_Food_Can_Empty.get(1L), + ItemList.IC2_Food_Can_Spoiled.get(1L), + null, + 200, + 1); + GT_Values.RA.addCannerRecipe( + new ItemStack(Items.spider_eye, 2, 32767), + ItemList.IC2_Food_Can_Empty.get(1L), + ItemList.IC2_Food_Can_Spoiled.get(1L), + null, + 100, + 1); + GT_Values.RA.addCannerRecipe( + ItemList.Food_Poisonous_Potato.get(2L), + ItemList.IC2_Food_Can_Empty.get(1L), + ItemList.IC2_Food_Can_Spoiled.get(1L), + null, + 100, + 1); + GT_Values.RA.addCannerRecipe( + new ItemStack(Items.cake, 1, 32767), + ItemList.IC2_Food_Can_Empty.get(12L), + ItemList.IC2_Food_Can_Filled.get(12L), + null, + 600, + 1); + GT_Values.RA.addCannerRecipe( + new ItemStack(Items.mushroom_stew, 1, 32767), + ItemList.IC2_Food_Can_Empty.get(6L), + ItemList.IC2_Food_Can_Filled.get(6L), + new ItemStack(Items.bowl, 1), + 300, + 1); GT_Log.out.println("GT_Mod: Scanning ItemList."); @@ -67,9 +152,13 @@ public class GT_ItemIterator implements Runnable { String tName; if ((tName = tItem.getUnlocalizedName()) != null) { if ((tItem instanceof IToolCrowbar)) { - if ((!tItem.isDamageable()) && (!GT_ModHandler.isElectricItem(new ItemStack(tItem, 1, 0)))) { - if ((GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.disabledrecipes, "infiniteDurabilityRCCrowbars", false)) && - (GT_ModHandler.removeRecipeByOutput(new ItemStack(tItem, 1, 32767)))) { + if ((!tItem.isDamageable()) + && (!GT_ModHandler.isElectricItem(new ItemStack(tItem, 1, 0)))) { + if ((GregTech_API.sRecipeFile.get( + ConfigCategories.Recipes.disabledrecipes, + "infiniteDurabilityRCCrowbars", + false)) + && (GT_ModHandler.removeRecipeByOutput(new ItemStack(tItem, 1, 32767)))) { GT_Log.out.println("GT_Mod: Removed infinite RC Crowbar: " + tName); } } else if (GregTech_API.registerCrowbar(new ItemStack(tItem, 1, 32767))) { @@ -77,9 +166,13 @@ public class GT_ItemIterator implements Runnable { } } if ((tItem instanceof IToolWrench)) { - if ((!tItem.isDamageable()) && (!GT_ModHandler.isElectricItem(new ItemStack(tItem, 1, 0)))) { - if ((GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.disabledrecipes, "infiniteDurabilityBCWrenches", false)) && - (GT_ModHandler.removeRecipeByOutput(new ItemStack(tItem, 1, 32767)))) { + if ((!tItem.isDamageable()) + && (!GT_ModHandler.isElectricItem(new ItemStack(tItem, 1, 0)))) { + if ((GregTech_API.sRecipeFile.get( + ConfigCategories.Recipes.disabledrecipes, + "infiniteDurabilityBCWrenches", + false)) + && (GT_ModHandler.removeRecipeByOutput(new ItemStack(tItem, 1, 32767)))) { GT_Log.out.println("GT_Mod: Removed infinite BC Wrench: " + tName); } } else if (GregTech_API.registerWrench(new ItemStack(tItem, 1, 32767))) { @@ -92,16 +185,27 @@ public class GT_ItemIterator implements Runnable { tBlock.setHarvestLevel("scoop", 0); gregtech.common.tools.GT_Tool_Scoop.sBeeHiveMaterial = tBlock.getMaterial(); } - if (OrePrefixes.stone.mDefaultStackSize < tItem.getItemStackLimit(new ItemStack(tItem, 1, 0))) { - if ((tBlock.isReplaceableOreGen(GT_Values.DW, 0, 0, 0, Blocks.stone)) || (tBlock.isReplaceableOreGen(GT_Values.DW, 0, 0, 0, Blocks.netherrack)) || (tBlock.isReplaceableOreGen(GT_Values.DW, 0, 0, 0, Blocks.end_stone))) { + if (OrePrefixes.stone.mDefaultStackSize + < tItem.getItemStackLimit(new ItemStack(tItem, 1, 0))) { + if ((tBlock.isReplaceableOreGen(GT_Values.DW, 0, 0, 0, Blocks.stone)) + || (tBlock.isReplaceableOreGen(GT_Values.DW, 0, 0, 0, Blocks.netherrack)) + || (tBlock.isReplaceableOreGen(GT_Values.DW, 0, 0, 0, Blocks.end_stone))) { tItem.setMaxStackSize(OrePrefixes.stone.mDefaultStackSize); } } } - if (((tItem instanceof ItemFood)) && (tItem != ItemList.IC2_Food_Can_Filled.getItem()) && (tItem != ItemList.IC2_Food_Can_Spoiled.getItem())) { + if (((tItem instanceof ItemFood)) + && (tItem != ItemList.IC2_Food_Can_Filled.getItem()) + && (tItem != ItemList.IC2_Food_Can_Spoiled.getItem())) { int tFoodValue = ((ItemFood) tItem).func_150905_g(new ItemStack(tItem, 1, 0)); if (tFoodValue > 0) { - GT_Values.RA.addCannerRecipe(new ItemStack(tItem, 1, 32767), ItemList.IC2_Food_Can_Empty.get(tFoodValue), ItemList.IC2_Food_Can_Filled.get(tFoodValue), GT_Utility.getContainerItem(new ItemStack(tItem, 1, 0), true), tFoodValue * 100, 1); + GT_Values.RA.addCannerRecipe( + new ItemStack(tItem, 1, 32767), + ItemList.IC2_Food_Can_Empty.get(tFoodValue), + ItemList.IC2_Food_Can_Filled.get(tFoodValue), + GT_Utility.getContainerItem(new ItemStack(tItem, 1, 0), true), + tFoodValue * 100, + 1); } } if ((tItem instanceof IFluidContainerItem)) { @@ -117,8 +221,15 @@ public class GT_ItemIterator implements Runnable { GT_Values.RA.addFuel(new ItemStack(tItem, 1, 0), null, 2048, 5); } if (tName.equals("tile.TFRoots")) { - GT_ModHandler.addPulverisationRecipe(new ItemStack(tItem, 1, 0), new ItemStack(Items.stick, 2), new ItemStack(Items.stick, 1), 30); - GT_ModHandler.addSawmillRecipe(new ItemStack(tItem, 1, 0), new ItemStack(Items.stick, 4), new ItemStack(Items.stick, 2)); + GT_ModHandler.addPulverisationRecipe( + new ItemStack(tItem, 1, 0), + new ItemStack(Items.stick, 2), + new ItemStack(Items.stick, 1), + 30); + GT_ModHandler.addSawmillRecipe( + new ItemStack(tItem, 1, 0), + new ItemStack(Items.stick, 4), + new ItemStack(Items.stick, 2)); GT_Values.RA.addFuel(new ItemStack(tItem, 1, 1), new ItemStack(Items.stick, 4), 32, 5); } if (tName.equals("item.tconstruct.manual")) { @@ -172,71 +283,124 @@ public class GT_ItemIterator implements Runnable { GT_OreDictUnificator.set(OrePrefixes.gem, Materials.Lignite, new ItemStack(tItem, 1, 0)); } if ((tName.equals("tile.extrabiomes.redrock")) || (tName.equals("tile.bop.redRocks"))) { - GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Redrock, new ItemStack(tItem, 1, 0)); - GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Redrock, new ItemStack(tItem, 1, 1)); - GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Redrock, new ItemStack(tItem, 1, 2)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, Materials.Redrock, new ItemStack(tItem, 1, 0)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, Materials.Redrock, new ItemStack(tItem, 1, 1)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, Materials.Redrock, new ItemStack(tItem, 1, 2)); } if (tName.equals("tile.rpstone")) { - GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Marble, new ItemStack(tItem, 1, 0)); - GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Basalt, new ItemStack(tItem, 1, 1)); - GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Marble, new ItemStack(tItem, 1, 2)); - GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Basalt, new ItemStack(tItem, 1, 3)); - GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Basalt, new ItemStack(tItem, 1, 4)); - GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Basalt, new ItemStack(tItem, 1, 5)); - GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Basalt, new ItemStack(tItem, 1, 6)); - } - if (/**(tName.equals("tile.sedimentaryStone")) ||**/((tName.equals("tile.igneousStone")) || (tName.equals("tile.igneousStoneBrick")) || (tName.equals("tile.igneousCobblestone")))) { - GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.GraniteRed, new ItemStack(tItem, 1, 0)); - GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.GraniteBlack, new ItemStack(tItem, 1, 1)); - GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Rhyolite, new ItemStack(tItem, 1, 2)); - GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Andesite, new ItemStack(tItem, 1, 3)); - GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Gabbro, new ItemStack(tItem, 1, 4)); - GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Basalt, new ItemStack(tItem, 1, 5)); - GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Komatiite, new ItemStack(tItem, 1, 6)); - GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Dacite, new ItemStack(tItem, 1, 7)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, Materials.Marble, new ItemStack(tItem, 1, 0)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, Materials.Basalt, new ItemStack(tItem, 1, 1)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, Materials.Marble, new ItemStack(tItem, 1, 2)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, Materials.Basalt, new ItemStack(tItem, 1, 3)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, Materials.Basalt, new ItemStack(tItem, 1, 4)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, Materials.Basalt, new ItemStack(tItem, 1, 5)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, Materials.Basalt, new ItemStack(tItem, 1, 6)); + } + if ( + /**(tName.equals("tile.sedimentaryStone")) ||**/ + ((tName.equals("tile.igneousStone")) + || (tName.equals("tile.igneousStoneBrick")) + || (tName.equals("tile.igneousCobblestone")))) { + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, Materials.GraniteRed, new ItemStack(tItem, 1, 0)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, Materials.GraniteBlack, new ItemStack(tItem, 1, 1)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, Materials.Rhyolite, new ItemStack(tItem, 1, 2)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, Materials.Andesite, new ItemStack(tItem, 1, 3)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, Materials.Gabbro, new ItemStack(tItem, 1, 4)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, Materials.Basalt, new ItemStack(tItem, 1, 5)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, Materials.Komatiite, new ItemStack(tItem, 1, 6)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, Materials.Dacite, new ItemStack(tItem, 1, 7)); - GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.GraniteRed, new ItemStack(tItem, 1, 8)); - GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.GraniteBlack, new ItemStack(tItem, 1, 9)); - GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Rhyolite, new ItemStack(tItem, 1, 10)); - GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Andesite, new ItemStack(tItem, 1, 11)); - GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Gabbro, new ItemStack(tItem, 1, 12)); - GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Basalt, new ItemStack(tItem, 1, 13)); - GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Komatiite, new ItemStack(tItem, 1, 14)); - GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Dacite, new ItemStack(tItem, 1, 15)); - } - if ((tName.equals("tile.metamorphicStone")) || (tName.equals("tile.metamorphicStoneBrick")) || (tName.equals("tile.metamorphicCobblestone"))) { - GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Gneiss, new ItemStack(tItem, 1, 0)); - GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Eclogite, new ItemStack(tItem, 1, 1)); - GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Marble, new ItemStack(tItem, 1, 2)); - GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Quartzite, new ItemStack(tItem, 1, 3)); - GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Blueschist, new ItemStack(tItem, 1, 4)); - GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Greenschist, new ItemStack(tItem, 1, 5)); - GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Soapstone, new ItemStack(tItem, 1, 6)); - GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Migmatite, new ItemStack(tItem, 1, 7)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, Materials.GraniteRed, new ItemStack(tItem, 1, 8)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, Materials.GraniteBlack, new ItemStack(tItem, 1, 9)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, Materials.Rhyolite, new ItemStack(tItem, 1, 10)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, Materials.Andesite, new ItemStack(tItem, 1, 11)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, Materials.Gabbro, new ItemStack(tItem, 1, 12)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, Materials.Basalt, new ItemStack(tItem, 1, 13)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, Materials.Komatiite, new ItemStack(tItem, 1, 14)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, Materials.Dacite, new ItemStack(tItem, 1, 15)); + } + if ((tName.equals("tile.metamorphicStone")) + || (tName.equals("tile.metamorphicStoneBrick")) + || (tName.equals("tile.metamorphicCobblestone"))) { + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, Materials.Gneiss, new ItemStack(tItem, 1, 0)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, Materials.Eclogite, new ItemStack(tItem, 1, 1)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, Materials.Marble, new ItemStack(tItem, 1, 2)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, Materials.Quartzite, new ItemStack(tItem, 1, 3)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, Materials.Blueschist, new ItemStack(tItem, 1, 4)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, Materials.Greenschist, new ItemStack(tItem, 1, 5)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, Materials.Soapstone, new ItemStack(tItem, 1, 6)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, Materials.Migmatite, new ItemStack(tItem, 1, 7)); - GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Gneiss, new ItemStack(tItem, 1, 8)); - GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Eclogite, new ItemStack(tItem, 1, 9)); - GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Marble, new ItemStack(tItem, 1, 10)); - GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Quartzite, new ItemStack(tItem, 1, 11)); - GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Blueschist, new ItemStack(tItem, 1, 12)); - GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Greenschist, new ItemStack(tItem, 1, 13)); - GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Soapstone, new ItemStack(tItem, 1, 14)); - GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Migmatite, new ItemStack(tItem, 1, 15)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, Materials.Gneiss, new ItemStack(tItem, 1, 8)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, Materials.Eclogite, new ItemStack(tItem, 1, 9)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, Materials.Marble, new ItemStack(tItem, 1, 10)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, Materials.Quartzite, new ItemStack(tItem, 1, 11)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, Materials.Blueschist, new ItemStack(tItem, 1, 12)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, Materials.Greenschist, new ItemStack(tItem, 1, 13)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, Materials.Soapstone, new ItemStack(tItem, 1, 14)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, Materials.Migmatite, new ItemStack(tItem, 1, 15)); } if (tName.equals("tile.blockCosmeticSolid")) { - GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Obsidian, new ItemStack(tItem, 1, 0)); - GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Obsidian, new ItemStack(tItem, 1, 1)); - GT_OreDictUnificator.registerOre(OrePrefixes.block, Materials.Thaumium, new ItemStack(tItem, 1, 4)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, Materials.Obsidian, new ItemStack(tItem, 1, 0)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, Materials.Obsidian, new ItemStack(tItem, 1, 1)); + GT_OreDictUnificator.registerOre( + OrePrefixes.block, Materials.Thaumium, new ItemStack(tItem, 1, 4)); } if (tName.equals("tile.enderchest")) { GT_OreDictUnificator.registerOre(OreDictNames.enderChest, new ItemStack(tItem, 1, 32767)); } if (tName.equals("tile.autoWorkbenchBlock")) { - GT_OreDictUnificator.registerOre(OreDictNames.craftingWorkBench, new ItemStack(tItem, 1, 0)); + GT_OreDictUnificator.registerOre( + OreDictNames.craftingWorkBench, new ItemStack(tItem, 1, 0)); } if (tName.equals("tile.pumpBlock")) { GT_OreDictUnificator.registerOre(OreDictNames.craftingPump, new ItemStack(tItem, 1, 0)); - if (GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.disabledrecipes, "BCPump", false)) { + if (GregTech_API.sRecipeFile.get( + ConfigCategories.Recipes.disabledrecipes, "BCPump", false)) { GT_ModHandler.removeRecipeByOutput(new ItemStack(tItem, 1, 0)); } } @@ -244,11 +408,14 @@ public class GT_ItemIterator implements Runnable { GT_OreDictUnificator.registerOre(OreDictNames.craftingTank, new ItemStack(tItem, 1, 0)); } if (tName.equals("item.drawplateDiamond")) { - GT_OreDictUnificator.registerOre(ToolDictNames.craftingToolDrawplate, new ItemStack(tItem, 1, 32767)); + GT_OreDictUnificator.registerOre( + ToolDictNames.craftingToolDrawplate, new ItemStack(tItem, 1, 32767)); } } } } - } catch (Throwable e) {/**/} + } catch (Throwable e) { + /**/ + } } } diff --git a/src/main/java/gregtech/loaders/load/GT_SonictronLoader.java b/src/main/java/gregtech/loaders/load/GT_SonictronLoader.java index a525bf872e..d067cf74d5 100644 --- a/src/main/java/gregtech/loaders/load/GT_SonictronLoader.java +++ b/src/main/java/gregtech/loaders/load/GT_SonictronLoader.java @@ -110,7 +110,8 @@ public class GT_SonictronLoader implements Runnable { GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Items.glass_bottle, 1)); GT_Mod.gregtechproxy.mSoundNames.add(SoundResource.RANDOM_BURP.toString()); GT_Mod.gregtechproxy.mSoundCounts.add(1); - GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.ender_chest == null ? Blocks.obsidian : Blocks.ender_chest, 1)); + GT_Mod.gregtechproxy.mSoundItems.add( + new ItemStack(Blocks.ender_chest == null ? Blocks.obsidian : Blocks.ender_chest, 1)); GT_Mod.gregtechproxy.mSoundNames.add(SoundResource.RANDOM_CHESTOPEN.toString()); GT_Mod.gregtechproxy.mSoundCounts.add(1); GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.chest, 1)); diff --git a/src/main/java/gregtech/loaders/materialprocessing/ProcessingConfig.java b/src/main/java/gregtech/loaders/materialprocessing/ProcessingConfig.java index 23bc718bb4..d8fc898cf4 100644 --- a/src/main/java/gregtech/loaders/materialprocessing/ProcessingConfig.java +++ b/src/main/java/gregtech/loaders/materialprocessing/ProcessingConfig.java @@ -2,8 +2,8 @@ package gregtech.loaders.materialprocessing; import gregtech.api.GregTech_API; import gregtech.api.enums.Dyes; -import gregtech.api.enums.Materials; import gregtech.api.enums.GTNH_ExtraMaterials; +import gregtech.api.enums.Materials; import gregtech.api.enums.TextureSet; public class ProcessingConfig implements gregtech.api.interfaces.IMaterialHandler { @@ -17,9 +17,36 @@ public class ProcessingConfig implements gregtech.api.interfaces.IMaterialHandle /** This is just left here as an example of how to add new materials. **/ if (false) { int i = 0; - for (int j = GregTech_API.sMaterialProperties.get("general", "AmountOfCustomMaterialSlots", 16); i < j; i++) { + for (int j = GregTech_API.sMaterialProperties.get("general", "AmountOfCustomMaterialSlots", 16); + i < j; + i++) { String aID = (i < 10 ? "0" : "") + i; - new Materials(-1, TextureSet.SET_METALLIC, 1.0F, 0, 0, 0, 255, 255, 255, 0, "CustomMat" + aID, "CustomMat" + aID, 0, 0, 0, 0, false, false, 1, 1, 1, Dyes._NULL, "custom", true, aID); + new Materials( + -1, + TextureSet.SET_METALLIC, + 1.0F, + 0, + 0, + 0, + 255, + 255, + 255, + 0, + "CustomMat" + aID, + "CustomMat" + aID, + 0, + 0, + 0, + 0, + false, + false, + 1, + 1, + 1, + Dyes._NULL, + "custom", + true, + aID); } } } diff --git a/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java b/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java index 12299e3eca..d1c7d48f3a 100644 --- a/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java +++ b/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java @@ -1,12 +1,12 @@ package gregtech.loaders.materialprocessing; +import static gregtech.api.enums.GT_Values.MOD_ID_DC; + import cpw.mods.fml.common.Loader; import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; -import static gregtech.api.enums.GT_Values.MOD_ID_DC; - public class ProcessingModSupport implements gregtech.api.interfaces.IMaterialHandler { public static boolean aTGregSupport = Loader.isModLoaded("TGregworks") || Loader.isModLoaded(MOD_ID_DC); public static boolean aEnableUBCMats = Loader.isModLoaded("UndergroundBiomes") || aTGregSupport; @@ -26,7 +26,7 @@ public class ProcessingModSupport implements gregtech.api.interfaces.IMaterialHa @Override public void onMaterialsInit() { - //Disable Materials if Parent Mod is not loaded + // Disable Materials if Parent Mod is not loaded if (!aTGregSupport) { Materials.Dysprosium.mHasParentMod = false; Materials.Erbium.mHasParentMod = false; @@ -49,7 +49,7 @@ public class ProcessingModSupport implements gregtech.api.interfaces.IMaterialHa Materials.DarkIron.mHasParentMod = false; Materials.ElectrumFlux.mHasParentMod = false; Materials.Force.mHasParentMod = false; - //Materials.Nikolite.mHasParentMod = false; + // Materials.Nikolite.mHasParentMod = false; Materials.Sunnarium.mHasParentMod = false; Materials.BlueAlloy.mHasParentMod = false; Materials.Vinteum.mHasParentMod = false; @@ -134,11 +134,11 @@ public class ProcessingModSupport implements gregtech.api.interfaces.IMaterialHa if (!aEnableRailcraftMats) { Materials.Firestone.mHasParentMod = false; } - if(!aEnableProjectRedMats){ + if (!aEnableProjectRedMats) { Materials.Electrotine.mHasParentMod = false; } - //Enable Materials if correct mod is Loaded + // Enable Materials if correct mod is Loaded Materials.ChromiumDioxide.mHasParentMod = Loader.isModLoaded("computronics"); } @@ -157,6 +157,6 @@ public class ProcessingModSupport implements gregtech.api.interfaces.IMaterialHa @Override public void onComponentIteration(Materials aMaterial) { - //NOP + // NOP } } diff --git a/src/main/java/gregtech/loaders/misc/GT_Achievements.java b/src/main/java/gregtech/loaders/misc/GT_Achievements.java index e7a34e13d3..c0a89e723c 100644 --- a/src/main/java/gregtech/loaders/misc/GT_Achievements.java +++ b/src/main/java/gregtech/loaders/misc/GT_Achievements.java @@ -15,6 +15,7 @@ import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Recipe; import gregtech.common.items.GT_MetaGenerated_Tool_01; import ic2.core.Ic2Items; +import java.util.concurrent.ConcurrentHashMap; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -27,11 +28,9 @@ import net.minecraftforge.event.entity.player.EntityItemPickupEvent; import net.minecraftforge.fluids.FluidStack; import thaumcraft.api.ThaumcraftApiHelper; -import java.util.concurrent.ConcurrentHashMap; - public class GT_Achievements { public static int oreReg = -1; - public static int assReg=-1; + public static int assReg = -1; public ConcurrentHashMap achievementList; public ConcurrentHashMap issuedAchievements; public int adjX = 5; @@ -41,10 +40,16 @@ public class GT_Achievements { this.achievementList = new ConcurrentHashMap<>(); this.issuedAchievements = new ConcurrentHashMap<>(); - for(GT_Recipe recipe: GT_Recipe.GT_Recipe_Map.sAssemblylineVisualRecipes.mRecipeList) + for (GT_Recipe recipe : GT_Recipe.GT_Recipe_Map.sAssemblylineVisualRecipes.mRecipeList) registerAssAchievement(recipe); - registerAchievement("flintpick", 0, 0, GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(2, 1, Materials.Flint, Materials.Wood, null), "", false); + registerAchievement( + "flintpick", + 0, + 0, + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(2, 1, Materials.Flint, Materials.Wood, null), + "", + false); registerAchievement("crops", -4, 0, GT_ModHandler.getIC2Item("crop", 1L), "flintpick", false); registerAchievement("havestlead", -4, 2, ItemList.Crop_Drop_Plumbilia.get(1), "crops", false); registerAchievement("havestcopper", -2, 1, ItemList.Crop_Drop_Coppon.get(1), "crops", false); @@ -55,33 +60,107 @@ public class GT_Achievements { registerAchievement("havestsilver", -4, -5, ItemList.Crop_Drop_Argentia.get(1), "havestiron", false); registerAchievement("havestemeralds", -2, -8, ItemList.Crop_Drop_BobsYerUncleRanks.get(1), "havestgold", false); - registerAchievement("tools", 0, 4, GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(GT_MetaGenerated_Tool_01.HARDHAMMER, 1, Materials.Iron, Materials.Wood, null), "flintpick", false); - registerAchievement("driltime", 2, 4, GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(GT_MetaGenerated_Tool_01.DRILL_LV, 1, Materials.BlueSteel, Materials.StainlessSteel, null), "tools", false); - registerAchievement("brrrr", 2, 6, GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(GT_MetaGenerated_Tool_01.CHAINSAW_LV, 1, Materials.BlueSteel, Materials.StainlessSteel, null), "driltime", false); - registerAchievement("highpowerdrill", 3, 5, GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(GT_MetaGenerated_Tool_01.DRILL_HV, 1, Materials.TungstenSteel, Materials.TungstenSteel, null), "driltime", false); - registerAchievement("hammertime", 3, 7, GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(GT_MetaGenerated_Tool_01.JACKHAMMER, 1, Materials.TungstenSteel, Materials.TungstenSteel, null), "highpowerdrill", false); + registerAchievement( + "tools", + 0, + 4, + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.HARDHAMMER, 1, Materials.Iron, Materials.Wood, null), + "flintpick", + false); + registerAchievement( + "driltime", + 2, + 4, + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.DRILL_LV, 1, Materials.BlueSteel, Materials.StainlessSteel, null), + "tools", + false); + registerAchievement( + "brrrr", + 2, + 6, + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.CHAINSAW_LV, 1, Materials.BlueSteel, Materials.StainlessSteel, null), + "driltime", + false); + registerAchievement( + "highpowerdrill", + 3, + 5, + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.DRILL_HV, 1, Materials.TungstenSteel, Materials.TungstenSteel, null), + "driltime", + false); + registerAchievement( + "hammertime", + 3, + 7, + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.JACKHAMMER, 1, Materials.TungstenSteel, Materials.TungstenSteel, null), + "highpowerdrill", + false); registerAchievement("repair", 4, 5, ItemList.Machine_HV_Disassembler.get(1), "highpowerdrill", false); - registerAchievement("unitool", -2, 4, GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(GT_MetaGenerated_Tool_01.UNIVERSALSPADE, 1, Materials.Steel, Materials.Iron, null), "tools", false); + registerAchievement( + "unitool", + -2, + 4, + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.UNIVERSALSPADE, 1, Materials.Steel, Materials.Iron, null), + "tools", + false); registerAchievement("recycling", -4, 4, ItemList.Machine_LV_ArcFurnace.get(1), "unitool", false); - registerAchievement("crushed", 0, 6, GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.Tin, 1L), "tools", false); - registerAchievement("cleandust", 0, 10, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L), "crushed", false); - registerAchievement("washing", -2, 6, GT_OreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Iron, 1L), "crushed", false); - registerAchievement("spinit", -4, 6, GT_OreDictUnificator.get(OrePrefixes.crushedCentrifuged, Materials.Redstone, 1L), "crushed", false); - if(!GregTech_API.mIC2Classic){ - registerAchievement("newfuel", -4, 8, ItemList.ThoriumCell_4.get(1), "spinit", false); - registerAchievement("newmetal", -4, 10, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lutetium, 1L), "newfuel", false); - registerAchievement("reflect", -2, 9, ItemList.Neutron_Reflector.get(1), "newfuel", false); + registerAchievement( + "crushed", 0, 6, GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.Tin, 1L), "tools", false); + registerAchievement( + "cleandust", + 0, + 10, + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L), + "crushed", + false); + registerAchievement( + "washing", + -2, + 6, + GT_OreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Iron, 1L), + "crushed", + false); + registerAchievement( + "spinit", + -4, + 6, + GT_OreDictUnificator.get(OrePrefixes.crushedCentrifuged, Materials.Redstone, 1L), + "crushed", + false); + if (!GregTech_API.mIC2Classic) { + registerAchievement("newfuel", -4, 8, ItemList.ThoriumCell_4.get(1), "spinit", false); + registerAchievement( + "newmetal", + -4, +