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/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 +- 236 files changed, 10489 insertions(+), 5680 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 351a1aac16..9938b46ab0 100644 --- a/src/main/java/gregtech/common/GT_Client.java +++ b/src/main/java/gregtech/common/GT_Client.java @@ -101,17 +101,25 @@ public class GT_Client extends GT_Proxy implements Runnable { // 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 }; 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; @@ -314,8 +322,10 @@ 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; @@ -392,17 +402,19 @@ public class GT_Client extends GT_Proxy implements Runnable { final ForgeDirection direction = tAlignment.getDirection(); 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); - } + 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); + } } } GL11.glPopMatrix(); // get back to player center @@ -518,8 +530,10 @@ public class GT_Client extends GT_Proxy implements Runnable { super.onPreLoad(); MinecraftForge.EVENT_BUS.register(new ExtraIcons()); - Minecraft.getMinecraft().getResourcePackRepository().rprMetadataSerializer - .registerMetadataSectionType(new ColorsMetadataSectionSerializer(), ColorsMetadataSection.class); + Minecraft.getMinecraft() + .getResourcePackRepository().rprMetadataSerializer.registerMetadataSectionType( + new ColorsMetadataSectionSerializer(), + ColorsMetadataSection.class); new GT_MetaTileEntity_AdvDebugStructureWriter.ForgeEventHandler(); @@ -580,7 +594,8 @@ public class GT_Client extends GT_Proxy implements Runnable { for (int i = 1; i < GregTech_API.METATILEENTITIES.length; i++) { try { if (GregTech_API.METATILEENTITIES[i] != null) { - GregTech_API.METATILEENTITIES[i].getStackForm(1L).getTooltip(null, true); + GregTech_API.METATILEENTITIES[i].getStackForm(1L) + .getTooltip(null, true); GT_Log.out.println("META " + i + " " + GregTech_API.METATILEENTITIES[i].getMetaName()); } } catch (Throwable e) { @@ -594,16 +609,19 @@ 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); - } - }); + ((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); + } + }); } @Override @@ -611,7 +629,9 @@ public class GT_Client extends GT_Proxy implements Runnable { GT_Log.out.println("GT_Mod: Downloading Cape List."); try (final Scanner tScanner = new Scanner(new URL(GT_CAPE_LIST_URL).openStream())) { while (tScanner.hasNextLine()) { - this.mCapeList.add(tScanner.nextLine().toLowerCase()); + this.mCapeList.add( + tScanner.nextLine() + .toLowerCase()); } } catch (Throwable e) { e.printStackTrace(GT_Log.err); @@ -619,7 +639,8 @@ public class GT_Client extends GT_Proxy implements Runnable { GT_Log.out.println("GT New Horizons: Downloading Cape List."); try (final Scanner tScanner = new Scanner(new URL(GTNH_CAPE_LIST_URL).openStream())) { while (tScanner.hasNextLine()) { - final String tName = tScanner.nextLine().toLowerCase(); + final String tName = tScanner.nextLine() + .toLowerCase(); if (tName.contains(":")) { if (!this.mCapeList.contains(tName.substring(0, tName.indexOf(":")))) { this.mCapeList.add(tName); @@ -659,7 +680,8 @@ public class GT_Client extends GT_Proxy implements Runnable { mFirstTick = false; GT_Values.NW.sendToServer(new GT_Packet_ClientPreference(mPreference)); - if (!Minecraft.getMinecraft().isSingleplayer()) { + if (!Minecraft.getMinecraft() + .isSingleplayer()) { // Check for more IC2 recipes to also catch MineTweaker additions GT_ModHandler.addIC2RecipesToGT( GT_ModHandler.getMaceratorRecipeList(), @@ -701,7 +723,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(); @@ -718,8 +740,10 @@ public class GT_Client extends GT_Proxy implements Runnable { 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) { final IGregTechTileEntity gtTile = (IGregTechTileEntity) tileEntity; if (gtTile.getMetaTileEntity() instanceof IHasFluidDisplayItem) { @@ -749,10 +773,14 @@ 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) @@ -975,11 +1003,20 @@ 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(); + 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(); } } @@ -1005,7 +1042,8 @@ public class GT_Client extends GT_Proxy implements Runnable { final int[] ids = OreDictionary.getOreIDs(tCurrentItem); int hide = 0; for (int i : ids) { - if (OreDictionary.getOreName(i).equals("craftingToolSolderingIron")) { + if (OreDictionary.getOreName(i) + .equals("craftingToolSolderingIron")) { hide |= 0x1; break; } diff --git a/src/main/java/gregtech/common/GT_Network.java b/src/main/java/gregtech/common/GT_Network.java index 77a7e3477e..665439dbd8 100644 --- a/src/main/java/gregtech/common/GT_Network.java +++ b/src/main/java/gregtech/common/GT_Network.java @@ -74,15 +74,23 @@ 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()); + final ByteBuf tBuf = Unpooled.buffer() + .writeByte(aPacket.getPacketID()); aPacket.encode(tBuf); - aOutput.add(new FMLProxyPacket(tBuf, aContext.channel().attr(NetworkRegistry.FML_CHANNEL).get())); + aOutput.add( + new FMLProxyPacket( + tBuf, + aContext.channel() + .attr(NetworkRegistry.FML_CHANNEL) + .get())); } @Override protected void decode(ChannelHandlerContext aContext, FMLProxyPacket aPacket, List aOutput) throws Exception { - final ByteArrayDataInput aData = ByteStreams.newDataInput(aPacket.payload().array()); + final ByteArrayDataInput aData = ByteStreams.newDataInput( + aPacket.payload() + .array()); final GT_Packet tPacket = this.mSubChannels[aData.readByte()].decode(aData); tPacket.setINetHandler(aPacket.handler()); aOutput.add(tPacket); @@ -98,25 +106,35 @@ public class GT_Network extends MessageToMessageCodec GT_FML_LOGGER.info("player null"); return; } - this.mChannel.get(Side.SERVER).attr(FMLOutboundHandler.FML_MESSAGETARGET) - .set(FMLOutboundHandler.OutboundTarget.PLAYER); - this.mChannel.get(Side.SERVER).attr(FMLOutboundHandler.FML_MESSAGETARGETARGS).set(aPlayer); - this.mChannel.get(Side.SERVER).writeAndFlush(aPacket); + this.mChannel.get(Side.SERVER) + .attr(FMLOutboundHandler.FML_MESSAGETARGET) + .set(FMLOutboundHandler.OutboundTarget.PLAYER); + this.mChannel.get(Side.SERVER) + .attr(FMLOutboundHandler.FML_MESSAGETARGETARGS) + .set(aPlayer); + this.mChannel.get(Side.SERVER) + .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); - this.mChannel.get(Side.SERVER).attr(FMLOutboundHandler.FML_MESSAGETARGETARGS).set(aPosition); - this.mChannel.get(Side.SERVER).writeAndFlush(aPacket); + this.mChannel.get(Side.SERVER) + .attr(FMLOutboundHandler.FML_MESSAGETARGET) + .set(FMLOutboundHandler.OutboundTarget.ALLAROUNDPOINT); + this.mChannel.get(Side.SERVER) + .attr(FMLOutboundHandler.FML_MESSAGETARGETARGS) + .set(aPosition); + this.mChannel.get(Side.SERVER) + .writeAndFlush(aPacket); } @Override public void sendToServer(GT_Packet aPacket) { - this.mChannel.get(Side.CLIENT).attr(FMLOutboundHandler.FML_MESSAGETARGET) - .set(FMLOutboundHandler.OutboundTarget.TOSERVER); - this.mChannel.get(Side.CLIENT).writeAndFlush(aPacket); + this.mChannel.get(Side.CLIENT) + .attr(FMLOutboundHandler.FML_MESSAGETARGET) + .set(FMLOutboundHandler.OutboundTarget.TOSERVER); + this.mChannel.get(Side.CLIENT) + .writeAndFlush(aPacket); } @Override @@ -128,8 +146,9 @@ public class GT_Network extends MessageToMessageCodec } EntityPlayerMP tPlayer = (EntityPlayerMP) tObject; Chunk tChunk = aWorld.getChunkFromBlockCoords(aX, aZ); - if (tPlayer.getServerForPlayer().getPlayerManager() - .isPlayerWatchingChunk(tPlayer, tChunk.xPosition, tChunk.zPosition)) { + if (tPlayer.getServerForPlayer() + .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 12ea4650e9..ad2da33259 100644 --- a/src/main/java/gregtech/common/GT_Pollution.java +++ b/src/main/java/gregtech/common/GT_Pollution.java @@ -318,8 +318,7 @@ public class GT_Pollution { if (iMetaTileEntity instanceof IMachineCallback) { if (((IMachineCallback) iMetaTileEntity).getCallbackBase() instanceof GT_MetaTileEntity_Cleanroom) { if (aPollution > 0) { - ((GT_MetaTileEntity_Cleanroom) ((IMachineCallback) iMetaTileEntity).getCallbackBase()) - .doMaintenanceIssue(); + ((GT_MetaTileEntity_Cleanroom) ((IMachineCallback) iMetaTileEntity).getCallbackBase()).doMaintenanceIssue(); } } } @@ -384,7 +383,8 @@ public class GT_Pollution { if (w.isRemote) // it really should be querying the client side stuff instead return GT_PollutionRenderer.getKnownPollution(chunkX << 4, chunkZ << 4); - return STORAGE.get(w, chunkX, chunkZ).getAmount(); + return STORAGE.get(w, chunkX, chunkZ) + .getAmount(); } @Deprecated @@ -394,7 +394,9 @@ public class GT_Pollution { public static boolean hasPollution(Chunk ch) { if (!GT_Mod.gregtechproxy.mPollution) return false; - return STORAGE.isCreated(ch.worldObj, ch.getChunkCoordIntPair()) && STORAGE.get(ch).getAmount() > 0; + return STORAGE.isCreated(ch.worldObj, ch.getChunkCoordIntPair()) && STORAGE.get(ch) + .getAmount() + > 0; } // Add compatibility with old code @@ -406,7 +408,10 @@ public class GT_Pollution { } static void migrate(ChunkDataEvent.Load e) { - addPollution(e.getChunk(), e.getData().getInteger("GTPOLLUTION")); + addPollution( + e.getChunk(), + e.getData() + .getInteger("GTPOLLUTION")); } public static class GT_PollutionEventHandler { @@ -416,7 +421,8 @@ public class GT_Pollution { if (!GT_Mod.gregtechproxy.mPollution) return; World world = event.player.worldObj; if (STORAGE.isCreated(world, event.chunk)) { - int pollution = STORAGE.get(world, event.chunk).getAmount(); + int pollution = STORAGE.get(world, event.chunk) + .getAmount(); if (pollution > POLLUTIONPACKET_MINVALUE) GT_Values.NW.sendToPlayer(new GT_Packet_Pollution(event.chunk, pollution), event.player); } diff --git a/src/main/java/gregtech/common/GT_Proxy.java b/src/main/java/gregtech/common/GT_Proxy.java index 401b1395d5..30de62084a 100644 --- a/src/main/java/gregtech/common/GT_Proxy.java +++ b/src/main/java/gregtech/common/GT_Proxy.java @@ -748,18 +748,24 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG GameRegistry.registerFuelHandler(this); MinecraftForge.EVENT_BUS.register(this); MinecraftForge.ORE_GEN_BUS.register(this); - FMLCommonHandler.instance().bus().register(this); - GregTech_API.sThaumcraftCompat = (IThaumcraftCompat) GT_Utility - .callConstructor("gregtech.common.GT_ThaumcraftCompat", 0, null, GT_Values.D1, new Object[0]); - for (FluidContainerRegistry.FluidContainerData tData : FluidContainerRegistry - .getRegisteredFluidContainerData()) { + FMLCommonHandler.instance() + .bus() + .register(this); + GregTech_API.sThaumcraftCompat = (IThaumcraftCompat) GT_Utility.callConstructor( + "gregtech.common.GT_ThaumcraftCompat", + 0, + null, + GT_Values.D1, + new Object[0]); + for (FluidContainerRegistry.FluidContainerData tData : FluidContainerRegistry.getRegisteredFluidContainerData()) { onFluidContainerRegistration(new FluidContainerRegistry.FluidContainerRegisterEvent(tData)); } try { for (String tOreName : OreDictionary.getOreNames()) { ItemStack tOreStack; - for (Iterator i$ = OreDictionary.getOres(tOreName).iterator(); i$ - .hasNext(); registerOre(new OreDictionary.OreRegisterEvent(tOreName, tOreStack))) { + for (Iterator i$ = OreDictionary.getOres(tOreName) + .iterator(); i$.hasNext(); registerOre( + new OreDictionary.OreRegisterEvent(tOreName, tOreStack))) { tOreStack = (ItemStack) i$.next(); } } @@ -776,8 +782,7 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG this.mIgnoreTcon = GregTech_API.sOPStuff.get(ConfigCategories.general, "ignoreTConstruct", true); this.mWireHeatingTicks = GregTech_API.sOPStuff.get(ConfigCategories.general, "WireHeatingTicks", 4); NetworkRegistry.INSTANCE.registerGuiHandler(GT_Values.GT, this); - for (FluidContainerRegistry.FluidContainerData tData : FluidContainerRegistry - .getRegisteredFluidContainerData()) { + for (FluidContainerRegistry.FluidContainerData tData : FluidContainerRegistry.getRegisteredFluidContainerData()) { if ((tData.filledContainer.getItem() == Items.potionitem) && (tData.filledContainer.getItemDamage() == 0)) { tData.fluid.amount = 0; break; @@ -872,8 +877,8 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG ItemList.IC2_Hops.set(GT_ModHandler.getIC2Item("hops", 1L)); ItemList.IC2_Resin.set(GT_ModHandler.getIC2Item("resin", 1L)); ItemList.IC2_Plantball.set(GT_ModHandler.getIC2Item("plantBall", 1L)); - ItemList.IC2_PlantballCompressed - .set(GT_ModHandler.getIC2Item("compressedPlantBall", 1L, ItemList.IC2_Plantball.get(1L))); + ItemList.IC2_PlantballCompressed.set( + GT_ModHandler.getIC2Item("compressedPlantBall", 1L, ItemList.IC2_Plantball.get(1L))); ItemList.IC2_Crop_Seeds.set(GT_ModHandler.getIC2Item("cropSeed", 1L)); ItemList.IC2_Grin_Powder.set(GT_ModHandler.getIC2Item("grinPowder", 1L)); ItemList.IC2_Energium_Dust.set(GT_ModHandler.getIC2Item("energiumDust", 1L)); @@ -883,8 +888,8 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG ItemList.IC2_Food_Can_Empty.set(GT_ModHandler.getIC2Item("tinCan", 1L)); ItemList.IC2_Food_Can_Filled.set(GT_ModHandler.getIC2Item("filledTinCan", 1L, 0)); ItemList.IC2_Food_Can_Spoiled.set(GT_ModHandler.getIC2Item("filledTinCan", 1L, 1)); - ItemList.IC2_Industrial_Diamond - .set(GT_ModHandler.getIC2Item("industrialDiamond", 1L, new ItemStack(Items.diamond, 1))); + ItemList.IC2_Industrial_Diamond.set( + GT_ModHandler.getIC2Item("industrialDiamond", 1L, new ItemStack(Items.diamond, 1))); ItemList.IC2_Compressed_Coal_Ball.set(GT_ModHandler.getIC2Item("compressedCoalBall", 1L)); ItemList.IC2_Compressed_Coal_Chunk.set(GT_ModHandler.getIC2Item("coalChunk", 1L)); ItemList.IC2_ShaftIron.set(GT_ModHandler.getIC2Item("ironshaft", 1L)); @@ -960,40 +965,40 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getIC2Item("hazmatChestplate", 1L, 32767)); GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getIC2Item("hazmatLeggings", 1L, 32767)); GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getIC2Item("hazmatBoots", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems - .add(GT_ModHandler.getModItem(Railcraft.modID, "part.turbine.disk", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems - .add(GT_ModHandler.getModItem(Railcraft.modID, "part.turbine.blade", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems - .add(GT_ModHandler.getModItem(Railcraft.modID, "part.turbine.rotor", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems - .add(GT_ModHandler.getModItem(Railcraft.modID, "borehead.diamond", 1L, 32767)); + GT_ModHandler.sNonReplaceableItems.add( + GT_ModHandler.getModItem(Railcraft.modID, "part.turbine.disk", 1L, 32767)); + GT_ModHandler.sNonReplaceableItems.add( + GT_ModHandler.getModItem(Railcraft.modID, "part.turbine.blade", 1L, 32767)); + GT_ModHandler.sNonReplaceableItems.add( + GT_ModHandler.getModItem(Railcraft.modID, "part.turbine.rotor", 1L, 32767)); + GT_ModHandler.sNonReplaceableItems.add( + GT_ModHandler.getModItem(Railcraft.modID, "borehead.diamond", 1L, 32767)); GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(Railcraft.modID, "borehead.steel", 1L, 32767)); GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(Railcraft.modID, "borehead.iron", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems - .add(GT_ModHandler.getModItem(TwilightForest.modID, "item.plateNaga", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems - .add(GT_ModHandler.getModItem(TwilightForest.modID, "item.legsNaga", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems - .add(GT_ModHandler.getModItem(TwilightForest.modID, "item.arcticHelm", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems - .add(GT_ModHandler.getModItem(TwilightForest.modID, "item.arcticPlate", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems - .add(GT_ModHandler.getModItem(TwilightForest.modID, "item.arcticLegs", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems - .add(GT_ModHandler.getModItem(TwilightForest.modID, "item.arcticBoots", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems - .add(GT_ModHandler.getModItem(TwilightForest.modID, "item.yetiHelm", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems - .add(GT_ModHandler.getModItem(TwilightForest.modID, "item.yetiPlate", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems - .add(GT_ModHandler.getModItem(TwilightForest.modID, "item.yetiLegs", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems - .add(GT_ModHandler.getModItem(TwilightForest.modID, "item.yetiBoots", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems - .add(GT_ModHandler.getModItem("appliedenergistics2", "item.ToolCertusQuartzCuttingKnife", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems - .add(GT_ModHandler.getModItem("appliedenergistics2", "item.ToolNetherQuartzCuttingKnife", 1L, 32767)); + GT_ModHandler.sNonReplaceableItems.add( + GT_ModHandler.getModItem(TwilightForest.modID, "item.plateNaga", 1L, 32767)); + GT_ModHandler.sNonReplaceableItems.add( + GT_ModHandler.getModItem(TwilightForest.modID, "item.legsNaga", 1L, 32767)); + GT_ModHandler.sNonReplaceableItems.add( + GT_ModHandler.getModItem(TwilightForest.modID, "item.arcticHelm", 1L, 32767)); + GT_ModHandler.sNonReplaceableItems.add( + GT_ModHandler.getModItem(TwilightForest.modID, "item.arcticPlate", 1L, 32767)); + GT_ModHandler.sNonReplaceableItems.add( + GT_ModHandler.getModItem(TwilightForest.modID, "item.arcticLegs", 1L, 32767)); + GT_ModHandler.sNonReplaceableItems.add( + GT_ModHandler.getModItem(TwilightForest.modID, "item.arcticBoots", 1L, 32767)); + GT_ModHandler.sNonReplaceableItems.add( + GT_ModHandler.getModItem(TwilightForest.modID, "item.yetiHelm", 1L, 32767)); + GT_ModHandler.sNonReplaceableItems.add( + GT_ModHandler.getModItem(TwilightForest.modID, "item.yetiPlate", 1L, 32767)); + GT_ModHandler.sNonReplaceableItems.add( + GT_ModHandler.getModItem(TwilightForest.modID, "item.yetiLegs", 1L, 32767)); + GT_ModHandler.sNonReplaceableItems.add( + GT_ModHandler.getModItem(TwilightForest.modID, "item.yetiBoots", 1L, 32767)); + GT_ModHandler.sNonReplaceableItems.add( + GT_ModHandler.getModItem("appliedenergistics2", "item.ToolCertusQuartzCuttingKnife", 1L, 32767)); + GT_ModHandler.sNonReplaceableItems.add( + GT_ModHandler.getModItem("appliedenergistics2", "item.ToolNetherQuartzCuttingKnife", 1L, 32767)); GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(aTextForestry, "apiaristHelmet", 1L, 32767)); GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(aTextForestry, "apiaristChest", 1L, 32767)); GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(aTextForestry, "apiaristLegs", 1L, 32767)); @@ -1002,10 +1007,10 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(aTextForestry, "frameImpregnated", 1L, 32767)); GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(aTextForestry, "frameProven", 1L, 32767)); GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(aTextForestry, "waxCast", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems - .add(GT_ModHandler.getModItem("GalacticraftCore", "item.sensorGlasses", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems - .add(GT_ModHandler.getModItem("IC2NuclearControl", "ItemToolThermometer", 1L, 32767)); + GT_ModHandler.sNonReplaceableItems.add( + GT_ModHandler.getModItem("GalacticraftCore", "item.sensorGlasses", 1L, 32767)); + GT_ModHandler.sNonReplaceableItems.add( + GT_ModHandler.getModItem("IC2NuclearControl", "ItemToolThermometer", 1L, 32767)); RecipeSorter.register( "gregtech:shaped", @@ -1028,16 +1033,21 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG GT_OreDictUnificator.registerOre( "cropChilipepper", GT_ModHandler.getModItem("magicalcrops", "magicalcrops_CropProduce", 1L, 2)); - GT_OreDictUnificator - .registerOre("cropTomato", GT_ModHandler.getModItem("magicalcrops", "magicalcrops_CropProduce", 1L, 8)); - GT_OreDictUnificator - .registerOre("cropGrape", GT_ModHandler.getModItem("magicalcrops", "magicalcrops_CropProduce", 1L, 4)); + GT_OreDictUnificator.registerOre( + "cropTomato", + GT_ModHandler.getModItem("magicalcrops", "magicalcrops_CropProduce", 1L, 8)); + GT_OreDictUnificator.registerOre( + "cropGrape", + GT_ModHandler.getModItem("magicalcrops", "magicalcrops_CropProduce", 1L, 4)); GT_OreDictUnificator.registerOre("cropTea", GT_ModHandler.getModItem("ganyssurface", "teaLeaves", 1L, 0)); // Clay buckets, which don't get registered until Iguana Tweaks pre-init if (IguanaTweaksTinkerConstruct.isModLoaded()) { - OrePrefixes.bucketClay.mContainerItem = GT_ModHandler - .getModItem(IguanaTweaksTinkerConstruct.modID, "clayBucketFired", 1L, 0); + OrePrefixes.bucketClay.mContainerItem = GT_ModHandler.getModItem( + IguanaTweaksTinkerConstruct.modID, + "clayBucketFired", + 1L, + 0); GT_OreDictUnificator.set( OrePrefixes.bucketClay, Materials.Empty, @@ -1162,8 +1172,7 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG addFullHazmatToGeneralItem("EnderIO", "item.stellar_boots", 1L); GregTech_API.sLoadStarted = true; - for (FluidContainerRegistry.FluidContainerData tData : FluidContainerRegistry - .getRegisteredFluidContainerData()) { + for (FluidContainerRegistry.FluidContainerData tData : FluidContainerRegistry.getRegisteredFluidContainerData()) { if ((tData.filledContainer.getItem() == Items.potionitem) && (tData.filledContainer.getItemDamage() == 0)) { tData.fluid.amount = 0; break; @@ -1189,10 +1198,10 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG GT_MetaGenerated_Item_98.init(); GT_OreDictUnificator.addItemData(new ItemStack(Items.iron_door, 1), new ItemData(Materials.Iron, 21772800L)); - GT_OreDictUnificator - .addItemData(new ItemStack(Items.wooden_door, 1, 32767), new ItemData(Materials.Wood, 21772800L)); - for (FluidContainerRegistry.FluidContainerData tData : FluidContainerRegistry - .getRegisteredFluidContainerData()) { + GT_OreDictUnificator.addItemData( + new ItemStack(Items.wooden_door, 1, 32767), + new ItemData(Materials.Wood, 21772800L)); + for (FluidContainerRegistry.FluidContainerData tData : FluidContainerRegistry.getRegisteredFluidContainerData()) { if ((tData.filledContainer.getItem() == Items.potionitem) && (tData.filledContainer.getItemDamage() == 0)) { tData.fluid.amount = 0; break; @@ -1284,8 +1293,7 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG this.mUniverse = null; this.isFirstServerWorldTick = true; - for (FluidContainerRegistry.FluidContainerData tData : FluidContainerRegistry - .getRegisteredFluidContainerData()) { + for (FluidContainerRegistry.FluidContainerData tData : FluidContainerRegistry.getRegisteredFluidContainerData()) { if ((tData.filledContainer.getItem() == Items.potionitem) && (tData.filledContainer.getItemDamage() == 0)) { tData.fluid.amount = 0; break; @@ -1310,7 +1318,8 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG GT_Log.out.println( "GT_Mod: Cleaning up all OreDict Crafting Recipes, which have an empty List in them, since they are never meeting any Condition."); - List tList = CraftingManager.getInstance().getRecipeList(); + List tList = CraftingManager.getInstance() + .getRecipeList(); for (int i = 0; i < tList.size(); i++) { if ((tList.get(i) instanceof ShapedOreRecipe)) { for (Object tObject : ((ShapedOreRecipe) tList.get(i)).getInput()) { @@ -1362,8 +1371,10 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG public void onArrowNockEvent(ArrowNockEvent aEvent) { if ((!aEvent.isCanceled()) && (GT_Utility.isStackValid(aEvent.result)) && (GT_Utility.getProjectile(SubTag.PROJECTILE_ARROW, aEvent.entityPlayer.inventory) != null)) { - aEvent.entityPlayer - .setItemInUse(aEvent.result, aEvent.result.getItem().getMaxItemUseDuration(aEvent.result)); + aEvent.entityPlayer.setItemInUse( + aEvent.result, + aEvent.result.getItem() + .getMaxItemUseDuration(aEvent.result)); aEvent.setCanceled(true); } } @@ -1407,8 +1418,11 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG aEvent.bow.getItem(); new WorldSpawnedEventBuilder.SoundAtEntityEventBuilder().setPitch(0.64893958288F + tSpeed * 0.5F) - .setVolume(1f).setIdentifier(SoundResource.RANDOM_BOW).setEntity(aEvent.entityPlayer) - .setWorld(aEvent.entityPlayer.worldObj).run(); + .setVolume(1f) + .setIdentifier(SoundResource.RANDOM_BOW) + .setEntity(aEvent.entityPlayer) + .setWorld(aEvent.entityPlayer.worldObj) + .run(); tArrowEntity.canBePickedUp = 1; if (!aEvent.entityPlayer.capabilities.isCreativeMode) { @@ -1446,8 +1460,8 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG new GT_Entity_Arrow( (EntityArrow) aEvent.entity, OrePrefixes.arrowGtWood.mPrefixedItems.get( - aEvent.entity.worldObj.rand - .nextInt(OrePrefixes.arrowGtWood.mPrefixedItems.size())))); + aEvent.entity.worldObj.rand.nextInt( + OrePrefixes.arrowGtWood.mPrefixedItems.size())))); aEvent.entity.setDead(); } } @@ -1570,7 +1584,8 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG @SubscribeEvent public void registerOre(OreDictionary.OreRegisterEvent aEvent) { - ModContainer tContainer = Loader.instance().activeModContainer(); + ModContainer tContainer = Loader.instance() + .activeModContainer(); String aMod = tContainer == null ? "UNKNOWN" : tContainer.getModId(); String aOriginalMod = aMod; if (GT_OreDictUnificator.isRegisteringOres()) { @@ -1582,7 +1597,9 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG || (aEvent.Ore.getItem() == null) || (aEvent.Name == null) || (aEvent.Name.isEmpty()) - || (aEvent.Name.replaceAll("_", "").length() - aEvent.Name.length() == 9)) { + || (aEvent.Name.replaceAll("_", "") + .length() + - aEvent.Name.length() == 9)) { if (aOriginalMod.equals("gregtech")) { aOriginalMod = "UNKNOWN"; } @@ -1595,11 +1612,16 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG } try { aEvent.Ore.stackSize = 1; - if (this.mIgnoreTcon || aEvent.Ore.getUnlocalizedName().startsWith("item.oreberry")) { - if ((aOriginalMod.toLowerCase(Locale.ENGLISH).contains("xycraft")) - || (aOriginalMod.toLowerCase(Locale.ENGLISH).contains("tconstruct")) - || ((aOriginalMod.toLowerCase(Locale.ENGLISH).contains("natura")) - && (!aOriginalMod.toLowerCase(Locale.ENGLISH).contains("natural")))) { + if (this.mIgnoreTcon || aEvent.Ore.getUnlocalizedName() + .startsWith("item.oreberry")) { + if ((aOriginalMod.toLowerCase(Locale.ENGLISH) + .contains("xycraft")) + || (aOriginalMod.toLowerCase(Locale.ENGLISH) + .contains("tconstruct")) + || ((aOriginalMod.toLowerCase(Locale.ENGLISH) + .contains("natura")) + && (!aOriginalMod.toLowerCase(Locale.ENGLISH) + .contains("natural")))) { if (GT_Values.D1) { GT_Log.ore.println(aMod + " -> " + aEvent.Name + " is getting ignored, because of racism. :P"); } @@ -1689,8 +1711,9 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG GT_Log.ore.println( tModToName + " is getting re-registered because the OreDict Name containing invalid spaces."); - GT_OreDictUnificator - .registerOre(aEvent.Name.replaceAll(" ", ""), GT_Utility.copyAmount(1L, aEvent.Ore)); + GT_OreDictUnificator.registerOre( + aEvent.Name.replaceAll(" ", ""), + GT_Utility.copyAmount(1L, aEvent.Ore)); aEvent.Ore.setStackDisplayName("Invalid OreDictionary Tag"); return; } else if (this.mInvalidNames.contains(aEvent.Name)) { @@ -1701,19 +1724,25 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG OrePrefixes aPrefix = OrePrefixes.getOrePrefix(aEvent.Name); Materials aMaterial = Materials._NULL; if ((aPrefix == OrePrefixes.nugget) && (aMod.equals("Thaumcraft")) - && (aEvent.Ore.getItem().getUnlocalizedName().contains("ItemResource"))) { + && (aEvent.Ore.getItem() + .getUnlocalizedName() + .contains("ItemResource"))) { return; } if (aPrefix == null) { - if (aEvent.Name.toLowerCase().equals(aEvent.Name)) { + if (aEvent.Name.toLowerCase() + .equals(aEvent.Name)) { GT_Log.ore.println(tModToName + " is invalid due to being solely lowercased."); return; - } else if (aEvent.Name.toUpperCase().equals(aEvent.Name)) { - GT_Log.ore.println(tModToName + " is invalid due to being solely uppercased."); - return; - } else if (Character.isUpperCase(aEvent.Name.charAt(0))) { - GT_Log.ore.println(tModToName + " is invalid due to the first character being uppercased."); - } + } else if (aEvent.Name.toUpperCase() + .equals(aEvent.Name)) { + GT_Log.ore.println( + tModToName + " is invalid due to being solely uppercased."); + return; + } else + if (Character.isUpperCase(aEvent.Name.charAt(0))) { + GT_Log.ore.println(tModToName + " is invalid due to the first character being uppercased."); + } } else { if (aPrefix.mDontUnificateActively) { GT_OreDictUnificator.addToBlacklist(aEvent.Ore); @@ -1749,9 +1778,10 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG } if (aMaterial != Materials._NULL) { Materials tReRegisteredMaterial; - for (Iterator i$ = aMaterial.mOreReRegistrations.iterator(); i$ - .hasNext(); GT_OreDictUnificator - .registerOre(aPrefix, tReRegisteredMaterial, aEvent.Ore)) { + for (Iterator i$ = aMaterial.mOreReRegistrations.iterator(); i$.hasNext(); GT_OreDictUnificator.registerOre( + aPrefix, + tReRegisteredMaterial, + aEvent.Ore)) { tReRegisteredMaterial = (Materials) i$.next(); } aMaterial.add(GT_Utility.copyAmount(1L, aEvent.Ore)); @@ -1822,8 +1852,9 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG if (aMaterial == Materials.Tin) { GT_OreDictUnificator.registerOre(OreDictNames.craftingWireTin, aEvent.Ore); } else if (aMaterial == Materials.AnyCopper) { - GT_OreDictUnificator - .registerOre(OreDictNames.craftingWireCopper, aEvent.Ore); + GT_OreDictUnificator.registerOre( + OreDictNames.craftingWireCopper, + aEvent.Ore); } else if (aMaterial == Materials.Gold) { GT_OreDictUnificator.registerOre(OreDictNames.craftingWireGold, aEvent.Ore); } else if (aMaterial == Materials.AnyIron) { @@ -1834,8 +1865,8 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG if ((aMaterial.contains(SubTag.TRANSPARENT)) && (aMaterial.mColor != Dyes._NULL)) { GT_OreDictUnificator.registerOre( - "craftingLens" - + aMaterial.mColor.toString().replaceFirst("dye", ""), + "craftingLens" + aMaterial.mColor.toString() + .replaceFirst("dye", ""), aEvent.Ore); } break; @@ -1905,40 +1936,66 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG } else if (aMaterial == Materials.Knightmetal) { GT_OreDictUnificator.registerOre("knightmetal", aEvent.Ore); } else if ((aMaterial == Materials.Brass) && (aEvent.O