From 5f50e4a36ec000657b0a1664784acf00275293c6 Mon Sep 17 00:00:00 2001 From: boubou19 Date: Sat, 1 Apr 2023 18:11:43 +0200 Subject: update spotless formatting (#1827) --- src/main/java/gregtech/loaders/ExtraIcons.java | 8 +- .../java/gregtech/loaders/load/GT_FuelLoader.java | 40 +- .../gregtech/loaders/load/GT_ItemIterator.java | 286 +- .../gregtech/loaders/load/GT_SonictronLoader.java | 4 +- .../gregtech/loaders/misc/GT_Achievements.java | 580 +- .../gregtech/loaders/misc/GT_BeeDefinition.java | 222 +- .../gregtech/loaders/misc/GT_BranchDefinition.java | 5 +- .../loaders/oreprocessing/ProcessingAll.java | 8 +- .../loaders/oreprocessing/ProcessingArrows.java | 6 +- .../loaders/oreprocessing/ProcessingBlock.java | 30 +- .../loaders/oreprocessing/ProcessingCell.java | 10 +- .../loaders/oreprocessing/ProcessingCrop.java | 12 +- .../loaders/oreprocessing/ProcessingDust.java | 26 +- .../loaders/oreprocessing/ProcessingDye.java | 15 +- .../loaders/oreprocessing/ProcessingFood.java | 7 +- .../loaders/oreprocessing/ProcessingGem.java | 14 +- .../loaders/oreprocessing/ProcessingIngot.java | 34 +- .../loaders/oreprocessing/ProcessingLens.java | 6 +- .../loaders/oreprocessing/ProcessingLog.java | 49 +- .../loaders/oreprocessing/ProcessingNugget.java | 10 +- .../loaders/oreprocessing/ProcessingOre.java | 80 +- .../oreprocessing/ProcessingOreSmelting.java | 12 +- .../loaders/oreprocessing/ProcessingPipe.java | 9 +- .../loaders/oreprocessing/ProcessingPlate.java | 19 +- .../loaders/oreprocessing/ProcessingRound.java | 5 +- .../loaders/oreprocessing/ProcessingShaping.java | 7 +- .../loaders/oreprocessing/ProcessingToolOther.java | 56 +- .../oreprocessing/ProcessingTransforming.java | 24 +- .../loaders/oreprocessing/ProcessingWire.java | 53 +- .../loaders/postload/GT_BookAndLootLoader.java | 15 +- .../loaders/postload/GT_CraftingRecipeLoader.java | 81 +- .../postload/GT_ItemMaxStacksizeLoader.java | 162 +- .../gregtech/loaders/postload/GT_PostLoad.java | 261 +- .../postload/GT_ProcessingArrayRecipeLoader.java | 145 +- .../postload/GT_RecyclerBlacklistLoader.java | 17 +- .../postload/chains/GT_PCBFactoryRecipes.java | 213 +- .../postload/recipes/AlloySmelterRecipes.java | 100 +- .../postload/recipes/ArcFurnaceRecipes.java | 792 +- .../loaders/postload/recipes/AssemblerRecipes.java | 9625 ++++++++++++-------- .../postload/recipes/AssemblyLineRecipes.java | 1304 +-- .../loaders/postload/recipes/AutoclaveRecipes.java | 353 +- .../loaders/postload/recipes/BenderRecipes.java | 451 +- .../postload/recipes/BlastFurnaceRecipes.java | 815 +- .../loaders/postload/recipes/BreweryRecipes.java | 689 +- .../loaders/postload/recipes/CannerRecipes.java | 76 +- .../postload/recipes/CentrifugeRecipes.java | 1292 ++- .../postload/recipes/ChemicalBathRecipes.java | 409 +- .../loaders/postload/recipes/ChemicalRecipes.java | 8486 ++++++++++------- .../postload/recipes/CircuitAssemblerRecipes.java | 394 +- .../postload/recipes/CompressorRecipes.java | 215 +- .../postload/recipes/CropProcessingRecipes.java | 44 +- .../loaders/postload/recipes/CuttingRecipes.java | 77 +- .../postload/recipes/DistilleryRecipes.java | 945 +- .../postload/recipes/ElectrolyzerRecipes.java | 405 +- .../recipes/ElectromagneticSeparatorRecipes.java | 13 +- .../loaders/postload/recipes/ExtractorRecipes.java | 10 +- .../loaders/postload/recipes/ExtruderRecipes.java | 22 +- .../loaders/postload/recipes/FermenterRecipes.java | 577 +- .../postload/recipes/FluidCannerRecipes.java | 108 +- .../postload/recipes/FluidExtractorRecipes.java | 855 +- .../postload/recipes/FluidHeaterRecipes.java | 113 +- .../postload/recipes/FluidSolidifierRecipes.java | 857 +- .../postload/recipes/ForgeHammerRecipes.java | 227 +- .../postload/recipes/FormingPressRecipes.java | 260 +- .../loaders/postload/recipes/FuelRecipes.java | 221 +- .../postload/recipes/FusionReactorRecipes.java | 523 +- .../recipes/ImplosionCompressorRecipes.java | 43 +- .../postload/recipes/LaserEngraverRecipes.java | 58 +- .../loaders/postload/recipes/LatheRecipes.java | 30 +- .../postload/recipes/MatterAmplifierRecipes.java | 22 +- .../loaders/postload/recipes/MixerRecipes.java | 2760 +++--- .../loaders/postload/recipes/PackagerRecipes.java | 53 +- .../postload/recipes/PlasmaForgeRecipes.java | 44 +- .../loaders/postload/recipes/PrinterRecipes.java | 70 +- .../loaders/postload/recipes/Pulverizer.java | 956 +- .../loaders/postload/recipes/PyrolyseRecipes.java | 156 +- .../loaders/postload/recipes/RecipeRemover.java | 32 +- .../loaders/postload/recipes/SifterRecipes.java | 50 +- .../loaders/postload/recipes/SlicerRecipes.java | 44 +- .../loaders/postload/recipes/SmelterRecipes.java | 10 +- .../postload/recipes/ThermalCentrifugeRecipes.java | 18 +- .../recipes/TranscendentPlasmaMixerRecipes.java | 128 +- .../postload/recipes/VacuumFreezerRecipes.java | 668 +- .../loaders/postload/recipes/WiremillRecipes.java | 260 +- .../loaders/preload/GT_Loader_ItemData.java | 290 +- .../preload/GT_Loader_Item_Block_And_Fluid.java | 1996 ++-- .../preload/GT_Loader_MetaTileEntities.java | 1117 ++- .../preload/GT_Loader_MultiTileEntities.java | 88 +- .../loaders/preload/GT_Loader_OreDictionary.java | 170 +- .../java/gregtech/loaders/preload/GT_PreLoad.java | 808 +- 90 files changed, 27213 insertions(+), 15447 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 42d5c1ec7c..bc90879e5f 100644 --- a/src/main/java/gregtech/loaders/ExtraIcons.java +++ b/src/main/java/gregtech/loaders/ExtraIcons.java @@ -26,10 +26,10 @@ public class ExtraIcons { 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 470924053f..9a9837aae9 100644 --- a/src/main/java/gregtech/loaders/load/GT_FuelLoader.java +++ b/src/main/java/gregtech/loaders/load/GT_FuelLoader.java @@ -19,16 +19,36 @@ 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.sGreenVitriol = GT_Mod.gregtechproxy - .addFluid("solution.greenvitriol", "Green Vitriol 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.sGreenVitriol = GT_Mod.gregtechproxy.addFluid( + "solution.greenvitriol", + "Green Vitriol 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), diff --git a/src/main/java/gregtech/loaders/load/GT_ItemIterator.java b/src/main/java/gregtech/loaders/load/GT_ItemIterator.java index e894acf4be..8e6130eccb 100644 --- a/src/main/java/gregtech/loaders/load/GT_ItemIterator.java +++ b/src/main/java/gregtech/loaders/load/GT_ItemIterator.java @@ -298,122 +298,215 @@ 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)); + 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, 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)); + 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, 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)); } } @@ -421,8 +514,9 @@ 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)); } } } diff --git a/src/main/java/gregtech/loaders/load/GT_SonictronLoader.java b/src/main/java/gregtech/loaders/load/GT_SonictronLoader.java index ce66b80a55..115e95a6d3 100644 --- a/src/main/java/gregtech/loaders/load/GT_SonictronLoader.java +++ b/src/main/java/gregtech/loaders/load/GT_SonictronLoader.java @@ -112,8 +112,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/misc/GT_Achievements.java b/src/main/java/gregtech/loaders/misc/GT_Achievements.java index 59abc0566a..7970dd695f 100644 --- a/src/main/java/gregtech/loaders/misc/GT_Achievements.java +++ b/src/main/java/gregtech/loaders/misc/GT_Achievements.java @@ -68,8 +68,12 @@ public class GT_Achievements { "tools", 0, 4, - GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(GT_MetaGenerated_Tool_01.HARDHAMMER, 1, Materials.Iron, Materials.Wood, null), + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.HARDHAMMER, + 1, + Materials.Iron, + Materials.Wood, + null), "flintpick", false); registerAchievement( @@ -387,9 +391,12 @@ public class GT_Achievements { new AchievementPage( "GregTech 5", (Achievement[]) this.achievementList.values() - .toArray(new Achievement[this.achievementList.size()]))); + .toArray( + new Achievement[this.achievementList.size()]))); MinecraftForge.EVENT_BUS.register(this); - FMLCommonHandler.instance().bus().register(this); + FMLCommonHandler.instance() + .bus() + .register(this); } } @@ -448,14 +455,19 @@ public class GT_Achievements { return null; } if (recipe.getOutput(0) == null) { - GT_Mod.GT_FML_LOGGER - .error("Invalid achievement registration attempt for recipe with null output", new Exception()); + GT_Mod.GT_FML_LOGGER.error( + "Invalid achievement registration attempt for recipe with null output", + new Exception()); return null; } - if (this.achievementList.get(recipe.getOutput(0).getUnlocalizedName()) == null) { + if (this.achievementList.get( + recipe.getOutput(0) + .getUnlocalizedName()) + == null) { assReg++; return registerAchievement( - recipe.getOutput(0).getUnlocalizedName(), + recipe.getOutput(0) + .getUnlocalizedName(), -(11 + assReg % 5), ((assReg) / 5) - 8, recipe.getOutput(0), @@ -508,7 +520,8 @@ public class GT_Achievements { issueAchievement(player, "finalpreparations"); } } - if (stack.getUnlocalizedName().equals("ic2.itemPartIndustrialDiamond")) { + if (stack.getUnlocalizedName() + .equals("ic2.itemPartIndustrialDiamond")) { issueAchievement(player, "artificaldia"); issueAchievement(player, "buildCoalDiamond"); } @@ -518,7 +531,8 @@ public class GT_Achievements { if (player == null || fluid == null) { return; } - switch (fluid.getFluid().getUnlocalizedName()) { + switch (fluid.getFluid() + .getUnlocalizedName()) { case "fluid.plasma.helium": issueAchievement(player, "fusion"); break; @@ -553,7 +567,8 @@ public class GT_Achievements { issueAchievement(player, "bronze"); } } - if (stack.getUnlocalizedName().startsWith("gt.metaitem.")) { + if (stack.getUnlocalizedName() + .startsWith("gt.metaitem.")) { switch (stack.getUnlocalizedName()) { case "gt.metaitem.01.2300": issueAchievement(player, "bronze"); @@ -584,118 +599,277 @@ public class GT_Achievements { issueAchievement(player, "hightech"); break; } - } else if (stack.getUnlocalizedName().equals("ic2.blockCrop")) { - issueAchievement(player, "crops"); - } else if (stack.getUnlocalizedName().equals("ic2.itemPartCircuit")) { - issueAchievement(player, "gtbasiccircuit"); - } else if (stack.getUnlocalizedName().equals("ic2.itemPartCircuitAdv")) { - issueAchievement(player, "stepforward"); - } else if (stack.getUnlocalizedName().startsWith("gt.blockmachines.")) { - if (stack.getUnlocalizedName().startsWith("gt.blockmachines.basicmachine.arcfurnace.tier.")) { - issueAchievement(player, "recycling"); - } else if (stack.getUnlocalizedName().startsWith("gt.blockmachines.basicmachine.disassembler.tier.")) { - issueAchievement(player, "repair"); - } else if (stack.getUnlocalizedName().equals("gt.blockmachines.boiler.solar")) { - issueAchievement(player, "simplyeco"); - } else if (stack.getUnlocalizedName().equals("gt.blockmachines.boiler.bronze")) { - issueAchievement(player, "firststeam"); - } else if (stack.getUnlocalizedName().equals("gt.blockmachines.boiler.steel")) { - issueAchievement(player, "highpressure"); - } else if (stack.getUnlocalizedName().equals("gt.blockmachines.bronzemachine.macerator")) { - issueAchievement(player, "macerator"); - issueAchievement(player, "buildMacerator"); - } else if (stack.getUnlocalizedName().equals("gt.blockmachines.bronzemachine.alloysmelter")) { - issueAchievement(player, "alloysmelter"); - issueAchievement(player, "buildElecFurnace"); - if (stack.getUnlocalizedName().equals("gt.blockmachines.bronzemachine.alloysmelter.tier.3")) { - issueAchievement(player, "buildIndFurnace"); - } - } else if (stack.getUnlocalizedName().equals("gt.blockmachines.bronzemachine.extractor")) { - issueAchievement(player, "extract"); - issueAchievement(player, "buildCompressor"); - issueAchievement(player, "buildExtractor"); - } else if (stack.getUnlocalizedName().startsWith("gt.blockmachines.automation.superbuffer.tier.")) { - issueAchievement(player, "superbuffer"); - } else if (stack.getUnlocalizedName().startsWith("gt.blockmachines.quantum.tank.tier.")) { - issueAchievement(player, "whereistheocean"); - } else if (stack.getUnlocalizedName().startsWith("gt.blockmachines.quantum.chest.tier.")) { - issueAchievement(player, "newstorage"); - } else if (stack.getUnlocalizedName().startsWith("gt.blockmachines.basicmachine.hammer.tier.")) { - issueAchievement(player, "cheapermac"); - } else if (stack.getUnlocalizedName().startsWith("gt.blockmachines.automation.chestbuffer.tier.")) { - issueAchievement(player, "buffer"); - issueAchievement(player, "buildBatBox"); - if (stack.getUnlocalizedName().startsWith("gt.blockmachines.automation.chestbuffer.tier.3")) { - issueAchievement(player, "buildMFE"); - } - } else if (stack.getUnlocalizedName().startsWith("gt.blockmachines.basicgenerator.steamturbine.tier.")) { - issueAchievement(player, "steampower"); - issueAchievement(player, "buildGenerator"); - } else if (stack.getUnlocalizedName().equals("gt.blockmachines.basicmachine.pump.tier.03")) { - issueAchievement(player, "slurp"); - } else if (stack.getUnlocalizedName().startsWith("gt.blockmachines.basicmachine.assembler.tier.")) { - issueAchievement(player, "avengers"); - } else if (stack.getUnlocalizedName().equals("gt.blockmachines.multimachine.blastfurnace")) { - issueAchievement(player, "ebf"); - } else if (stack.getUnlocalizedName().startsWith("gt.blockmachines.batterybuffer.")) { - issueAchievement(player, "batterys"); - } else if (stack.getUnlocalizedName().equals("gt.blockmachines.hatch.energy.tier.02")) { - issueAchievement(player, "upgradeebf"); - } else if (stack.getUnlocalizedName().equals("gt.blockmachines.multimachine.multifurnace")) { - issueAchievement(player, "highpowersmelt"); - } else if (stack.getUnlocalizedName().equals("gt.blockmachines.hatch.energy.tier.01")) { - issueAchievement(player, "energyhatch"); - } else if (stack.getUnlocalizedName().equals("gt.blockmachines.multimachine.processingarray")) { - issueAchievement(player, "factory"); - } else - if (stack.getUnlocalizedName().equals("gt.blockmachines.basicgenerator.magicenergyconverter.tier.01")) { - issueAchievement(player, "magic"); - } else if (stack.getUnlocalizedName() - .equals("gt.blockmachines.basicgenerator.magicenergyabsorber.tier.03")) { - issueAchievement(player, "highmage"); + } else if (stack.getUnlocalizedName() + .equals("ic2.blockCrop")) { + issueAchievement(player, "crops"); } else - if (stack.getUnlocalizedName().startsWith("gt.blockmachines.basicmachine.amplifab.tier.")) { - issueAchievement(player, "amplifier"); - } else if (stack.getUnlocalizedName().startsWith("gt.blockmachines.basicmachine.massfab.tier.")) { - issueAchievement(player, "universal"); - issueAchievement(player, "buildMassFab"); - } else - if (stack.getUnlocalizedName().startsWith("gt.blockmachines.basicgenerator.naquadah.tier.")) { - issueAchievement(player, "alienpower"); - } else if (stack.getUnlocalizedName() - .startsWith("gt.blockmachines.basicmachine.replicator.tier.")) { - issueAchievement(player, "replication"); - } else + if (stack.getUnlocalizedName() + .equals("ic2.itemPartCircuit")) { + issueAchievement(player, "gtbasiccircuit"); + } else + if (stack.getUnlocalizedName() + .equals("ic2.itemPartCircuitAdv")) { + issueAchievement(player, "stepforward"); + } else + if (stack.getUnlocalizedName() + .startsWith("gt.blockmachines.")) { + if (stack.getUnlocalizedName() + .startsWith("gt.blockmachines.basicmachine.arcfurnace.tier.")) { + issueAchievement(player, "recycling"); + } else if (stack.getUnlocalizedName() + .startsWith("gt.blockmachines.basicmachine.disassembler.tier.")) { + issueAchievement(player, "repair"); + } else + if (stack.getUnlocalizedName() + .equals("gt.blockmachines.boiler.solar")) { + issueAchievement(player, "simplyeco"); + } else + if (stack.getUnlocalizedName() + .equals("gt.blockmachines.boiler.bronze")) { + issueAchievement(player, "firststeam"); + } else + if (stack.getUnlocalizedName() + .equals("gt.blockmachines.boiler.steel")) { + issueAchievement(player, "highpressure"); + } else + if (stack.getUnlocalizedName() + .equals("gt.blockmachines.bronzemachine.macerator")) { + issueAchievement(player, "macerator"); + issueAchievement(player, "buildMacerator"); + } else + if (stack.getUnlocalizedName() + .equals("gt.blockmachines.bronzemachine.alloysmelter")) { + issueAchievement(player, "alloysmelter"); + issueAchievement(player, "buildElecFurnace"); + if (stack.getUnlocalizedName() + .equals( + "gt.blockmachines.bronzemachine.alloysmelter.tier.3")) { + issueAchievement(player, "buildIndFurnace"); + } + } else + if (stack.getUnlocalizedName() + .equals("gt.blockmachines.bronzemachine.extractor")) { + issueAchievement(player, "extract"); + issueAchievement(player, "buildCompressor"); + issueAchievement(player, "buildExtractor"); + } else + if (stack.getUnlocalizedName() + .startsWith( + "gt.blockmachines.automation.superbuffer.tier.")) { + issueAchievement( + player, + "superbuffer"); + } else + if (stack.getUnlocalizedName() + .startsWith( + "gt.blockmachines.quantum.tank.tier.")) { + issueAchievement( + player, + "whereistheocean"); + } else + if (stack.getUnlocalizedName() + .startsWith( + "gt.blockmachines.quantum.chest.tier.")) { + issueAchievement( + player, + "newstorage"); + } else + if (stack.getUnlocalizedName() + .startsWith( + "gt.blockmachines.basicmachine.hammer.tier.")) { + issueAchievement( + player, + "cheapermac"); + } else + if (stack.getUnlocalizedName() + .startsWith( + "gt.blockmachines.automation.chestbuffer.tier.")) { + issueAchievement( + player, + "buffer"); + issueAchievement( + player, + "buildBatBox"); + if (stack.getUnlocalizedName() + .startsWith( + "gt.blockmachines.automation.chestbuffer.tier.3")) { + issueAchievement( + player, + "buildMFE"); + } + } else + if (stack.getUnlocalizedName() + .startsWith( + "gt.blockmachines.basicgenerator.steamturbine.tier.")) { + issueAchievement( + player, + "steampower"); + issueAchievement( + player, + "buildGenerator"); + } else + if (stack.getUnlocalizedName() + .equals( + "gt.blockmachines.basicmachine.pump.tier.03")) { + issueAchievement( + player, + "slurp"); + } else + if (stack.getUnlocalizedName() + .startsWith( + "gt.blockmachines.basicmachine.assembler.tier.")) { + issueAchievement( + player, + "avengers"); + } else + if (stack.getUnlocalizedName() + .equals( + "gt.blockmachines.multimachine.blastfurnace")) { + issueAchievement( + player, + "ebf"); + } else + if (stack.getUnlocalizedName() + .startsWith( + "gt.blockmachines.batterybuffer.")) { + issueAchievement( + player, + "batterys"); + } else + if (stack.getUnlocalizedName() + .equals( + "gt.blockmachines.hatch.energy.tier.02")) { + issueAchievement( + player, + "upgradeebf"); + } else + if (stack.getUnlocalizedName() + .equals( + "gt.blockmachines.multimachine.multifurnace")) { + issueAchievement( + player, + "highpowersmelt"); + } else + if (stack.getUnlocalizedName() + .equals( + "gt.blockmachines.hatch.energy.tier.01")) { + issueAchievement( + player, + "energyhatch"); + } else + if (stack.getUnlocalizedName() + .equals( + "gt.blockmachines.multimachine.processingarray")) { + issueAchievement( + player, + "factory"); + } else + if (stack.getUnlocalizedName() + .equals( + "gt.blockmachines.basicgenerator.magicenergyconverter.tier.01")) { + issueAchievement( + player, + "magic"); + } else + if (stack.getUnlocalizedName() + .equals( + "gt.blockmachines.basicgenerator.magicenergyabsorber.tier.03")) { + issueAchievement( + player, + "highmage"); + } else + if (stack.getUnlocalizedName() + .startsWith( + "gt.blockmachines.basicmachine.amplifab.tier.")) { + issueAchievement( + player, + "amplifier"); + } else +