From b5fb58403e9feb92018a737b9b6a77c559c5eda7 Mon Sep 17 00:00:00 2001 From: Raven Szewczyk Date: Sat, 27 Aug 2022 10:56:37 +0100 Subject: Update buildscript & apply spotless (#192) * Update dependencies * updateBuildscript & spotlessApply Former-commit-id: f780e1a8d0f0bd192ba977eef17d41ee6fcd4b12 --- .../bartworks/API/API_ConfigValues.java | 2 +- .../bartworks/API/AcidGenFuelAdder.java | 3 +- .../bartworks/API/BioObjectAdder.java | 76 +- .../bartworks/API/BioObjectGetter.java | 6 +- .../bartworks/API/BioRecipeAdder.java | 137 +- .../bartworks/API/BioVatLogicAdder.java | 91 +- .../bartworks/API/BorosilicateGlass.java | 29 +- .../bartimaeusnek/bartworks/API/INoiseGen.java | 17 +- .../bartworks/API/ITileDropsContent.java | 3 +- .../API/ITileHasDifferentTextureSides.java | 2 - .../bartimaeusnek/bartworks/API/ITileWithGUI.java | 8 +- .../bartworks/API/LoaderReference.java | 3 +- .../bartimaeusnek/bartworks/API/SideReference.java | 13 +- .../bartworks/API/VoidMinerDropAdder.java | 23 +- .../bartimaeusnek/bartworks/API/WerkstoffAPI.java | 1 - .../bartworks/API/WerkstoffAdderRegistry.java | 6 +- .../bartimaeusnek/bartworks/API/package-info.java | 2 +- .../bartimaeusnek/bartworks/ASM/ASMUtils.java | 14 +- .../github/bartimaeusnek/bartworks/ASM/BWCore.java | 11 +- .../bartimaeusnek/bartworks/ASM/BWCorePlugin.java | 14 +- .../ASM/BWCoreStaticReplacementMethodes.java | 52 +- .../bartworks/ASM/BWCoreTransformer.java | 208 ++- .../github/bartimaeusnek/bartworks/GuiHandler.java | 12 +- .../github/bartimaeusnek/bartworks/MainMod.java | 55 +- .../client/ClientEventHandler/TooltipCache.java | 21 +- .../ClientEventHandler/TooltipEventHandler.java | 45 +- .../client/creativetabs/bartworksTab.java | 1 - .../gui/BW_GUIContainer_HeatedWaterPump.java | 14 +- .../client/gui/BW_GUIContainer_RadLevel.java | 1 - .../client/gui/BW_GUIContainer_RotorBlock.java | 26 +- .../client/gui/BW_GUIContainer_Windmill.java | 8 +- .../gui/GT_GUIContainer_CircuitProgrammer.java | 3 +- .../client/gui/GT_GUIContainer_Destructopack.java | 8 +- .../bartworks/client/gui/GT_GUIContainer_LESU.java | 53 +- .../client/gui/GT_GUIContainer_RadioHatch.java | 40 +- .../client/renderer/BW_CropVisualizer.java | 13 +- .../client/renderer/BW_GT_ItemRenderer.java | 59 +- .../client/renderer/BW_Renderer_Block_Ores.java | 11 +- .../client/renderer/RendererGlasBlock.java | 16 +- .../renderer/RendererSwitchingColorFluid.java | 87 +- .../client/textures/PrefixTextureLinker.java | 27 +- .../bartworks/common/blocks/BW_Blocks.java | 6 +- .../bartworks/common/blocks/BW_GlasBlocks.java | 23 +- .../common/blocks/BW_TileEntityContainer.java | 28 +- .../BW_TileEntityContainer_MachineBlock.java | 3 +- .../blocks/BW_TileEntityContainer_Multiple.java | 22 +- .../bartworks/common/blocks/BioFluidBlock.java | 2 +- .../bartworks/common/commands/ChangeConfig.java | 25 +- .../common/commands/GetWorkingDirectory.java | 3 +- .../common/commands/PrintRecipeListToFile.java | 14 +- .../bartworks/common/commands/SummonRuin.java | 16 +- .../bartworks/common/configs/ConfigHandler.java | 362 +++- .../bartworks/common/items/BW_ItemBlocks.java | 17 +- .../bartworks/common/items/BW_SimpleWindMeter.java | 28 +- .../bartworks/common/items/BW_Stonage_Rotors.java | 26 +- .../bartworks/common/items/Circuit_Programmer.java | 12 +- .../common/items/GT_Destructopack_Item.java | 3 +- .../bartworks/common/items/GT_Rockcutter_Item.java | 38 +- .../bartworks/common/items/GT_Teslastaff_Item.java | 9 +- .../bartworks/common/items/LabModule.java | 3 +- .../bartworks/common/items/LabParts.java | 33 +- .../bartworks/common/items/SimpleIconItem.java | 1 - .../bartworks/common/items/SimpleSubItemClass.java | 15 +- .../common/loaders/ArtificialMicaLine.java | 194 +- .../bartworks/common/loaders/BeforeGTPreload.java | 19 +- .../bartworks/common/loaders/BioCultureLoader.java | 79 +- .../bartworks/common/loaders/BioItemList.java | 46 +- .../bartworks/common/loaders/BioRecipeLoader.java | 586 +++--- .../bartworks/common/loaders/FluidLoader.java | 70 +- .../bartworks/common/loaders/GTNHBlocks.java | 24 +- .../bartworks/common/loaders/ItemRegistry.java | 352 +++- .../common/loaders/LocalisationLoader.java | 46 +- .../bartworks/common/loaders/RecipeLoader.java | 1927 ++++++++++++-------- .../common/loaders/RegisterServerCommands.java | 3 +- .../common/loaders/StaticRecipeChangeLoaders.java | 421 +++-- .../bartworks/common/net/BW_Network.java | 60 +- .../common/net/CircuitProgrammerPacket.java | 22 +- .../bartworks/common/net/MetaBlockPacket.java | 34 +- .../bartworks/common/net/OreDictCachePacket.java | 17 +- .../bartworks/common/net/RendererPacket.java | 74 +- .../bartworks/common/net/ServerJoinedPackage.java | 10 +- .../classic/BWTileEntityDimIDBridge.java | 3 +- .../common/tileentities/classic/BW_RotorBlock.java | 1 - .../BW_TileEntity_ExperimentalFloodGate.java | 30 +- .../classic/BW_TileEntity_HeatedWaterPump.java | 153 +- .../classic/BW_TileEntity_InfinityTank.java | 27 +- .../classic/BW_TileEntity_LESU_Redux.java | 67 +- .../common/tileentities/debug/CreativeScanner.java | 11 +- .../tileentities/multis/GT_TileEntity_BioVat.java | 400 ++-- .../multis/GT_TileEntity_CircuitAssemblyLine.java | 274 +-- .../multis/GT_TileEntity_CrackingDistillTower.java | 36 +- .../tileentities/multis/GT_TileEntity_DEHP.java | 85 +- .../GT_TileEntity_ElectricImplosionCompressor.java | 297 +-- .../GT_TileEntity_ExtremeIndustrialGreenhouse.java | 732 ++++---- .../tileentities/multis/GT_TileEntity_HTGR.java | 657 +++++-- .../tileentities/multis/GT_TileEntity_LESU.java | 95 +- .../multis/GT_TileEntity_ManualTrafo.java | 287 +-- .../tileentities/multis/GT_TileEntity_THTR.java | 516 ++++-- .../multis/GT_TileEntity_Windmill.java | 404 ++-- .../mega/GT_TileEntity_MegaBlastFurnace.java | 275 +-- .../mega/GT_TileEntity_MegaChemicalReactor.java | 178 +- .../mega/GT_TileEntity_MegaDistillTower.java | 452 +++-- .../mega/GT_TileEntity_MegaMultiBlockBase.java | 178 +- .../multis/mega/GT_TileEntity_MegaOilCracker.java | 283 ++- .../mega/GT_TileEntity_MegaVacuumFreezer.java | 430 ++++- .../tiered/GT_MetaTileEntity_AcidGenerator.java | 75 +- .../tiered/GT_MetaTileEntity_BioLab.java | 410 +++-- .../GT_MetaTileEntity_CompressedFluidHatch.java | 6 +- .../tiered/GT_MetaTileEntity_Diode.java | 53 +- .../GT_MetaTileEntity_EnergyDistributor.java | 23 +- .../tiered/GT_MetaTileEntity_GiantOutputHatch.java | 3 +- .../tiered/GT_MetaTileEntity_RadioHatch.java | 177 +- .../tiered/GT_MetaTileEntity_Transistor.java | 83 +- .../bartworks/neiHandler/BW_NEI_BioLabHandler.java | 22 +- .../bartworks/neiHandler/BW_NEI_BioVatHandler.java | 82 +- .../bartworks/neiHandler/BW_NEI_OreHandler.java | 142 +- .../bartworks/neiHandler/NEI_BW_Config.java | 36 +- .../server/EventHandler/ServerEventHandler.java | 100 +- .../container/BW_Container_HeatedWaterPump.java | 23 +- .../server/container/BW_Container_RadioHatch.java | 28 +- .../server/container/BW_Container_Windmill.java | 1 - .../container/GT_Container_CircuitProgrammer.java | 67 +- .../container/GT_Container_Item_Destructopack.java | 2 +- .../server/container/GT_Container_LESU.java | 1 - .../server/container/GT_Container_RadioHatch.java | 42 +- .../server/container/Slots/BW_DelSlot.java | 2 - .../system/material/BW_GT_MaterialReference.java | 1508 +++++++++------ .../material/BW_MetaGeneratedBlock_Item.java | 44 +- .../material/BW_MetaGeneratedBlocks_Casing.java | 38 +- .../BW_MetaGeneratedBlocks_CasingAdvanced_TE.java | 10 +- .../material/BW_MetaGeneratedBlocks_Casing_TE.java | 10 +- .../system/material/BW_MetaGeneratedFrames.java | 46 +- .../system/material/BW_MetaGeneratedOreTE.java | 10 +- .../material/BW_MetaGeneratedSmallOreTE.java | 36 +- .../system/material/BW_MetaGenerated_Block_TE.java | 14 +- .../system/material/BW_MetaGenerated_Blocks.java | 30 +- .../system/material/BW_MetaGenerated_Items.java | 101 +- .../system/material/BW_MetaGenerated_Ores.java | 27 +- .../material/BW_MetaGenerated_SmallOres.java | 14 +- .../BW_MetaGenerated_WerkstoffBlock_TE.java | 12 +- .../material/BW_MetaGenerated_WerkstoffBlocks.java | 10 +- .../system/material/BW_NonMeta_MaterialItems.java | 15 +- .../CircuitGeneration/BW_CircuitsLoader.java | 7 +- .../material/CircuitGeneration/BW_Meta_Items.java | 278 +-- .../material/CircuitGeneration/CircuitData.java | 11 +- .../CircuitGeneration/CircuitImprintLoader.java | 194 +- .../CircuitGeneration/CircuitPartLoader.java | 190 +- .../material/GT_Enhancement/BWGTMetaItems.java | 113 +- .../GT_Enhancement/GTMetaItemEnhancer.java | 86 +- .../material/GT_Enhancement/LuVTierEnhancer.java | 242 ++- .../GT_Enhancement/PlatinumSludgeOverHaul.java | 1074 ++++++++--- .../bartworks/system/material/Werkstoff.java | 450 +++-- .../bartworks/system/material/WerkstoffLoader.java | 1172 ++++++------ .../processingLoaders/AdditionalRecipes.java | 710 +++++--- .../processingLoaders/AfterLuVTierEnhacement.java | 70 +- .../material/processingLoaders/DownTierLoader.java | 1 - .../processingLoaders/LoadItemContainers.java | 56 +- .../werkstoff_loaders/IWerkstoffRunnable.java | 2 +- .../werkstoff_loaders/recipe/AspectLoader.java | 19 +- .../werkstoff_loaders/recipe/BlockLoader.java | 19 +- .../werkstoff_loaders/recipe/CasingLoader.java | 79 +- .../werkstoff_loaders/recipe/CellLoader.java | 178 +- .../recipe/CraftingMaterialLoader.java | 198 +- .../werkstoff_loaders/recipe/CrushedLoader.java | 149 +- .../werkstoff_loaders/recipe/DustLoader.java | 269 ++- .../werkstoff_loaders/recipe/GemLoader.java | 95 +- .../werkstoff_loaders/recipe/MetalLoader.java | 22 +- .../werkstoff_loaders/recipe/MoltenCellLoader.java | 148 +- .../recipe/MultipleMetalLoader.java | 24 +- .../werkstoff_loaders/recipe/OreLoader.java | 19 +- .../recipe/SimpleMetalLoader.java | 108 +- .../werkstoff_loaders/recipe/ToolLoader.java | 945 +++++++++- .../registration/AssociationLoader.java | 5 +- .../registration/BridgeMaterialsLoader.java | 149 +- .../registration/CasingRegistrator.java | 20 +- .../bartworks/system/object/AbstractedStack.java | 8 +- .../bartworks/system/oredict/OreDictAdder.java | 21 +- .../bartworks/system/oredict/OreDictHandler.java | 52 +- .../bartworks/system/oregen/BW_OreLayer.java | 193 +- .../bartworks/system/oregen/BW_WordGenerator.java | 48 +- .../system/oregen/BW_WorldGenRoss128b.java | 86 +- .../system/oregen/BW_WorldGenRoss128ba.java | 114 +- .../bartworks/system/worldgen/GT_WorldgenUtil.java | 21 +- .../bartworks/system/worldgen/MapGenRuins.java | 144 +- .../bartimaeusnek/bartworks/util/BWRecipes.java | 724 ++++++-- .../bartimaeusnek/bartworks/util/BW_ColorUtil.java | 171 +- .../bartworks/util/BW_Tooltip_Reference.java | 26 +- .../bartimaeusnek/bartworks/util/BW_Util.java | 844 ++++++--- .../bartimaeusnek/bartworks/util/BioCulture.java | 119 +- .../bartimaeusnek/bartworks/util/BioDNA.java | 7 +- .../bartimaeusnek/bartworks/util/BioData.java | 42 +- .../bartimaeusnek/bartworks/util/BioPlasmid.java | 7 +- .../bartworks/util/CachedReflectionUtils.java | 3 +- .../bartworks/util/ConnectedBlocksChecker.java | 87 +- .../util/ConnectedBlocksCheckerIteration.java | 77 +- .../bartimaeusnek/bartworks/util/Coords.java | 11 +- .../bartimaeusnek/bartworks/util/EnumUtils.java | 95 +- .../bartimaeusnek/bartworks/util/MathUtils.java | 38 +- .../bartimaeusnek/bartworks/util/MegaUtils.java | 6 +- .../bartimaeusnek/bartworks/util/MurmurHash3.java | 82 +- .../bartworks/util/NoiseUtil/BartsNoise.java | 199 +- .../bartworks/util/NoiseUtil/SimplexNoise.java | 713 ++++---- .../bartworks/util/NonNullWrappedHashMap.java | 7 +- .../bartworks/util/NonNullWrappedHashSet.java | 6 +- .../github/bartimaeusnek/bartworks/util/Pair.java | 16 +- .../bartworks/util/RecipeFinderForParallel.java | 32 +- .../bartimaeusnek/bartworks/util/StreamUtils.java | 5 +- .../accessprioritylist/AccessPriorityList.java | 74 +- .../AccessPriorityListIterators.java | 15 +- .../accessprioritylist/AccessPriorityListNode.java | 6 +- .../bartworks/util/flowerset/FlowerSet.java | 20 +- .../bartimaeusnek/bartworks/util/log/DebugLog.java | 15 +- .../bartimaeusnek/bartworks/util/package-info.java | 2 +- .../bartimaeusnek/crossmod/BartWorksCrossmod.java | 85 +- .../crossmod/GTpp/loader/RadioHatchCompat.java | 119 +- .../crossmod/ae2/ItemSingleItemStorageCell.java | 62 +- .../bartimaeusnek/crossmod/cls/CLSCompat.java | 17 +- .../crossmod/emt/recipe/TCRecipeHandler.java | 250 ++- .../multi/GT_Industrial_Alchemic_Construct.java | 46 +- .../crossmod/emt/util/EMTHandler.java | 6 +- .../galacticgreg/GT_TileEntity_VoidMiner_Base.java | 216 ++- .../galacticgreg/GT_TileEntity_VoidMiners.java | 2 +- .../crossmod/galacticraft/GalacticraftProxy.java | 44 +- .../crossmod/galacticraft/PlanetsHelperClass.java | 4 +- .../galacticraft/UniversalTeleportType.java | 16 +- .../atmosphere/BWAtmosphereManager.java | 70 +- .../planets/AbstractWorldProviderSpace.java | 1 - .../planets/ross128b/ChunkProviderRoss128b.java | 44 +- .../planets/ross128b/SkyProviderRoss128b.java | 5 +- .../planets/ross128b/WorldProviderRoss128b.java | 4 +- .../planets/ross128ba/ChunkProviderRoss128ba.java | 15 +- .../solarsystems/Ross128SolarSystem.java | 40 +- .../tileEntity/DysonSwarmSunReplacement.java | 23 +- .../galaxySpace/tileEntity/GalaxySpaceProxy.java | 50 +- .../crossmod/openComputers/GT_NBT_DataBase.java | 17 +- .../openComputers/TileEntity_GTDataServer.java | 76 +- .../tectech/TT_TileEntity_ManualTrafo.java | 41 +- .../crossmod/tectech/TecTechEnabledMulti.java | 51 +- .../crossmod/tectech/TecTechResearchLoader.java | 127 +- .../crossmod/tectech/helper/IHasCoils.java | 1 + .../crossmod/tectech/helper/TecTechUtils.java | 40 +- .../tectech/tileentites/tiered/LowPowerLaser.java | 33 +- .../tiered/TT_Abstract_LowPowerLaserThingy.java | 46 +- .../tiered/TT_MetaTileEntity_LowPowerLaserBox.java | 88 +- .../TT_MetaTileEntity_LowPowerLaserDynamo.java | 20 +- .../TT_MetaTileEntity_LowPowerLaserHatch.java | 21 +- .../TT_MetaTileEntity_Pipe_Energy_LowPower.java | 69 +- .../crossmod/tgregworks/MaterialsInjector.java | 86 +- .../crossmod/thaumcraft/CustomAspects.java | 53 +- .../tile/GT_Multi_IndustrialCrucible.java | 3 +- .../crossmod/thaumcraft/tile/GT_WandBuffer.java | 5 +- .../thaumcraft/util/ThaumcraftHandler.java | 74 +- 252 files changed, 18127 insertions(+), 10149 deletions(-) (limited to 'src/main/java/com') diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/API/API_ConfigValues.java b/src/main/java/com/github/bartimaeusnek/bartworks/API/API_ConfigValues.java index 3839d28038..679e4f9cd3 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/API/API_ConfigValues.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/API/API_ConfigValues.java @@ -23,6 +23,6 @@ package com.github.bartimaeusnek.bartworks.API; public class API_ConfigValues { - //One-Side-Only + // One-Side-Only public static boolean debugLog = true; } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/API/AcidGenFuelAdder.java b/src/main/java/com/github/bartimaeusnek/bartworks/API/AcidGenFuelAdder.java index 909489a0c6..e7696f25ed 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/API/AcidGenFuelAdder.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/API/AcidGenFuelAdder.java @@ -33,7 +33,8 @@ public final class AcidGenFuelAdder { } public static void addLiquidFuel(FluidStack fluidStack, int burn) { - ((BWRecipes.BW_Recipe_Map_LiquidFuel) BWRecipes.instance.getMappingsFor((byte) 2)).addLiquidFuel(fluidStack, burn); + ((BWRecipes.BW_Recipe_Map_LiquidFuel) BWRecipes.instance.getMappingsFor((byte) 2)) + .addLiquidFuel(fluidStack, burn); } public static void addMoltenFuel(Materials M, int burn) { 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 c8806d269b..e8e9bf1f09 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/API/BioObjectAdder.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/API/BioObjectAdder.java @@ -30,18 +30,19 @@ import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; import gregtech.api.objects.GT_Fluid; import gregtech.api.util.GT_Utility; +import java.awt.*; import net.minecraft.item.EnumRarity; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; -import java.awt.*; @SuppressWarnings("ALL") public final class BioObjectAdder { -// @Deprecated -// public static BioCulture createAndRegisterBioCulture(Color color, String name, long ID, BioPlasmid plasmid, BioDNA dna, EnumRarity rarity){ -// return BioCulture.createAndRegisterBioCulture(color,name,ID,plasmid,dna,rarity); -// } + // @Deprecated + // public static BioCulture createAndRegisterBioCulture(Color color, String name, long ID, BioPlasmid plasmid, + // BioDNA dna, EnumRarity rarity){ + // return BioCulture.createAndRegisterBioCulture(color,name,ID,plasmid,dna,rarity); + // } /** * @param color the color of the Culture @@ -52,11 +53,14 @@ public final class BioObjectAdder { * @param rarity visual * @return */ - public static BioCulture createAndRegisterBioCulture(Color color, String name, BioPlasmid plasmid, BioDNA dna, EnumRarity rarity, boolean breedable) { + public static BioCulture createAndRegisterBioCulture( + Color color, String name, BioPlasmid plasmid, BioDNA dna, EnumRarity rarity, boolean breedable) { if (BioCulture.BIO_CULTURE_ARRAY_LIST.size() > 1) return BioCulture.createAndRegisterBioCulture(color, name, plasmid, dna, rarity, breedable); else - new Exception("Too Early to register a BioCulture! You MUST run this either after:bartworks OR in the init Phase!").printStackTrace(); + new Exception( + "Too Early to register a BioCulture! You MUST run this either after:bartworks OR in the init Phase!") + .printStackTrace(); return null; } @@ -70,11 +74,14 @@ public final class BioObjectAdder { * @param breedable if the culture can be inserted into the BacterialVat * @return */ - public static BioCulture createAndRegisterBioCulture(Color color, String name, BioPlasmid plasmid, BioDNA dna, boolean breedable) { + public static BioCulture createAndRegisterBioCulture( + Color color, String name, BioPlasmid plasmid, BioDNA dna, boolean breedable) { if (BioCulture.BIO_CULTURE_ARRAY_LIST.size() > 1) return BioCulture.createAndRegisterBioCulture(color, name, plasmid, dna, breedable); else - new Exception("Too Early to register a BioCulture! You MUST run this either after:bartworks OR in the init Phase!").printStackTrace(); + new Exception( + "Too Early to register a BioCulture! You MUST run this either after:bartworks OR in the init Phase!") + .printStackTrace(); return null; } @@ -90,7 +97,8 @@ public final class BioObjectAdder { public static BioData createAndRegisterBioData(String aName, EnumRarity rarity, int chance, int tier) { 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(); + new Exception("Too Early to register a BioData! You MUST run this either after:bartworks OR in the init Phase!") + .printStackTrace(); return null; } @@ -102,9 +110,9 @@ public final class BioObjectAdder { * @return */ 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(); + 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(); return null; } @@ -116,9 +124,9 @@ public final class BioObjectAdder { * @return */ 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(); + 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(); return null; } @@ -130,9 +138,9 @@ public final class BioObjectAdder { * @return */ 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(); + 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(); return null; } @@ -146,7 +154,8 @@ public final class BioObjectAdder { public static BioPlasmid createAndRegisterBioPlasmid(String aName, EnumRarity rarity, int chance, int tier) { 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(); + new Exception("Too Early to register a BioData! You MUST run this either after:bartworks OR in the init Phase!") + .printStackTrace(); return null; } @@ -162,15 +171,34 @@ public final class BioObjectAdder { * If you get NPE's related to BioCultures (most likely because of Load Order or creating BioCultures after the postinit Phase) execute this. */ public static void regenerateBioFluids() { - FluidStack dnaFluid = LoaderReference.gendustry ? FluidRegistry.getFluidStack("liquiddna", 100) : Materials.Biomass.getFluid(100L); + FluidStack dnaFluid = LoaderReference.gendustry + ? FluidRegistry.getFluidStack("liquiddna", 100) + : Materials.Biomass.getFluid(100L); for (BioCulture B : BioCulture.BIO_CULTURE_ARRAY_LIST) { if (B.getFluidNotSet()) { - B.setFluid(new GT_Fluid(B.getName().replaceAll(" ", "").toLowerCase() + "fluid", "molten.autogenerated", new short[]{(short) B.getColor().getRed(), (short) B.getColor().getBlue(), (short) B.getColor().getGreen()})); + B.setFluid(new GT_Fluid( + B.getName().replaceAll(" ", "").toLowerCase() + "fluid", "molten.autogenerated", new short[] { + (short) B.getColor().getRed(), + (short) B.getColor().getBlue(), + (short) B.getColor().getGreen() + })); if (!FluidRegistry.registerFluid(B.getFluid())) new Exception("FAILED TO REGISTER FLUID FOR: " + B.getName()).printStackTrace(); - GT_Values.RA.addCentrifugeRecipe(GT_Utility.getIntegratedCircuit(10),GT_Values.NI,new FluidStack(B.getFluid(),1000),dnaFluid,GT_Values.NI,GT_Values.NI,GT_Values.NI,GT_Values.NI,GT_Values.NI,GT_Values.NI,null,500,120); + GT_Values.RA.addCentrifugeRecipe( + GT_Utility.getIntegratedCircuit(10), + GT_Values.NI, + new FluidStack(B.getFluid(), 1000), + dnaFluid, + GT_Values.NI, + GT_Values.NI, + GT_Values.NI, + GT_Values.NI, + GT_Values.NI, + GT_Values.NI, + null, + 500, + 120); } } } - } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/API/BioObjectGetter.java b/src/main/java/com/github/bartimaeusnek/bartworks/API/BioObjectGetter.java index 11ebdccb3d..145f762e30 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/API/BioObjectGetter.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/API/BioObjectGetter.java @@ -27,11 +27,10 @@ import com.github.bartimaeusnek.bartworks.util.BioCulture; import com.github.bartimaeusnek.bartworks.util.BioDNA; import com.github.bartimaeusnek.bartworks.util.BioData; import com.github.bartimaeusnek.bartworks.util.BioPlasmid; +import java.util.Collection; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import java.util.Collection; - @SuppressWarnings("ALL") public final class BioObjectGetter { @@ -83,7 +82,7 @@ public final class BioObjectGetter { return BioObjectGetter.convertDataToDNA(BioObjectGetter.convertBioPlasmidToData(bioPlasmid)); } - //UNSAFE needs to be reworked! + // UNSAFE needs to be reworked! public static Collection getAllPetriDishes() { return BioItemList.getAllPetriDishes(); @@ -121,5 +120,4 @@ public final class BioObjectGetter { public static ItemStack getOther(int selection) { return BioItemList.getOther(selection); } - } 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 7fb06e019e..7a355b332d 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/API/BioRecipeAdder.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/API/BioRecipeAdder.java @@ -25,11 +25,10 @@ package com.github.bartimaeusnek.bartworks.API; import com.github.bartimaeusnek.bartworks.util.BWRecipes; import com.github.bartimaeusnek.bartworks.util.BioCulture; import gregtech.api.enums.Materials; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; - import javax.annotation.Nonnegative; import javax.annotation.Nonnull; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; @SuppressWarnings("ALL") public final class BioRecipeAdder { @@ -38,8 +37,18 @@ public final class BioRecipeAdder { public static final int LOWGRAVITY = -100; 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) { - return BWRecipes.instance.addBioLabRecipe(aInputs, aOutput, aSpecialItems, aChances, aFluidInputs, aFluidOutputs, aDuration, aEUt, aSpecialValue); + public static boolean addBioLabRecipe( + ItemStack[] aInputs, + ItemStack aOutput, + ItemStack aSpecialItems, + 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); } /** @@ -54,8 +63,16 @@ public final class BioRecipeAdder { * @param aSpecialValue 0 = STANDART, -100 = LowGravity, -200 = Cleanroom * @return if the recipe was added. */ - public static boolean addBioLabRecipeIncubation(ItemStack aInput, BioCulture aOutput, int[] aChances, FluidStack aFluidInputs, int aDuration, int aEUt, int aSpecialValue) { - return BWRecipes.instance.addBioLabRecipeIncubation(aInput, aOutput, aChances, aFluidInputs, aDuration, aEUt, aSpecialValue); + public static boolean addBioLabRecipeIncubation( + ItemStack aInput, + BioCulture aOutput, + int[] aChances, + FluidStack aFluidInputs, + int aDuration, + int aEUt, + int aSpecialValue) { + return BWRecipes.instance.addBioLabRecipeIncubation( + aInput, aOutput, aChances, aFluidInputs, aDuration, aEUt, aSpecialValue); } /** @@ -71,8 +88,19 @@ public final class BioRecipeAdder { * @param exactSv if the recipe needs EXACTLY the Sv or can use less... * @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) { - return BWRecipes.instance.addBacterialVatRecipe(aInputs, aCulture, aFluidInputs, aFluidOutputs, aDuration, aEUt, Sv, glasTier, aSpecialValue, exactSv); + 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) { + return BWRecipes.instance.addBacterialVatRecipe( + aInputs, aCulture, aFluidInputs, aFluidOutputs, aDuration, aEUt, Sv, glasTier, aSpecialValue, exactSv); } /** @@ -88,38 +116,69 @@ public final class BioRecipeAdder { * @param exactSv if the recipe needs EXACTLY the Sv or can use less... * @return */ - 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) { - return BWRecipes.instance.addBacterialVatRecipe(aInputs, aCulture, aFluidInputs, aFluidOutputs, aDuration, aEUt, material, glasTier, aSpecialValue, exactSv); + 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) { + return BWRecipes.instance.addBacterialVatRecipe( + aInputs, + aCulture, + aFluidInputs, + aFluidOutputs, + aDuration, + aEUt, + material, + glasTier, + aSpecialValue, + exactSv); } -// public static boolean addBacterialVatRecipe(ItemStack[] aInputs, ItemStack[] aOutputs, FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs, int aDuration, int aEUt, int aSievert) { -// return BWRecipes.instance.addBacterialVatRecipe(aInputs, aOutputs, aFluidInputs, aFluidOutputs, aDuration, aEUt, aSievert); -// } - -// @Deprecated -// public static boolean addBioLabRecipeDNAExtraction(ItemStack[] aInputs, ItemStack aOutput, int[] aChances, FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs, int aDuration, int aEUt, int aSpecialValue){ -// return BWRecipes.instance.addBioLabRecipeDNAExtraction(aInputs, aOutput, aChances, aFluidInputs, aFluidOutputs, aDuration, aEUt, aSpecialValue); -// } -// -// @Deprecated -// public static boolean addBioLabRecipePCRThermoclycling(ItemStack[] aInputs, ItemStack aOutput, int[] aChances, FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs, int aDuration, int aEUt, int aSpecialValue){ -// return BWRecipes.instance.addBioLabRecipePCRThermoclycling(aInputs, aOutput, aChances, aFluidInputs, aFluidOutputs, aDuration, aEUt, aSpecialValue); -// } -// -// @Deprecated -// public static boolean addBioLabRecipePlasmidSynthesis(ItemStack[] aInputs, ItemStack aOutput, int[] aChances, FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs, int aDuration, int aEUt, int aSpecialValue){ -// return BWRecipes.instance.addBioLabRecipePlasmidSynthesis(aInputs, aOutput, aChances, aFluidInputs, aFluidOutputs, aDuration, aEUt, aSpecialValue); -// } -// -// @Deprecated -// public static boolean addBioLabRecipeTransformation(ItemStack[] aInputs, ItemStack aOutput, int[] aChances, FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs, int aDuration, int aEUt, int aSpecialValue){ -// return BWRecipes.instance.addBioLabRecipeTransformation(aInputs, aOutput, aChances, aFluidInputs, aFluidOutputs, aDuration, aEUt, aSpecialValue); -// } -// -// @Deprecated -// public static boolean addBioLabRecipeClonalCellularSynthesis(ItemStack[] aInputs, ItemStack aOutput, int[] aChances, FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs, int aDuration, int aEUt, int aSpecialValue){ -// return BWRecipes.instance.addBioLabRecipeClonalCellularSynthesis(aInputs, aOutput, aChances, aFluidInputs, aFluidOutputs, aDuration, aEUt, aSpecialValue); -// } + // public static boolean addBacterialVatRecipe(ItemStack[] aInputs, ItemStack[] aOutputs, FluidStack[] + // aFluidInputs, FluidStack[] aFluidOutputs, int aDuration, int aEUt, int aSievert) { + // return BWRecipes.instance.addBacterialVatRecipe(aInputs, aOutputs, aFluidInputs, aFluidOutputs, aDuration, + // aEUt, aSievert); + // } + // @Deprecated + // public static boolean addBioLabRecipeDNAExtraction(ItemStack[] aInputs, ItemStack aOutput, int[] aChances, + // FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs, int aDuration, int aEUt, int aSpecialValue){ + // return BWRecipes.instance.addBioLabRecipeDNAExtraction(aInputs, aOutput, aChances, aFluidInputs, + // aFluidOutputs, aDuration, aEUt, aSpecialValue); + // } + // + // @Deprecated + // public static boolean addBioLabRecipePCRThermoclycling(ItemStack[] aInputs, ItemStack aOutput, int[] aChances, + // FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs, int aDuration, int aEUt, int aSpecialValue){ + // return BWRecipes.instance.addBioLabRecipePCRThermoclycling(aInputs, aOutput, aChances, aFluidInputs, + // aFluidOutputs, aDuration, aEUt, aSpecialValue); + // } + // + // @Deprecated + // public static boolean addBioLabRecipePlasmidSynthesis(ItemStack[] aInputs, ItemStack aOutput, int[] aChances, + // FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs, int aDuration, int aEUt, int aSpecialValue){ + // return BWRecipes.instance.addBioLabRecipePlasmidSynthesis(aInputs, aOutput, aChances, aFluidInputs, + // aFluidOutputs, aDuration, aEUt, aSpecialValue); + // } + // + // @Deprecated + // public static boolean addBioLabRecipeTransformation(ItemStack[] aInputs, ItemStack aOutput, int[] aChances, + // FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs, int aDuration, int aEUt, int aSpecialValue){ + // return BWRecipes.instance.addBioLabRecipeTransformation(aInputs, aOutput, aChances, aFluidInputs, + // aFluidOutputs, aDuration, aEUt, aSpecialValue); + // } + // + // @Deprecated + // public static boolean addBioLabRecipeClonalCellularSynthesis(ItemStack[] aInputs, ItemStack aOutput, int[] + // aChances, FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs, int aDuration, int aEUt, int aSpecialValue){ + // return BWRecipes.instance.addBioLabRecipeClonalCellularSynthesis(aInputs, aOutput, aChances, aFluidInputs, + // aFluidOutputs, aDuration, aEUt, aSpecialValue); + // } } 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 36d4e04503..e850e4135b 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/API/BioVatLogicAdder.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/API/BioVatLogicAdder.java @@ -22,27 +22,25 @@ package com.github.bartimaeusnek.bartworks.API; +import static cpw.mods.fml.common.registry.GameRegistry.findBlock; + import com.github.bartimaeusnek.bartworks.system.material.BW_NonMeta_MaterialItems; import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; import com.github.bartimaeusnek.bartworks.util.BW_Util; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.util.GT_ModHandler; -import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; - -import javax.annotation.Nonnegative; -import javax.annotation.Nonnull; import java.util.HashMap; import java.util.HashSet; import java.util.Objects; - -import static cpw.mods.fml.common.registry.GameRegistry.findBlock; +import javax.annotation.Nonnegative; +import javax.annotation.Nonnull; +import net.minecraft.block.Block; +import net.minecraft.item.ItemStack; @SuppressWarnings("ALL") public final class BioVatLogicAdder { - public static class RadioHatch { public static void runBasicItemIntegration() { @@ -62,9 +60,12 @@ public final class BioVatLogicAdder { giveItemStackRadioHatchAbilites(ItemList.Uraniumcell_2.get(1), Materials.Uranium, 6); giveItemStackRadioHatchAbilites(ItemList.Uraniumcell_4.get(1), Materials.Uranium, 12); - giveItemStackRadioHatchAbilites(BW_NonMeta_MaterialItems.TiberiumCell_1.get(1), WerkstoffLoader.Tiberium.getBridgeMaterial(), 3); - giveItemStackRadioHatchAbilites(BW_NonMeta_MaterialItems.TiberiumCell_2.get(1), WerkstoffLoader.Tiberium.getBridgeMaterial(), 6); - giveItemStackRadioHatchAbilites(BW_NonMeta_MaterialItems.TiberiumCell_4.get(1), WerkstoffLoader.Tiberium.getBridgeMaterial(), 12); + giveItemStackRadioHatchAbilites( + BW_NonMeta_MaterialItems.TiberiumCell_1.get(1), WerkstoffLoader.Tiberium.getBridgeMaterial(), 3); + giveItemStackRadioHatchAbilites( + BW_NonMeta_MaterialItems.TiberiumCell_2.get(1), WerkstoffLoader.Tiberium.getBridgeMaterial(), 6); + giveItemStackRadioHatchAbilites( + BW_NonMeta_MaterialItems.TiberiumCell_4.get(1), WerkstoffLoader.Tiberium.getBridgeMaterial(), 12); giveItemStackRadioHatchAbilites(BW_NonMeta_MaterialItems.TheCoreCell.get(1), Materials.Naquadah, 96); @@ -76,19 +77,38 @@ public final class BioVatLogicAdder { giveItemStackRadioHatchAbilites(ItemList.Depleted_Naquadah_2.get(1), Materials.Naquadah, 6, 10); giveItemStackRadioHatchAbilites(ItemList.Depleted_Naquadah_4.get(1), Materials.Naquadah, 12, 10); - giveItemStackRadioHatchAbilites(GT_ModHandler.getModItem("IC2","reactorMOXSimpledepleted",1), Materials.Plutonium, 3, 10); - giveItemStackRadioHatchAbilites(GT_ModHandler.getModItem("IC2","reactorMOXDualdepleted",1), Materials.Plutonium, 6, 10); - giveItemStackRadioHatchAbilites(GT_ModHandler.getModItem("IC2","reactorMOXQuaddepleted",1), Materials.Plutonium, 12, 10); - - giveItemStackRadioHatchAbilites(GT_ModHandler.getModItem("IC2","reactorUraniumSimpledepleted",1), Materials.Uranium, 3, 10); - giveItemStackRadioHatchAbilites(GT_ModHandler.getModItem("IC2","reactorUraniumDualdepleted",1), Materials.Uranium, 6, 10); - giveItemStackRadioHatchAbilites(GT_ModHandler.getModItem("IC2","reactorUraniumQuaddepleted",1), Materials.Uranium, 12, 10); - - giveItemStackRadioHatchAbilites(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); - giveItemStackRadioHatchAbilites(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); + giveItemStackRadioHatchAbilites( + GT_ModHandler.getModItem("IC2", "reactorMOXSimpledepleted", 1), Materials.Plutonium, 3, 10); + giveItemStackRadioHatchAbilites( + GT_ModHandler.getModItem("IC2", "reactorMOXDualdepleted", 1), Materials.Plutonium, 6, 10); + giveItemStackRadioHatchAbilites( + GT_ModHandler.getModItem("IC2", "reactorMOXQuaddepleted", 1), Materials.Plutonium, 12, 10); + + giveItemStackRadioHatchAbilites( + GT_ModHandler.getModItem("IC2", "reactorUraniumSimpledepleted", 1), Materials.Uranium, 3, 10); + giveItemStackRadioHatchAbilites( + GT_ModHandler.getModItem("IC2", "reactorUraniumDualdepleted", 1), Materials.Uranium, 6, 10); + giveItemStackRadioHatchAbilites( + GT_ModHandler.getModItem("IC2", "reactorUraniumQuaddepleted", 1), Materials.Uranium, 12, 10); + + giveItemStackRadioHatchAbilites( + 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); + giveItemStackRadioHatchAbilites( + 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); if (WerkstoffLoader.gtnhGT) { giveItemStackRadioHatchAbilites(ItemList.MNqCell_1.get(1), Materials.Naquadria, 3); @@ -158,16 +178,13 @@ public final class BioVatLogicAdder { public static int getMaxSv() { int ret = MaxSV; for (MaterialSvPair pair : RadioHatch.getMaSv()) { - if (pair.getSievert() > ret) - ret = pair.getSievert(); + if (pair.getSievert() > ret) ret = pair.getSievert(); } for (ItemStack is : RadioHatch.IsSv.keySet()) { - if (RadioHatch.IsSv.get(is) > ret) - ret = RadioHatch.IsSv.get(is); + if (RadioHatch.IsSv.get(is) > ret) ret = RadioHatch.IsSv.get(is); } return ret; } - } public static class BioVatGlass { @@ -184,10 +201,11 @@ public final class BioVatLogicAdder { public static boolean addCustomGlass(String sModname, String sUnlocBlockName, int meta, int tier) { Block block = findBlock(sModname, sUnlocBlockName); boolean ret = block != null; - if (ret) - BioVatGlass.glasses.put(new BlockMetaPair(block, (byte) meta), (byte) tier); + 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(); + new IllegalArgumentException( + "Block: " + sUnlocBlockName + " of the Mod: " + sModname + " was NOT found!") + .printStackTrace(); block = null; return ret; } @@ -236,8 +254,8 @@ public final class BioVatLogicAdder { if (this == o) return true; 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()); + return Objects.equals(this.getMaterials(), that.getMaterials()) + && Objects.equals(this.getSievert(), that.getSievert()); } @Override @@ -252,8 +270,6 @@ public final class BioVatLogicAdder { public Integer getSievert() { return this.sievert; } - - } public static class BlockMetaPair { @@ -270,8 +286,7 @@ public final class BioVatLogicAdder { if (this == o) return true; if (o == null || this.getClass() != o.getClass()) return false; BioVatLogicAdder.BlockMetaPair that = (BioVatLogicAdder.BlockMetaPair) o; - return Objects.equals(this.getBlock(), that.getBlock()) && - Objects.equals(this.getaByte(), that.getaByte()); + return Objects.equals(this.getBlock(), that.getBlock()) && Objects.equals(this.getaByte(), that.getaByte()); } @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 178ab6f475..27d6f30e0c 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/API/BorosilicateGlass.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/API/BorosilicateGlass.java @@ -1,17 +1,16 @@ package com.github.bartimaeusnek.bartworks.API; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; + import com.gtnewhorizon.structurelib.structure.IStructureElement; import cpw.mods.fml.common.registry.GameRegistry; -import net.minecraft.block.Block; -import org.apache.commons.lang3.tuple.Pair; - import java.util.ArrayList; import java.util.List; import java.util.function.BiConsumer; import java.util.function.Function; import java.util.stream.Collectors; - -import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; +import net.minecraft.block.Block; +import org.apache.commons.lang3.tuple.Pair; /** * API for bartworks borosilicate glass. @@ -27,8 +26,7 @@ public class BorosilicateGlass { private static List> representatives; private static Block getGlassBlock() { - if (block == null) - block = GameRegistry.findBlock("bartworks", "BW_GlasBlocks"); + if (block == null) block = GameRegistry.findBlock("bartworks", "BW_GlasBlocks"); return block; } @@ -91,8 +89,10 @@ public class BorosilicateGlass { * * @param initialValue the value set before structure check started */ - public static IStructureElement ofBoroGlass(byte initialValue, BiConsumer setter, Function getter) { - return lazy(t -> ofBlocksTiered(BorosilicateGlass::getTier, getRepresentatives(), initialValue, setter, getter)); + public static IStructureElement ofBoroGlass( + byte initialValue, BiConsumer setter, Function getter) { + return lazy( + t -> ofBlocksTiered(BorosilicateGlass::getTier, getRepresentatives(), initialValue, setter, getter)); } /** @@ -102,15 +102,18 @@ public class BorosilicateGlass { * @param minTier minimal accepted tier. inclusive. must be greater than 0. * @param maxTier maximal accepted tier. inclusive. */ - public static IStructureElement ofBoroGlass(byte initialValue, byte minTier, byte maxTier, BiConsumer setter, Function getter) { + public static IStructureElement ofBoroGlass( + byte initialValue, byte minTier, byte maxTier, 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()), + getRepresentatives().stream() + .skip(Math.max(minTier - 3, 0)) + .limit(maxTier - minTier + 1) + .collect(Collectors.toList()), initialValue, setter, - getter - )); + getter)); } /** diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/API/INoiseGen.java b/src/main/java/com/github/bartimaeusnek/bartworks/API/INoiseGen.java index 96a075d9c7..61ce6d2c8a 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/API/INoiseGen.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/API/INoiseGen.java @@ -24,10 +24,15 @@ package com.github.bartimaeusnek.bartworks.API; public interface INoiseGen { - double getNoise(int x, int z); - double[][] getNoiseForRegion(int xStart, int zStart, int xEnd, int zEnd); - void setOctaves(int octaves); - void setFrequency(double freq); - void setSeed(long seed); - void setAmplitude(double amplitude); + double getNoise(int x, int z); + + double[][] getNoiseForRegion(int xStart, int zStart, int xEnd, int zEnd); + + void setOctaves(int octaves); + + void setFrequency(double freq); + + void setSeed(long seed); + + void setAmplitude(double amplitude); } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/API/ITileDropsContent.java b/src/main/java/com/github/bartimaeusnek/bartworks/API/ITileDropsContent.java index c10f7ffb39..22403b5cc1 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/API/ITileDropsContent.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/API/ITileDropsContent.java @@ -25,8 +25,7 @@ package com.github.bartimaeusnek.bartworks.API; import net.minecraft.inventory.ISidedInventory; public interface ITileDropsContent extends ISidedInventory { - default int[] getDropSlots(){ + default int[] getDropSlots() { return new int[] {0}; } - } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/API/ITileHasDifferentTextureSides.java b/src/main/java/com/github/bartimaeusnek/bartworks/API/ITileHasDifferentTextureSides.java index 369a403dc1..473908c7a3 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/API/ITileHasDifferentTextureSides.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/API/ITileHasDifferentTextureSides.java @@ -28,7 +28,6 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; import net.minecraftforge.common.util.ForgeDirection; - public interface ITileHasDifferentTextureSides { IIcon[] texture = new IIcon[7]; @@ -45,5 +44,4 @@ public interface ITileHasDifferentTextureSides { @SideOnly(Side.CLIENT) void registerBlockIcons(IIconRegister par1IconRegister); - } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/API/ITileWithGUI.java b/src/main/java/com/github/bartimaeusnek/bartworks/API/ITileWithGUI.java index 1318cb919f..38b762fa9a 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/API/ITileWithGUI.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/API/ITileWithGUI.java @@ -42,7 +42,13 @@ public interface ITileWithGUI { */ default boolean openGUI(TileEntity tileEntity, EntityPlayer player) { if (!tileEntity.getWorldObj().isRemote) - player.openGui(MainMod.MOD_ID, getGUIID(), tileEntity.getWorldObj(), tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord); + player.openGui( + MainMod.MOD_ID, + getGUIID(), + tileEntity.getWorldObj(), + tileEntity.xCoord, + tileEntity.yCoord, + tileEntity.zCoord); return true; } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/API/LoaderReference.java b/src/main/java/com/github/bartimaeusnek/bartworks/API/LoaderReference.java index 09ba5e6dfd..14c56e7ad9 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/API/LoaderReference.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/API/LoaderReference.java @@ -28,7 +28,7 @@ import cpw.mods.fml.common.Loader; * DO NOT CALL THIS IN THE CORE MOD! IT WILL __NOT__ WORK AND FUCK EVERYTHING UP! */ public class LoaderReference { - private LoaderReference(){} + private LoaderReference() {} public static boolean Natura; public static boolean RandomThings; @@ -60,7 +60,6 @@ public class LoaderReference { public static boolean ProjRedIllumination; public static boolean Botania; - public static void init() { Natura = Loader.isModLoaded("Natura"); RandomThings = Loader.isModLoaded("RandomThings"); 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 8a753938bf..a11e0c4a03 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/API/SideReference.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/API/SideReference.java @@ -27,11 +27,16 @@ import cpw.mods.fml.common.FMLCommonHandler; 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/VoidMinerDropAdder.java b/src/main/java/com/github/bartimaeusnek/bartworks/API/VoidMinerDropAdder.java index 468885d454..29b84ae5ca 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/API/VoidMinerDropAdder.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/API/VoidMinerDropAdder.java @@ -23,24 +23,25 @@ package com.github.bartimaeusnek.bartworks.API; import gregtech.api.interfaces.ISubTagContainer; - import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; public class VoidMinerDropAdder { - private static Method getExtraDropsDimMap; + private static Method getExtraDropsDimMap; - static { - try { - getExtraDropsDimMap = Class.forName("com.github.bartimaeusnek.crossmod.galacticgreg.GT_TileEntity_VoidMiner_Base").getMethod("addMatierialToDimensionList",int.class, ISubTagContainer.class, float.class); - } catch (NoSuchMethodException | ClassNotFoundException e) { - e.printStackTrace(); - } - } + static { + try { + getExtraDropsDimMap = Class.forName( + "com.github.bartimaeusnek.crossmod.galacticgreg.GT_TileEntity_VoidMiner_Base") + .getMethod("addMatierialToDimensionList", int.class, ISubTagContainer.class, float.class); + } catch (NoSuchMethodException | ClassNotFoundException e) { + e.printStackTrace(); + } + } - public static void addDropsToDim(int dimID, ISubTagContainer material, float chance) throws InvocationTargetException, IllegalAccessException { + public static void addDropsToDim(int dimID, ISubTagContainer material, float chance) + throws InvocationTargetException, IllegalAccessException { getExtraDropsDimMap.invoke(null, dimID, material, chance); } - } 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 bb3400512c..f8079ff6ff 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/API/WerkstoffAPI.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/API/WerkstoffAPI.java @@ -40,5 +40,4 @@ public final class WerkstoffAPI { public static Werkstoff getWerkstoff(String aName) throws NoSuchFieldException, IllegalAccessException { return (Werkstoff) w.getField(aName).get(null); } - } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/API/WerkstoffAdderRegistry.java b/src/main/java/com/github/bartimaeusnek/bartworks/API/WerkstoffAdderRegistry.java index 9eabdee449..577e9621ff 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/API/WerkstoffAdderRegistry.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/API/WerkstoffAdderRegistry.java @@ -28,15 +28,13 @@ public final class WerkstoffAdderRegistry { private static final HashSet toRun = new HashSet<>(); - private WerkstoffAdderRegistry() { - } + private WerkstoffAdderRegistry() {} public static void addWerkstoffAdder(Runnable adder) { toRun.add(adder); } public static void run() { - for (Runnable r : toRun) - r.run(); + for (Runnable r : toRun) r.run(); } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/API/package-info.java b/src/main/java/com/github/bartimaeusnek/bartworks/API/package-info.java index 78f721e950..7dabe8be07 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/API/package-info.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/API/package-info.java @@ -22,4 +22,4 @@ @API(owner = "bartworks", apiVersion = API_REFERENCE.VERSION, provides = "bartworks API") package com.github.bartimaeusnek.bartworks.API; -import cpw.mods.fml.common.API; \ No newline at end of file +import cpw.mods.fml.common.API; diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/ASM/ASMUtils.java b/src/main/java/com/github/bartimaeusnek/bartworks/ASM/ASMUtils.java index 48a8f49d5c..5f618c6955 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/ASM/ASMUtils.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/ASM/ASMUtils.java @@ -22,19 +22,17 @@ package com.github.bartimaeusnek.bartworks.ASM; -import org.objectweb.asm.tree.MethodNode; - import java.io.File; import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStream; +import org.objectweb.asm.tree.MethodNode; public class ASMUtils { public static String matchAny(String toCompare, String... args) { for (String arg : args) { - if (toCompare.equalsIgnoreCase(arg)) - return arg; + if (toCompare.equalsIgnoreCase(arg)) return arg; } return ""; } @@ -44,16 +42,15 @@ public class ASMUtils { */ public static boolean isCorrectMethod(MethodNode methodNode, String... args) { for (String arg : args) { - if (methodNode.name.equalsIgnoreCase(arg) || methodNode.desc.equalsIgnoreCase(arg)) - return true; + if (methodNode.name.equalsIgnoreCase(arg) || methodNode.desc.equalsIgnoreCase(arg)) return true; } return false; } public static boolean writeClassToDisk(byte[] towrite, String Classname, String Path) { try { - if (Path.charAt(Path.length()-1) == '/' || Path.charAt(Path.length()-1) == '\\') - Path = Path.substring(0,Path.length()-1); + if (Path.charAt(Path.length() - 1) == '/' || Path.charAt(Path.length() - 1) == '\\') + Path = Path.substring(0, Path.length() - 1); OutputStream os = new FileOutputStream(new File(Path + '/' + Classname + ".class")); os.write(towrite); } catch (IOException e) { @@ -62,5 +59,4 @@ public class ASMUtils { } return true; } - } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/ASM/BWCore.java b/src/main/java/com/github/bartimaeusnek/bartworks/ASM/BWCore.java index e97de8cf21..f4251f2cd5 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/ASM/BWCore.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/ASM/BWCore.java @@ -22,6 +22,8 @@ package com.github.bartimaeusnek.bartworks.ASM; +import static com.github.bartimaeusnek.bartworks.ASM.BWCoreTransformer.shouldTransform; + import com.github.bartimaeusnek.bartworks.MainMod; import com.github.bartimaeusnek.bartworks.common.configs.ConfigHandler; import com.github.bartimaeusnek.crossmod.BartWorksCrossmod; @@ -33,13 +35,10 @@ import cpw.mods.fml.common.ModMetadata; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.versioning.ArtifactVersion; import cpw.mods.fml.common.versioning.DefaultArtifactVersion; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - import java.util.ArrayList; import java.util.List; - -import static com.github.bartimaeusnek.bartworks.ASM.BWCoreTransformer.shouldTransform; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; @SuppressWarnings("ALL") public class BWCore extends DummyModContainer { @@ -65,7 +64,7 @@ public class BWCore extends DummyModContainer { shouldTransform[4] = true; shouldTransform[5] = ConfigHandler.enabledPatches[5]; shouldTransform[6] = ConfigHandler.enabledPatches[6]; - //shouldTransform[6] = true; + // shouldTransform[6] = true; BWCore.BWCORE_LOG.info("Extra Utilities found and ASM Patch enabled? " + shouldTransform[0]); BWCore.BWCORE_LOG.info("Thaumcraft found and ASM Patch enabled? " + shouldTransform[3]); BWCore.BWCORE_LOG.info("RWG found and ASM Patch enabled? " + shouldTransform[5]); diff --git a/src/main/java/