From 8ac58626bd4caa9e49f58acc6b97ac031f6c2107 Mon Sep 17 00:00:00 2001 From: Raven Szewczyk Date: Mon, 10 Apr 2023 17:49:16 +0100 Subject: Update spotless config to 0.2.2 --- src/main/java/gregtech/common/GT_Client.java | 495 +- src/main/java/gregtech/common/GT_DummyWorld.java | 2 +- src/main/java/gregtech/common/GT_Network.java | 88 +- src/main/java/gregtech/common/GT_Pollution.java | 114 +- src/main/java/gregtech/common/GT_Proxy.java | 2160 +++---- src/main/java/gregtech/common/GT_RecipeAdder.java | 2640 ++++---- .../java/gregtech/common/GT_ThaumcraftCompat.java | 131 +- .../java/gregtech/common/GT_UndergroundOil.java | 53 +- .../gregtech/common/GT_Worldgen_GT_Ore_Layer.java | 511 +- .../common/GT_Worldgen_GT_Ore_SmallPieces.java | 78 +- .../java/gregtech/common/GT_Worldgen_Stone.java | 224 +- .../java/gregtech/common/GT_Worldgenerator.java | 378 +- .../gregtech/common/bees/GT_AlleleBeeSpecies.java | 22 +- .../java/gregtech/common/bees/GT_AlleleHelper.java | 152 +- .../java/gregtech/common/bees/GT_Bee_Mutation.java | 6 +- .../gregtech/common/blocks/GT_Block_Casings1.java | 10 +- .../gregtech/common/blocks/GT_Block_Casings2.java | 16 +- .../gregtech/common/blocks/GT_Block_Casings3.java | 6 +- .../gregtech/common/blocks/GT_Block_Casings4.java | 86 +- .../gregtech/common/blocks/GT_Block_Casings6.java | 4 +- .../gregtech/common/blocks/GT_Block_Casings8.java | 63 +- .../gregtech/common/blocks/GT_Block_Casings9.java | 5 +- .../common/blocks/GT_Block_Casings_Abstract.java | 7 +- .../gregtech/common/blocks/GT_Block_Concretes.java | 4 +- .../gregtech/common/blocks/GT_Block_Machines.java | 104 +- .../gregtech/common/blocks/GT_Block_Metal.java | 4 +- .../java/gregtech/common/blocks/GT_Block_Ores.java | 34 +- .../common/blocks/GT_Block_Ores_Abstract.java | 58 +- .../gregtech/common/blocks/GT_Block_Ores_UB1.java | 14 +- .../gregtech/common/blocks/GT_Block_Ores_UB2.java | 14 +- .../gregtech/common/blocks/GT_Block_Ores_UB3.java | 14 +- .../common/blocks/GT_Block_Reinforced.java | 174 +- .../gregtech/common/blocks/GT_Block_Stones.java | 16 +- .../common/blocks/GT_Block_Stones_Abstract.java | 102 +- .../gregtech/common/blocks/GT_Block_Storage.java | 3 +- .../gregtech/common/blocks/GT_Cyclotron_Coils.java | 5 +- .../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 | 161 +- .../java/gregtech/common/blocks/GT_Item_Ores.java | 24 +- .../common/blocks/GT_Item_Stones_Abstract.java | 5 +- .../gregtech/common/blocks/GT_TileEntity_Ores.java | 203 +- .../java/gregtech/common/covers/CoverInfo.java | 43 +- .../java/gregtech/common/covers/GT_Cover_Arm.java | 330 +- .../common/covers/GT_Cover_ControlsWork.java | 139 +- .../gregtech/common/covers/GT_Cover_Conveyor.java | 207 +- .../gregtech/common/covers/GT_Cover_Crafting.java | 16 +- .../gregtech/common/covers/GT_Cover_DoesWork.java | 100 +- .../gregtech/common/covers/GT_Cover_Drain.java | 87 +- .../gregtech/common/covers/GT_Cover_EUMeter.java | 183 +- .../common/covers/GT_Cover_FacadeBase.java | 185 +- .../common/covers/GT_Cover_FluidLimiter.java | 38 +- .../common/covers/GT_Cover_FluidRegulator.java | 357 +- .../covers/GT_Cover_FluidStorageMonitor.java | 90 +- .../common/covers/GT_Cover_Fluidfilter.java | 251 +- .../common/covers/GT_Cover_ItemFilter.java | 127 +- .../gregtech/common/covers/GT_Cover_ItemMeter.java | 168 +- .../java/gregtech/common/covers/GT_Cover_Lens.java | 2 +- .../common/covers/GT_Cover_LiquidMeter.java | 142 +- .../common/covers/GT_Cover_NeedMaintainance.java | 251 +- .../common/covers/GT_Cover_PlayerDetector.java | 103 +- .../java/gregtech/common/covers/GT_Cover_Pump.java | 223 +- .../common/covers/GT_Cover_RedstoneConductor.java | 12 +- .../covers/GT_Cover_RedstoneReceiverExternal.java | 12 +- .../covers/GT_Cover_RedstoneReceiverInternal.java | 8 +- .../common/covers/GT_Cover_RedstoneSignalizer.java | 20 +- .../GT_Cover_RedstoneTransmitterExternal.java | 4 +- .../GT_Cover_RedstoneTransmitterInternal.java | 6 +- .../covers/GT_Cover_RedstoneWirelessBase.java | 94 +- .../gregtech/common/covers/GT_Cover_Screen.java | 10 +- .../gregtech/common/covers/GT_Cover_Shutter.java | 141 +- .../common/covers/GT_Cover_SolarPanel.java | 32 +- .../common/covers/GT_Cover_SteamValve.java | 2 +- .../java/gregtech/common/covers/GT_Cover_Vent.java | 6 +- .../GT_Cover_AdvancedRedstoneReceiverBase.java | 106 +- .../GT_Cover_AdvancedRedstoneReceiverExternal.java | 10 +- .../GT_Cover_AdvancedRedstoneReceiverInternal.java | 6 +- .../GT_Cover_AdvancedRedstoneTransmitterBase.java | 42 +- ..._Cover_AdvancedRedstoneTransmitterExternal.java | 8 +- ..._Cover_AdvancedRedstoneTransmitterInternal.java | 8 +- .../GT_Cover_AdvancedWirelessRedstoneBase.java | 114 +- .../redstone/GT_Cover_WirelessFluidDetector.java | 38 +- .../redstone/GT_Cover_WirelessItemDetector.java | 102 +- .../GT_Cover_WirelessMaintenanceDetector.java | 48 +- .../gregtech/common/entities/GT_Entity_Arrow.java | 219 +- .../common/entities/GT_Entity_Arrow_Potion.java | 28 +- src/main/java/gregtech/common/fluid/GT_Fluid.java | 18 +- .../gregtech/common/fluid/GT_FluidBuilder.java | 2 +- .../gregtech/common/gui/modularui/UIHelper.java | 69 +- .../modularui/uifactory/SelectItemUIFactory.java | 92 +- .../modularui/widget/CoverCycleButtonWidget.java | 21 +- .../widget/CoverDataControllerWidget.java | 36 +- .../CoverDataFollower_CycleButtonWidget.java | 2 +- .../widget/CoverDataFollower_SlotWidget.java | 2 +- .../widget/CoverDataFollower_TextFieldWidget.java | 8 +- .../CoverDataFollower_ToggleButtonWidget.java | 19 +- .../gui/modularui/widget/DataControllerWidget.java | 2 +- .../modularui/widget/FluidDisplaySlotWidget.java | 33 +- src/main/java/gregtech/common/items/CombType.java | 24 +- src/main/java/gregtech/common/items/DropType.java | 12 +- .../common/items/GT_DepletetCell_Item.java | 6 +- .../gregtech/common/items/GT_FluidDisplayItem.java | 44 +- .../common/items/GT_IntegratedCircuit_Item.java | 224 +- .../common/items/GT_MetaGenerated_Item_01.java | 6807 ++++++++++---------- .../common/items/GT_MetaGenerated_Item_02.java | 4779 +++++++------- .../common/items/GT_MetaGenerated_Item_03.java | 1324 ++-- .../common/items/GT_MetaGenerated_Item_98.java | 22 +- .../common/items/GT_MetaGenerated_Item_99.java | 36 +- .../common/items/GT_MetaGenerated_Tool_01.java | 1123 ++-- .../common/items/GT_NeutronReflector_Item.java | 13 +- .../gregtech/common/items/GT_SensorCard_Item.java | 12 +- .../gregtech/common/items/GT_VolumetricFlask.java | 71 +- src/main/java/gregtech/common/items/ItemComb.java | 2573 ++++---- src/main/java/gregtech/common/items/ItemDrop.java | 126 +- .../java/gregtech/common/items/ItemPropolis.java | 33 +- .../java/gregtech/common/items/PollenType.java | 8 +- .../java/gregtech/common/items/PropolisType.java | 10 +- .../common/items/behaviors/Behaviour_Arrow.java | 48 +- .../items/behaviors/Behaviour_Arrow_Potion.java | 16 +- .../items/behaviors/Behaviour_Cover_Tool.java | 65 +- .../common/items/behaviors/Behaviour_Crowbar.java | 2 +- .../items/behaviors/Behaviour_DataStick.java | 4 +- .../common/items/behaviors/Behaviour_Hoe.java | 19 +- .../common/items/behaviors/Behaviour_Lighter.java | 39 +- .../common/items/behaviors/Behaviour_None.java | 10 +- .../behaviors/Behaviour_Plunger_Essentia.java | 15 +- .../items/behaviors/Behaviour_Plunger_Fluid.java | 33 +- .../items/behaviors/Behaviour_Plunger_Item.java | 46 +- .../items/behaviors/Behaviour_Prospecting.java | 75 +- .../common/items/behaviors/Behaviour_Scanner.java | 13 +- .../common/items/behaviors/Behaviour_Scoop.java | 33 +- .../items/behaviors/Behaviour_Screwdriver.java | 2 +- .../common/items/behaviors/Behaviour_Sense.java | 13 +- .../items/behaviors/Behaviour_SensorKit.java | 8 +- .../items/behaviors/Behaviour_SoftHammer.java | 105 +- .../items/behaviors/Behaviour_Sonictron.java | 14 +- .../items/behaviors/Behaviour_Spray_Color.java | 48 +- .../items/behaviors/Behaviour_Switch_Metadata.java | 2 +- .../common/items/behaviors/Behaviour_Wrench.java | 77 +- .../items/behaviors/Behaviour_WrittenBook.java | 6 +- src/main/java/gregtech/common/misc/GT_Command.java | 224 +- .../common/misc/GT_DrillingLogicDelegate.java | 62 +- .../misc/spaceprojects/SpaceProjectManager.java | 38 +- .../spaceprojects/SpaceProjectWorldSavedData.java | 128 +- .../common/misc/spaceprojects/base/SP_Upgrade.java | 28 +- .../misc/spaceprojects/base/SpaceProject.java | 20 +- .../misc/spaceprojects/commands/SPM_Command.java | 46 +- .../misc/spaceprojects/commands/SP_Command.java | 22 +- .../java/gregtech/common/power/FusionPower.java | 6 +- .../redstonecircuits/GT_Circuit_BasicLogic.java | 38 +- .../common/redstonecircuits/GT_Circuit_BitAnd.java | 9 +- .../common/redstonecircuits/GT_Circuit_Equals.java | 7 +- .../common/redstonecircuits/GT_Circuit_Pulser.java | 8 +- .../redstonecircuits/GT_Circuit_Randomizer.java | 5 +- .../redstonecircuits/GT_Circuit_RedstoneMeter.java | 5 +- .../common/redstonecircuits/GT_Circuit_Timer.java | 4 +- .../gregtech/common/render/GT_CapeRenderer.java | 66 +- .../common/render/GT_CopiedBlockTexture.java | 12 +- .../common/render/GT_CopiedCTMBlockTexture.java | 24 +- .../gregtech/common/render/GT_FlaskRenderer.java | 20 +- .../render/GT_FluidDisplayStackRenderer.java | 16 +- .../render/GT_MetaGenerated_Tool_Renderer.java | 148 +- .../common/render/GT_PollutionRenderer.java | 34 +- .../java/gregtech/common/render/GT_RenderUtil.java | 4 +- .../gregtech/common/render/GT_RenderedTexture.java | 119 +- .../gregtech/common/render/GT_Renderer_Block.java | 740 ++- .../gregtech/common/render/GT_SidedTexture.java | 8 +- .../gregtech/common/render/GT_TextureBuilder.java | 22 +- .../render/items/CosmicNeutroniumRenderer.java | 16 +- .../render/items/GT_GeneratedItem_Renderer.java | 58 +- .../items/GT_GeneratedMaterial_Renderer.java | 56 +- .../items/GT_MetaGenerated_Item_Renderer.java | 4 +- .../common/render/items/GaiaSpiritRenderer.java | 16 +- .../common/render/items/InfinityRenderer.java | 2 +- .../render/items/TranscendentMetalRenderer.java | 46 +- .../common/render/items/UniversiumRenderer.java | 61 +- .../automation/GT_MetaTileEntity_ChestBuffer.java | 48 +- .../automation/GT_MetaTileEntity_Filter.java | 156 +- .../GT_MetaTileEntity_ItemDistributor.java | 69 +- .../automation/GT_MetaTileEntity_RecipeFilter.java | 36 +- .../automation/GT_MetaTileEntity_Regulator.java | 135 +- .../automation/GT_MetaTileEntity_SuperBuffer.java | 46 +- .../automation/GT_MetaTileEntity_TypeFilter.java | 78 +- .../boilers/GT_MetaTileEntity_Boiler.java | 142 +- .../boilers/GT_MetaTileEntity_Boiler_Bronze.java | 281 +- .../boilers/GT_MetaTileEntity_Boiler_Lava.java | 232 +- .../boilers/GT_MetaTileEntity_Boiler_Solar.java | 116 +- .../GT_MetaTileEntity_Boiler_Solar_Steel.java | 24 +- .../boilers/GT_MetaTileEntity_Boiler_Steel.java | 35 +- .../casings/upgrade/InventoryUpgrade.java | 23 +- .../GT_MetaTileEntity_AdvDebugStructureWriter.java | 241 +- .../GT_MetaTileEntity_DieselGenerator.java | 178 +- .../generators/GT_MetaTileEntity_GasTurbine.java | 180 +- .../generators/GT_MetaTileEntity_LightningRod.java | 41 +- .../GT_MetaTileEntity_MagicEnergyConverter.java | 102 +- .../GT_MetaTileEntity_MagicalEnergyAbsorber.java | 227 +- .../GT_MetaTileEntity_NaquadahReactor.java | 113 +- .../GT_MetaTileEntity_PlasmaGenerator.java | 50 +- .../generators/GT_MetaTileEntity_SteamTurbine.java | 145 +- .../GT_MetaTileEntity_BasicHull_Bronze.java | 19 +- .../GT_MetaTileEntity_BasicHull_BronzeBricks.java | 29 +- .../GT_MetaTileEntity_BasicHull_Steel.java | 14 +- .../GT_MetaTileEntity_BasicHull_SteelBricks.java | 29 +- .../GT_MetaTileEntity_Hatch_InputBus_ME.java | 241 +- .../GT_MetaTileEntity_Hatch_OutputBus_ME.java | 83 +- .../GT_MetaTileEntity_Hatch_Output_ME.java | 70 +- .../GT_MetaTileEntity_AdvSeismicProspector.java | 245 +- .../basic/GT_MetaTileEntity_Boxinator.java | 185 +- .../machines/basic/GT_MetaTileEntity_Charger.java | 53 +- .../basic/GT_MetaTileEntity_CuringOven.java | 107 +- .../basic/GT_MetaTileEntity_IndustrialApiary.java | 651 +- .../basic/GT_MetaTileEntity_Massfabricator.java | 148 +- ..._MetaTileEntity_MicrowaveEnergyTransmitter.java | 197 +- .../machines/basic/GT_MetaTileEntity_Miner.java | 225 +- .../basic/GT_MetaTileEntity_MonsterRepellent.java | 74 +- .../basic/GT_MetaTileEntity_PotionBrewer.java | 159 +- .../machines/basic/GT_MetaTileEntity_Printer.java | 56 +- .../machines/basic/GT_MetaTileEntity_Pump.java | 285 +- .../basic/GT_MetaTileEntity_Replicator.java | 157 +- .../basic/GT_MetaTileEntity_RockBreaker.java | 156 +- .../machines/basic/GT_MetaTileEntity_Scanner.java | 271 +- .../basic/GT_MetaTileEntity_SeismicProspector.java | 301 +- .../basic/GT_MetaTileEntity_Teleporter.java | 294 +- ...GT_MetaTileEntity_LongDistancePipelineBase.java | 72 +- ...T_MetaTileEntity_LongDistancePipelineFluid.java | 16 +- ...GT_MetaTileEntity_LongDistancePipelineItem.java | 16 +- .../GT_MetaTileEntity_AbstractMultiFurnace.java | 8 +- .../multi/GT_MetaTileEntity_AssemblyLine.java | 363 +- .../GT_MetaTileEntity_BrickedBlastFurnace.java | 41 +- .../GT_MetaTileEntity_BronzeBlastFurnace.java | 10 +- .../multi/GT_MetaTileEntity_Charcoal_Pit.java | 112 +- .../multi/GT_MetaTileEntity_Cleanroom.java | 161 +- .../GT_MetaTileEntity_ConcreteBackfillerBase.java | 57 +- .../multi/GT_MetaTileEntity_DieselEngine.java | 228 +- .../multi/GT_MetaTileEntity_DistillationTower.java | 271 +- .../multi/GT_MetaTileEntity_DrillerBase.java | 200 +- .../GT_MetaTileEntity_ElectricBlastFurnace.java | 308 +- .../GT_MetaTileEntity_ExtremeDieselEngine.java | 170 +- .../multi/GT_MetaTileEntity_FusionComputer.java | 411 +- .../multi/GT_MetaTileEntity_FusionComputer1.java | 50 +- .../multi/GT_MetaTileEntity_FusionComputer2.java | 50 +- .../multi/GT_MetaTileEntity_FusionComputer3.java | 50 +- .../multi/GT_MetaTileEntity_HeatExchanger.java | 276 +- .../GT_MetaTileEntity_ImplosionCompressor.java | 76 +- .../GT_MetaTileEntity_IntegratedOreFactory.java | 429 +- .../multi/GT_MetaTileEntity_LargeBoiler.java | 217 +- .../GT_MetaTileEntity_LargeChemicalReactor.java | 229 +- .../multi/GT_MetaTileEntity_LargeTurbine.java | 242 +- .../multi/GT_MetaTileEntity_LargeTurbine_Gas.java | 58 +- ...GT_MetaTileEntity_LargeTurbine_GasAdvanced.java | 58 +- .../GT_MetaTileEntity_LargeTurbine_HPSteam.java | 82 +- .../GT_MetaTileEntity_LargeTurbine_Plasma.java | 210 +- .../GT_MetaTileEntity_LargeTurbine_Steam.java | 82 +- .../multi/GT_MetaTileEntity_MultiFurnace.java | 260 +- .../multi/GT_MetaTileEntity_NanoForge.java | 316 +- .../multi/GT_MetaTileEntity_OilCracker.java | 227 +- .../multi/GT_MetaTileEntity_OilDrillBase.java | 162 +- .../multi/GT_MetaTileEntity_OilDrillInfinite.java | 28 +- .../GT_MetaTileEntity_OreDrillingPlantBase.java | 132 +- .../multi/GT_MetaTileEntity_PCBFactory.java | 1442 ++--- .../multi/GT_MetaTileEntity_PlasmaForge.java | 1194 ++-- .../GT_MetaTileEntity_PrimitiveBlastFurnace.java | 253 +- .../multi/GT_MetaTileEntity_ProcessingArray.java | 325 +- .../multi/GT_MetaTileEntity_PyrolyseOven.java | 172 +- .../GT_MetaTileEntity_TranscendentPlasmaMixer.java | 134 +- .../multi/GT_MetaTileEntity_VacuumFreezer.java | 72 +- .../machines/multiblock/MultiBlock_CokeOven.java | 58 +- .../machines/multiblock/MultiBlock_Macerator.java | 157 +- .../GT_MetaTileEntity_AlloySmelter_Bronze.java | 88 +- .../GT_MetaTileEntity_AlloySmelter_Steel.java | 88 +- .../steam/GT_MetaTileEntity_Compressor_Bronze.java | 85 +- .../steam/GT_MetaTileEntity_Compressor_Steel.java | 85 +- .../steam/GT_MetaTileEntity_Extractor_Bronze.java | 82 +- .../steam/GT_MetaTileEntity_Extractor_Steel.java | 82 +- .../GT_MetaTileEntity_ForgeHammer_Bronze.java | 82 +- .../steam/GT_MetaTileEntity_ForgeHammer_Steel.java | 82 +- .../steam/GT_MetaTileEntity_Furnace_Bronze.java | 84 +- .../steam/GT_MetaTileEntity_Furnace_Steel.java | 83 +- .../steam/GT_MetaTileEntity_Macerator_Bronze.java | 117 +- .../steam/GT_MetaTileEntity_Macerator_Steel.java | 117 +- .../GT_MetaTileEntity_DigitalChestBase.java | 205 +- .../storage/GT_MetaTileEntity_DigitalTankBase.java | 418 +- .../storage/GT_MetaTileEntity_Locker.java | 6 +- .../storage/GT_MetaTileEntity_QuantumTank.java | 36 +- .../storage/GT_MetaTileEntity_SuperTank.java | 34 +- src/main/java/gregtech/common/tools/GT_Tool.java | 18 +- .../java/gregtech/common/tools/GT_Tool_Axe.java | 38 +- .../common/tools/GT_Tool_BranchCutter.java | 28 +- .../common/tools/GT_Tool_ButcheryKnife.java | 14 +- .../gregtech/common/tools/GT_Tool_BuzzSaw.java | 20 +- .../gregtech/common/tools/GT_Tool_Chainsaw_HV.java | 6 +- .../gregtech/common/tools/GT_Tool_Chainsaw_LV.java | 57 +- .../gregtech/common/tools/GT_Tool_Chainsaw_MV.java | 6 +- .../gregtech/common/tools/GT_Tool_Crowbar.java | 14 +- .../gregtech/common/tools/GT_Tool_Drill_HV.java | 6 +- .../gregtech/common/tools/GT_Tool_Drill_LV.java | 44 +- .../gregtech/common/tools/GT_Tool_Drill_MV.java | 6 +- .../java/gregtech/common/tools/GT_Tool_File.java | 20 +- .../gregtech/common/tools/GT_Tool_HardHammer.java | 59 +- .../java/gregtech/common/tools/GT_Tool_Hoe.java | 24 +- .../gregtech/common/tools/GT_Tool_JackHammer.java | 44 +- .../java/gregtech/common/tools/GT_Tool_Knife.java | 24 +- .../java/gregtech/common/tools/GT_Tool_Mortar.java | 12 +- .../gregtech/common/tools/GT_Tool_Pickaxe.java | 34 +- .../java/gregtech/common/tools/GT_Tool_Plow.java | 50 +- .../gregtech/common/tools/GT_Tool_Plunger.java | 24 +- .../gregtech/common/tools/GT_Tool_RollingPin.java | 12 +- .../java/gregtech/common/tools/GT_Tool_Saw.java | 59 +- .../java/gregtech/common/tools/GT_Tool_Scoop.java | 16 +- .../gregtech/common/tools/GT_Tool_Screwdriver.java | 40 +- .../common/tools/GT_Tool_Screwdriver_LV.java | 8 +- .../java/gregtech/common/tools/GT_Tool_Sense.java | 48 +- .../java/gregtech/common/tools/GT_Tool_Shovel.java | 36 +- .../gregtech/common/tools/GT_Tool_SoftHammer.java | 22 +- .../common/tools/GT_Tool_Soldering_Iron.java | 36 +- .../java/gregtech/common/tools/GT_Tool_Sword.java | 34 +- .../gregtech/common/tools/GT_Tool_Turbine.java | 16 +- .../common/tools/GT_Tool_UniversalSpade.java | 62 +- .../gregtech/common/tools/GT_Tool_WireCutter.java | 14 +- .../java/gregtech/common/tools/GT_Tool_Wrench.java | 25 +- .../gregtech/common/tools/GT_Tool_Wrench_HV.java | 8 +- .../gregtech/common/tools/GT_Tool_Wrench_LV.java | 10 +- .../gregtech/common/tools/GT_Tool_Wrench_MV.java | 8 +- 325 files changed, 24431 insertions(+), 27336 deletions(-) (limited to 'src/main/java/gregtech/common') diff --git a/src/main/java/gregtech/common/GT_Client.java b/src/main/java/gregtech/common/GT_Client.java index af7a4a6c00..2874bde726 100644 --- a/src/main/java/gregtech/common/GT_Client.java +++ b/src/main/java/gregtech/common/GT_Client.java @@ -97,47 +97,47 @@ public class GT_Client extends GT_Proxy implements Runnable { private static final List ROTATABLE_VANILLA_BLOCKS; private static final int[][] GRID_SWITCH_TABLE = new int[][] { { 0, 5, 3, 1, 2, 4 }, { 5, 0, 1, 3, 2, 4 }, - { 1, 3, 0, 5, 2, 4 }, { 3, 1, 5, 0, 2, 4 }, { 4, 2, 3, 1, 0, 5 }, { 2, 4, 3, 1, 5, 0 }, }; + { 1, 3, 0, 5, 2, 4 }, { 3, 1, 5, 0, 2, 4 }, { 4, 2, 3, 1, 0, 5 }, { 2, 4, 3, 1, 5, 0 }, }; // don't ask. these "just works" private static final Transformation ROTATION_MARKER_TRANSFORM_CENTER = new Scale(0.5); private static final Transformation[] ROTATION_MARKER_TRANSFORMS_SIDES_TRANSFORMS = { - new Scale(0.25).with(new Translation(0, 0, 0.375)) - .compile(), - new Scale(0.25).with(new Translation(0.375, 0, 0)) - .compile(), - new Scale(0.25).with(new Translation(0, 0, -0.375)) - .compile(), - new Scale(0.25).with(new Translation(-0.375, 0, 0)) - .compile(), }; + new Scale(0.25).with(new Translation(0, 0, 0.375)) + .compile(), + new Scale(0.25).with(new Translation(0.375, 0, 0)) + .compile(), + new Scale(0.25).with(new Translation(0, 0, -0.375)) + .compile(), + new Scale(0.25).with(new Translation(-0.375, 0, 0)) + .compile(), }; private static final int[] ROTATION_MARKER_TRANSFORMS_SIDES = { -1, -1, 2, 0, 3, 1, -1, -1, 0, 2, 3, 1, 0, 2, -1, - -1, 3, 1, 2, 0, -1, -1, 3, 1, 1, 3, 2, 0, -1, -1, 3, 1, 2, 0, -1, -1 }; + -1, 3, 1, 2, 0, -1, -1, 3, 1, 1, 3, 2, 0, -1, -1, 3, 1, 2, 0, -1, -1 }; private static final Transformation[] ROTATION_MARKER_TRANSFORMS_CORNER = { - new Scale(0.25).with(new Translation(0.375, 0, 0.375)) - .compile(), - new Scale(0.25).with(new Translation(-0.375, 0, 0.375)) - .compile(), - new Scale(0.25).with(new Translation(0.375, 0, -0.375)) - .compile(), - new Scale(0.25).with(new Translation(-0.375, 0, -0.375)) - .compile(), }; + new Scale(0.25).with(new Translation(0.375, 0, 0.375)) + .compile(), + new Scale(0.25).with(new Translation(-0.375, 0, 0.375)) + .compile(), + new Scale(0.25).with(new Translation(0.375, 0, -0.375)) + .compile(), + new Scale(0.25).with(new Translation(-0.375, 0, -0.375)) + .compile(), }; private static int rotationMarkerDisplayList; private static boolean rotationMarkerDisplayListCompiled = false; static { ROTATABLE_VANILLA_BLOCKS = Arrays.asList( - Blocks.piston, - Blocks.sticky_piston, - Blocks.furnace, - Blocks.lit_furnace, - Blocks.dropper, - Blocks.dispenser, - Blocks.chest, - Blocks.trapped_chest, - Blocks.ender_chest, - Blocks.hopper, - Blocks.pumpkin, - Blocks.lit_pumpkin); + Blocks.piston, + Blocks.sticky_piston, + Blocks.furnace, + Blocks.lit_furnace, + Blocks.dropper, + Blocks.dispenser, + Blocks.chest, + Blocks.trapped_chest, + Blocks.ender_chest, + Blocks.hopper, + Blocks.pumpkin, + Blocks.lit_pumpkin); } private final HashSet mCapeList = new HashSet<>(); @@ -181,103 +181,103 @@ public class GT_Client extends GT_Proxy implements Runnable { mAnimationTick = 0L; mAnimationDirection = false; mPosR = Arrays.asList( - Materials.Enderium, - Materials.Vinteum, - Materials.Uranium235, - Materials.InfusedGold, - Materials.Plutonium241, - Materials.NaquadahEnriched, - Materials.Naquadria, - Materials.InfusedOrder, - Materials.Force, - Materials.Pyrotheum, - Materials.Sunnarium, - Materials.Glowstone, - Materials.Thaumium, - Materials.InfusedVis, - Materials.InfusedAir, - Materials.InfusedFire, - Materials.FierySteel, - Materials.Firestone); + Materials.Enderium, + Materials.Vinteum, + Materials.Uranium235, + Materials.InfusedGold, + Materials.Plutonium241, + Materials.NaquadahEnriched, + Materials.Naquadria, + Materials.InfusedOrder, + Materials.Force, + Materials.Pyrotheum, + Materials.Sunnarium, + Materials.Glowstone, + Materials.Thaumium, + Materials.InfusedVis, + Materials.InfusedAir, + Materials.InfusedFire, + Materials.FierySteel, + Materials.Firestone); mPosG = Arrays.asList( - Materials.Enderium, - Materials.Vinteum, - Materials.Uranium235, - Materials.InfusedGold, - Materials.Plutonium241, - Materials.NaquadahEnriched, - Materials.Naquadria, - Materials.InfusedOrder, - Materials.Force, - Materials.Pyrotheum, - Materials.Sunnarium, - Materials.Glowstone, - Materials.InfusedAir, - Materials.InfusedEarth); + Materials.Enderium, + Materials.Vinteum, + Materials.Uranium235, + Materials.InfusedGold, + Materials.Plutonium241, + Materials.NaquadahEnriched, + Materials.Naquadria, + Materials.InfusedOrder, + Materials.Force, + Materials.Pyrotheum, + Materials.Sunnarium, + Materials.Glowstone, + Materials.InfusedAir, + Materials.InfusedEarth); mPosB = Arrays.asList( - Materials.Enderium, - Materials.Vinteum, - Materials.Uranium235, - Materials.InfusedGold, - Materials.Plutonium241, - Materials.NaquadahEnriched, - Materials.Naquadria, - Materials.InfusedOrder, - Materials.InfusedVis, - Materials.InfusedWater, - Materials.Thaumium); + Materials.Enderium, + Materials.Vinteum, + Materials.Uranium235, + Materials.InfusedGold, + Materials.Plutonium241, + Materials.NaquadahEnriched, + Materials.Naquadria, + Materials.InfusedOrder, + Materials.InfusedVis, + Materials.InfusedWater, + Materials.Thaumium); mNegR = Arrays.asList(Materials.InfusedEntropy, Materials.NetherStar); mNegG = Arrays.asList(Materials.InfusedEntropy, Materials.NetherStar); mNegB = Arrays.asList(Materials.InfusedEntropy, Materials.NetherStar); mMoltenPosR = Arrays.asList( - Materials.Enderium, - Materials.NetherStar, - Materials.Vinteum, - Materials.Uranium235, - Materials.InfusedGold, - Materials.Plutonium241, - Materials.NaquadahEnriched, - Materials.Naquadria, - Materials.InfusedOrder, - Materials.Force, - Materials.Pyrotheum, - Materials.Sunnarium, - Materials.Glowstone, - Materials.Thaumium, - Materials.InfusedVis, - Materials.InfusedAir, - Materials.InfusedFire, - Materials.FierySteel, - Materials.Firestone); + Materials.Enderium, + Materials.NetherStar, + Materials.Vinteum, + Materials.Uranium235, + Materials.InfusedGold, + Materials.Plutonium241, + Materials.NaquadahEnriched, + Materials.Naquadria, + Materials.InfusedOrder, + Materials.Force, + Materials.Pyrotheum, + Materials.Sunnarium, + Materials.Glowstone, + Materials.Thaumium, + Materials.InfusedVis, + Materials.InfusedAir, + Materials.InfusedFire, + Materials.FierySteel, + Materials.Firestone); mMoltenPosG = Arrays.asList( - Materials.Enderium, - Materials.NetherStar, - Materials.Vinteum, - Materials.Uranium235, - Materials.InfusedGold, - Materials.Plutonium241, - Materials.NaquadahEnriched, - Materials.Naquadria, - Materials.InfusedOrder, - Materials.Force, - Materials.Pyrotheum, - Materials.Sunnarium, - Materials.Glowstone, - Materials.InfusedAir, - Materials.InfusedEarth); + Materials.Enderium, + Materials.NetherStar, + Materials.Vinteum, + Materials.Uranium235, + Materials.InfusedGold, + Materials.Plutonium241, + Materials.NaquadahEnriched, + Materials.Naquadria, + Materials.InfusedOrder, + Materials.Force, + Materials.Pyrotheum, + Materials.Sunnarium, + Materials.Glowstone, + Materials.InfusedAir, + Materials.InfusedEarth); mMoltenPosB = Arrays.asList( - Materials.Enderium, - Materials.NetherStar, - Materials.Vinteum, - Materials.Uranium235, - Materials.InfusedGold, - Materials.Plutonium241, - Materials.NaquadahEnriched, - Materials.Naquadria, - Materials.InfusedOrder, - Materials.InfusedVis, - Materials.InfusedWater, - Materials.Thaumium); + Materials.Enderium, + Materials.NetherStar, + Materials.Vinteum, + Materials.Uranium235, + Materials.InfusedGold, + Materials.Plutonium241, + Materials.NaquadahEnriched, + Materials.Naquadria, + Materials.InfusedOrder, + Materials.InfusedVis, + Materials.InfusedWater, + Materials.Thaumium); mMoltenNegR = Collections.singletonList(Materials.InfusedEntropy); mMoltenNegG = Collections.singletonList(Materials.InfusedEntropy); mMoltenNegB = Collections.singletonList(Materials.InfusedEntropy); @@ -286,7 +286,7 @@ public class GT_Client extends GT_Proxy implements Runnable { private static boolean checkedForChicken = false; private static void drawGrid(DrawBlockHighlightEvent aEvent, boolean showCoverConnections, boolean aIsWrench, - boolean aIsSneaking) { + boolean aIsSneaking) { if (!checkedForChicken) { try { Class.forName("codechicken.lib.vec.Rotation"); @@ -298,16 +298,16 @@ public class GT_Client extends GT_Proxy implements Runnable { GL11.glPushMatrix(); GL11.glTranslated( - -(aEvent.player.lastTickPosX - + (aEvent.player.posX - aEvent.player.lastTickPosX) * (double) aEvent.partialTicks), - -(aEvent.player.lastTickPosY - + (aEvent.player.posY - aEvent.player.lastTickPosY) * (double) aEvent.partialTicks), - -(aEvent.player.lastTickPosZ - + (aEvent.player.posZ - aEvent.player.lastTickPosZ) * (double) aEvent.partialTicks)); + -(aEvent.player.lastTickPosX + + (aEvent.player.posX - aEvent.player.lastTickPosX) * (double) aEvent.partialTicks), + -(aEvent.player.lastTickPosY + + (aEvent.player.posY - aEvent.player.lastTickPosY) * (double) aEvent.partialTicks), + -(aEvent.player.lastTickPosZ + + (aEvent.player.posZ - aEvent.player.lastTickPosZ) * (double) aEvent.partialTicks)); GL11.glTranslated( - (float) aEvent.target.blockX + 0.5F, - (float) aEvent.target.blockY + 0.5F, - (float) aEvent.target.blockZ + 0.5F); + (float) aEvent.target.blockX + 0.5F, + (float) aEvent.target.blockY + 0.5F, + (float) aEvent.target.blockZ + 0.5F); final int tSideHit = aEvent.target.sideHit; Rotation.sideRotations[tSideHit].glApply(); // draw grid @@ -323,10 +323,8 @@ public class GT_Client extends GT_Proxy implements Runnable { GL11.glVertex3d(+.25D, .0D, +.50D); GL11.glVertex3d(-.25D, .0D, -.50D); GL11.glVertex3d(-.25D, .0D, +.50D); - final TileEntity tTile = aEvent.player.worldObj.getTileEntity( - aEvent.target.blockX, - aEvent.target.blockY, - aEvent.target.blockZ); + final TileEntity tTile = aEvent.player.worldObj + .getTileEntity(aEvent.target.blockX, aEvent.target.blockY, aEvent.target.blockZ); // draw connection indicators byte tConnections = 0; @@ -404,18 +402,17 @@ public class GT_Client extends GT_Proxy implements Runnable { if (direction.ordinal() == tSideHit) drawExtendedRotationMarker(ROTATION_MARKER_TRANSFORM_CENTER, aIsSneaking, false); else if (direction.getOpposite() - .ordinal() - == tSideHit) { - for (Transformation t : ROTATION_MARKER_TRANSFORMS_CORNER) { - drawExtendedRotationMarker(t, aIsSneaking, true); - } - } else { - drawExtendedRotationMarker( - ROTATION_MARKER_TRANSFORMS_SIDES_TRANSFORMS[ROTATION_MARKER_TRANSFORMS_SIDES[tSideHit - * 6 + direction.ordinal()]], - aIsSneaking, - true); + .ordinal() == tSideHit) { + for (Transformation t : ROTATION_MARKER_TRANSFORMS_CORNER) { + drawExtendedRotationMarker(t, aIsSneaking, true); } + } else { + drawExtendedRotationMarker( + ROTATION_MARKER_TRANSFORMS_SIDES_TRANSFORMS[ROTATION_MARKER_TRANSFORMS_SIDES[tSideHit * 6 + + direction.ordinal()]], + aIsSneaking, + true); + } } } GL11.glPopMatrix(); // get back to player center @@ -443,15 +440,15 @@ public class GT_Client extends GT_Proxy implements Runnable { GL11.glBegin(GL_LINE_LOOP); for (int i = 0; i <= ROTATION_MARKER_RESOLUTION; i++) { GL11.glVertex3d( - Math.cos(i * Math.PI * 1.75 / ROTATION_MARKER_RESOLUTION) * 0.4, - 0, - Math.sin(i * Math.PI * 1.75 / ROTATION_MARKER_RESOLUTION) * 0.4); + Math.cos(i * Math.PI * 1.75 / ROTATION_MARKER_RESOLUTION) * 0.4, + 0, + Math.sin(i * Math.PI * 1.75 / ROTATION_MARKER_RESOLUTION) * 0.4); } for (int i = ROTATION_MARKER_RESOLUTION; i >= 0; i--) { GL11.glVertex3d( - Math.cos(i * Math.PI * 1.75 / ROTATION_MARKER_RESOLUTION) * 0.24, - 0, - Math.sin(i * Math.PI * 1.75 / ROTATION_MARKER_RESOLUTION) * 0.24); + Math.cos(i * Math.PI * 1.75 / ROTATION_MARKER_RESOLUTION) * 0.24, + 0, + Math.sin(i * Math.PI * 1.75 / ROTATION_MARKER_RESOLUTION) * 0.24); } GL11.glVertex3d(0.141114561800, 0, 0); GL11.glVertex3d(0.32, 0, -0.178885438199); @@ -532,30 +529,28 @@ public class GT_Client extends GT_Proxy implements Runnable { MinecraftForge.EVENT_BUS.register(new ExtraIcons()); Minecraft.getMinecraft() - .getResourcePackRepository().rprMetadataSerializer.registerMetadataSectionType( - new ColorsMetadataSectionSerializer(), - ColorsMetadataSection.class); + .getResourcePackRepository().rprMetadataSerializer + .registerMetadataSectionType(new ColorsMetadataSectionSerializer(), ColorsMetadataSection.class); new GT_MetaTileEntity_AdvDebugStructureWriter.ForgeEventHandler(); final String[] arr = { "renadi", "hanakocz", "MysteryDump", "Flaver4", "x_Fame", "Peluche321", - "Goshen_Ithilien", "manf", "Bimgo", "leagris", "IAmMinecrafter02", "Cerous", "Devilin_Pixy", - "Bkarlsson87", "BadAlchemy", "CaballoCraft", "melanclock", "Resursator", "demanzke", "AndrewAmmerlaan", - "Deathlycraft", "Jirajha", "Axlegear", "kei_kouma", "Dracion", "dungi", "Dorfschwein", "Zero Tw0", - "mattiagraz85", "sebastiank30", "Plem", "invultri", "grillo126", "malcanteth", "Malevolence_", - "Nicholas_Manuel", "Sirbab", "kehaan", "bpgames123", "semig0d", "9000bowser", "Sovereignty89", - "Kris1432", "xander_cage_", "samuraijp", "bsaa", "SpwnX", "tworf", "Kadah", "kanni", "Stute", "Hegik", - "Onlyme", "t3hero", "Hotchi", "jagoly", "Nullav", "BH5432", "Sibmer", "inceee", "foxxx0", "Hartok", - "TMSama", "Shlnen", "Carsso", "zessirb", "meep310", "Seldron", "yttr1um", "hohounk", "freebug", - "Sylphio", "jmarler", "Saberawr", "r00teniy", "Neonbeta", "yinscape", "voooon24", "Quintine", - "peach774", "lepthymo", "bildeman", "Kremnari", "Aerosalo", "OndraSter", "oscares91", "mr10movie", - "Daxx367x2", "EGERTRONx", "aka13_404", "Abouttabs", "Johnstaal", "djshiny99", "megatronp", "DZCreeper", - "Kane_Hart", "Truculent", "vidplace7", "simon6689", "MomoNasty", "UnknownXLV", "goreacraft", - "Fluttermine", "Daddy_Cecil", "MrMaleficus", "TigersFangs", "cublikefoot", "chainman564", "NikitaBuker", - "Misha999777", "25FiveDetail", "AntiCivilBoy", "michaelbrady", "xXxIceFirexXx", "Speedynutty68", - "GarretSidzaka", "HallowCharm977", "mastermind1919", "The_Hypersonic", "diamondguy2798", - "zF4ll3nPr3d4t0r", "CrafterOfMines57", "XxELIT3xSNIP3RxX", "SuterusuKusanagi", "xavier0014", "adamros", - "alexbegt" }; + "Goshen_Ithilien", "manf", "Bimgo", "leagris", "IAmMinecrafter02", "Cerous", "Devilin_Pixy", "Bkarlsson87", + "BadAlchemy", "CaballoCraft", "melanclock", "Resursator", "demanzke", "AndrewAmmerlaan", "Deathlycraft", + "Jirajha", "Axlegear", "kei_kouma", "Dracion", "dungi", "Dorfschwein", "Zero Tw0", "mattiagraz85", + "sebastiank30", "Plem", "invultri", "grillo126", "malcanteth", "Malevolence_", "Nicholas_Manuel", "Sirbab", + "kehaan", "bpgames123", "semig0d", "9000bowser", "Sovereignty89", "Kris1432", "xander_cage_", "samuraijp", + "bsaa", "SpwnX", "tworf", "Kadah", "kanni", "Stute", "Hegik", "Onlyme", "t3hero", "Hotchi", "jagoly", + "Nullav", "BH5432", "Sibmer", "inceee", "foxxx0", "Hartok", "TMSama", "Shlnen", "Carsso", "zessirb", + "meep310", "Seldron", "yttr1um", "hohounk", "freebug", "Sylphio", "jmarler", "Saberawr", "r00teniy", + "Neonbeta", "yinscape", "voooon24", "Quintine", "peach774", "lepthymo", "bildeman", "Kremnari", "Aerosalo", + "OndraSter", "oscares91", "mr10movie", "Daxx367x2", "EGERTRONx", "aka13_404", "Abouttabs", "Johnstaal", + "djshiny99", "megatronp", "DZCreeper", "Kane_Hart", "Truculent", "vidplace7", "simon6689", "MomoNasty", + "UnknownXLV", "goreacraft", "Fluttermine", "Daddy_Cecil", "MrMaleficus", "TigersFangs", "cublikefoot", + "chainman564", "NikitaBuker", "Misha999777", "25FiveDetail", "AntiCivilBoy", "michaelbrady", + "xXxIceFirexXx", "Speedynutty68", "GarretSidzaka", "HallowCharm977", "mastermind1919", "The_Hypersonic", + "diamondguy2798", "zF4ll3nPr3d4t0r", "CrafterOfMines57", "XxELIT3xSNIP3RxX", "SuterusuKusanagi", + "xavier0014", "adamros", "alexbegt" }; for (String tName : arr) { mCapeList.add(tName.toLowerCase()); } @@ -596,7 +591,7 @@ public class GT_Client extends GT_Proxy implements Runnable { try { if (GregTech_API.METATILEENTITIES[i] != null) { GregTech_API.METATILEENTITIES[i].getStackForm(1L) - .getTooltip(null, true); + .getTooltip(null, true); GT_Log.out.println("META " + i + " " + GregTech_API.METATILEENTITIES[i].getMetaName()); } } catch (Throwable e) { @@ -611,18 +606,16 @@ public class GT_Client extends GT_Proxy implements Runnable { // reobf doesn't work with lambda, so this must be a class // noinspection Convert2Lambda ((IReloadableResourceManager) Minecraft.getMinecraft() - .getResourceManager()).registerReloadListener( - new IResourceManagerReloadListener() { - - @Override - public void onResourceManagerReload(IResourceManager l) { - GT_GUIColorOverride.onResourceManagerReload(); - FallbackableSteamTexture.reload(); - GregTech_API.sCoverBehaviors.values() - .forEach( - GT_CoverBehaviorBase::reloadColorOverride); - } - }); + .getResourceManager()).registerReloadListener(new IResourceManagerReloadListener() { + + @Override + public void onResourceManagerReload(IResourceManager l) { + GT_GUIColorOverride.onResourceManagerReload(); + FallbackableSteamTexture.reload(); + GregTech_API.sCoverBehaviors.values() + .forEach(GT_CoverBehaviorBase::reloadColorOverride); + } + }); } @Override @@ -631,8 +624,8 @@ public class GT_Client extends GT_Proxy implements Runnable { try (final Scanner tScanner = new Scanner(new URL(GT_CAPE_LIST_URL).openStream())) { while (tScanner.hasNextLine()) { this.mCapeList.add( - tScanner.nextLine() - .toLowerCase()); + tScanner.nextLine() + .toLowerCase()); } } catch (Throwable e) { e.printStackTrace(GT_Log.err); @@ -641,7 +634,7 @@ public class GT_Client extends GT_Proxy implements Runnable { try (final Scanner tScanner = new Scanner(new URL(GTNH_CAPE_LIST_URL).openStream())) { while (tScanner.hasNextLine()) { final String tName = tScanner.nextLine() - .toLowerCase(); + .toLowerCase(); if (tName.contains(":")) { if (!this.mCapeList.contains(tName.substring(0, tName.indexOf(":")))) { this.mCapeList.add(tName); @@ -682,38 +675,38 @@ public class GT_Client extends GT_Proxy implements Runnable { GT_Values.NW.sendToServer(new GT_Packet_ClientPreference(mPreference)); if (!Minecraft.getMinecraft() - .isSingleplayer()) { + .isSingleplayer()) { // Check for more IC2 recipes to also catch MineTweaker additions GT_ModHandler.addIC2RecipesToGT( - GT_ModHandler.getMaceratorRecipeList(), - GT_Recipe.GT_Recipe_Map.sMaceratorRecipes, - true, - true, - true); + GT_ModHandler.getMaceratorRecipeList(), + GT_Recipe.GT_Recipe_Map.sMaceratorRecipes, + true, + true, + true); GT_ModHandler.addIC2RecipesToGT( - GT_ModHandler.getCompressorRecipeList(), - GT_Recipe.GT_Recipe_Map.sCompressorRecipes, - true, - true, - true); + GT_ModHandler.getCompressorRecipeList(), + GT_Recipe.GT_Recipe_Map.sCompressorRecipes, + true, + true, + true); GT_ModHandler.addIC2RecipesToGT( - GT_ModHandler.getExtractorRecipeList(), - GT_Recipe.GT_Recipe_Map.sExtractorRecipes, - true, - true, - true); + GT_ModHandler.getExtractorRecipeList(), + GT_Recipe.GT_Recipe_Map.sExtractorRecipes, + true, + true, + true); GT_ModHandler.addIC2RecipesToGT( - GT_ModHandler.getOreWashingRecipeList(), - GT_Recipe.GT_Recipe_Map.sOreWasherRecipes, - false, - true, - true); + GT_ModHandler.getOreWashingRecipeList(), + GT_Recipe.GT_Recipe_Map.sOreWasherRecipes, + false, + true, + true); GT_ModHandler.addIC2RecipesToGT( - GT_ModHandler.getThermalCentrifugeRecipeList(), - GT_Recipe.GT_Recipe_Map.sThermalCentrifugeRecipes, - true, - true, - true); + GT_ModHandler.getThermalCentrifugeRecipeList(), + GT_Recipe.GT_Recipe_Map.sThermalCentrifugeRecipes, + true, + true, + true); } } afterSomeTime++; @@ -724,7 +717,7 @@ public class GT_Client extends GT_Proxy implements Runnable { } } for (Iterator> iterator = GT_Utility.sPlayedSoundMap.entrySet() - .iterator(); iterator.hasNext();) { + .iterator(); iterator.hasNext();) { Map.Entry tEntry = iterator.next(); if (tEntry.getValue() < 0) { iterator.remove(); @@ -736,23 +729,21 @@ public class GT_Client extends GT_Proxy implements Runnable { if (GT_Values.updateFluidDisplayItems) { final MovingObjectPosition trace = Minecraft.getMinecraft().objectMouseOver; if (trace != null && trace.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK - && (mLastUpdatedBlockX != trace.blockX && mLastUpdatedBlockY != trace.blockY - && mLastUpdatedBlockZ != trace.blockZ || afterSomeTime % 10 == 0)) { + && (mLastUpdatedBlockX != trace.blockX && mLastUpdatedBlockY != trace.blockY + && mLastUpdatedBlockZ != trace.blockZ || afterSomeTime % 10 == 0)) { mLastUpdatedBlockX = trace.blockX; mLastUpdatedBlockY = trace.blockY; mLastUpdatedBlockZ = trace.blockZ; - final TileEntity tileEntity = aEvent.player.worldObj.getTileEntity( - trace.blockX, - trace.blockY, - trace.blockZ); + final TileEntity tileEntity = aEvent.player.worldObj + .getTileEntity(trace.blockX, trace.blockY, trace.blockZ); if (tileEntity instanceof IGregTechTileEntity gtTile) { if (gtTile.getMetaTileEntity() instanceof IHasFluidDisplayItem) { GT_Values.NW.sendToServer( - new MessageUpdateFluidDisplayItem( - trace.blockX, - trace.blockY, - trace.blockZ, - gtTile.getWorld().provider.dimensionId)); + new MessageUpdateFluidDisplayItem( + trace.blockX, + trace.blockY, + trace.blockZ, + gtTile.getWorld().provider.dimensionId)); } } } @@ -773,34 +764,29 @@ public class GT_Client extends GT_Proxy implements Runnable { @SubscribeEvent public void onDrawBlockHighlight(DrawBlockHighlightEvent aEvent) { - final Block aBlock = aEvent.player.worldObj.getBlock( - aEvent.target.blockX, - aEvent.target.blockY, - aEvent.target.blockZ); - final TileEntity aTileEntity = aEvent.player.worldObj.getTileEntity( - aEvent.target.blockX, - aEvent.target.blockY, - aEvent.target.blockZ); + final Block aBlock = aEvent.player.worldObj + .getBlock(aEvent.target.blockX, aEvent.target.blockY, aEvent.target.blockZ); + final TileEntity aTileEntity = aEvent.player.worldObj + .getTileEntity(aEvent.target.blockX, aEvent.target.blockY, aEvent.target.blockZ); if (GT_Utility.isStackInList(aEvent.currentItem, GregTech_API.sWrenchList)) { if (aTileEntity instanceof ITurnable || ROTATABLE_VANILLA_BLOCKS.contains(aBlock) - || aTileEntity instanceof IWrenchable) - drawGrid(aEvent, false, true, aEvent.player.isSneaking()); + || aTileEntity instanceof IWrenchable) drawGrid(aEvent, false, true, aEvent.player.isSneaking()); return; } if (!(aTileEntity instanceof ICoverable)) return; if (GT_Utility.isStackInList(aEvent.currentItem, GregTech_API.sWireCutterList) - || GT_Utility.isStackInList(aEvent.currentItem, GregTech_API.sSolderingToolList)) { + || GT_Utility.isStackInList(aEvent.currentItem, GregTech_API.sSolderingToolList)) { if (((ICoverable) aTileEntity).getCoverIDAtSide((byte) aEvent.target.sideHit) == 0) drawGrid(aEvent, false, false, aEvent.player.isSneaking()); return; } if ((aEvent.currentItem == null && aEvent.player.isSneaking()) - || GT_Utility.isStackInList(aEvent.currentItem, GregTech_API.sCrowbarList) - || GT_Utility.isStackInList(aEvent.currentItem, GregTech_API.sScrewdriverList)) { + || GT_Utility.isStackInList(aEvent.currentItem, GregTech_API.sCrowbarList) + || GT_Utility.isStackInList(aEvent.currentItem, GregTech_API.sScrewdriverList)) { if (((ICoverable) aTileEntity).getCoverIDAtSide((byte) aEvent.target.sideHit) == 0) for (byte tSide : ALL_VALID_SIDES) if (((ICoverable) aTileEntity).getCoverIDAtSide(tSide) > 0) { drawGrid(aEvent, true, false, true); @@ -977,20 +963,15 @@ public class GT_Client extends GT_Proxy implements Runnable { }; if (tString.startsWith("streaming.")) { new WorldSpawnedEventBuilder.RecordEffectEventBuilder().setIdentifier(tString.substring(10)) - .setPosition(aX, aY, aZ) - .run(); + .setPosition(aX, aY, aZ) + .run(); } else { new WorldSpawnedEventBuilder.SoundEventBuilder().setVolume(3f) - .setPitch( - tString.startsWith("note.") - ? (float) Math.pow( - 2D, - (double) (aStack.stackSize - 13) - / 12D) - : 1.0F) - .setIdentifier(tString) - .setPosition(aX, aY, aZ) - .run(); + .setPitch( + tString.startsWith("note.") ? (float) Math.pow(2D, (double) (aStack.stackSize - 13) / 12D) : 1.0F) + .setIdentifier(tString) + .setPosition(aX, aY, aZ) + .run(); } } @@ -1017,19 +998,19 @@ public class GT_Client extends GT_Proxy implements Runnable { int hide = 0; for (int i : ids) { if (OreDictionary.getOreName(i) - .equals("craftingToolSolderingIron")) { + .equals("craftingToolSolderingIron")) { hide |= 0x1; break; } } if (GT_Utility.isStackInList(tCurrentItem, GregTech_API.sWrenchList) - || GT_Utility.isStackInList(tCurrentItem, GregTech_API.sScrewdriverList) - || GT_Utility.isStackInList(tCurrentItem, GregTech_API.sHardHammerList) - || GT_Utility.isStackInList(tCurrentItem, GregTech_API.sSoftHammerList) - || GT_Utility.isStackInList(tCurrentItem, GregTech_API.sWireCutterList) - || GT_Utility.isStackInList(tCurrentItem, GregTech_API.sSolderingToolList) - || GT_Utility.isStackInList(tCurrentItem, GregTech_API.sCrowbarList) - || GregTech_API.sCovers.containsKey(new GT_ItemStack(tCurrentItem))) { + || GT_Utility.isStackInList(tCurrentItem, GregTech_API.sScrewdriverList) + || GT_Utility.isStackInList(tCurrentItem, GregTech_API.sHardHammerList) + || GT_Utility.isStackInList(tCurrentItem, GregTech_API.sSoftHammerList) + || GT_Utility.isStackInList(tCurrentItem, GregTech_API.sWireCutterList) + || GT_Utility.isStackInList(tCurrentItem, GregTech_API.sSolderingToolList) + || GT_Utility.isStackInList(tCurrentItem, GregTech_API.sCrowbarList) + || GregTech_API.sCovers.containsKey(new GT_ItemStack(tCurrentItem))) { hide |= 0x2; } return hide; diff --git a/src/main/java/gregtech/common/GT_DummyWorld.java b/src/main/java/gregtech/common/GT_DummyWorld.java index 321e0688ce..d394ad3703 100644 --- a/src/main/java/gregtech/common/GT_DummyWorld.java +++ b/src/main/java/gregtech/common/GT_DummyWorld.java @@ -24,7 +24,7 @@ public class GT_DummyWorld extends World { public ItemStack mLastSetBlock = null; public GT_DummyWorld(ISaveHandler saveHandler, String name, WorldProvider worldProvider, - WorldSettings worldSettings, Profiler profiler) { + WorldSettings worldSettings, Profiler profiler) { super(saveHandler, name, worldSettings, worldProvider, profiler); this.rand = this.mRandom; } diff --git a/src/main/java/gregtech/common/GT_Network.java b/src/main/java/gregtech/common/GT_Network.java index b6d44be85b..6ab0ed4f02 100644 --- a/src/main/java/gregtech/common/GT_Network.java +++ b/src/main/java/gregtech/common/GT_Network.java @@ -39,26 +39,26 @@ public class GT_Network extends MessageToMessageCodec public GT_Network() { this( - "GregTech", - new GT_Packet_TileEntity(), // 0 - new GT_Packet_Sound(), // 1 - new GT_Packet_Block_Event(), // 2 - new GT_Packet_Ores(), // 3 - new GT_Packet_Pollution(), // 4 - new MessageSetFlaskCapacity(), // 5 - new GT_Packet_TileEntityCover(), // 6 - new GT_Packet_TileEntityCoverGUI(), // 7 - new MessageUpdateFluidDisplayItem(), // 8 - new GT_Packet_ClientPreference(), // 9 - new GT_Packet_WirelessRedstoneCover(), // 10 - new GT_Packet_TileEntityCoverNew(), // 11 - new GT_Packet_SetConfigurationCircuit(), // 12 - new GT_Packet_UpdateItem(), // 13 - new GT_Packet_SetLockedFluid(), // 14 - new GT_Packet_GtTileEntityGuiRequest(), // 15 - new GT_Packet_SendCoverData(), // 16 - new GT_Packet_RequestCoverData(), // 17 - new GT_Packet_MultiTileEntity() // 18 + "GregTech", + new GT_Packet_TileEntity(), // 0 + new GT_Packet_Sound(), // 1 + new GT_Packet_Block_Event(), // 2 + new GT_Packet_Ores(), // 3 + new GT_Packet_Pollution(), // 4 + new MessageSetFlaskCapacity(), // 5 + new GT_Packet_TileEntityCover(), // 6 + new GT_Packet_TileEntityCoverGUI(), // 7 + new MessageUpdateFluidDisplayItem(), // 8 + new GT_Packet_ClientPreference(), // 9 + new GT_Packet_WirelessRedstoneCover(), // 10 + new GT_Packet_TileEntityCoverNew(), // 11 + new GT_Packet_SetConfigurationCircuit(), // 12 + new GT_Packet_UpdateItem(), // 13 + new GT_Packet_SetLockedFluid(), // 14 + new GT_Packet_GtTileEntityGuiRequest(), // 15 + new GT_Packet_SendCoverData(), // 16 + new GT_Packet_RequestCoverData(), // 17 + new GT_Packet_MultiTileEntity() // 18 ); } @@ -75,22 +75,22 @@ public class GT_Network extends MessageToMessageCodec @Override protected void encode(ChannelHandlerContext aContext, GT_Packet aPacket, List aOutput) throws Exception { final ByteBuf tBuf = Unpooled.buffer() - .writeByte(aPacket.getPacketID()); + .writeByte(aPacket.getPacketID()); aPacket.encode(tBuf); aOutput.add( - new FMLProxyPacket( - tBuf, - aContext.channel() - .attr(NetworkRegistry.FML_CHANNEL) - .get())); + new FMLProxyPacket( + tBuf, + aContext.channel() + .attr(NetworkRegistry.FML_CHANNEL) + .get())); } @Override protected void decode(ChannelHandlerContext aContext, FMLProxyPacket aPacket, List aOutput) - throws Exception { + throws Exception { final ByteArrayDataInput aData = ByteStreams.newDataInput( - aPacket.payload() - .array()); + aPacket.payload() + .array()); final GT_Packet tPacket = this.mSubChannels[aData.readByte()].decode(aData); tPacket.setINetHandler(aPacket.handler()); aOutput.add(tPacket); @@ -107,34 +107,34 @@ public class GT_Network extends MessageToMessageCodec return; } this.mChannel.get(Side.SERVER) - .attr(FMLOutboundHandler.FML_MESSAGETARGET) - .set(FMLOutboundHandler.OutboundTarget.PLAYER); + .attr(FMLOutboundHandler.FML_MESSAGETARGET) + .set(FMLOutboundHandler.OutboundTarget.PLAYER); this.mChannel.get(Side.SERVER) - .attr(FMLOutboundHandler.FML_MESSAGETARGETARGS) - .set(aPlayer); + .attr(FMLOutboundHandler.FML_MESSAGETARGETARGS) + .set(aPlayer); this.mChannel.get(Side.SERVER) - .writeAndFlush(aPacket); + .writeAndFlush(aPacket); } @Override public void sendToAllAround(GT_Packet aPacket, NetworkRegistry.TargetPoint aPosition) { this.mChannel.get(Side.SERVER) - .attr(FMLOutboundHandler.FML_MESSAGETARGET) - .set(FMLOutboundHandler.OutboundTarget.ALLAROUNDPOINT); + .attr(FMLOutboundHandler.FML_MESSAGETARGET) + .set(FMLOutboundHandler.OutboundTarget.ALLAROUNDPOINT); this.mChannel.get(Side.SERVER) - .attr(FMLOutboundHandler.FML_MESSAGETARGETARGS) - .set(aPosition); + .attr(FMLOutboundHandler.FML_MESSAGETARGETARGS) + .set(aPosition); this.mChannel.get(Side.SERVER) - .writeAndFlush(aPacket); + .writeAndFlush(aPacket); } @Override public void sendToServer(GT_Packet aPacket) { this.mChannel.get(Side.CLIENT) - .attr(FMLOutboundHandler.FML_MESSAGETARGET) - .set(FMLOutboundHandler.OutboundTarget.TOSERVER); + .attr(FMLOutboundHandler.FML_MESSAGETARGET) + .set(FMLOutboundHandler.OutboundTarget.TOSERVER); this.mChannel.get(Side.CLIENT) - .writeAndFlush(aPacket); + .writeAndFlush(aPacket); } @Override @@ -146,8 +146,8 @@ public class GT_Network extends MessageToMessageCodec } Chunk tChunk = aWorld.getChunkFromBlockCoords(aX, aZ); if (tPlayer.getServerForPlayer() - .getPlayerManager() - .isPlayerWatchingChunk(tPlayer, tChunk.xPosition, tChunk.zPosition)) { + .getPlayerManager() + .isPlayerWatchingChunk(tPlayer, tChunk.xPosition, tChunk.zPosition)) { sendToPlayer(aPacket, tPlayer); } } diff --git a/src/main/java/gregtech/common/GT_Pollution.java b/src/main/java/gregtech/common/GT_Pollution.java index ad2da33259..dede2599e8 100644 --- a/src/main/java/gregtech/common/GT_Pollution.java +++ b/src/main/java/gregtech/common/GT_Pollution.java @@ -144,12 +144,12 @@ public class GT_Pollution { // Smog filter TODO if (tPollution > GT_Mod.gregtechproxy.mPo