From 5f50e4a36ec000657b0a1664784acf00275293c6 Mon Sep 17 00:00:00 2001 From: boubou19 Date: Sat, 1 Apr 2023 18:11:43 +0200 Subject: update spotless formatting (#1827) --- src/main/java/gregtech/GT_Mod.java | 149 +- src/main/java/gregtech/api/GregTech_API.java | 218 +- .../api/enchants/Enchantment_EnderDamage.java | 20 +- .../api/enchants/Enchantment_Radioactivity.java | 15 +- .../java/gregtech/api/enums/GT_HatchElement.java | 3 +- src/main/java/gregtech/api/enums/GT_Values.java | 10 +- src/main/java/gregtech/api/enums/ItemList.java | 8 +- .../java/gregtech/api/enums/MaterialBuilder.java | 6 +- src/main/java/gregtech/api/enums/Materials.java | 484 +- .../java/gregtech/api/enums/MaterialsBotania.java | 169 +- .../java/gregtech/api/enums/MaterialsKevlar.java | 1012 +- .../java/gregtech/api/enums/MaterialsOreAlum.java | 102 +- src/main/java/gregtech/api/enums/OrePrefixes.java | 170 +- .../java/gregtech/api/enums/SoundResource.java | 5 +- src/main/java/gregtech/api/enums/Textures.java | 6 +- .../java/gregtech/api/enums/ToolDictNames.java | 3 +- src/main/java/gregtech/api/fluid/FluidTankGT.java | 4 +- .../java/gregtech/api/fluid/GT_FluidFactory.java | 13 +- .../gregtech/api/graphs/GenerateNodeMapPower.java | 6 +- src/main/java/gregtech/api/graphs/Node.java | 3 +- .../api/graphs/consumers/NodeEnergyReceiver.java | 12 +- .../gregtech/api/graphs/paths/PowerNodePath.java | 7 +- src/main/java/gregtech/api/gui/GT_Container.java | 13 +- .../api/gui/GT_ContainerMetaTile_Machine.java | 5 +- .../java/gregtech/api/gui/GT_GUIColorOverride.java | 34 +- .../api/gui/GT_GUIContainerMetaTile_Machine.java | 6 +- .../api/gui/GT_GUIContainer_BasicMachine.java | 4 +- .../api/gui/GT_GUIContainer_BasicTank.java | 7 +- .../api/gui/GT_GUIContainer_MultiMachine.java | 58 +- .../gregtech/api/gui/GT_GUIDialogSelectItem.java | 28 +- src/main/java/gregtech/api/gui/GT_Slot_Armor.java | 4 +- .../gui/modularui/FallbackableSteamTexture.java | 4 +- .../gregtech/api/gui/modularui/GT_UIInfos.java | 130 +- .../gregtech/api/gui/modularui/GT_UITextures.java | 562 +- .../gregtech/api/gui/modularui/GUITextureSet.java | 63 +- .../api/gui/widgets/GT_GuiCoverTabLine.java | 6 +- .../api/gui/widgets/GT_GuiFakeItemButton.java | 14 +- .../java/gregtech/api/gui/widgets/GT_GuiTab.java | 14 +- .../gregtech/api/gui/widgets/GT_GuiTabLine.java | 3 +- .../api/gui/widgets/GT_GuiTooltipManager.java | 7 +- .../api/interfaces/IGlobalWirelessEnergy.java | 11 +- .../gregtech/api/interfaces/IHatchElement.java | 35 +- .../metatileentity/IMetaTileEntityItemPipe.java | 20 +- .../interfaces/tileentity/IColoredTileEntity.java | 4 +- .../interfaces/tileentity/IEnergyConnected.java | 20 +- .../tileentity/IExperimentalEnergyTileEntity.java | 25 +- .../api/items/GT_Block_LongDistancePipe.java | 4 +- .../gregtech/api/items/GT_EnergyArmor_Item.java | 37 +- .../java/gregtech/api/items/GT_Generic_Item.java | 6 +- .../java/gregtech/api/items/GT_MetaBase_Item.java | 44 +- .../gregtech/api/items/GT_MetaGenerated_Item.java | 31 +- .../api/items/GT_MetaGenerated_Item_X01.java | 3 +- .../gregtech/api/items/GT_MetaGenerated_Tool.java | 59 +- .../api/items/GT_RadioactiveCellIC_Item.java | 11 +- .../gregtech/api/items/GT_Spray_Foam_Item.java | 17 +- .../gregtech/api/items/GT_Spray_Hardener_Item.java | 7 +- .../gregtech/api/items/GT_Spray_Pepper_Item.java | 10 +- .../api/metatileentity/BaseMetaPipeEntity.java | 6 +- .../api/metatileentity/BaseMetaTileEntity.java | 91 +- .../api/metatileentity/BaseTileEntity.java | 111 +- .../api/metatileentity/CommonMetaTileEntity.java | 3 +- .../api/metatileentity/CoverableTileEntity.java | 111 +- .../api/metatileentity/MetaPipeEntity.java | 31 +- .../api/metatileentity/MetaTileEntity.java | 54 +- .../api/metatileentity/TileIC2EnergySink.java | 11 +- .../examples/GT_MetaTileEntity_E_Furnace.java | 40 +- .../implementations/GT_MetaPipeEntity_Cable.java | 21 +- .../implementations/GT_MetaPipeEntity_Fluid.java | 132 +- .../implementations/GT_MetaPipeEntity_Frame.java | 5 +- .../implementations/GT_MetaPipeEntity_Item.java | 23 +- .../GT_MetaTileEntity_BasicBatteryBuffer.java | 87 +- .../GT_MetaTileEntity_BasicGenerator.java | 6 +- .../GT_MetaTileEntity_BasicMachine.java | 228 +- .../GT_MetaTileEntity_BasicMachine_Bronze.java | 70 +- .../GT_MetaTileEntity_BasicMachine_GT_Recipe.java | 180 +- .../GT_MetaTileEntity_BasicTank.java | 96 +- .../implementations/GT_MetaTileEntity_Buffer.java | 100 +- .../GT_MetaTileEntity_CubicMultiBlockBase.java | 38 +- .../GT_MetaTileEntity_EnhancedMultiBlockBase.java | 10 +- ...MetaTileEntity_ExtendedPowerMultiBlockBase.java | 6 +- .../GT_MetaTileEntity_Hatch_DataAccess.java | 12 +- .../GT_MetaTileEntity_Hatch_InputBus.java | 11 +- .../GT_MetaTileEntity_Hatch_Maintenance.java | 76 +- .../GT_MetaTileEntity_Hatch_Muffler.java | 32 +- .../GT_MetaTileEntity_Hatch_MultiInput.java | 52 +- .../GT_MetaTileEntity_Hatch_Output.java | 121 +- .../GT_MetaTileEntity_Hatch_OutputBus.java | 4 +- .../GT_MetaTileEntity_MultiBlockBase.java | 563 +- .../GT_MetaTileEntity_SpecialFilter.java | 120 +- .../GT_MetaTileEntity_TieredMachineBlock.java | 12 +- .../GT_MetaTileEntity_Transformer.java | 10 +- .../GT_MetaTileEntity_Wireless_Dynamo.java | 3 +- .../GT_MetaTileEntity_Wireless_Hatch.java | 7 +- .../api/multitileentity/MultiTileEntityBlock.java | 21 +- .../MultiTileEntityBlockInternal.java | 12 +- .../MultiTileEntityClassContainer.java | 7 +- .../MultiTileEntityItemInternal.java | 119 +- .../multitileentity/MultiTileEntityRegistry.java | 14 +- .../api/multitileentity/base/MultiTileEntity.java | 33 +- .../machine/MultiTileBasicMachine.java | 29 +- .../multiblock/base/MultiBlockController.java | 418 +- .../multiblock/base/MultiBlockPart.java | 34 +- .../java/gregtech/api/net/GT_Packet_Pollution.java | 4 +- .../gregtech/api/net/GT_Packet_SendCoverData.java | 4 +- .../api/net/GT_Packet_SetConfigurationCircuit.java | 8 +- .../gregtech/api/net/GT_Packet_TileEntity.java | 15 +- .../api/net/GT_Packet_TileEntityCoverGUI.java | 7 +- .../api/net/GT_Packet_TileEntityCoverNew.java | 4 +- .../api/net/GT_Packet_WirelessRedstoneCover.java | 4 +- .../java/gregtech/api/objects/GT_ChunkManager.java | 37 +- .../java/gregtech/api/objects/GT_FluidStack.java | 15 +- src/main/java/gregtech/api/objects/GT_HashSet.java | 3 +- .../api/objects/GT_StdRenderedTexture.java | 3 +- .../java/gregtech/api/objects/GT_UO_Dimension.java | 13 +- .../gregtech/api/objects/GT_UO_DimensionList.java | 33 +- .../java/gregtech/api/objects/GT_UO_Fluid.java | 19 +- src/main/java/gregtech/api/objects/ItemData.java | 4 +- .../gregtech/api/objects/ReverseShapedRecipe.java | 6 +- .../api/objects/ReverseShapelessRecipe.java | 6 +- src/main/java/gregtech/api/objects/XSTR.java | 4 +- .../java/gregtech/api/render/TextureFactory.java | 37 +- .../api/threads/GT_Runnable_Cable_Update.java | 4 +- .../threads/GT_Runnable_MachineBlockUpdate.java | 12 +- .../gregtech/api/util/ColorsMetadataSection.java | 3 +- .../api/util/ColorsMetadataSectionSerializer.java | 14 +- .../java/gregtech/api/util/GT_ApiaryUpgrade.java | 6 +- .../gregtech/api/util/GT_AssemblyLineUtils.java | 31 +- .../gregtech/api/util/GT_Assemblyline_Server.java | 448 +- src/main/java/gregtech/api/util/GT_BaseCrop.java | 43 +- src/main/java/gregtech/api/util/GT_CLS_Compat.java | 39 +- .../gregtech/api/util/GT_ChunkAssociatedData.java | 106 +- .../gregtech/api/util/GT_CircuitryBehavior.java | 84 +- .../gregtech/api/util/GT_ClientPreference.java | 6 +- src/main/java/gregtech/api/util/GT_Config.java | 29 +- .../gregtech/api/util/GT_CoverBehaviorBase.java | 37 +- .../api/util/GT_ExoticEnergyInputHelper.java | 23 +- src/main/java/gregtech/api/util/GT_FoodStat.java | 21 +- .../java/gregtech/api/util/GT_Forestry_Compat.java | 3 +- src/main/java/gregtech/api/util/GT_GC_Compat.java | 6 +- .../gregtech/api/util/GT_HatchElementBuilder.java | 171 +- .../java/gregtech/api/util/GT_LanguageManager.java | 28 +- src/main/java/gregtech/api/util/GT_ModHandler.java | 302 +- .../api/util/GT_Multiblock_Tooltip_Builder.java | 19 +- .../gregtech/api/util/GT_OreDictUnificator.java | 21 +- .../gregtech/api/util/GT_PCBFactoryManager.java | 3 +- .../java/gregtech/api/util/GT_ParallelHelper.java | 10 +- src/main/java/gregtech/api/util/GT_Recipe.java | 1243 +-- .../java/gregtech/api/util/GT_RecipeBuilder.java | 19 +- .../java/gregtech/api/util/GT_RecipeConstants.java | 101 +- .../java/gregtech/api/util/GT_RecipeMapUtil.java | 36 +- .../gregtech/api/util/GT_RecipeRegistrator.java | 29 +- .../java/gregtech/api/util/GT_RenderingWorld.java | 14 +- .../java/gregtech/api/util/GT_Shaped_Recipe.java | 17 +- .../gregtech/api/util/GT_Shapeless_Recipe.java | 17 +- .../gregtech/api/util/GT_Single_Recipe_Check.java | 50 +- .../GT_Single_Recipe_Check_Processing_Array.java | 18 +- .../gregtech/api/util/GT_SpawnEventHandler.java | 12 +- .../gregtech/api/util/GT_StructureUtility.java | 67 +- src/main/java/gregtech/api/util/GT_Util.java | 52 +- src/main/java/gregtech/api/util/GT_Utility.java | 423 +- .../java/gregtech/api/util/GT_UtilityClient.java | 6 +- .../java/gregtech/api/util/LightingHelper.java | 654 +- src/main/java/gregtech/api/world/GT_Worldgen.java | 21 +- .../api/world/GT_Worldgen_Ore_SingleBlock.java | 3 +- .../GT_Worldgen_Ore_SingleBlock_UnderLava.java | 3 +- .../java/gregtech/client/GT_GUI_ClientConfig.java | 10 +- src/main/java/gregtech/client/GT_SoundLoop.java | 9 +- src/main/java/gregtech/common/GT_Client.java | 136 +- src/main/java/gregtech/common/GT_Network.java | 51 +- src/main/java/gregtech/common/GT_Pollution.java | 18 +- src/main/java/gregtech/common/GT_Proxy.java | 576 +- src/main/java/gregtech/common/GT_RecipeAdder.java | 148 +- .../java/gregtech/common/GT_ThaumcraftCompat.java | 8 +- .../java/gregtech/common/GT_UndergroundOil.java | 29 +- .../gregtech/common/GT_Worldgen_GT_Ore_Layer.java | 263 +- .../common/GT_Worldgen_GT_Ore_SmallPieces.java | 22 +- .../java/gregtech/common/GT_Worldgen_Stone.java | 44 +- .../java/gregtech/common/GT_Worldgenerator.java | 45 +- .../java/gregtech/common/bees/GT_AlleleHelper.java | 79 +- .../java/gregtech/common/bees/GT_Bee_Mutation.java | 3 +- .../gregtech/common/blocks/GT_Block_Casings1.java | 5 +- .../gregtech/common/blocks/GT_Block_Casings2.java | 4 +- .../gregtech/common/blocks/GT_Block_Casings4.java | 10 +- .../gregtech/common/blocks/GT_Block_Casings8.java | 10 +- .../gregtech/common/blocks/GT_Block_Casings9.java | 5 +- .../common/blocks/GT_Block_Casings_Abstract.java | 4 +- .../gregtech/common/blocks/GT_Block_Machines.java | 36 +- .../java/gregtech/common/blocks/GT_Block_Ores.java | 20 +- .../common/blocks/GT_Block_Ores_Abstract.java | 6 +- .../common/blocks/GT_Block_Reinforced.java | 109 +- .../gregtech/common/blocks/GT_Block_Storage.java | 4 +- .../gregtech/common/blocks/GT_Item_Casings5.java | 10 +- .../common/blocks/GT_Item_Casings_Abstract.java | 60 +- .../gregtech/common/blocks/GT_Item_Concretes.java | 5 +- .../common/blocks/GT_Item_LongDistancePipe.java | 10 +- .../gregtech/common/blocks/GT_Item_Machines.java | 19 +- .../java/gregtech/common/blocks/GT_Item_Ores.java | 4 +- .../common/blocks/GT_Item_Stones_Abstract.java | 5 +- .../gregtech/common/blocks/GT_TileEntity_Ores.java | 47 +- .../java/gregtech/common/covers/CoverInfo.java | 31 +- .../java/gregtech/common/covers/GT_Cover_Arm.java | 207 +- .../common/covers/GT_Cover_ControlsWork.java | 99 +- .../gregtech/common/covers/GT_Cover_Conveyor.java | 157 +- .../gregtech/common/covers/GT_Cover_DoesWork.java | 59 +- .../gregtech/common/covers/GT_Cover_Drain.java | 43 +- .../gregtech/common/covers/GT_Cover_EUMeter.java | 92 +- .../common/covers/GT_Cover_FacadeBase.java | 124 +- .../common/covers/GT_Cover_FluidLimiter.java | 18 +- .../common/covers/GT_Cover_FluidRegulator.java | 303 +- .../covers/GT_Cover_FluidStorageMonitor.java | 32 +- .../common/covers/GT_Cover_Fluidfilter.java | 191 +- .../common/covers/GT_Cover_ItemFilter.java | 59 +- .../gregtech/common/covers/GT_Cover_ItemMeter.java | 120 +- .../common/covers/GT_Cover_LiquidMeter.java | 108 +- .../common/covers/GT_Cover_NeedMaintainance.java | 150 +- .../common/covers/GT_Cover_PlayerDetector.java | 73 +- .../java/gregtech/common/covers/GT_Cover_Pump.java | 177 +- .../GT_Cover_RedstoneTransmitterInternal.java | 5 +- .../covers/GT_Cover_RedstoneWirelessBase.java | 65 +- .../gregtech/common/covers/GT_Cover_Shutter.java | 93 +- .../common/covers/GT_Cover_SolarPanel.java | 19 +- .../GT_Cover_AdvancedRedstoneReceiverBase.java | 92 +- .../GT_Cover_AdvancedRedstoneTransmitterBase.java | 10 +- .../GT_Cover_AdvancedWirelessRedstoneBase.java | 92 +- .../redstone/GT_Cover_WirelessFluidDetector.java | 14 +- .../redstone/GT_Cover_WirelessItemDetector.java | 68 +- .../GT_Cover_WirelessMaintenanceDetector.java | 11 +- .../gregtech/common/entities/GT_Entity_Arrow.java | 91 +- src/main/java/gregtech/common/fluid/GT_Fluid.java | 7 +- .../gregtech/common/gui/modularui/UIHelper.java | 20 +- .../modularui/uifactory/SelectItemUIFactory.java | 44 +- .../modularui/widget/CoverCycleButtonWidget.java | 21 +- .../CoverDataFollower_ToggleButtonWidget.java | 15 +- .../modularui/widget/FluidDisplaySlotWidget.java | 8 +- src/main/java/gregtech/common/items/CombType.java | 10 +- src/main/java/gregtech/common/items/DropType.java | 5 +- .../gregtech/common/items/GT_FluidDisplayItem.java | 20 +- .../common/items/GT_IntegratedCircuit_Item.java | 26 +- .../common/items/GT_MetaGenerated_Item_01.java | 230 +- .../common/items/GT_MetaGenerated_Item_02.java | 39 +- .../common/items/GT_MetaGenerated_Item_03.java | 142 +- .../common/items/GT_MetaGenerated_Item_98.java | 7 +- .../common/items/GT_MetaGenerated_Item_99.java | 4 +- .../common/items/GT_NeutronReflector_Item.java | 11 +- .../gregtech/common/items/GT_VolumetricFlask.java | 52 +- src/main/java/gregtech/common/items/ItemComb.java | 10 +- .../java/gregtech/common/items/PollenType.java | 5 +- .../java/gregtech/common/items/PropolisType.java | 5 +- .../items/behaviors/Behaviour_Cover_Tool.java | 11 +- .../items/behaviors/Behaviour_DataStick.java | 6 +- .../common/items/behaviors/Behaviour_Hoe.java | 13 +- .../common/items/behaviors/Behaviour_Lighter.java | 15 +- .../behaviors/Behaviour_Plunger_Essentia.java | 5 +- .../items/behaviors/Behaviour_Plunger_Fluid.java | 15 +- .../items/behaviors/Behaviour_Plunger_Item.java | 15 +- .../items/behaviors/Behaviour_Prospecting.java | 16 +- .../common/items/behaviors/Behaviour_Scanner.java | 5 +- .../common/items/behaviors/Behaviour_Scoop.java | 22 +- .../common/items/behaviors/Behaviour_Sense.java | 5 +- .../items/behaviors/Behaviour_SoftHammer.java | 75 +- .../items/behaviors/Behaviour_Spray_Color.java | 10 +- .../common/items/behaviors/Behaviour_Wrench.java | 7 +- .../items/behaviors/Behaviour_WrittenBook.java | 3 +- src/main/java/gregtech/common/misc/GT_Command.java | 29 +- .../common/misc/GT_DrillingLogicDelegate.java | 63 +- .../misc/spaceprojects/SpaceProjectManager.java | 21 +- .../spaceprojects/SpaceProjectWorldSavedData.java | 107 +- .../common/misc/spaceprojects/base/SP_Upgrade.java | 24 +- .../misc/spaceprojects/base/SpaceProject.java | 19 +- .../misc/spaceprojects/commands/SPM_Command.java | 18 +- .../misc/spaceprojects/commands/SP_Command.java | 4 +- .../redstonecircuits/GT_Circuit_Randomizer.java | 5 +- .../gregtech/common/render/GT_CapeRenderer.java | 37 +- .../common/render/GT_CopiedBlockTexture.java | 12 +- .../common/render/GT_CopiedCTMBlockTexture.java | 39 +- .../gregtech/common/render/GT_FlaskRenderer.java | 6 +- .../render/GT_FluidDisplayStackRenderer.java | 9 +- .../render/GT_MetaGenerated_Tool_Renderer.java | 10 +- .../common/render/GT_PollutionRenderer.java | 4 +- .../gregtech/common/render/GT_RenderedTexture.java | 23 +- .../gregtech/common/render/GT_Renderer_Block.java | 43 +- .../gregtech/common/render/GT_TextureBuilder.java | 6 +- .../render/items/GT_GeneratedItem_Renderer.java | 6 +- .../items/GT_GeneratedMaterial_Renderer.java | 3 +- .../common/render/items/InfinityRenderer.java | 3 +- .../common/render/items/UniversiumRenderer.java | 19 +- .../automation/GT_MetaTileEntity_ChestBuffer.java | 10 +- .../automation/GT_MetaTileEntity_Filter.java | 98 +- .../GT_MetaTileEntity_ItemDistributor.java | 10 +- .../automation/GT_MetaTileEntity_RecipeFilter.java | 5 +- .../automation/GT_MetaTileEntity_Regulator.java | 53 +- .../automation/GT_MetaTileEntity_SuperBuffer.java | 12 +- .../automation/GT_MetaTileEntity_TypeFilter.java | 9 +- .../boilers/GT_MetaTileEntity_Boiler.java | 120 +- .../boilers/GT_MetaTileEntity_Boiler_Bronze.java | 122 +- .../boilers/GT_MetaTileEntity_Boiler_Lava.java | 140 +- .../boilers/GT_MetaTileEntity_Boiler_Solar.java | 15 +- .../boilers/GT_MetaTileEntity_Boiler_Steel.java | 10 +- .../casings/upgrade/InventoryUpgrade.java | 21 +- .../GT_MetaTileEntity_AdvDebugStructureWriter.java | 162 +- .../GT_MetaTileEntity_DieselGenerator.java | 57 +- .../generators/GT_MetaTileEntity_GasTurbine.java | 56 +- .../generators/GT_MetaTileEntity_LightningRod.java | 20 +- .../GT_MetaTileEntity_MagicEnergyConverter.java | 50 +- .../GT_MetaTileEntity_MagicalEnergyAbsorber.java | 104 +- .../GT_MetaTileEntity_NaquadahReactor.java | 60 +- .../GT_MetaTileEntity_PlasmaGenerator.java | 25 +- .../generators/GT_MetaTileEntity_SteamTurbine.java | 56 +- .../GT_MetaTileEntity_BasicHull_Bronze.java | 15 +- .../GT_MetaTileEntity_BasicHull_BronzeBricks.java | 15 +- .../GT_MetaTileEntity_BasicHull_Steel.java | 10 +- .../GT_MetaTileEntity_BasicHull_SteelBricks.java | 15 +- .../GT_MetaTileEntity_Hatch_InputBus_ME.java | 177 +- .../GT_MetaTileEntity_Hatch_OutputBus_ME.java | 45 +- .../GT_MetaTileEntity_Hatch_Output_ME.java | 30 +- .../GT_MetaTileEntity_AdvSeismicProspector.java | 91 +- .../basic/GT_MetaTileEntity_Boxinator.java | 52 +- .../basic/GT_MetaTileEntity_CuringOven.java | 15 +- .../basic/GT_MetaTileEntity_Disassembler.java | 175 +- .../basic/GT_MetaTileEntity_IndustrialApiary.java | 423 +- .../basic/GT_MetaTileEntity_Massfabricator.java | 52 +- ..._MetaTileEntity_MicrowaveEnergyTransmitter.java | 79 +- .../machines/basic/GT_MetaTileEntity_Miner.java | 87 +- .../basic/GT_MetaTileEntity_MonsterRepellent.java | 22 +- .../basic/GT_MetaTileEntity_PotionBrewer.java | 48 +- .../machines/basic/GT_MetaTileEntity_Printer.java | 4 +- .../machines/basic/GT_MetaTileEntity_Pump.java | 45 +- .../basic/GT_MetaTileEntity_Replicator.java | 54 +- .../basic/GT_MetaTileEntity_RockBreaker.java | 40 +- .../machines/basic/GT_MetaTileEntity_Scanner.java | 142 +- .../basic/GT_MetaTileEntity_SeismicProspector.java | 108 +- .../basic/GT_MetaTileEntity_Teleporter.java | 147 +- ...GT_MetaTileEntity_LongDistancePipelineBase.java | 12 +- ...T_MetaTileEntity_LongDistancePipelineFluid.java | 6 +- ...GT_MetaTileEntity_LongDistancePipelineItem.java | 6 +- .../multi/GT_MetaTileEntity_AssemblyLine.java | 321 +- .../GT_MetaTileEntity_BrickedBlastFurnace.java | 31 +- .../GT_MetaTileEntity_BronzeBlastFurnace.java | 5 +- .../multi/GT_MetaTileEntity_Charcoal_Pit.java | 66 +- .../multi/GT_MetaTileEntity_Cleanroom.java | 111 +- .../GT_MetaTileEntity_ConcreteBackfillerBase.java | 53 +- .../multi/GT_MetaTileEntity_DieselEngine.java | 114 +- .../multi/GT_MetaTileEntity_DistillationTower.java | 213 +- .../multi/GT_MetaTileEntity_DrillerBase.java | 120 +- .../GT_MetaTileEntity_ElectricBlastFurnace.java | 174 +- .../GT_MetaTileEntity_ExtremeDieselEngine.java | 71 +- .../multi/GT_MetaTileEntity_FusionComputer.java | 316 +- .../multi/GT_MetaTileEntity_FusionComputer1.java | 40 +- .../multi/GT_MetaTileEntity_FusionComputer2.java | 40 +- .../multi/GT_MetaTileEntity_FusionComputer3.java | 40 +- .../multi/GT_MetaTileEntity_HeatExchanger.java | 181 +- .../GT_MetaTileEntity_ImplosionCompressor.java | 58 +- .../GT_MetaTileEntity_IntegratedOreFactory.java | 346 +- .../multi/GT_MetaTileEntity_LargeBoiler.java | 130 +- .../GT_MetaTileEntity_LargeChemicalReactor.java | 155 +- .../multi/GT_MetaTileEntity_LargeTurbine.java | 68 +- .../multi/GT_MetaTileEntity_LargeTurbine_Gas.java | 41 +- ...GT_MetaTileEntity_LargeTurbine_GasAdvanced.java | 40 +- .../GT_MetaTileEntity_LargeTurbine_HPSteam.java | 45 +- .../GT_MetaTileEntity_LargeTurbine_Plasma.java | 62 +- .../GT_MetaTileEntity_LargeTurbine_Steam.java | 46 +- .../multi/GT_MetaTileEntity_MultiFurnace.java | 122 +- .../multi/GT_MetaTileEntity_NanoForge.java | 259 +- .../multi/GT_MetaTileEntity_OilCracker.java | 191 +- .../multi/GT_MetaTileEntity_OilDrillBase.java | 75 +- .../multi/GT_MetaTileEntity_OilDrillInfinite.java | 26 +- .../GT_MetaTileEntity_OreDrillingPlantBase.java | 68 +- .../multi/GT_MetaTileEntity_PCBFactory.java | 1144 ++- .../multi/GT_MetaTileEntity_PlasmaForge.java | 254 +- .../GT_MetaTileEntity_PrimitiveBlastFurnace.java | 233 +- .../multi/GT_MetaTileEntity_ProcessingArray.java | 147 +- .../multi/GT_MetaTileEntity_PyrolyseOven.java | 136 +- .../GT_MetaTileEntity_TranscendentPlasmaMixer.java | 89 +- .../multi/GT_MetaTileEntity_VacuumFreezer.java | 48 +- .../machines/multiblock/MultiBlock_CokeOven.java | 58 +- .../machines/multiblock/MultiBlock_Macerator.java | 144 +- .../GT_MetaTileEntity_AlloySmelter_Bronze.java | 72 +- .../GT_MetaTileEntity_AlloySmelter_Steel.java | 72 +- .../steam/GT_MetaTileEntity_Compressor_Bronze.java | 68 +- .../steam/GT_MetaTileEntity_Compressor_Steel.java | 68 +- .../steam/GT_MetaTileEntity_Extractor_Bronze.java | 64 +- .../steam/GT_MetaTileEntity_Extractor_Steel.java | 64 +- .../GT_MetaTileEntity_ForgeHammer_Bronze.java | 60 +- .../steam/GT_MetaTileEntity_ForgeHammer_Steel.java | 60 +- .../steam/GT_MetaTileEntity_Furnace_Bronze.java | 56 +- .../steam/GT_MetaTileEntity_Furnace_Steel.java | 60 +- .../steam/GT_MetaTileEntity_Macerator_Bronze.java | 91 +- .../steam/GT_MetaTileEntity_Macerator_Steel.java | 90 +- .../GT_MetaTileEntity_DigitalChestBase.java | 69 +- .../storage/GT_MetaTileEntity_DigitalTankBase.java | 302 +- src/main/java/gregtech/common/tools/GT_Tool.java | 4 +- .../java/gregtech/common/tools/GT_Tool_Axe.java | 8 +- .../common/tools/GT_Tool_BranchCutter.java | 8 +- .../gregtech/common/tools/GT_Tool_Chainsaw_LV.java | 9 +- .../gregtech/common/tools/GT_Tool_Crowbar.java | 4 +- .../gregtech/common/tools/GT_Tool_HardHammer.java | 32 +- .../gregtech/common/tools/GT_Tool_JackHammer.java | 16 +- .../java/gregtech/common/tools/GT_Tool_Plow.java | 23 +- .../java/gregtech/common/tools/GT_Tool_Saw.java | 9 +- .../gregtech/common/tools/GT_Tool_Screwdriver.java | 3 +- .../java/gregtech/common/tools/GT_Tool_Sense.java | 23 +- .../common/tools/GT_Tool_Soldering_Iron.java | 3 +- .../java/gregtech/common/tools/GT_Tool_Wrench.java | 8 +- src/main/java/gregtech/loaders/ExtraIcons.java | 8 +- .../java/gregtech/loaders/load/GT_FuelLoader.java | 40 +- .../gregtech/loaders/load/GT_ItemIterator.java | 286 +- .../gregtech/loaders/load/GT_SonictronLoader.java | 4 +- .../gregtech/loaders/misc/GT_Achievements.java | 580 +- .../gregtech/loaders/misc/GT_BeeDefinition.java | 222 +- .../gregtech/loaders/misc/GT_BranchDefinition.java | 5 +- .../loaders/oreprocessing/ProcessingAll.java | 8 +- .../loaders/oreprocessing/ProcessingArrows.java | 6 +- .../loaders/oreprocessing/ProcessingBlock.java | 30 +- .../loaders/oreprocessing/ProcessingCell.java | 10 +- .../loaders/oreprocessing/ProcessingCrop.java | 12 +- .../loaders/oreprocessing/ProcessingDust.java | 26 +- .../loaders/oreprocessing/ProcessingDye.java | 15 +- .../loaders/oreprocessing/ProcessingFood.java | 7 +- .../loaders/oreprocessing/ProcessingGem.java | 14 +- .../loaders/oreprocessing/ProcessingIngot.java | 34 +- .../loaders/oreprocessing/ProcessingLens.java | 6 +- .../loaders/oreprocessing/ProcessingLog.java | 49 +- .../loaders/oreprocessing/ProcessingNugget.java | 10 +- .../loaders/oreprocessing/ProcessingOre.java | 80 +- .../oreprocessing/ProcessingOreSmelting.java | 12 +- .../loaders/oreprocessing/ProcessingPipe.java | 9 +- .../loaders/oreprocessing/ProcessingPlate.java | 19 +- .../loaders/oreprocessing/ProcessingRound.java | 5 +- .../loaders/oreprocessing/ProcessingShaping.java | 7 +- .../loaders/oreprocessing/ProcessingToolOther.java | 56 +- .../oreprocessing/ProcessingTransforming.java | 24 +- .../loaders/oreprocessing/ProcessingWire.java | 53 +- .../loaders/postload/GT_BookAndLootLoader.java | 15 +- .../loaders/postload/GT_CraftingRecipeLoader.java | 81 +- .../postload/GT_ItemMaxStacksizeLoader.java | 162 +- .../gregtech/loaders/postload/GT_PostLoad.java | 261 +- .../postload/GT_ProcessingArrayRecipeLoader.java | 145 +- .../postload/GT_RecyclerBlacklistLoader.java | 17 +- .../postload/chains/GT_PCBFactoryRecipes.java | 213 +- .../postload/recipes/AlloySmelterRecipes.java | 100 +- .../postload/recipes/ArcFurnaceRecipes.java | 792 +- .../loaders/postload/recipes/AssemblerRecipes.java | 9625 ++++++++++++-------- .../postload/recipes/AssemblyLineRecipes.java | 1304 +-- .../loaders/postload/recipes/AutoclaveRecipes.java | 353 +- .../loaders/postload/recipes/BenderRecipes.java | 451 +- .../postload/recipes/BlastFurnaceRecipes.java | 815 +- .../loaders/postload/recipes/BreweryRecipes.java | 689 +- .../loaders/postload/recipes/CannerRecipes.java | 76 +- .../postload/recipes/CentrifugeRecipes.java | 1292 ++- .../postload/recipes/ChemicalBathRecipes.java | 409 +- .../loaders/postload/recipes/ChemicalRecipes.java | 8486 ++++++++++------- .../postload/recipes/CircuitAssemblerRecipes.java | 394 +- .../postload/recipes/CompressorRecipes.java | 215 +- .../postload/recipes/CropProcessingRecipes.java | 44 +- .../loaders/postload/recipes/CuttingRecipes.java | 77 +- .../postload/recipes/DistilleryRecipes.java | 945 +- .../postload/recipes/ElectrolyzerRecipes.java | 405 +- .../recipes/ElectromagneticSeparatorRecipes.java | 13 +- .../loaders/postload/recipes/ExtractorRecipes.java | 10 +- .../loaders/postload/recipes/ExtruderRecipes.java | 22 +- .../loaders/postload/recipes/FermenterRecipes.java | 577 +- .../postload/recipes/FluidCannerRecipes.java | 108 +- .../postload/recipes/FluidExtractorRecipes.java | 855 +- .../postload/recipes/FluidHeaterRecipes.java | 113 +- .../postload/recipes/FluidSolidifierRecipes.java | 857 +- .../postload/recipes/ForgeHammerRecipes.java | 227 +- .../postload/recipes/FormingPressRecipes.java | 260 +- .../loaders/postload/recipes/FuelRecipes.java | 221 +- .../postload/recipes/FusionReactorRecipes.java | 523 +- .../recipes/ImplosionCompressorRecipes.java | 43 +- .../postload/recipes/LaserEngraverRecipes.java | 58 +- .../loaders/postload/recipes/LatheRecipes.java | 30 +- .../postload/recipes/MatterAmplifierRecipes.java | 22 +- .../loaders/postload/recipes/MixerRecipes.java | 2760 +++--- .../loaders/postload/recipes/PackagerRecipes.java | 53 +- .../postload/recipes/PlasmaForgeRecipes.java | 44 +- .../loaders/postload/recipes/PrinterRecipes.java | 70 +- .../loaders/postload/recipes/Pulverizer.java | 956 +- .../loaders/postload/recipes/PyrolyseRecipes.java | 156 +- .../loaders/postload/recipes/RecipeRemover.java | 32 +- .../loaders/postload/recipes/SifterRecipes.java | 50 +- .../loaders/postload/recipes/SlicerRecipes.java | 44 +- .../loaders/postload/recipes/SmelterRecipes.java | 10 +- .../postload/recipes/ThermalCentrifugeRecipes.java | 18 +- .../recipes/TranscendentPlasmaMixerRecipes.java | 128 +- .../postload/recipes/VacuumFreezerRecipes.java | 668 +- .../loaders/postload/recipes/WiremillRecipes.java | 260 +- .../loaders/preload/GT_Loader_ItemData.java | 290 +- .../preload/GT_Loader_Item_Block_And_Fluid.java | 1996 ++-- .../preload/GT_Loader_MetaTileEntities.java | 1117 ++- .../preload/GT_Loader_MultiTileEntities.java | 88 +- .../loaders/preload/GT_Loader_OreDictionary.java | 170 +- .../java/gregtech/loaders/preload/GT_PreLoad.java | 808 +- .../java/gregtech/nei/GT_NEI_DefaultHandler.java | 155 +- src/main/java/gregtech/nei/NEI_GT_Config.java | 17 +- src/main/java/gregtech/nei/RecipeMapHandler.java | 7 +- .../java/gregtech/nei/dumper/GregTechIDDumper.java | 4 +- .../java/gregtech/nei/dumper/MaterialDumper.java | 5 +- .../gregtech/nei/dumper/MetaTileEntityDumper.java | 6 +- 499 files changed, 45167 insertions(+), 25256 deletions(-) (limited to 'src/main') diff --git a/src/main/java/gregtech/GT_Mod.java b/src/main/java/gregtech/GT_Mod.java index fabc76d581..ca00a5373f 100644 --- a/src/main/java/gregtech/GT_Mod.java +++ b/src/main/java/gregtech/GT_Mod.java @@ -222,7 +222,10 @@ public class GT_Mod implements IGT_Mod { Configuration tMainConfig = GT_PreLoad.getConfiguration(aEvent.getModConfigurationDirectory()); GT_PreLoad.initCompat(); - GT_PreLoad.createLogFiles(aEvent.getModConfigurationDirectory().getParentFile(), tMainConfig); + GT_PreLoad.createLogFiles( + aEvent.getModConfigurationDirectory() + .getParentFile(), + tMainConfig); gregtechproxy.onPreLoad(); @@ -239,7 +242,9 @@ public class GT_Mod implements IGT_Mod { GT_Log.out.println("GT_Mod: Saving Main Config"); tMainConfig.save(); - GT_PreLoad.initLocalization(aEvent.getModConfigurationDirectory().getParentFile()); + GT_PreLoad.initLocalization( + aEvent.getModConfigurationDirectory() + .getParentFile()); GT_PreLoad.adjustScrap(); EntityRegistry.registerModEntity(GT_Entity_Arrow.class, "GT_Entity_Arrow", 1, GT_Values.GT, 160, 1, true); @@ -279,7 +284,10 @@ public class GT_Mod implements IGT_Mod { } } - if (FMLCommonHandler.instance().getEffectiveSide().isServer()) GT_Assemblyline_Server.fillMap(aEvent); + if (FMLCommonHandler.instance() + .getEffectiveSide() + .isServer()) + GT_Assemblyline_Server.fillMap(aEvent); } @Mod.EventHandler @@ -441,8 +449,10 @@ public class GT_Mod implements IGT_Mod { aThermalCentrifugeRecipeList); if (GT_Values.D1) { - GT_ModHandler.sSingleNonBlockDamagableRecipeList - .forEach(iRecipe -> GT_Log.out.println("=> " + iRecipe.getRecipeOutput().getDisplayName())); + GT_ModHandler.sSingleNonBlockDamagableRecipeList.forEach( + iRecipe -> GT_Log.out.println( + "=> " + iRecipe.getRecipeOutput() + .getDisplayName())); } new GT_CraftingRecipeLoader().run(); if (GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.disabledrecipes, "ic2forgehammer", true)) { @@ -463,8 +473,13 @@ public class GT_Mod implements IGT_Mod { } if (GregTech_API.mAE2) { GT_MetaTileEntity_DigitalChestBase.registerAEIntegration(); - ItemStack facade = AEApi.instance().definitions().items().facade().maybeItem() - .transform(i -> new ItemStack(i, 1, GT_Values.W)).orNull(); + ItemStack facade = AEApi.instance() + .definitions() + .items() + .facade() + .maybeItem() + .transform(i -> new ItemStack(i, 1, GT_Values.W)) + .orNull(); if (facade != null) { GregTech_API.registerCover(facade, null, new GT_Cover_FacadeAE()); } @@ -474,10 +489,13 @@ public class GT_Mod implements IGT_Mod { new String[] { "blastfurnace", "blockcutter", "inductionFurnace", "generator", "windMill", "waterMill", "solarPanel", "centrifuge", "electrolyzer", "compressor", "electroFurnace", "extractor", "macerator", "recycler", "metalformer", "orewashingplant", "massFabricator", "replicator", }) - .filter( - tName -> GregTech_API.sRecipeFile - .get(ConfigCategories.Recipes.disabledrecipes, aTextIC2 + tName, true)) - .map(tName -> GT_ModHandler.getIC2Item(tName, 1L)).forEach(GT_ModHandler::removeRecipeByOutputDelayed); + .filter( + tName -> GregTech_API.sRecipeFile.get( + ConfigCategories.Recipes.disabledrecipes, + aTextIC2 + tName, + true)) + .map(tName -> GT_ModHandler.getIC2Item(tName, 1L)) + .forEach(GT_ModHandler::removeRecipeByOutputDelayed); GT_PostLoad.nerfVanillaTools(); new GT_ExtremeDieselFuelLoader().run(); @@ -595,61 +613,110 @@ public class GT_Mod implements IGT_Mod { ArrayList tStacks = new ArrayList<>(10000); GT_Log.out.println("GT_Mod: IC2 Machines"); - ic2.api.recipe.Recipes.cannerBottle.getRecipes().values().stream().map(t -> t.items).forEach(tStacks::addAll); - ic2.api.recipe.Recipes.centrifuge.getRecipes().values().stream().map(t -> t.items).forEach(tStacks::addAll); - ic2.api.recipe.Recipes.compressor.getRecipes().values().stream().map(t -> t.items).forEach(tStacks::addAll); - ic2.api.recipe.Recipes.extractor.getRecipes().values().stream().map(t -> t.items).forEach(tStacks::addAll); - ic2.api.recipe.Recipes.macerator.getRecipes().values().stream().map(t -> t.items).forEach(tStacks::addAll); - ic2.api.recipe.Recipes.metalformerCutting.getRecipes().values().stream().map(t -> t.items) - .forEach(tStacks::addAll); - ic2.api.recipe.Recipes.metalformerExtruding.getRecipes().values().stream().map(t -> t.items) - .forEach(tStacks::addAll); - ic2.api.recipe.Recipes.metalformerRolling.getRecipes().values().stream().map(t -> t.items) - .forEach(tStacks::addAll); - ic2.api.recipe.Recipes.matterAmplifier.getRecipes().values().stream().map(t -> t.items) - .forEach(tStacks::addAll); - ic2.api.recipe.Recipes.oreWashing.getRecipes().values().stream().map(t -> t.items).forEach(tStacks::addAll); + ic2.api.recipe.Recipes.cannerBottle.getRecipes() + .values() + .stream() + .map(t -> t.items) + .forEach(tStacks::addAll); + ic2.api.recipe.Recipes.centrifuge.getRecipes() + .values() + .stream() + .map(t -> t.items) + .forEach(tStacks::addAll); + ic2.api.recipe.Recipes.compressor.getRecipes() + .values() + .stream() + .map(t -> t.items) + .forEach(tStacks::addAll); + ic2.api.recipe.Recipes.extractor.getRecipes() + .values() + .stream() + .map(t -> t.items) + .forEach(tStacks::addAll); + ic2.api.recipe.Recipes.macerator.getRecipes() + .values() + .stream() + .map(t -> t.items) + .forEach(tStacks::addAll); + ic2.api.recipe.Recipes.metalformerCutting.getRecipes() + .values() + .stream() + .map(t -> t.items) + .forEach(tStacks::addAll); + ic2.api.recipe.Recipes.metalformerExtruding.getRecipes() + .values() + .stream() + .map(t -> t.items) + .forEach(tStacks::addAll); + ic2.api.recipe.Recipes.metalformerRolling.getRecipes() + .values() + .stream() + .map(t -> t.items) + .forEach(tStacks::addAll); + ic2.api.recipe.Recipes.matterAmplifier.getRecipes() + .values() + .stream() + .map(t -> t.items) + .forEach(tStacks::addAll); + ic2.api.recipe.Recipes.oreWashing.getRecipes() + .values() + .stream() + .map(t -> t.items) + .forEach(tStacks::addAll); GT_Log.out.println("GT_Mod: Dungeon Loot"); - for (WeightedRandomChestContent tContent : ChestGenHooks.getInfo("dungeonChest").getItems(new XSTR())) { + for (WeightedRandomChestContent tContent : ChestGenHooks.getInfo("dungeonChest") + .getItems(new XSTR())) { tStacks.add(tContent.theItemId); } - for (WeightedRandomChestContent tContent : ChestGenHooks.getInfo("bonusChest").getItems(new XSTR())) { + for (WeightedRandomChestContent tContent : ChestGenHooks.getInfo("bonusChest") + .getItems(new XSTR())) { tStacks.add(tContent.theItemId); } - for (WeightedRandomChestContent tContent : ChestGenHooks.getInfo("villageBlacksmith").getItems(new XSTR())) { + for (WeightedRandomChestContent tContent : ChestGenHooks.getInfo("villageBlacksmith") + .getItems(new XSTR())) { tStacks.add(tContent.theItemId); } - for (WeightedRandomChestContent tContent : ChestGenHooks.getInfo("strongholdCrossing").getItems(new XSTR())) { + for (WeightedRandomChestContent tContent : ChestGenHooks.getInfo("strongholdCrossing") + .getItems(new XSTR())) { tStacks.add(tContent.theItemId); } - for (WeightedRandomChestContent tContent : ChestGenHooks.getInfo("strongholdLibrary").getItems(new XSTR())) { + for (WeightedRandomChestContent tContent : ChestGenHooks.getInfo("strongholdLibrary") + .getItems(new XSTR())) { tStacks.add(tContent.theItemId); } - for (WeightedRandomChestContent tContent : ChestGenHooks.getInfo("strongholdCorridor").getItems(new XSTR())) { + for (WeightedRandomChestContent tContent : ChestGenHooks.getInfo("strongholdCorridor") + .getItems(new XSTR())) { tStacks.add(tContent.theItemId); } for (WeightedRandomChestContent tContent : ChestGenHooks.getInfo("pyramidJungleDispenser") - .getItems(new XSTR())) { + .getItems(new XSTR())) { tStacks.add(tContent.theItemId); } - for (WeightedRandomChestContent tContent : ChestGenHooks.getInfo("pyramidJungleChest").getItems(new XSTR())) { + for (WeightedRandomChestContent tContent : ChestGenHooks.getInfo("pyramidJungleChest") + .getItems(new XSTR())) { tStacks.add(tContent.theItemId); } - for (WeightedRandomChestContent tContent : ChestGenHooks.getInfo("pyramidDesertyChest").getItems(new XSTR())) { + for (WeightedRandomChestContent tContent : ChestGenHooks.getInfo("pyramidDesertyChest") + .getItems(new XSTR())) { tStacks.add(tContent.theItemId); } - for (WeightedRandomChestContent tContent : ChestGenHooks.getInfo("mineshaftCorridor").getItems(new XSTR())) { + for (WeightedRandomChestContent tContent : ChestGenHooks.getInfo("mineshaftCorridor") + .getItems(new XSTR())) { tStacks.add(tContent.theItemId); } GT_Log.out.println("GT_Mod: Smelting"); // noinspection unchecked// Deal with legacy Minecraft raw types - FurnaceRecipes.smelting().getSmeltingList().values().forEach(k -> tStacks.add((ItemStack) k)); + FurnaceRecipes.smelting() + .getSmeltingList() + .values() + .forEach(k -> tStacks.add((ItemStack) k)); if (gregtechproxy.mCraftingUnification) { GT_Log.out.println("GT_Mod: Crafting Recipes"); - for (Object tRecipe : CraftingManager.getInstance().getRecipeList()) { + for (Object tRecipe : CraftingManager.getInstance() + .getRecipeList()) { if ((tRecipe instanceof IRecipe)) { tStacks.add(((IRecipe) tRecipe).getRecipeOutput()); } @@ -662,8 +729,8 @@ public class GT_Mod implements IGT_Mod { "A Recipe used an OreDict Item as Output directly, without copying it before!!! This is a typical CallByReference/CallByValue Error"); GT_FML_LOGGER.error( "Said Item will be renamed to make the invalid Recipe visible, so that you can report it properly."); - GT_FML_LOGGER - .error("Please check all Recipes outputting this Item, and report the Recipes to their Owner."); + GT_FML_LOGGER.error( + "Please check all Recipes outputting this Item, and report the Recipes to their Owner."); GT_FML_LOGGER.error( "The Owner of the ==>RECIPE<==, NOT the Owner of the Item, which has been mentioned above!!!"); GT_FML_LOGGER.error( @@ -675,8 +742,8 @@ public class GT_Mod implements IGT_Mod { GT_FML_LOGGER.error("And speaking of failed Reports:"); GT_FML_LOGGER.error( "Both IC2 and GregTech CANNOT be the CAUSE of this Problem, so don't report it to either of them."); - GT_FML_LOGGER - .error("I REPEAT, BOTH, IC2 and GregTech CANNOT be the source of THIS BUG. NO MATTER WHAT."); + GT_FML_LOGGER.error( + "I REPEAT, BOTH, IC2 and GregTech CANNOT be the source of THIS BUG. NO MATTER WHAT."); GT_FML_LOGGER.error( "Asking in the IC2 Forums, which Mod is causing that, won't help anyone, since it is not possible to determine, which Mod it is."); GT_FML_LOGGER.error( diff --git a/src/main/java/gregtech/api/GregTech_API.java b/src/main/java/gregtech/api/GregTech_API.java index d8ad1ca07b..7a8b495a4b 100644 --- a/src/main/java/gregtech/api/GregTech_API.java +++ b/src/main/java/gregtech/api/GregTech_API.java @@ -185,12 +185,13 @@ public class GregTech_API { sHeatHazmatList = new GT_HashSet<>(), sRadioHazmatList = new GT_HashSet<>(), sElectroHazmatList = new GT_HashSet<>(); - private static final Multimap sRealConfigurationList = Multimaps - .newListMultimap(new TreeMap<>(), ArrayList::new); + private static final Multimap sRealConfigurationList = Multimaps.newListMultimap( + new TreeMap<>(), + ArrayList::new); private static final Map> sConfigurationLists = new ConcurrentHashMap<>(); private static final Map, BiFunction> sRealCircuitProgrammerList = new LinkedHashMap<>(); - public static final Map, BiFunction> sCircuitProgrammerList = Collections - .unmodifiableMap(sRealCircuitProgrammerList); + public static final Map, BiFunction> sCircuitProgrammerList = Collections.unmodifiableMap( + sRealCircuitProgrammerList); /** * The List of Dimensions, which are Whitelisted for the Teleporter. This list should not contain other Planets. @@ -455,34 +456,36 @@ public class GregTech_API { int aTier, int aDamageEnergyCost, int aSpecials, double aArmorAbsorbtionPercentage, boolean aChargeProvider, int aType, int aArmorIndex) { try { - return (Item) Class.forName("gregtechmod.api.items.GT_EnergyArmorIC_Item").getConstructors()[0].newInstance( - aUnlocalized, - aEnglish, - aCharge, - aTransfer, - aTier, - aDamageEnergyCost, - aSpecials, - aArmorAbsorbtionPercentage, - aChargeProvider, - aType, - aArmorIndex); + return (Item) Class.forName("gregtechmod.api.items.GT_EnergyArmorIC_Item") + .getConstructors()[0].newInstance( + aUnlocalized, + aEnglish, + aCharge, + aTransfer, + aTier, + aDamageEnergyCost, + aSpecials, + aArmorAbsorbtionPercentage, + aChargeProvider, + aType, + aArmorIndex); } catch (Throwable e) { /* Do nothing */ } try { - return (Item) Class.forName("gregtechmod.api.items.GT_EnergyArmor_Item").getConstructors()[0].newInstance( - aUnlocalized, - aEnglish, - aCharge, - aTransfer, - aTier, - aDamageEnergyCost, - aSpecials, - aArmorAbsorbtionPercentage, - aChargeProvider, - aType, - aArmorIndex); + return (Item) Class.forName("gregtechmod.api.items.GT_EnergyArmor_Item") + .getConstructors()[0].newInstance( + aUnlocalized, + aEnglish, + aCharge, + aTransfer, + aTier, + aDamageEnergyCost, + aSpecials, + aArmorAbsorbtionPercentage, + aChargeProvider, + aType, + aArmorIndex); } catch (Throwable e) { /* Do nothing */ } @@ -499,14 +502,28 @@ public class GregTech_API { public static Item constructElectricEnergyStorageItem(String aUnlocalized, String aEnglish, int aCharge, int aTransfer, int aTier, int aEmptyID, int aFullID) { try { - return (Item) Class.forName("gregtechmod.api.items.GT_EnergyStoreIC_Item").getConstructors()[0] - .newInstance(aUnlocalized, aEnglish, aCharge, aTransfer, aTier, aEmptyID, aFullID); + return (Item) Class.forName("gregtechmod.api.items.GT_EnergyStoreIC_Item") + .getConstructors()[0].newInstance( + aUnlocalized, + aEnglish, + aCharge, + aTransfer, + aTier, + aEmptyID, + aFullID); } catch (Throwable e) { /* Do nothing */ } try { - return (Item) Class.forName("gregtechmod.api.items.GT_EnergyStore_Item").getConstructors()[0] - .newInstance(aUnlocalized, aEnglish, aCharge, aTransfer, aTier, aEmptyID, aFullID); + return (Item) Class.forName("gregtechmod.api.items.GT_EnergyStore_Item") + .getConstructors()[0].newInstance( + aUnlocalized, + aEnglish, + aCharge, + aTransfer, + aTier, + aEmptyID, + aFullID); } catch (Throwable e) { /* Do nothing */ } @@ -523,8 +540,12 @@ public class GregTech_API { public static GT_Tool_Item constructHardHammerItem(String aUnlocalized, String aEnglish, int aMaxDamage, int aEntityDamage) { try { - return (GT_Tool_Item) Class.forName("gregtechmod.api.items.GT_HardHammer_Item").getConstructors()[0] - .newInstance(aUnlocalized, aEnglish, aMaxDamage, aEntityDamage); + return (GT_Tool_Item) Class.forName("gregtechmod.api.items.GT_HardHammer_Item") + .getConstructors()[0].newInstance( + aUnlocalized, + aEnglish, + aMaxDamage, + aEntityDamage); } catch (Throwable e) { /* Do nothing */ } @@ -543,14 +564,22 @@ public class GregTech_API { public static GT_Tool_Item constructCrowbarItem(String aUnlocalized, String aEnglish, int aMaxDamage, int aEntityDamage) { try { - return (GT_Tool_Item) Class.forName("gregtechmod.api.items.GT_CrowbarRC_Item").getConstructors()[0] - .newInstance(aUnlocalized, aEnglish, aMaxDamage, aEntityDamage); + return (GT_Tool_Item) Class.forName("gregtechmod.api.items.GT_CrowbarRC_Item") + .getConstructors()[0].newInstance( + aUnlocalized, + aEnglish, + aMaxDamage, + aEntityDamage); } catch (Throwable e) { /* Do nothing */ } try { - return (GT_Tool_Item) Class.forName("gregtechmod.api.items.GT_Crowbar_Item").getConstructors()[0] - .newInstance(aUnlocalized, aEnglish, aMaxDamage, aEntityDamage); + return (GT_Tool_Item) Class.forName("gregtechmod.api.items.GT_Crowbar_Item") + .getConstructors()[0].newInstance( + aUnlocalized, + aEnglish, + aMaxDamage, + aEntityDamage); } catch (Throwable e) { /* Do nothing */ } @@ -569,8 +598,13 @@ public class GregTech_API { public static GT_Tool_Item constructWrenchItem(String aUnlocalized, String aEnglish, int aMaxDamage, int aEntityDamage, int aDisChargedGTID) { try { - return (GT_Tool_Item) Class.forName("gregtechmod.api.items.GT_Wrench_Item").getConstructors()[0] - .newInstance(aUnlocalized, aEnglish, aMaxDamage, aEntityDamage, aDisChargedGTID); + return (GT_Tool_Item) Class.forName("gregtechmod.api.items.GT_Wrench_Item") + .getConstructors()[0].newInstance( + aUnlocalized, + aEnglish, + aMaxDamage, + aEntityDamage, + aDisChargedGTID); } catch (Throwable e) { /* Do nothing */ } @@ -589,8 +623,13 @@ public class GregTech_API { public static GT_Tool_Item constructElectricScrewdriverItem(String aUnlocalized, String aEnglish, int aMaxDamage, int aEntityDamage, int aDisChargedGTID) { try { - return (GT_Tool_Item) Class.forName("gregtechmod.api.items.GT_ScrewdriverIC_Item").getConstructors()[0] - .newInstance(aUnlocalized, aEnglish, aMaxDamage, aEntityDamage, aDisChargedGTID); + return (GT_Tool_Item) Class.forName("gregtechmod.api.items.GT_ScrewdriverIC_Item") + .getConstructors()[0].newInstance( + aUnlocalized, + aEnglish, + aMaxDamage, + aEntityDamage, + aDisChargedGTID); } catch (Throwable e) { /* Do nothing */ } @@ -609,8 +648,13 @@ public class GregTech_API { public static GT_Tool_Item constructElectricWrenchItem(String aUnlocalized, String aEnglish, int aMaxDamage, int aEntityDamage, int aDisChargedGTID) { try { - return (GT_Tool_Item) Class.forName("gregtechmod.api.items.GT_WrenchIC_Item").getConstructors()[0] - .newInstance(aUnlocalized, aEnglish, aMaxDamage, aEntityDamage, aDisChargedGTID); + return (GT_Tool_Item) Class.forName("gregtechmod.api.items.GT_WrenchIC_Item") + .getConstructors()[0].newInstance( + aUnlocalized, + aEnglish, + aMaxDamage, + aEntityDamage, + aDisChargedGTID); } catch (Throwable e) { /* Do nothing */ } @@ -630,15 +674,16 @@ public class GregTech_API { int aEntityDamage, int aToolQuality, float aToolStrength, int aEnergyConsumptionPerBlockBreak, int aDisChargedGTID) { try { - return (GT_Tool_Item) Class.forName("gregtechmod.api.items.GT_SawIC_Item").getConstructors()[0].newInstance( - aUnlocalized, - aEnglish, - aMaxDamage, - aEntityDamage, - aToolQuality, - aToolStrength, - aEnergyConsumptionPerBlockBreak, - aDisChargedGTID); + return (GT_Tool_Item) Class.forName("gregtechmod.api.items.GT_SawIC_Item") + .getConstructors()[0].newInstance( + aUnlocalized, + aEnglish, + aMaxDamage, + aEntityDamage, + aToolQuality, + aToolStrength, + aEnergyConsumptionPerBlockBreak, + aDisChargedGTID); } catch (Throwable e) { /* Do nothing */ } @@ -658,16 +703,16 @@ public class GregTech_API { int aEntityDamage, int aToolQuality, float aToolStrength, int aEnergyConsumptionPerBlockBreak, int aDisChargedGTID) { try { - return (GT_Tool_Item) Class.forName("gregtechmod.api.items.GT_DrillIC_Item").getConstructors()[0] - .newInstance( - aUnlocalized, - aEnglish, - aMaxDamage, - aEntityDamage, - aToolQuality, - aToolStrength, - aEnergyConsumptionPerBlockBreak, - aDisChargedGTID); + return (GT_Tool_Item) Class.forName("gregtechmod.api.items.GT_DrillIC_Item") + .getConstructors()[0].newInstance( + aUnlocalized, + aEnglish, + aMaxDamage, + aEntityDamage, + aToolQuality, + aToolStrength, + aEnergyConsumptionPerBlockBreak, + aDisChargedGTID); } catch (Throwable e) { /* Do nothing */ } @@ -686,8 +731,13 @@ public class GregTech_API { public static GT_Tool_Item constructElectricSolderingToolItem(String aUnlocalized, String aEnglish, int aMaxDamage, int aEntityDamage, int aDisChargedGTID) { try { - return (GT_Tool_Item) Class.forName("gregtechmod.api.items.GT_SolderingToolIC_Item").getConstructors()[0] - .newInstance(aUnlocalized, aEnglish, aMaxDamage, aEntityDamage, aDisChargedGTID); + return (GT_Tool_Item) Class.forName("gregtechmod.api.items.GT_SolderingToolIC_Item") + .getConstructors()[0].newInstance( + aUnlocalized, + aEnglish, + aMaxDamage, + aEntityDamage, + aDisChargedGTID); } catch (Throwable e) { /* Do nothing */ } @@ -706,8 +756,12 @@ public class GregTech_API { public static GT_Tool_Item constructEmptyElectricToolItem(String aUnlocalized, String aEnglish, int aMaxDamage, int aChargedGTID) { try { - return (GT_Tool_Item) Class.forName("gregtechmod.api.items.GT_EmptyToolIC_Item").getConstructors()[0] - .newInstance(aUnlocalized, aEnglish, aMaxDamage, aChargedGTID); + return (GT_Tool_Item) Class.forName("gregtechmod.api.items.GT_EmptyToolIC_Item") + .getConstructors()[0].newInstance( + aUnlocalized, + aEnglish, + aMaxDamage, + aChargedGTID); } catch (Throwable e) { /* Do nothing */ } @@ -763,8 +817,10 @@ public class GregTech_API { sRealConfigurationList.put(minTier, stack); for (Map.Entry> e : sConfigurationLists.entrySet()) { if (e.getKey() >= minTier) { - e.getValue().add(stack); - e.getValue().sort(getConfigurationCircuitsComparator()); + e.getValue() + .add(stack); + e.getValue() + .sort(getConfigurationCircuitsComparator()); } } } @@ -780,9 +836,12 @@ public class GregTech_API { return Collections.unmodifiableList( sConfigurationLists.computeIfAbsent( machineTier, - (t) -> sRealConfigurationList.entries().stream().filter(e -> e.getKey() <= machineTier) - .map(Map.Entry::getValue).sorted(getConfigurationCircuitsComparator()) - .collect(Collectors.toList()))); + (t) -> sRealConfigurationList.entries() + .stream() + .filter(e -> e.getKey() <= machineTier) + .map(Map.Entry::getValue) + .sorted(getConfigurationCircuitsComparator()) + .collect(Collectors.toList()))); } public static Comparator getConfigurationCircuitsComparator() { @@ -794,7 +853,9 @@ public class GregTech_API { return GT_Mod.gregtechproxy.mCircuitsOrder.getOrDefault( String.valueOf(GameRegistry.findUniqueIdentifierFor(is.getItem())), Integer.MAX_VALUE); - }).thenComparing(ItemStack::getUnlocalizedName).thenComparing(ItemStack::getItemDamage); + }) + .thenComparing(ItemStack::getUnlocalizedName) + .thenComparing(ItemStack::getItemDamage); } public static void registerCircuitProgrammer(ItemStack stack, boolean ignoreNBT, boolean useContainer) { @@ -802,8 +863,11 @@ public class GregTech_API { }