From 9c07ac0bffe24963f4fd6f44d148e3dcea5b2fd7 Mon Sep 17 00:00:00 2001 From: Raven Szewczyk Date: Fri, 24 May 2024 19:00:07 +0100 Subject: Apply updated GT5 spotless config --- gradle.properties | 2 +- .../bartworks/API/BioObjectAdder.java | 57 +- .../bartworks/API/BioRecipeAdder.java | 74 +- .../bartworks/API/BioVatLogicAdder.java | 102 +- .../bartworks/API/BorosilicateGlass.java | 37 +- .../bartimaeusnek/bartworks/API/SideReference.java | 16 +- .../bartimaeusnek/bartworks/API/WerkstoffAPI.java | 3 +- .../bartworks/API/modularUI/BW_UITextures.java | 33 +- .../bartworks/API/recipe/BacterialVatFrontend.java | 22 +- .../bartworks/API/recipe/BartWorksRecipeMaps.java | 111 +- .../bartworks/API/recipe/DynamicGTRecipe.java | 24 +- .../bartworks/API/recipe/RadioHatchFrontend.java | 8 +- .../bartimaeusnek/bartworks/ASM/BWCorePlugin.java | 3 +- .../ASM/BWCoreStaticReplacementMethodes.java | 12 +- .../bartworks/ASM/BWCoreTransformer.java | 55 +- .../github/bartimaeusnek/bartworks/MainMod.java | 40 +- .../client/ClientEventHandler/TooltipCache.java | 3 +- .../ClientEventHandler/TooltipEventHandler.java | 61 +- .../bartworks/client/creativetabs/BioTab.java | 3 +- .../client/gui/BW_GUIContainer_RotorBlock.java | 41 +- .../client/renderer/BW_EICPistonVisualizer.java | 16 +- .../client/renderer/BW_GT_ItemRenderer.java | 58 +- .../client/renderer/BW_Renderer_Block_Ores.java | 96 +- .../renderer/RendererSwitchingColorFluid.java | 78 +- .../client/textures/PrefixTextureLinker.java | 61 +- .../bartworks/common/blocks/BW_GlasBlocks.java | 4 +- .../bartworks/common/blocks/BW_GlasBlocks2.java | 14 +- .../common/blocks/BW_TileEntityContainer.java | 47 +- .../BW_TileEntityContainer_MachineBlock.java | 2 +- .../blocks/BW_TileEntityContainer_Multiple.java | 7 +- .../common/commands/PrintRecipeListToFile.java | 20 +- .../bartworks/common/commands/RunGC.java | 3 +- .../bartworks/common/commands/SummonRuin.java | 10 +- .../bartworks/common/configs/ConfigHandler.java | 288 +-- .../bartworks/common/items/BW_ItemBlocks.java | 10 +- .../bartworks/common/items/BW_SimpleWindMeter.java | 26 +- .../bartworks/common/items/BW_Stonage_Rotors.java | 13 +- .../bartworks/common/items/Circuit_Programmer.java | 57 +- .../common/items/GT_Destructopack_Item.java | 9 +- .../bartworks/common/items/GT_Rockcutter_Item.java | 31 +- .../bartworks/common/items/GT_Teslastaff_Item.java | 4 +- .../bartworks/common/items/LabParts.java | 46 +- .../common/loaders/ArtificialMicaLine.java | 213 +- .../bartworks/common/loaders/BeforeGTPreload.java | 31 +- .../bartworks/common/loaders/BioCultureLoader.java | 90 +- .../bartworks/common/loaders/BioItemList.java | 12 +- .../bartworks/common/loaders/BioRecipeLoader.java | 209 +- .../ElectricImplosionCompressorRecipes.java | 224 +- .../bartworks/common/loaders/FluidLoader.java | 79 +- .../bartworks/common/loaders/ItemRegistry.java | 438 ++-- .../common/loaders/LocalisationLoader.java | 38 +- .../common/loaders/RadioHatchMaterialLoader.java | 241 +- .../bartworks/common/loaders/RecipeLoader.java | 2 +- .../common/loaders/StaticRecipeChangeLoaders.java | 310 +-- .../common/loaders/recipes/Assembler.java | 323 +-- .../common/loaders/recipes/AssemblyLine.java | 89 +- .../common/loaders/recipes/Autoclave.java | 24 +- .../common/loaders/recipes/Centrifuge.java | 140 +- .../common/loaders/recipes/ChemicalBath.java | 87 +- .../common/loaders/recipes/ChemicalReactor.java | 11 +- .../common/loaders/recipes/CraftingRecipes.java | 590 +++-- .../common/loaders/recipes/Electrolyzer.java | 204 +- .../common/loaders/recipes/Extractor.java | 18 +- .../common/loaders/recipes/FluidHeater.java | 11 +- .../common/loaders/recipes/FluidSolidifier.java | 128 +- .../common/loaders/recipes/FormingPress.java | 70 +- .../common/loaders/recipes/LaserEngraver.java | 9 +- .../bartworks/common/loaders/recipes/Mixer.java | 39 +- .../common/loaders/recipes/Pulverizer.java | 110 +- .../common/loaders/recipes/PyrolyseOven.java | 14 +- .../bartworks/common/net/BW_Network.java | 75 +- .../common/net/CircuitProgrammerPacket.java | 16 +- .../bartworks/common/net/MetaBlockPacket.java | 32 +- .../bartworks/common/net/OreDictCachePacket.java | 9 +- .../bartworks/common/net/RendererPacket.java | 29 +- .../bartworks/common/net/ServerJoinedPackage.java | 2 +- .../BW_TileEntity_ExperimentalFloodGate.java | 12 +- .../classic/BW_TileEntity_HeatedWaterPump.java | 121 +- .../classic/BW_TileEntity_InfinityTank.java | 21 +- .../tileentities/multis/GT_TileEntity_BioVat.java | 467 ++-- .../multis/GT_TileEntity_CircuitAssemblyLine.java | 289 ++- .../tileentities/multis/GT_TileEntity_DEHP.java | 124 +- .../GT_TileEntity_ElectricImplosionCompressor.java | 279 ++- .../tileentities/multis/GT_TileEntity_HTGR.java | 323 ++- .../tileentities/multis/GT_TileEntity_LESU.java | 293 ++- .../multis/GT_TileEntity_ManualTrafo.java | 199 +- .../tileentities/multis/GT_TileEntity_THTR.java | 235 +- .../multis/GT_TileEntity_Windmill.java | 363 +-- .../mega/GT_TileEntity_MegaBlastFurnace.java | 173 +- .../mega/GT_TileEntity_MegaChemicalReactor.java | 140 +- .../mega/GT_TileEntity_MegaDistillTower.java | 317 +-- .../mega/GT_TileEntity_MegaMultiBlockBase.java | 133 +- .../multis/mega/GT_TileEntity_MegaOilCracker.java | 204 +- .../mega/GT_TileEntity_MegaVacuumFreezer.java | 187 +- .../tiered/GT_MetaTileEntity_AcidGenerator.java | 72 +- .../tiered/GT_MetaTileEntity_BioLab.java | 363 ++- .../GT_MetaTileEntity_CompressedFluidHatch.java | 10 +- .../tiered/GT_MetaTileEntity_Diode.java | 47 +- .../GT_MetaTileEntity_EnergyDistributor.java | 22 +- .../tiered/GT_MetaTileEntity_GiantOutputHatch.java | 2 +- .../GT_MetaTileEntity_HumongousInputHatch.java | 10 +- .../tiered/GT_MetaTileEntity_RadioHatch.java | 298 +-- .../tiered/GT_MetaTileEntity_Transistor.java | 36 +- .../bartworks/neiHandler/BW_NEI_BioLabHandler.java | 16 +- .../bartworks/neiHandler/BW_NEI_BioVatHandler.java | 15 +- .../bartworks/neiHandler/BW_NEI_OreHandler.java | 117 +- .../bartworks/neiHandler/NEI_BW_Config.java | 41 +- .../server/EventHandler/ServerEventHandler.java | 5 +- .../system/material/BW_GT_MaterialReference.java | 116 +- .../material/BW_MetaGeneratedBlock_Item.java | 4 +- .../material/BW_MetaGeneratedBlocks_Casing.java | 29 +- .../BW_MetaGeneratedBlocks_CasingAdvanced_TE.java | 8 +- .../material/BW_MetaGeneratedBlocks_Casing_TE.java | 8 +- .../system/material/BW_MetaGeneratedFrames.java | 27 +- .../system/material/BW_MetaGeneratedOreTE.java | 7 +- .../material/BW_MetaGeneratedSmallOreTE.java | 45 +- .../system/material/BW_MetaGenerated_Block_TE.java | 8 +- .../system/material/BW_MetaGenerated_Blocks.java | 10 +- .../system/material/BW_MetaGenerated_Items.java | 59 +- .../system/material/BW_MetaGenerated_Ores.java | 13 +- .../material/BW_MetaGenerated_SmallOres.java | 11 +- .../BW_MetaGenerated_WerkstoffBlock_TE.java | 7 +- .../material/BW_MetaGenerated_WerkstoffBlocks.java | 11 +- .../system/material/BW_NonMeta_MaterialItems.java | 4 +- .../material/CircuitGeneration/BW_Meta_Items.java | 96 +- .../material/CircuitGeneration/CircuitData.java | 12 +- .../CircuitGeneration/CircuitImprintLoader.java | 200 +- .../CircuitGeneration/CircuitPartLoader.java | 207 +- .../material/GT_Enhancement/BWGTMetaItems.java | 26 +- .../GT_Enhancement/GTMetaItemEnhancer.java | 63 +- .../GT_Enhancement/PlatinumSludgeOverHaul.java | 1124 +++++---- .../bartworks/system/material/Werkstoff.java | 308 +-- .../bartworks/system/material/WerkstoffLoader.java | 2501 +++++++++++--------- .../material/processingLoaders/AddSomeRecipes.java | 98 +- .../processingLoaders/AdditionalRecipes.java | 853 +++---- .../material/processingLoaders/DownTierLoader.java | 29 +- .../processingLoaders/LoadItemContainers.java | 88 +- .../werkstoff_loaders/recipe/AspectLoader.java | 21 +- .../werkstoff_loaders/recipe/BlockLoader.java | 32 +- .../werkstoff_loaders/recipe/CasingLoader.java | 37 +- .../werkstoff_loaders/recipe/CellLoader.java | 264 ++- .../recipe/CraftingMaterialLoader.java | 242 +- .../werkstoff_loaders/recipe/CrushedLoader.java | 289 ++- .../werkstoff_loaders/recipe/DustLoader.java | 493 ++-- .../werkstoff_loaders/recipe/GemLoader.java | 327 ++- .../werkstoff_loaders/recipe/MetalLoader.java | 36 +- .../werkstoff_loaders/recipe/MoltenCellLoader.java | 367 ++- .../recipe/MultipleMetalLoader.java | 39 +- .../werkstoff_loaders/recipe/OreLoader.java | 29 +- .../werkstoff_loaders/recipe/RawOreLoader.java | 32 +- .../recipe/SimpleMetalLoader.java | 256 +- .../werkstoff_loaders/recipe/ToolLoader.java | 909 +++---- .../registration/BridgeMaterialsLoader.java | 147 +- .../registration/CasingRegistrator.java | 16 +- .../bartworks/system/oredict/OreDictHandler.java | 31 +- .../bartworks/system/oregen/BW_OreLayer.java | 107 +- .../bartworks/system/oregen/BW_WordGenerator.java | 34 +- .../system/oregen/BW_WorldGenRoss128b.java | 213 +- .../system/oregen/BW_WorldGenRoss128ba.java | 220 +- .../bartworks/system/worldgen/MapGenRuins.java | 262 +- .../bartimaeusnek/bartworks/util/BWRecipes.java | 210 +- .../bartimaeusnek/bartworks/util/BW_ColorUtil.java | 9 +- .../bartworks/util/BW_Tooltip_Reference.java | 15 +- .../bartimaeusnek/bartworks/util/BW_Util.java | 152 +- .../bartimaeusnek/bartworks/util/BioCulture.java | 104 +- .../bartimaeusnek/bartworks/util/BioData.java | 28 +- .../bartworks/util/CachedReflectionUtils.java | 6 +- .../bartworks/util/ConnectedBlocksChecker.java | 72 +- .../util/ConnectedBlocksCheckerIteration.java | 54 +- .../bartimaeusnek/bartworks/util/EnumUtils.java | 38 +- .../bartimaeusnek/bartworks/util/MurmurHash3.java | 18 +- .../bartworks/util/NoiseUtil/BartsNoise.java | 14 +- .../bartworks/util/NoiseUtil/SimplexNoise.java | 41 +- .../bartworks/util/NonNullWrappedHashMap.java | 5 +- .../github/bartimaeusnek/bartworks/util/Pair.java | 11 +- .../bartworks/util/RecipeFinderForParallel.java | 9 +- .../bartworks/util/ResultWrongSievert.java | 9 +- .../bartimaeusnek/bartworks/util/StreamUtils.java | 4 +- .../accessprioritylist/AccessPriorityList.java | 6 +- .../AccessPriorityListIterators.java | 2 +- .../bartimaeusnek/bartworks/util/log/DebugLog.java | 10 +- .../bartimaeusnek/crossmod/BartWorksCrossmod.java | 26 +- .../crossmod/GTpp/loader/RadioHatchCompat.java | 50 +- .../bartimaeusnek/crossmod/cls/CLSCompat.java | 32 +- .../galacticgreg/GT_TileEntity_VoidMiner_Base.java | 85 +- .../crossmod/galacticgreg/VoidMinerUtility.java | 107 +- .../crossmod/galacticraft/GalacticraftProxy.java | 2 +- .../atmosphere/BWAtmosphereManager.java | 31 +- .../planets/AbstractWorldProviderSpace.java | 3 +- .../planets/ross128b/ChunkProviderRoss128b.java | 22 +- .../planets/ross128b/SkyProviderRoss128b.java | 2 +- .../planets/ross128ba/ChunkProviderRoss128ba.java | 2 +- .../solarsystems/Ross128SolarSystem.java | 26 +- .../crossmod/openComputers/GT_NBT_DataBase.java | 8 +- .../openComputers/TileEntity_GTDataServer.java | 31 +- .../crossmod/tectech/TecTechResearchLoader.java | 93 +- .../tectech/tileentites/tiered/LowPowerLaser.java | 27 +- .../tiered/TT_Abstract_LowPowerLaserThingy.java | 17 +- .../tiered/TT_MetaTileEntity_LowPowerLaserBox.java | 77 +- .../TT_MetaTileEntity_LowPowerLaserDynamo.java | 28 +- .../TT_MetaTileEntity_LowPowerLaserHatch.java | 28 +- .../TT_MetaTileEntity_Pipe_Energy_LowPower.java | 72 +- .../crossmod/tgregworks/MaterialsInjector.java | 37 +- .../tile/GT_Multi_IndustrialCrucible.java | 2 +- .../crossmod/thaumcraft/tile/GT_WandBuffer.java | 6 +- .../thaumcraft/util/ThaumcraftHandler.java | 59 +- 206 files changed, 12490 insertions(+), 10033 deletions(-) diff --git a/gradle.properties b/gradle.properties index fcd5f9f406..0c29462f28 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ # ExampleMod tag to use as Blowdryer (Spotless, etc.) settings version, leave empty to disable. # LOCAL to test local config updates. -gtnh.settings.blowdryerTag = 0.2.0 +gtnh.settings.blowdryerTag = 0.2.2 # Human-readable mod name, available for mcmod.info population. modName = BartWorks diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/API/BioObjectAdder.java b/src/main/java/com/github/bartimaeusnek/bartworks/API/BioObjectAdder.java index 4d28c5fb46..2eee530a70 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/API/BioObjectAdder.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/API/BioObjectAdder.java @@ -47,12 +47,12 @@ public final class BioObjectAdder { * @return */ public static BioCulture createAndRegisterBioCulture(Color color, String name, BioPlasmid plasmid, BioDNA dna, - EnumRarity rarity, boolean breedable) { + EnumRarity rarity, boolean breedable) { if (BioCulture.BIO_CULTURE_ARRAY_LIST.size() > 1) return BioCulture.createAndRegisterBioCulture(color, name, plasmid, dna, rarity, breedable); new Exception( - "Too Early to register a BioCulture! You MUST run this either after:bartworks OR in the init Phase!") - .printStackTrace(); + "Too Early to register a BioCulture! You MUST run this either after:bartworks OR in the init Phase!") + .printStackTrace(); return null; } @@ -67,12 +67,12 @@ public final class BioObjectAdder { * @return */ public static BioCulture createAndRegisterBioCulture(Color color, String name, BioPlasmid plasmid, BioDNA dna, - boolean breedable) { + boolean breedable) { if (BioCulture.BIO_CULTURE_ARRAY_LIST.size() > 1) return BioCulture.createAndRegisterBioCulture(color, name, plasmid, dna, breedable); new Exception( - "Too Early to register a BioCulture! You MUST run this either after:bartworks OR in the init Phase!") - .printStackTrace(); + "Too Early to register a BioCulture! You MUST run this either after:bartworks OR in the init Phase!") + .printStackTrace(); return null; } @@ -89,7 +89,7 @@ public final class BioObjectAdder { if (BioData.BIO_DATA_ARRAY_LIST.size() > 1) return BioData.createAndRegisterBioData(aName, rarity, chance, tier); new Exception("Too Early to register a BioData! You MUST run this either after:bartworks OR in the init Phase!") - .printStackTrace(); + .printStackTrace(); return null; } @@ -103,7 +103,7 @@ public final class BioObjectAdder { public static BioDNA createAndRegisterBioDNA(String aName, EnumRarity rarity) { if (BioData.BIO_DATA_ARRAY_LIST.size() > 1) return BioDNA.createAndRegisterBioDNA(aName, rarity); new Exception("Too Early to register a BioData! You MUST run this either after:bartworks OR in the init Phase!") - .printStackTrace(); + .printStackTrace(); return null; } @@ -117,7 +117,7 @@ public final class BioObjectAdder { public static BioPlasmid createAndRegisterBioPlasmid(String aName, EnumRarity rarity) { if (BioData.BIO_DATA_ARRAY_LIST.size() > 1) return BioPlasmid.createAndRegisterBioPlasmid(aName, rarity); new Exception("Too Early to register a BioData! You MUST run this either after:bartworks OR in the init Phase!") - .printStackTrace(); + .printStackTrace(); return null; } @@ -131,7 +131,7 @@ public final class BioObjectAdder { public static BioDNA createAndRegisterBioDNA(String aName, EnumRarity rarity, int chance, int tier) { if (BioData.BIO_DATA_ARRAY_LIST.size() > 1) return BioDNA.createAndRegisterBioDNA(aName, rarity, chance, tier); new Exception("Too Early to register a BioData! You MUST run this either after:bartworks OR in the init Phase!") - .printStackTrace(); + .printStackTrace(); return null; } @@ -146,7 +146,7 @@ public final class BioObjectAdder { if (BioData.BIO_DATA_ARRAY_LIST.size() > 1) return BioPlasmid.createAndRegisterBioPlasmid(aName, rarity, chance, tier); new Exception("Too Early to register a BioData! You MUST run this either after:bartworks OR in the init Phase!") - .printStackTrace(); + .printStackTrace(); return null; } @@ -164,20 +164,33 @@ public final class BioObjectAdder { */ public static void regenerateBioFluids() { FluidStack dnaFluid = Gendustry.isModLoaded() ? FluidRegistry.getFluidStack("liquiddna", 100) - : Materials.Biomass.getFluid(100L); + : Materials.Biomass.getFluid(100L); for (BioCulture B : BioCulture.BIO_CULTURE_ARRAY_LIST) { if (B.getFluidNotSet()) { B.setFluid( - GT_FluidFactory.builder(B.getName().replace(" ", "").toLowerCase() + "fluid") - .withTextureName("molten.autogenerated") - .withColorRGBA( - new short[] { (short) B.getColor().getRed(), (short) B.getColor().getBlue(), - (short) B.getColor().getGreen() }) - .withStateAndTemperature(FluidState.LIQUID, 300).buildAndRegister().asFluid()); - - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(10)) - .fluidInputs(new FluidStack(B.getFluid(), 1000)).fluidOutputs(dnaFluid).duration(25 * SECONDS) - .eut(TierEU.RECIPE_MV).addTo(centrifugeRecipes); + GT_FluidFactory.builder( + B.getName() + .replace(" ", "") + .toLowerCase() + "fluid") + .withTextureName("molten.autogenerated") + .withColorRGBA( + new short[] { (short) B.getColor() + .getRed(), + (short) B.getColor() + .getBlue(), + (short) B.getColor() + .getGreen() }) + .withStateAndTemperature(FluidState.LIQUID, 300) + .buildAndRegister() + .asFluid()); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(10)) + .fluidInputs(new FluidStack(B.getFluid(), 1000)) + .fluidOutputs(dnaFluid) + .duration(25 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(centrifugeRecipes); } } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/API/BioRecipeAdder.java b/src/main/java/com/github/bartimaeusnek/bartworks/API/BioRecipeAdder.java index b1e3fb25df..6ab854c308 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/API/BioRecipeAdder.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/API/BioRecipeAdder.java @@ -31,18 +31,18 @@ public final class BioRecipeAdder { public static final int CLEANROOM = -200; public static boolean addBioLabRecipe(ItemStack[] aInputs, ItemStack aOutput, ItemStack aSpecialItems, - int[] aChances, FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs, int aDuration, int aEUt, - int aSpecialValue) { + int[] aChances, FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs, int aDuration, int aEUt, + int aSpecialValue) { return BWRecipes.instance.addBioLabRecipe( - aInputs, - aOutput, - aSpecialItems, - aChances, - aFluidInputs, - aFluidOutputs, - aDuration, - aEUt, - aSpecialValue); + aInputs, + aOutput, + aSpecialItems, + aChances, + aFluidInputs, + aFluidOutputs, + aDuration, + aEUt, + aSpecialValue); } /** @@ -58,9 +58,9 @@ public final class BioRecipeAdder { * @return if the recipe was added. */ public static boolean addBioLabRecipeIncubation(ItemStack aInput, BioCulture aOutput, int[] aChances, - FluidStack aFluidInputs, int aDuration, int aEUt, int aSpecialValue) { + FluidStack aFluidInputs, int aDuration, int aEUt, int aSpecialValue) { return BWRecipes.instance - .addBioLabRecipeIncubation(aInput, aOutput, aChances, aFluidInputs, aDuration, aEUt, aSpecialValue); + .addBioLabRecipeIncubation(aInput, aOutput, aChances, aFluidInputs, aDuration, aEUt, aSpecialValue); } /** @@ -78,19 +78,19 @@ public final class BioRecipeAdder { * @return */ public static boolean addBacterialVatRecipe(ItemStack[] aInputs, @Nonnull BioCulture aCulture, - @Nonnull FluidStack[] aFluidInputs, @Nonnull FluidStack[] aFluidOutputs, @Nonnegative int aDuration, - @Nonnegative int aEUt, int Sv, @Nonnegative int glasTier, int aSpecialValue, boolean exactSv) { + @Nonnull FluidStack[] aFluidInputs, @Nonnull FluidStack[] aFluidOutputs, @Nonnegative int aDuration, + @Nonnegative int aEUt, int Sv, @Nonnegative int glasTier, int aSpecialValue, boolean exactSv) { return BWRecipes.instance.addBacterialVatRecipe( - aInputs, - aCulture, - aFluidInputs, - aFluidOutputs, - aDuration, - aEUt, - Sv, - glasTier, - aSpecialValue, - exactSv); + aInputs, + aCulture, + aFluidInputs, + aFluidOutputs, + aDuration, + aEUt, + Sv, + glasTier, + aSpecialValue, + exactSv); } /** @@ -109,18 +109,18 @@ public final class BioRecipeAdder { */ @Deprecated public static boolean addBacterialVatRecipe(ItemStack[] aInputs, @Nonnull BioCulture aCulture, - @Nonnull FluidStack[] aFluidInputs, @Nonnull FluidStack[] aFluidOutputs, @Nonnegative int aDuration, - @Nonnegative int aEUt, Materials material, @Nonnegative int glasTier, int aSpecialValue, boolean exactSv) { + @Nonnull FluidStack[] aFluidInputs, @Nonnull FluidStack[] aFluidOutputs, @Nonnegative int aDuration, + @Nonnegative int aEUt, Materials material, @Nonnegative int glasTier, int aSpecialValue, boolean exactSv) { return BWRecipes.instance.addBacterialVatRecipe( - aInputs, - aCulture, - aFluidInputs, - aFluidOutputs, - aDuration, - aEUt, - material, - glasTier, - aSpecialValue, - exactSv); + aInputs, + aCulture, + aFluidInputs, + aFluidOutputs, + aDuration, + aEUt, + material, + glasTier, + aSpecialValue, + exactSv); } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/API/BioVatLogicAdder.java b/src/main/java/com/github/bartimaeusnek/bartworks/API/BioVatLogicAdder.java index 4084f485ab..b53638a77a 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/API/BioVatLogicAdder.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/API/BioVatLogicAdder.java @@ -56,17 +56,17 @@ public final class BioVatLogicAdder { giveItemStackRadioHatchAbilites(ItemList.Uraniumcell_4.get(1), Materials.Uranium, 12); giveItemStackRadioHatchAbilites( - BW_NonMeta_MaterialItems.TiberiumCell_1.get(1), - WerkstoffLoader.Tiberium.getBridgeMaterial(), - 3); + BW_NonMeta_MaterialItems.TiberiumCell_1.get(1), + WerkstoffLoader.Tiberium.getBridgeMaterial(), + 3); giveItemStackRadioHatchAbilites( - BW_NonMeta_MaterialItems.TiberiumCell_2.get(1), - WerkstoffLoader.Tiberium.getBridgeMaterial(), - 6); + BW_NonMeta_MaterialItems.TiberiumCell_2.get(1), + WerkstoffLoader.Tiberium.getBridgeMaterial(), + 6); giveItemStackRadioHatchAbilites( - BW_NonMeta_MaterialItems.TiberiumCell_4.get(1), - WerkstoffLoader.Tiberium.getBridgeMaterial(), - 12); + BW_NonMeta_MaterialItems.TiberiumCell_4.get(1), + WerkstoffLoader.Tiberium.getBridgeMaterial(), + 12); giveItemStackRadioHatchAbilites(BW_NonMeta_MaterialItems.TheCoreCell.get(1), Materials.Naquadah, 96); @@ -79,58 +79,58 @@ public final class BioVatLogicAdder { giveItemStackRadioHatchAbilites(ItemList.Depleted_Naquadah_4.get(1), Materials.Naquadah, 12, 10); giveItemStackRadioHatchAbilites( - GT_ModHandler.getModItem(IndustrialCraft2.ID, "reactorMOXSimpledepleted", 1), - Materials.Plutonium, - 3, - 10); + GT_ModHandler.getModItem(IndustrialCraft2.ID, "reactorMOXSimpledepleted", 1), + Materials.Plutonium, + 3, + 10); giveItemStackRadioHatchAbilites( - GT_ModHandler.getModItem(IndustrialCraft2.ID, "reactorMOXDualdepleted", 1), - Materials.Plutonium, - 6, - 10); + GT_ModHandler.getModItem(IndustrialCraft2.ID, "reactorMOXDualdepleted", 1), + Materials.Plutonium, + 6, + 10); giveItemStackRadioHatchAbilites( - GT_ModHandler.getModItem(IndustrialCraft2.ID, "reactorMOXQuaddepleted", 1), - Materials.Plutonium, - 12, - 10); + GT_ModHandler.getModItem(IndustrialCraft2.ID, "reactorMOXQuaddepleted", 1), + Materials.Plutonium, + 12, + 10); giveItemStackRadioHatchAbilites( - GT_ModHandler.getModItem(IndustrialCraft2.ID, "reactorUraniumSimpledepleted", 1), - Materials.Uranium, - 3, - 10); + GT_ModHandler.getModItem(IndustrialCraft2.ID, "reactorUraniumSimpledepleted", 1), + Materials.Uranium, + 3, + 10); giveItemStackRadioHatchAbilites( - GT_ModHandler.getModItem(IndustrialCraft2.ID, "reactorUraniumDualdepleted", 1), - Materials.Uranium, - 6, - 10); + GT_ModHandler.getModItem(IndustrialCraft2.ID, "reactorUraniumDualdepleted", 1), + Materials.Uranium, + 6, + 10); giveItemStackRadioHatchAbilites( - GT_ModHandler.getModItem(IndustrialCraft2.ID, "reactorUraniumQuaddepleted", 1), - Materials.Uranium, - 12, - 10); + GT_ModHandler.getModItem(IndustrialCraft2.ID, "reactorUraniumQuaddepleted", 1), + Materials.Uranium, + 12, + 10); giveItemStackRadioHatchAbilites( - BW_NonMeta_MaterialItems.Depleted_Tiberium_1.get(1), - WerkstoffLoader.Tiberium.getBridgeMaterial(), - 3, - 10); + BW_NonMeta_MaterialItems.Depleted_Tiberium_1.get(1), + WerkstoffLoader.Tiberium.getBridgeMaterial(), + 3, + 10); giveItemStackRadioHatchAbilites( - BW_NonMeta_MaterialItems.Depleted_Tiberium_2.get(1), - WerkstoffLoader.Tiberium.getBridgeMaterial(), - 6, - 10); + BW_NonMeta_MaterialItems.Depleted_Tiberium_2.get(1), + WerkstoffLoader.Tiberium.getBridgeMaterial(), + 6, + 10); giveItemStackRadioHatchAbilites( - BW_NonMeta_MaterialItems.Depleted_Tiberium_4.get(1), - WerkstoffLoader.Tiberium.getBridgeMaterial(), - 12, - 10); + BW_NonMeta_MaterialItems.Depleted_Tiberium_4.get(1), + WerkstoffLoader.Tiberium.getBridgeMaterial(), + 12, + 10); giveItemStackRadioHatchAbilites( - BW_NonMeta_MaterialItems.Depleted_TheCoreCell.get(1), - Materials.Naquadah, - 96, - 10); + BW_NonMeta_MaterialItems.Depleted_TheCoreCell.get(1), + Materials.Naquadah, + 96, + 10); giveItemStackRadioHatchAbilites(ItemList.MNqCell_1.get(1), Materials.Naquadria, 3); giveItemStackRadioHatchAbilites(ItemList.MNqCell_2.get(1), Materials.Naquadria, 6); @@ -223,7 +223,7 @@ public final class BioVatLogicAdder { boolean ret = block != null; if (ret) BioVatGlass.glasses.put(new BlockMetaPair(block, (byte) meta), (byte) tier); else new IllegalArgumentException( - "Block: " + sUnlocBlockName + " of the Mod: " + sModname + " was NOT found!").printStackTrace(); + "Block: " + sUnlocBlockName + " of the Mod: " + sModname + " was NOT found!").printStackTrace(); block = null; return ret; } @@ -274,7 +274,7 @@ public final class BioVatLogicAdder { if (o == null || this.getClass() != o.getClass()) return false; BioVatLogicAdder.MaterialSvPair that = (BioVatLogicAdder.MaterialSvPair) o; return Objects.equals(this.getMaterials(), that.getMaterials()) - && Objects.equals(this.getSievert(), that.getSievert()); + && Objects.equals(this.getSievert(), that.getSievert()); } @Override diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/API/BorosilicateGlass.java b/src/main/java/com/github/bartimaeusnek/bartworks/API/BorosilicateGlass.java index 764340af42..eb4c2a0405 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/API/BorosilicateGlass.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/API/BorosilicateGlass.java @@ -62,7 +62,7 @@ public class BorosilicateGlass { } private static void doRegister(byte level, Block block, int meta, - SetMultimap> allLevels) { + SetMultimap> allLevels) { allLevels.put(level, Pair.of(block, meta)); allLevelsReverse.put(block, meta, level); } @@ -96,7 +96,10 @@ public class BorosilicateGlass { SetMultimap> allLevels = getAllLevels(); ArrayList> ret = new ArrayList<>(); for (Byte level : new PriorityQueue<>(allLevels.keySet())) { - ret.add(allLevels.get(level).iterator().next()); + ret.add( + allLevels.get(level) + .iterator() + .next()); } representatives = ret; } @@ -115,10 +118,10 @@ public class BorosilicateGlass { * Can only be called at INIT stage. */ public static void registerGlass(Block block, int meta, byte tier) { - if (Loader.instance().hasReachedState(LoaderState.POSTINITIALIZATION)) - throw new IllegalStateException("register too late!"); - if (!Loader.instance().hasReachedState(LoaderState.INITIALIZATION)) - throw new IllegalStateException("register too early!"); + if (Loader.instance() + .hasReachedState(LoaderState.POSTINITIALIZATION)) throw new IllegalStateException("register too late!"); + if (!Loader.instance() + .hasReachedState(LoaderState.INITIALIZATION)) throw new IllegalStateException("register too early!"); if (!isValidTier(tier)) throw new IllegalArgumentException("not a valid tier: " + tier); doRegister(tier, block, meta, getAllLevels()); } @@ -167,9 +170,9 @@ public class BorosilicateGlass { * @param initialValue the value set before structure check started */ public static IStructureElement ofBoroGlass(byte initialValue, BiConsumer setter, - Function getter) { + Function getter) { return lazy( - t -> ofBlocksTiered(BorosilicateGlass::getTier, getRepresentatives(), initialValue, setter, getter)); + t -> ofBlocksTiered(BorosilicateGlass::getTier, getRepresentatives(), initialValue, setter, getter)); } /** @@ -181,16 +184,18 @@ public class BorosilicateGlass { * @param maxTier maximal accepted tier. inclusive. */ public static IStructureElement ofBoroGlass(byte initialValue, byte minTier, byte maxTier, - BiConsumer setter, Function getter) { + BiConsumer setter, Function getter) { if (minTier > maxTier || minTier < 0) throw new IllegalArgumentException(); return lazy( - t -> ofBlocksTiered( - (block1, meta) -> checkWithinBound(getTier(block1, meta), minTier, maxTier), - getRepresentatives().stream().skip(Math.max(minTier - 3, 0)).limit(maxTier - minTier + 1) - .collect(Collectors.toList()), - initialValue, - setter, - getter)); + t -> ofBlocksTiered( + (block1, meta) -> checkWithinBound(getTier(block1, meta), minTier, maxTier), + getRepresentatives().stream() + .skip(Math.max(minTier - 3, 0)) + .limit(maxTier - minTier + 1) + .collect(Collectors.toList()), + initialValue, + setter, + getter)); } /** diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/API/SideReference.java b/src/main/java/com/github/bartimaeusnek/bartworks/API/SideReference.java index 041096d4f6..88ae5bf5c0 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/API/SideReference.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/API/SideReference.java @@ -19,13 +19,21 @@ public class SideReference { public static class EffectiveSide { - public static final boolean Server = FMLCommonHandler.instance().getEffectiveSide().isServer(); - public static final boolean Client = FMLCommonHandler.instance().getEffectiveSide().isClient(); + public static final boolean Server = FMLCommonHandler.instance() + .getEffectiveSide() + .isServer(); + public static final boolean Client = FMLCommonHandler.instance() + .getEffectiveSide() + .isClient(); } public static class Side { - public static final boolean Server = FMLCommonHandler.instance().getSide().isServer(); - public static final boolean Client = FMLCommonHandler.instance().getSide().isClient(); + public static final boolean Server = FMLCommonHandler.instance() + .getSide() + .isServer(); + public static final boolean Client = FMLCommonHandler.instance() + .getSide() + .isClient(); } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/API/WerkstoffAPI.java b/src/main/java/com/github/bartimaeusnek/bartworks/API/WerkstoffAPI.java index 17a33e768d..01c172382f 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/API/WerkstoffAPI.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/API/WerkstoffAPI.java @@ -29,6 +29,7 @@ public final class WerkstoffAPI { } public static Werkstoff getWerkstoff(String aName) throws NoSuchFieldException, IllegalAccessException { - return (Werkstoff) w.getField(aName).get(null); + return (Werkstoff) w.getField(aName) + .get(null); } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/API/modularUI/BW_UITextures.java b/src/main/java/com/github/bartimaeusnek/bartworks/API/modularUI/BW_UITextures.java index 8d8f5c1778..620e9d65af 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/API/modularUI/BW_UITextures.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/API/modularUI/BW_UITextures.java @@ -11,9 +11,9 @@ import com.gtnewhorizons.modularui.api.drawable.UITexture; public class BW_UITextures { public static final AdaptableUITexture BACKGROUND_BROWN = AdaptableUITexture - .of(MOD_ID, "GUI/background/brown", 176, 166, 3); + .of(MOD_ID, "GUI/background/brown", 176, 166, 3); public static final UITexture BACKGROUND_CIRCUIT_PROGRAMMER = UITexture - .fullImage(MOD_ID, "GUI/background/circuit_programmer"); + .fullImage(MOD_ID, "GUI/background/circuit_programmer"); public static final AdaptableUITexture SLOT_BROWN = AdaptableUITexture.of(MOD_ID, "GUI/slot/brown", 18, 18, 1); @@ -25,36 +25,37 @@ public class BW_UITextures { public static final UITexture PROGRESSBAR_SIEVERT = UITexture.fullImage(MOD_ID, "GUI/progressbar/sievert"); public static final UITexture PROGRESSBAR_STORED_EU_116 = UITexture - .fullImage(MOD_ID, "GUI/progressbar/stored_eu_116"); + .fullImage(MOD_ID, "GUI/progressbar/stored_eu_116"); public static final UITexture PROGRESSBAR_FUEL = UITexture.fullImage(MOD_ID, "GUI/progressbar/fuel"); public static final UITexture PICTURE_BW_LOGO_47X21 = UITexture.fullImage(MOD_ID, "GUI/picture/bw_logo_47x21"); public static final UITexture PICTURE_SIEVERT_CONTAINER = UITexture - .fullImage(MOD_ID, "GUI/picture/sievert_container"); + .fullImage(MOD_ID, "GUI/picture/sievert_container"); public static final UITexture PICTURE_DECAY_TIME_CONTAINER = UITexture - .fullImage(MOD_ID, "GUI/picture/decay_time_container"); + .fullImage(MOD_ID, "GUI/picture/decay_time_container"); public static final UITexture PICTURE_DECAY_TIME_INSIDE = UITexture - .fullImage(MOD_ID, "GUI/picture/decay_time_inside"); + .fullImage(MOD_ID, "GUI/picture/decay_time_inside"); public static final UITexture PICTURE_RADIATION = UITexture.fullImage(MOD_ID, "GUI/picture/radiation"); public static final UITexture PICTURE_WINDMILL_EMPTY = UITexture.fullImage(MOD_ID, "GUI/picture/windmill_empty"); - public static final UITexture[] PICTURE_WINDMILL_ROTATING = IntStream.range(0, 4).mapToObj( - i -> UITexture.partly(MOD_ID, "GUI/picture/windmill_rotating", 32, 128, 0, i * 32, 32, (i + 1) * 32)) - .collect(Collectors.toList()).toArray(new UITexture[0]); + public static final UITexture[] PICTURE_WINDMILL_ROTATING = IntStream.range(0, 4) + .mapToObj(i -> UITexture.partly(MOD_ID, "GUI/picture/windmill_rotating", 32, 128, 0, i * 32, 32, (i + 1) * 32)) + .collect(Collectors.toList()) + .toArray(new UITexture[0]); public static final UITexture PICTURE_STORED_EU_FRAME = UITexture.fullImage(MOD_ID, "GUI/picture/stored_eu_frame"); public static final UITexture PICTURE_RADIATION_SHUTTER_FRAME = UITexture - .fullImage(MOD_ID, "GUI/picture/radiation_shutter_frame"); + .fullImage(MOD_ID, "GUI/picture/radiation_shutter_frame"); public static final AdaptableUITexture PICTURE_RADIATION_SHUTTER_INSIDE = AdaptableUITexture - .of(MOD_ID, "GUI/picture/radiation_shutter_inside", 51, 48, 1); + .of(MOD_ID, "GUI/picture/radiation_shutter_inside", 51, 48, 1); public static final AdaptableUITexture TAB_TITLE_BROWN = AdaptableUITexture - .of(MOD_ID, "GUI/tab/title_brown", 28, 28, 4); + .of(MOD_ID, "GUI/tab/title_brown", 28, 28, 4); public static final AdaptableUITexture TAB_TITLE_DARK_BROWN = AdaptableUITexture - .of(MOD_ID, "GUI/tab/title_dark_brown", 28, 28, 4); + .of(MOD_ID, "GUI/tab/title_dark_brown", 28, 28, 4); public static final AdaptableUITexture TAB_TITLE_ANGULAR_BROWN = AdaptableUITexture - .of(MOD_ID, "GUI/tab/title_angular_brown", 28, 28, 4); + .of(MOD_ID, "GUI/tab/title_angular_brown", 28, 28, 4); public static final UITexture OVERLAY_BUTTON_ASSEMBLER_MODE = UITexture - .fullImage(MOD_ID, "GUI/overlay_button/assembler_mode"); + .fullImage(MOD_ID, "GUI/overlay_button/assembler_mode"); public static final UITexture OVERLAY_BUTTON_LINE_MODE = UITexture - .fullImage(MOD_ID, "GUI/overlay_button/line_mode"); + .fullImage(MOD_ID, "GUI/overlay_button/line_mode"); } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/API/recipe/BacterialVatFrontend.java b/src/main/java/com/github/bartimaeusnek/bartworks/API/recipe/BacterialVatFrontend.java index 6ed4113017..01cf2ecd32 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/API/recipe/BacterialVatFrontend.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/API/recipe/BacterialVatFrontend.java @@ -24,15 +24,15 @@ import gregtech.nei.formatter.INEISpecialInfoFormatter; public class BacterialVatFrontend extends RecipeMapFrontend { public BacterialVatFrontend(BasicUIPropertiesBuilder uiPropertiesBuilder, - NEIRecipePropertiesBuilder neiPropertiesBuilder) { + NEIRecipePropertiesBuilder neiPropertiesBuilder) { super( - uiPropertiesBuilder, - neiPropertiesBuilder.neiSpecialInfoFormatter(new BacterialVatSpecialValueFormatter())); + uiPropertiesBuilder, + neiPropertiesBuilder.neiSpecialInfoFormatter(new BacterialVatSpecialValueFormatter())); } @Override protected List handleNEIItemInputTooltip(List currentTip, - GT_NEI_DefaultHandler.FixedPositionedStack pStack) { + GT_NEI_DefaultHandler.FixedPositionedStack pStack) { if (pStack.isFluid()) { currentTip.add(EnumChatFormatting.GRAY + StatCollector.translateToLocal("nei.biovat.input.tooltip")); return currentTip; @@ -42,7 +42,7 @@ public class BacterialVatFrontend extends RecipeMapFrontend { @Override protected List handleNEIItemOutputTooltip(List currentTip, - GT_NEI_DefaultHandler.FixedPositionedStack pStack) { + GT_NEI_DefaultHandler.FixedPositionedStack pStack) { if (pStack.isFluid()) { currentTip.add(EnumChatFormatting.GRAY + StatCollector.translateToLocal("nei.biovat.output.tooltip")); return currentTip; @@ -63,12 +63,12 @@ public class BacterialVatFrontend extends RecipeMapFrontend { private void drawFluidOverlay(GT_NEI_DefaultHandler.FixedPositionedStack stack) { if (stack.isFluid()) { drawNEIOverlayText( - "+", - stack, - colorOverride.getTextColorOrDefault("nei_overlay_yellow", 0xFDD835), - 0.5f, - true, - Alignment.TopRight); + "+", + stack, + colorOverride.getTextColorOrDefault("nei_overlay_yellow", 0xFDD835), + 0.5f, + true, + Alignment.TopRight); return; } super.drawNEIOverlayForOutput(stack); diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/API/recipe/BartWorksRecipeMaps.java b/src/main/java/com/github/bartimaeusnek/bartworks/API/recipe/BartWorksRecipeMaps.java index 97fa74bf85..281184893c 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/API/recipe/BartWorksRecipeMaps.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/API/recipe/BartWorksRecipeMaps.java @@ -12,53 +12,80 @@ import gregtech.nei.formatter.FuelSpecialValueFormatter; public class BartWorksRecipeMaps { public static final RecipeMap bioLabRecipes = RecipeMapBuilder.of("bw.recipe.biolab") - .maxIO(6, 2, 1, 0).minInputs(1, 1).useSpecialSlot().slotOverlays((index, isFluid, isOutput, isSpecial) -> { - if (isSpecial) { - return BW_UITextures.OVERLAY_SLOT_MODULE; + .maxIO(6, 2, 1, 0) + .minInputs(1, 1) + .useSpecialSlot() + .slotOverlays((index, isFluid, isOutput, isSpecial) -> { + if (isSpecial) { + return BW_UITextures.OVERLAY_SLOT_MODULE; + } + if (isFluid) { + return GT_UITextures.OVERLAY_SLOT_VIAL_2; + } + if (!isOutput) { + switch (index) { + case 0: + return BW_UITextures.OVERLAY_SLOT_DISH; + case 1: + return BW_UITextures.OVERLAY_SLOT_DNA_FLASK; + case 2: + return GT_UITextures.OVERLAY_SLOT_CIRCUIT; + case 3: + return GT_UITextures.OVERLAY_SLOT_MOLECULAR_1; + case 4: + return GT_UITextures.OVERLAY_SLOT_MOLECULAR_2; + case 5: + return GT_UITextures.OVERLAY_SLOT_DATA_ORB; } - if (isFluid) { - return GT_UITextures.OVERLAY_SLOT_VIAL_2; - } - if (!isOutput) { - switch (index) { - case 0: - return BW_UITextures.OVERLAY_SLOT_DISH; - case 1: - return BW_UITextures.OVERLAY_SLOT_DNA_FLASK; - case 2: - return GT_UITextures.OVERLAY_SLOT_CIRCUIT; - case 3: - return GT_UITextures.OVERLAY_SLOT_MOLECULAR_1; - case 4: - return GT_UITextures.OVERLAY_SLOT_MOLECULAR_2; - case 5: - return GT_UITextures.OVERLAY_SLOT_DATA_ORB; - } - } - return null; - }).progressBar(GT_UITextures.PROGRESSBAR_ARROW_MULTIPLE).logo(BW_UITextures.PICTURE_BW_LOGO_47X21) - .logoSize(47, 21).logoPos(125, 3).disableRegisterNEI().build(); + } + return null; + }) + .progressBar(GT_UITextures.PROGRESSBAR_ARROW_MULTIPLE) + .logo(BW_UITextures.PICTURE_BW_LOGO_47X21) + .logoSize(47, 21) + .logoPos(125, 3) + .disableRegisterNEI() + .build(); public static final RecipeMap bacterialVatRecipes = RecipeMapBuilder.of("bw.recipe.BacteriaVat") - .maxIO(6, 2, 1, 1).minInputs(0, 1).useSpecialSlot().specialSlotSensitive() - .progressBar(GT_UITextures.PROGRESSBAR_ARROW_MULTIPLE).frontend(BacterialVatFrontend::new) - .disableRegisterNEI().build(); + .maxIO(6, 2, 1, 1) + .minInputs(0, 1) + .useSpecialSlot() + .specialSlotSensitive() + .progressBar(GT_UITextures.PROGRESSBAR_ARROW_MULTIPLE) + .frontend(BacterialVatFrontend::new) + .disableRegisterNEI() + .build(); public static final RecipeMap acidGenFuels = RecipeMapBuilder.of("bw.fuels.acidgens", FuelBackend::new) - .maxIO(1, 1, 0, 0).neiSpecialInfoFormatter(FuelSpecialValueFormatter.INSTANCE).build(); + .maxIO(1, 1, 0, 0) + .neiSpecialInfoFormatter(FuelSpecialValueFormatter.INSTANCE) + .build(); public static final RecipeMap circuitAssemblyLineRecipes = RecipeMapBuilder.of("bw.recipe.cal") - .maxIO(6, 1, 1, 0).minInputs(1, 1).useSpecialSlot().specialSlotSensitive() - .progressBar(GT_UITextures.PROGRESSBAR_CIRCUIT_ASSEMBLER).build(); + .maxIO(6, 1, 1, 0) + .minInputs(1, 1) + .useSpecialSlot() + .specialSlotSensitive() + .progressBar(GT_UITextures.PROGRESSBAR_CIRCUIT_ASSEMBLER) + .build(); public static final RecipeMap radioHatchRecipes = RecipeMapBuilder.of("bw.recipe.radhatch") - .maxIO(1, 0, 0, 0).minInputs(1, 0) - .slotOverlays((index, isFluid, isOutput, isSpecial) -> BW_UITextures.OVERLAY_SLOT_ROD) - .logo(BW_UITextures.PICTURE_BW_LOGO_47X21).logoSize(47, 21).logoPos(118, 55).dontUseProgressBar() - .addSpecialTexture(74, 20, 29, 27, BW_UITextures.PICTURE_RADIATION).frontend(RadioHatchFrontend::new) - .build(); + .maxIO(1, 0, 0, 0) + .minInputs(1, 0) + .slotOverlays((index, isFluid, isOutput, isSpecial) -> BW_UITextures.OVERLAY_SLOT_ROD) + .logo(BW_UITextures.PICTURE_BW_LOGO_47X21) + .logoSize(47, 21) + .logoPos(118, 55) + .dontUseProgressBar() + .addSpecialTexture(74, 20, 29, 27, BW_UITextures.PICTURE_RADIATION) + .frontend(RadioHatchFrontend::new) + .build(); public static final RecipeMap electricImplosionCompressorRecipes = RecipeMapBuilder - .of("gt.recipe.electricimplosioncompressor").maxIO(6, 2, 1, 1) - .slotOverlays( - (index, isFluid, isOutput, - isSpecial) -> !isFluid && !isOutput ? GT_UITextures.OVERLAY_SLOT_IMPLOSION : null) - .progressBar(GT_UITextures.PROGRESSBAR_COMPRESS).build(); + .of("gt.recipe.electricimplosioncompressor") + .maxIO(6, 2, 1, 1) + .slotOverlays( + (index, isFluid, isOutput, isSpecial) -> !isFluid && !isOutput ? GT_UITextures.OVERLAY_SLOT_IMPLOSION + : null) + .progressBar(GT_UITextures.PROGRESSBAR_COMPRESS) + .build(); public static final RecipeMap htgrFakeRecipes = RecipeMapBuilder.of("bw.recipe.htgr") - .maxIO(1, 1, 0, 0).build(); + .maxIO(1, 1, 0, 0) + .build(); } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/API/recipe/DynamicGTRecipe.java b/src/main/java/com/github/bartimaeusnek/bartworks/API/recipe/DynamicGTRecipe.java index 3087255e51..d409d3ab26 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/API/recipe/DynamicGTRecipe.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/API/recipe/DynamicGTRecipe.java @@ -12,19 +12,19 @@ import gregtech.api.util.GT_Recipe; public class DynamicGTRecipe extends GT_Recipe { public DynamicGTRecipe(boolean aOptimize, ItemStack[] aInputs, ItemStack[] aOutputs, Object aSpecialItems, - int[] aChances, FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs, int aDuration, int aEUt, - int aSpecialValue, GT_Recipe originalRecipe) { + int[] aChances, FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs, int aDuration, int aEUt, + int aSpecialValue, GT_Recipe originalRecipe) { super( - aOptimize, - aInputs, - aOutputs, - aSpecialItems, - aChances, - aFluidInputs, - aFluidOutputs, - aDuration, - aEUt, - aSpecialValue); + aOptimize, + aInputs, + aOutputs, + aSpecialItems, + aChances, + aFluidInputs, + aFluidOutputs, + aDuration, + aEUt, + aSpecialValue); if (originalRecipe != null) { this.owners = new ArrayList<>(originalRecipe.owners); this.stackTraces = new ArrayList<>(originalRecipe.stackTraces); diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/API/recipe/RadioHatchFrontend.java b/src/main/java/com/github/bartimaeusnek/bartworks/API/recipe/RadioHatchFrontend.java index 0309a676d9..a6cf4b180e 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/API/recipe/RadioHatchFrontend.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/API/recipe/RadioHatchFrontend.java @@ -19,7 +19,7 @@ import gregtech.nei.formatter.INEISpecialInfoFormatter; public class RadioHatchFrontend extends RecipeMapFrontend { public RadioHatchFrontend(BasicUIPropertiesBuilder uiPropertiesBuilder, - NEIRecipePropertiesBuilder neiPropertiesBuilder) { + NEIRecipePropertiesBuilder neiPropertiesBuilder) { super(uiPropertiesBuilder, neiPropertiesBuilder.neiSpecialInfoFormatter(new RadioHatchSpecialInfoFormatter())); } @@ -37,9 +37,9 @@ public class RadioHatchFrontend extends RecipeMapFrontend { int amount = recipeInfo.recipe.mDuration; long time = recipeInfo.recipe.mSpecialValue; return Arrays.asList( - StatCollector.translateToLocalFormatted("BW.NEI.display.radhatch.0", radioLevel), - StatCollector.translateToLocalFormatted("BW.NEI.display.radhatch.1", amount), - StatCollector.translateToLocalFormatted("BW.NEI.display.radhatch.2", time * amount / 20.0)); + StatCollector.translateToLocalFormatted("BW.NEI.display.radhatch.0", radioLevel), + StatCollector.translateToLocalFormatted("BW.NEI.display.radhatch.1", amount), + StatCollector.translateToLocalFormatted("BW.NEI.display.radhatch.2", time * amount / 20.0)); } } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/ASM/BWCorePlugin.java b/src/main/java/com/github/bartimaeusnek/bartworks/ASM/BWCorePlugin.java index 7227780e37..f7fde1167d 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/ASM/BWCorePlugin.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/ASM/BWCorePlugin.java @@ -66,7 +66,8 @@ public class BWCorePlugin implements IFMLLoadingPlugin { } if (data.get("coremodList") != null) { for (Object o : (ArrayList) data.get("coremodList")) { - if (o.toString().contains("MicdoodlePlugin")) { + if (o.toString() + .contains("MicdoodlePlugin")) { BWCoreTransformer.shouldTransform[2] = ConfigHandler.enabledPatches[2]; break; } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/ASM/BWCoreStaticReplacementMethodes.java b/src/main/java/com/github/bartimaeusnek/bartworks/ASM/BWCoreStaticReplacementMethodes.java index 8d3fe4876c..38a5a70d27 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/ASM/BWCoreStaticReplacementMethodes.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/ASM/BWCoreStaticReplacementMethodes.java @@ -31,7 +31,7 @@ import com.github.bartimaeusnek.bartworks.util.accessprioritylist.AccessPriority public class BWCoreStaticReplacementMethodes { private static ThreadLocal> RECENTLYUSEDRECIPES = ThreadLocal - .withInitial(AccessPriorityList::new); + .withInitial(AccessPriorityList::new); public static void clearRecentlyUsedRecipes() { // the easiest way to ensure the cache is flushed without causing synchronization overhead @@ -58,9 +58,10 @@ public class BWCoreStaticReplacementMethodes { } if (i == 2 && itemstack.getItem() == itemstack1.getItem() - && itemstack.stackSize == 1 - && itemstack1.stackSize == 1 - && itemstack.getItem().isRepairable()) { + && itemstack.stackSize == 1 + && itemstack1.stackSize == 1 + && itemstack.getItem() + .isRepairable()) { Item item = itemstack.getItem(); int j1 = item.getMaxDamage() - itemstack.getItemDamageForDisplay(); int k = item.getMaxDamage() - itemstack1.getItemDamageForDisplay(); @@ -87,7 +88,8 @@ public class BWCoreStaticReplacementMethodes { } HashSet recipeSet = new NonNullWrappedHashSet<>(); - List recipeList = CraftingManager.getInstance().getRecipeList(); + List recipeList = CraftingManager.getInstance() + .getRecipeList(); for (IRecipe r : recipeList) { if (r.matches(inventoryCrafting, world)) recipeSet.add(r); diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/ASM/BWCoreTransformer.java b/src/main/java/com/github/bartimaeusnek/bartworks/ASM/BWCoreTransformer.java index 095273676b..02835e39c2 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/ASM/BWCoreTransformer.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/ASM/BWCoreTransformer.java @@ -46,13 +46,12 @@ import org.objectweb.asm.tree.VarInsnNode; public class BWCoreTransformer implements IClassTransformer { public static final String[] DESCRIPTIONFORCONFIG = { "REMOVING RAIN FROM LAST MILLENNIUM (EXU)", - "REMOVING CREATURES FROM LAST MILLENNIUM (EXU)", - "PATCHING THAUMCRAFT WAND PEDESTAL TO PREVENT VIS DUPLICATION", - "PATCHING CRAFTING MANAGER FOR CACHING RECIPES" }; + "REMOVING CREATURES FROM LAST MILLENNIUM (EXU)", "PATCHING THAUMCRAFT WAND PEDESTAL TO PREVENT VIS DUPLICATION", + "PATCHING CRAFTING MANAGER FOR CACHING RECIPES" }; public static final String[] CLASSESBEINGTRANSFORMED = { - "com.rwtema.extrautils.worldgen.endoftime.WorldProviderEndOfTime", - "com.rwtema.extrautils.worldgen.endoftime.ChunkProviderEndOfTime", - "thaumcraft.common.tiles.TileWandPedestal", "net.minecraft.item.crafting.CraftingManager" }; + "com.rwtema.extrautils.worldgen.endoftime.WorldProviderEndOfTime", + "com.rwtema.extrautils.worldgen.endoftime.ChunkProviderEndOfTime", "thaumcraft.common.tiles.TileWandPedestal", + "net.minecraft.item.crafting.CraftingManager" }; static boolean obfs; public static boolean[] shouldTransform = new boolean[BWCoreTransformer.CLASSESBEINGTRANSFORMED.length]; @@ -72,19 +71,19 @@ public class BWCoreTransformer implements IClassTransformer { LabelNode label = new LabelNode(); nu.insertBefore(beginning, new VarInsnNode(ALOAD, 0)); nu.insertBefore( - beginning, - new FieldInsnNode( - GETFIELD, - "thaumcraft/common/tiles/TileWandPedestal", - obfs ? "field_145850_b" : "worldObj", - "Lnet/minecraft/world/World;")); + beginning, + new FieldInsnNode( + GETFIELD, + "thaumcraft/common/tiles/TileWandPedestal", + obfs ? "field_145850_b" : "worldObj", + "Lnet/minecraft/world/World;")); nu.insertBefore( - beginning, - new FieldInsnNode( - GETFIELD, - "net/minecraft/world/World", - obfs ? "field_72995_K" : "isRemote", - "Z")); + beginning, + new FieldInsnNode( + GETFIELD, + "net/minecraft/world/World", + obfs ? "field_72995_K" : "isRemote", + "Z")); nu.insertBefore(beginning, new JumpInsnNode(IFNE, label)); nu.add(new InsnNode(POP)); nu.add(label); @@ -99,7 +98,7 @@ public class BWCoreTransformer implements IClassTransformer { public static byte[] transform(int id, byte[] basicClass) { if (!BWCoreTransformer.shouldTransform[id]) { BWCore.BWCORE_LOG - .info("Patch: " + BWCoreTransformer.DESCRIPTIONFORCONFIG[id] + " is disabled, will not patch!"); + .info("Patch: " + BWCoreTransformer.DESCRIPTIONFORCONFIG[id] + " is disabled, will not patch!"); return basicClass; } @@ -143,7 +142,7 @@ public class BWCoreTransformer implements IClassTransformer { for (int i = 0; i < methods.size(); i++) { if (ASMUtils.isCorrectMethod(methods.get(i), name_deObfs, name_Obfs, name_src) - && ASMUtils.isCorrectMethod(methods.get(i), dsc_deObfs, dsc_Obfs)) { + && ASMUtils.isCorrectMethod(methods.get(i), dsc_deObfs, dsc_Obfs)) { BWCore.BWCORE_LOG.info("Found " + name_deObfs + "! Patching!"); MethodNode toPatch = methods.get(i); InsnList insnList = new InsnList(); @@ -166,7 +165,7 @@ public class BWCoreTransformer implements IClassTransformer { for (int i = 0; i < methods.size(); i++) { if (ASMUtils.isCorrectMethod(methods.get(i), name_deObfs, name_Obfs, name_src) - && ASMUtils.isCorrectMethod(methods.get(i), dsc_universal, dsc_universal)) { + && ASMUtils.isCorrectMethod(methods.get(i), dsc_universal, dsc_universal)) { BWCore.BWCORE_LOG.info("Found " + name_deObfs + "! Patching!"); methods.set(i, BWCoreTransformer.transformThaumcraftWandPedestal(methods.get(i))); break scase; @@ -184,12 +183,12 @@ public class BWCoreTransformer implements IClassTransformer { toPatch.instructions.add(new VarInsnNode(ALOAD, 1)); toPatch.instructions.add(new VarInsnNode(ALOAD, 2)); toPatch.instructions.add( - new MethodInsnNode( - INVOKESTATIC, - "com/github/bartimaeusnek/bartworks/ASM/BWCoreStaticReplacementMethodes", - "findCachedMatchingRecipe", - "(Lnet/minecraft/inventory/InventoryCrafting;Lnet/minecraft/world/World;)Lnet/minecraft/item/ItemStack;", - false)); + new MethodInsnNode( + INVOKESTATIC, + "com/github/bartimaeusnek/bartworks/ASM/BWCoreStaticReplacementMethodes", + "findCachedMatchingRecipe", + "(Lnet/minecraft/inventory/InventoryCrafting;Lnet/minecraft/world/World;)Lnet/minecraft/item/ItemStack;", + false)); toPatch.instructions.add(new InsnNode(ARETURN)); toPatch.localVariables.clear(); toPatch.maxStack = 2; @@ -220,7 +21