From 69ce418e29e22391f60cdd55815727762a78c33a Mon Sep 17 00:00:00 2001 From: Raven Szewczyk Date: Fri, 24 May 2024 19:04:17 +0100 Subject: Apply updated GT5u spotless configs --- .../xmod/gregtech/common/Meta_GT_Proxy.java | 29 +- .../common/blocks/GregtechMetaCasingBlocks.java | 10 +- .../common/blocks/GregtechMetaCasingBlocks2.java | 4 +- .../common/blocks/GregtechMetaCasingBlocks3.java | 38 +- .../common/blocks/GregtechMetaCasingBlocks4.java | 2 +- .../common/blocks/GregtechMetaCasingBlocks5.java | 6 +- .../common/blocks/GregtechMetaCasingBlocks6.java | 26 +- .../blocks/GregtechMetaCasingBlocksAbstract.java | 8 +- .../GregtechMetaCasingBlocksPipeGearbox.java | 2 +- .../blocks/GregtechMetaItemCasingsAbstract.java | 14 +- .../blocks/GregtechMetaSpecialMachineCasings.java | 6 +- .../blocks/GregtechMetaSpecialMultiCasings.java | 20 +- .../blocks/GregtechMetaSpecialMultiCasings2.java | 2 +- .../common/blocks/fluid/GregtechFluidHandler.java | 164 +-- .../blocks/textures/CasingTextureHandler.java | 2 +- .../textures/TexturesCentrifugeMultiblock.java | 24 +- .../blocks/textures/TexturesGrinderMultiblock.java | 17 +- .../common/blocks/textures/TexturesGtBlock.java | 154 +-- .../turbine/LargeTurbineTextureHandler.java | 215 ++-- .../common/covers/GTPP_Cover_Overflow.java | 49 +- .../common/covers/GTPP_Cover_ToggleVisual.java | 22 +- .../gregtech/common/helpers/ChargingHelper.java | 59 +- .../common/helpers/tesseract/TesseractHelper.java | 46 +- .../gregtech/common/items/MetaCustomCoverItem.java | 20 +- .../common/items/MetaGeneratedGregtechItems.java | 341 +++--- .../common/items/MetaGeneratedGregtechTools.java | 38 +- .../items/behaviours/Behaviour_Choocher.java | 25 +- .../behaviours/Behaviour_Electric_Lighter.java | 59 +- .../items/behaviours/Behaviour_Prospecting_Ex.java | 41 +- .../common/items/covers/MetaItemCoverCasings.java | 15 +- .../gregtech/common/render/GTPP_CapeRenderer.java | 119 ++- .../gregtech/common/render/GTPP_FlaskRenderer.java | 22 +- .../common/render/GTPP_Render_MachineBlock.java | 1096 ++++++++++---------- .../GT_MetaTileEntity_ElectricAutoWorkbench.java | 221 ++-- .../GT_MetaTileEntity_TesseractGenerator.java | 350 ++++--- .../GT_MetaTileEntity_TesseractTerminal.java | 250 +++-- .../generators/GT_MetaTileEntity_Boiler_Base.java | 52 +- .../generators/GT_MetaTileEntity_Boiler_HV.java | 6 +- .../generators/GT_MetaTileEntity_Boiler_LV.java | 6 +- .../generators/GT_MetaTileEntity_Boiler_MV.java | 6 +- .../GT_MetaTileEntity_SemiFluidGenerator.java | 45 +- .../GregtechMetaTileEntityGeothermalGenerator.java | 63 +- .../GregtechMetaTileEntityRocketFuelGenerator.java | 41 +- .../generators/GregtechMetaTileEntity_RTG.java | 98 +- .../GT_MetaTileEntity_ULV_CombustionGenerator.java | 20 +- .../ULV/GT_MetaTileEntity_ULV_SteamTurbine.java | 2 +- .../basic/GT_MetaTileEntity_CropHarvestor.java | 214 ++-- .../GregtechMetaAtmosphericReconditioner.java | 292 +++--- .../basic/GregtechMetaPollutionCreator.java | 70 +- .../basic/GregtechMetaPollutionDetector.java | 83 +- .../basic/GregtechMetaTileEntity_AutoChisel.java | 56 +- .../basic/GregtechMetaWirelessCharger.java | 142 +-- .../machines/multi/misc/GMTE_AmazonPackager.java | 62 +- ...gtechMetaTileEntity_IndustrialAlloySmelter.java | 86 +- ...regtechMetaTileEntity_IndustrialArcFurnace.java | 170 +-- ...regtechMetaTileEntity_IndustrialCentrifuge.java | 61 +- .../GregtechMetaTileEntity_IndustrialChisel.java | 86 +- .../GregtechMetaTileEntity_IndustrialCokeOven.java | 93 +- ...echMetaTileEntity_IndustrialCuttingMachine.java | 60 +- ...regtechMetaTileEntity_IndustrialDehydrator.java | 81 +- ...gtechMetaTileEntity_IndustrialElectrolyzer.java | 59 +- .../GregtechMetaTileEntity_IndustrialExtruder.java | 60 +- ...egtechMetaTileEntity_IndustrialFluidHeater.java | 89 +- ...egtechMetaTileEntity_IndustrialForgeHammer.java | 77 +- ...GregtechMetaTileEntity_IndustrialMacerator.java | 264 ++--- .../GregtechMetaTileEntity_IndustrialMixer.java | 61 +- ...aTileEntity_IndustrialMolecularTransformer.java | 91 +- ...gtechMetaTileEntity_IndustrialMultiMachine.java | 108 +- ...regtechMetaTileEntity_IndustrialPlatePress.java | 57 +- .../GregtechMetaTileEntity_IndustrialSifter.java | 72 +- ...MetaTileEntity_IndustrialThermalCentrifuge.java | 69 +- ...techMetaTileEntity_IndustrialVacuumFreezer.java | 92 +- ...GregtechMetaTileEntity_IndustrialWashPlant.java | 93 +- .../GregtechMetaTileEntity_IndustrialWireMill.java | 62 +- .../processing/GregtechMetaTileEntity_IsaMill.java | 99 +- ...hMetaTileEntity_NuclearSaltProcessingPlant.java | 137 +-- .../GregtechMetaTileEntity_SpargeTower.java | 226 ++-- ...egtechMetaTileEntity_Adv_DistillationTower.java | 202 ++-- .../advanced/GregtechMetaTileEntity_Adv_EBF.java | 117 ++- .../GregtechMetaTileEntity_Adv_Fusion_MK4.java | 61 +- .../GregtechMetaTileEntity_Adv_Fusion_MK5.java | 61 +- .../GregtechMetaTileEntity_Adv_HeatExchanger.java | 243 +++-- .../GregtechMetaTileEntity_Adv_Implosion.java | 55 +- .../GregtechMetaTileEntity_SteamCompressor.java | 57 +- .../GregtechMetaTileEntity_SteamMacerator.java | 59 +- .../multi/production/GT4Entity_AutoCrafter.java | 55 +- .../multi/production/GT4Entity_ThermalBoiler.java | 70 +- .../GregtechMTE_ElementalDuplicator.java | 159 +-- .../production/GregtechMTE_FrothFlotationCell.java | 72 +- .../production/GregtechMTE_NuclearReactor.java | 207 ++-- .../production/GregtechMetaTileEntityTreeFarm.java | 206 ++-- .../GregtechMetaTileEntity_AlloyBlastSmelter.java | 69 +- .../GregtechMetaTileEntity_Cyclotron.java | 114 +- ...egtechMetaTileEntity_IndustrialFishingPond.java | 124 ++- ...egtechMetaTileEntity_IndustrialRockBreaker.java | 145 +-- .../GregtechMetaTileEntity_LargeRocketEngine.java | 135 +-- ...techMetaTileEntity_LargeSemifluidGenerator.java | 77 +- .../GregtechMetaTileEntity_MassFabricator.java | 91 +- ...techMetaTileEntity_QuantumForceTransformer.java | 466 ++++----- .../GregtechMetaTileEntity_Refinery.java | 97 +- .../GregtechMetaTileEntity_SolarTower.java | 435 ++++---- .../algae/GregtechMTE_AlgaePondBase.java | 98 +- .../chemplant/GregtechMTE_ChemicalPlant.java | 228 ++-- ...egTechMetaTileEntity_MegaAlloyBlastSmelter.java | 343 +++--- .../turbines/GT_MTE_LargeTurbine_Gas.java | 7 +- .../turbines/GT_MTE_LargeTurbine_Plasma.java | 36 +- .../turbines/GT_MTE_LargeTurbine_SHSteam.java | 23 +- .../turbines/GT_MTE_LargeTurbine_Steam.java | 19 +- .../GregtechMetaTileEntity_LargerTurbineBase.java | 333 +++--- ...chMetaTileEntity_PowerSubStationController.java | 453 ++++---- .../tileentities/misc/TileEntitySolarHeater.java | 52 +- .../storage/GT_MetaTileEntity_TieredChest.java | 98 +- .../storage/GT_MetaTileEntity_TieredTank.java | 58 +- .../storage/GregtechMetaEnergyBuffer.java | 87 +- .../GT_MetaTileEntity_InfiniteItemHolder.java | 21 +- .../common/tools/TOOL_Gregtech_AngleGrinder.java | 23 +- .../common/tools/TOOL_Gregtech_ElectricSnips.java | 12 +- 117 files changed, 6659 insertions(+), 5736 deletions(-) (limited to 'src/main/java/gtPlusPlus/xmod/gregtech/common') diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/Meta_GT_Proxy.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/Meta_GT_Proxy.java index 71f809ae99..c53e217560 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/Meta_GT_Proxy.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/Meta_GT_Proxy.java @@ -48,21 +48,26 @@ public class Meta_GT_Proxy { try { String aNewHeatedWaterName = "Heated Water"; Logger.INFO("Renaming [IC2 Hotspring Water] --> [" + aNewHeatedWaterName + "]."); - LanguageRegistry.instance().addStringLocalization("fluidHotWater", "Heated Water"); - LanguageRegistry.instance().addStringLocalization("fluidHotWater", aNewHeatedWaterName); - LanguageRegistry.instance().addStringLocalization("ic2.fluidHotWater", aNewHeatedWaterName); + LanguageRegistry.instance() + .addStringLocalization("fluidHotWater", "Heated Water"); + LanguageRegistry.instance() + .addStringLocalization("fluidHotWater", aNewHeatedWaterName); + LanguageRegistry.instance() + .addStringLocalization("ic2.fluidHotWater", aNewHeatedWaterName); GT_LanguageManager.addStringLocalization("fluidHotWater", aNewHeatedWaterName); GT_LanguageManager.addStringLocalization("ic2.fluidHotWater", aNewHeatedWaterName); Block b = BlocksItems.getFluidBlock(InternalName.fluidHotWater); if (b != null) { LanguageRegistry.addName(ItemUtils.getSimpleStack(b), aNewHeatedWaterName); - LanguageRegistry.instance().addStringLocalization(b.getUnlocalizedName(), aNewHeatedWaterName); + LanguageRegistry.instance() + .addStringLocalization(b.getUnlocalizedName(), aNewHeatedWaterName); GT_LanguageManager.addStringLocalization(b.getUnlocalizedName(), aNewHeatedWaterName); } Fluid f = BlocksItems.getFluid(InternalName.fluidHotWater); if (f != null) { - LanguageRegistry.instance().addStringLocalization(f.getUnlocalizedName(), aNewHeatedWaterName); + LanguageRegistry.instance() + .addStringLocalization(f.getUnlocalizedName(), aNewHeatedWaterName); GT_LanguageManager.addStringLocalization(f.getUnlocalizedName(), aNewHeatedWaterName); int aDam = FluidRegistry.getFluidID(f); ItemStack s = ItemList.Display_Fluid.getWithDamage(1, aDam); @@ -72,15 +77,15 @@ public class Meta_GT_Proxy { } String[] aLangs = new String[] { "de_DE", "en_US", "en_GB", "en_IC", "es_AR", "es_ES", "es_MX", "es_UY", - "es_VE", "fr_CA", "fr_FR", "it_IT", "ko_KR", "pt_BR", "pt_PT", "ru_RU", "sv_SE", "tr_TR", "zh_CN", - "zh_TW", }; + "es_VE", "fr_CA", "fr_FR", "it_IT", "ko_KR", "pt_BR", "pt_PT", "ru_RU", "sv_SE", "tr_TR", "zh_CN", + "zh_TW", }; String[] aLangValues = new String[] { "Erhitztes Wasser", "Heated Water", "Heated Water", "Heated Water", - "Agua caliente", "Agua caliente", "Agua caliente", "Agua caliente", "Agua caliente", "Eau chauffée", - "Eau chauffée", "Acqua riscaldata", "온수", "Água aquecida", "Água aquecida", "Вода с подогревом", - "Uppvärmt vatten", "Isıtılmış Su", "热水", "热水", }; + "Agua caliente", "Agua caliente", "Agua caliente", "Agua caliente", "Agua caliente", "Eau chauffée", + "Eau chauffée", "Acqua riscaldata", "온수", "Água aquecida", "Água aquecida", "Вода с подогревом", + "Uppvärmt vatten", "Isıtılmış Su", "热水", "热水", }; for (int i = 0; i < aLangs.length; i++) { - Logger.REFLECTION( - "Trying to inject new lang data for " + aLangs[i] + ", using value: " + aLangValues[i]); + Logger + .REFLECTION("Trying to inject new lang data for " + aLangs[i] + ", using value: " + aLangValues[i]); LangUtils.rewriteEntryForLanguageRegistry(aLangs[i], "fluidHotWater", aLangValues[i]); LangUtils.rewriteEntryForLanguageRegistry(aLangs[i], "ic2.fluidHotWater", aLangValues[i]); } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks.java index 64185ca239..ee0d040394 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks.java @@ -29,10 +29,10 @@ public class GregtechMetaCasingBlocks extends GregtechMetaCasingBlocksAbstract { GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".0.name", "Centrifuge Casing"); GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".1.name", "Structural Coke Oven Casing"); GT_LanguageManager - .addStringLocalization(this.getUnlocalizedName() + ".2.name", "Heat Resistant Coke Oven Casing"); + .addStringLocalization(this.getUnlocalizedName() + ".2.name", "Heat Resistant Coke Oven Casing"); GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".3.name", "Heat Proof Coke Oven Casing"); // 60 GT_LanguageManager - .addStringLocalization(this.getUnlocalizedName() + ".4.name", "Material Press Machine Casing"); + .addStringLocalization(this.getUnlocalizedName() + ".4.name", "Material Press Machine Casing"); GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".5.name", "Electrolyzer Casing"); GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".6.name", "Wire Factory Casing"); GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".7.name", "Maceration Stack Casing"); @@ -43,7 +43,7 @@ public class GregtechMetaCasingBlocks extends GregtechMetaCasingBlocksAbstract { GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".12.name", "Hastelloy-N Reactor Casing"); GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".13.name", "Zeron-100 Reactor Shielding"); GT_LanguageManager - .addStringLocalization(this.getUnlocalizedName() + ".14.name", "Blast Smelter Heat Containment Coil "); + .addStringLocalization(this.getUnlocalizedName() + ".14.name", "Blast Smelter Heat Containment Coil "); GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".15.name", "Blast Smelter Casing Block"); GregtechItemList.Casing_Centrifuge1.set(new ItemStack(this, 1, 0)); GregtechItemList.Casing_CokeOven.set(new ItemStack(this, 1, 1)); @@ -71,9 +71,9 @@ public class GregtechMetaCasingBlocks extends GregtechMetaCasingBlocksAbstract { @Override @SideOnly(Side.CLIENT) public IIcon getIcon(final IBlockAccess aWorld, final int xCoord, final int yCoord, final int zCoord, - final int ordinalSide) { + final int ordinalSide) { final GregtechMetaCasingBlocks i = this; return CasingTextureHandler - .handleCasingsGT(aWorld, xCoord, yCoord, zCoord, ForgeDirection.getOrientation(ordinalSide), i); + .handleCasingsGT(aWorld, xCoord, yCoord, zCoord, ForgeDirection.getOrientation(ordinalSide), i); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks2.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks2.java index 9a82ecf93b..9d53c281a2 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks2.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks2.java @@ -71,12 +71,12 @@ public class GregtechMetaCasingBlocks2 extends GregtechMetaCasingBlocksAbstract GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".1.name", "Hastelloy-N Sealant Block"); GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".2.name", "Hastelloy-X Structural Block"); GT_LanguageManager - .addStringLocalization(this.getUnlocalizedName() + ".3.name", "Incoloy-DS Fluid Containment Block"); + .addStringLocalization(this.getUnlocalizedName() + ".3.name", "Incoloy-DS Fluid Containment Block"); GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".4.name", "Wash Plant Casing"); GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".5.name", "Industrial Sieve Casing"); GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".6.name", "Large Sieve Grate"); GT_LanguageManager - .addStringLocalization(this.getUnlocalizedName() + ".7.name", "Vanadium Redox Power Cell (EV)"); + .addStringLocalization(this.getUnlocalizedName() + ".7.name", "Vanadium Redox Power Cell (EV)"); GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".8.name", "Sub-Station External Casing"); GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".9.name", "Cyclotron Coil"); GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".10.name", "Cyclotron Outer Casing"); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java index 5a16d0a20d..76fb077de1 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java @@ -57,20 +57,20 @@ public class GregtechMetaCasingBlocks3 extends GregtechMetaCasingBlocksAbstract GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".2.name", "Multi-Use Casing"); GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".3.name", "Trinium Plated Casing"); GT_LanguageManager - .addStringLocalization(this.getUnlocalizedName() + ".4.name", "Vanadium Redox Power Cell (IV)"); + .addStringLocalization(this.getUnlocalizedName() + ".4.name", "Vanadium Redox Power Cell (IV)"); GT_LanguageManager - .addStringLocalization(this.getUnlocalizedName() + ".5.name", "Vanadium Redox Power Cell (LuV)"); + .addStringLocalization(this.getUnlocalizedName() + ".5.name", "Vanadium Redox Power Cell (LuV)"); GT_LanguageManager - .addStringLocalization(this.getUnlocalizedName() + ".6.name", "Vanadium Redox Power Cell (ZPM)"); + .addStringLocalization(this.getUnlocalizedName() + ".6.name", "Vanadium Redox Power Cell (ZPM)"); GT_LanguageManager - .addStringLocalization(this.getUnlocalizedName() + ".7.name", "Vanadium Redox Power Cell (UV)"); + .addStringLocalization(this.getUnlocalizedName() + ".7.name", "Vanadium Redox Power Cell (UV)"); GT_LanguageManager - .addStringLocalization(this.getUnlocalizedName() + ".8.name", "Vanadium Redox Power Cell (UHV)"); + .addStringLocalization(this.getUnlocalizedName() + ".8.name", "Vanadium Redox Power Cell (UHV)"); GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".9.name", "Supply Depot Casing"); GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".10.name", "Advanced Cryogenic Casing"); GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".11.name", "Volcanus Casing"); GT_LanguageManager - .addStringLocalization(this.getUnlocalizedName() + ".12.name", "Fusion Machine Casing MK III"); + .addStringLocalization(this.getUnlocalizedName() + ".12.name", "Fusion Machine Casing MK III"); GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".13.name", "Advanced Fusion Coil"); GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".14.name", "Unnamed"); // Can Use, don't // change texture @@ -102,7 +102,7 @@ public class GregtechMetaCasingBlocks3 extends GregtechMetaCasingBlocksAbstract @SideOnly(Side.CLIENT) @Override public IIcon getIcon(final IBlockAccess aWorld, final int xCoord, final int yCoord, final int zCoord, - final int ordinalSide) { + final int ordinalSide) { final Block thisBlock = aWorld.getBlock(xCoord, yCoord, zCoord); final int tMeta = aWorld.getBlockMetadata(xCoord, yCoord, zCoord); if ((tMeta != 12) || !GregtechMetaCasingBlocks3.mConnectedMachineTextures) { @@ -111,18 +111,18 @@ public class GregtechMetaCasingBlocks3 extends GregtechMetaCasingBlocksAbstract final int tStartIndex = 0; if (tMeta == 12) { final boolean[] tConnectedSides = { - aWorld.getBlock(xCoord, yCoord - 1, zCoord) == thisBlock - && aWorld.getBlockMetadata(xCoord, yCoord - 1, zCoord) == tMeta, - aWorld.getBlock(xCoord, yCoord + 1, zCoord) == thisBlock - && aWorld.getBlockMetadata(xCoord, yCoord + 1, zCoord) == tMeta, - aWorld.getBlock(xCoord + 1, yCoord, zCoord) == thisBlock - && aWorld.getBlockMetadata(xCoord + 1, yCoord, zCoord) == tMeta, - aWorld.getBlock(xCoord, yCoord, zCoord + 1) == thisBlock - && aWorld.getBlockMetadata(xCoord, yCoord, zCoord + 1) == tMeta, - aWorld.getBlock(xCoord - 1, yCoord, zCoord) == thisBlock - && aWorld.getBlockMetadata(xCoord - 1, yCoord, zCoord) == tMeta, - aWorld.getBlock(xCoord, yCoord, zCoord - 1) == thisBlock - && aWorld.getBlockMetadata(xCoord, yCoord, zCoord - 1) == tMeta }; + aWorld.getBlock(xCoord, yCoord - 1, zCoord) == thisBlock + && aWorld.getBlockMetadata(xCoord, yCoord - 1, zCoord) == tMeta, + aWorld.getBlock(xCoord, yCoord + 1, zCoord) == thisBlock + && aWorld.getBlockMetadata(xCoord, yCoord + 1, zCoord) == tMeta, + aWorld.getBlock(xCoord + 1, yCoord, zCoord) == thisBlock + && aWorld.getBlockMetadata(xCoord + 1, yCoord, zCoord) == tMeta, + aWorld.getBlock(xCoord, yCoord, zCoord + 1) == thisBlock + && aWorld.getBlockMetadata(xCoord, yCoord, zCoord + 1) == tMeta, + aWorld.getBlock(xCoord - 1, yCoord, zCoord) == thisBlock + && aWorld.getBlockMetadata(xCoord - 1, yCoord, zCoord) == tMeta, + aWorld.getBlock(xCoord, yCoord, zCoord - 1) == thisBlock + && aWorld.getBlockMetadata(xCoord, yCoord, zCoord - 1) == tMeta }; switch (ordinalSide) { case 0: { if (tConnectedSides[0]) { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks4.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks4.java index cf9d272398..a150d7e828 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks4.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks4.java @@ -30,7 +30,7 @@ public class GregtechMetaCasingBlocks4 extends GregtechMetaCasingBlocksAbstract GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".2.name", "Naquadah Containment Chamber"); GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".3.name", "Tempered Arc Furnace Casing"); GT_LanguageManager - .addStringLocalization(this.getUnlocalizedName() + ".4.name", "Quantum Force Transformer Coil Casings"); + .addStringLocalization(this.getUnlocalizedName() + ".4.name", "Quantum Force Transformer Coil Casings"); GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".10.name", "Vacuum Casing"); GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".11.name", "Turbodyne Casing"); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks5.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks5.java index 26c747e50e..cc573cd188 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks5.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks5.java @@ -49,9 +49,9 @@ public class GregtechMetaCasingBlocks5 extends GregtechMetaCasingBlocksAbstract GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".10.name", "SpaceTime Continuum Ripper"); GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".11.name", "Neutron Shielding Core"); GT_LanguageManager - .addStringLocalization(this.getUnlocalizedName() + ".12.name", "Cosmic Fabric Shielding Core"); + .addStringLocalization(this.getUnlocalizedName() + ".12.name", "Cosmic Fabric Shielding Core"); GT_LanguageManager - .addStringLocalization(this.getUnlocalizedName() + ".13.name", "Infinity Infused Shielding Core"); + .addStringLocalization(this.getUnlocalizedName() + ".13.name", "Infinity Infused Shielding Core"); GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".14.name", "SpaceTime Bending Core"); GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".15.name", "Force Field Glass"); @@ -152,7 +152,7 @@ public class GregtechMetaCasingBlocks5 extends GregtechMetaCasingBlocksAbstract @Override @SideOnly(Side.CLIENT) public IIcon getIcon(final IBlockAccess aWorld, final int xCoord, final int yCoord, final int zCoord, - final int ordinalSide) { + final int ordinalSide) { final GregtechMetaCasingBlocks5 i = this; return mGrinderOverlayHandler.handleCasingsGT(aWorld, xCoord, yCoord, zCoord, ordinalSide, i); } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks6.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks6.java index a1b97bf341..d257078461 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks6.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks6.java @@ -64,7 +64,7 @@ public class GregtechMetaCasingBlocks6 extends GregtechMetaCasingBlocksAbstract @SideOnly(Side.CLIENT) @Override public IIcon getIcon(final IBlockAccess aWorld, final int xCoord, final int yCoord, final int zCoord, - final int ordinalSide) { + final int ordinalSide) { final Block thisBlock = aWorld.getBlock(xCoord, yCoord, zCoord); final int tMeta = aWorld.getBlockMetadata(xCoord, yCoord, zCoord); if ((tMeta != 0) || !GregtechMetaCasingBlocks6.mConnectedMachineTextures) { @@ -73,18 +73,18 @@ public class GregtechMetaCasingBlocks6 extends GregtechMetaCasingBlocksAbstract final int tStartIndex = 0; if (tMeta == 0) { final boolean[] tConnectedSides = { - aWorld.getBlock(xCoord, yCoord - 1, zCoord) == thisBlock - && aWorld.getBlockMetadata(xCoord, yCoord - 1, zCoord) == tMeta, - aWorld.getBlock(xCoord, yCoord + 1, zCoord) == thisBlock - && aWorld.getBlockMetadata(xCoord, yCoord + 1, zCoord) == tMeta, - aWorld.getBlock(xCoord + 1, yCoord, zCoord) == thisBlock - && aWorld.getBlockMetadata(xCoord + 1, yCoord, zCoord) == tMeta, - aWorld.getBlock(xCoord, yCoord, zCoord + 1) == thisBlock - && aWorld.getBlockMetadata(xCoord, yCoord, zCoord + 1) == tMeta, - aWorld.getBlock(xCoord - 1, yCoord, zCoord) == thisBlock - && aWorld.getBlockMetadata(xCoord - 1, yCoord, zCoord) == tMeta, - aWorld.getBlock(xCoord, yCoord, zCoord - 1) == thisBlock - && aWorld.getBlockMetadata(xCoord, yCoord, zCoord - 1) == tMeta }; + aWorld.getBlock(xCoord, yCoord - 1, zCoord) == thisBlock + && aWorld.getBlockMetadata(xCoord, yCoord - 1, zCoord) == tMeta, + aWorld.getBlock(xCoord, yCoord + 1, zCoord) == thisBlock + && aWorld.getBlockMetadata(xCoord, yCoord + 1, zCoord) == tMeta, + aWorld.getBlock(xCoord + 1, yCoord, zCoord) == thisBlock + && aWorld.getBlockMetadata(xCoord + 1, yCoord, zCoord) == tMeta, + aWorld.getBlock(xCoord, yCoord, zCoord + 1) == thisBlock + && aWorld.getBlockMetadata(xCoord, yCoord, zCoord + 1) == tMeta, + aWorld.getBlock(xCoord - 1, yCoord, zCoord) == thisBlock + && aWorld.getBlockMetadata(xCoord - 1, yCoord, zCoord) == tMeta, + aWorld.getBlock(xCoord, yCoord, zCoord - 1) == thisBlock + && aWorld.getBlockMetadata(xCoord, yCoord, zCoord - 1) == tMeta }; switch (ordinalSide) { case 0: { if (tConnectedSides[0]) { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocksAbstract.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocksAbstract.java index 2d4973aa9f..a87f6c92b3 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocksAbstract.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocksAbstract.java @@ -27,13 +27,13 @@ import gtPlusPlus.core.creative.AddToCreativeTab; public abstract class GregtechMetaCasingBlocksAbstract extends GT_Block_Casings_Abstract { public GregtechMetaCasingBlocksAbstract(final Class aItemClass, final String aName, - final Material aMaterial) { + final Material aMaterial) { super(aItemClass, aName, aMaterial); this.setStepSound(soundTypeMetal); this.setCreativeTab(AddToCreativeTab.tabMachines); GregTech_API.registerMachineBlock(this, -1); GT_LanguageManager - .addStringLocalization(this.getUnlocalizedName() + "." + 32767 + ".name", "Any Sub Block of this"); + .addStringLocalization(this.getUnlocalizedName() + "." + 32767 + ".name", "Any Sub Block of this"); } @Override @@ -105,7 +105,7 @@ public abstract class GregtechMetaCasingBlocksAbstract extends GT_Block_Casings_ @Override public void breakBlock(final World aWorld, final int aX, final int aY, final int aZ, final Block aBlock, - final int aMetaData) { + final int aMetaData) { if (GregTech_API.isMachineBlock(this, aWorld.getBlockMetadata(aX, aY, aZ))) { GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ); } @@ -113,7 +113,7 @@ public abstract class GregtechMetaCasingBlocksAbstract extends GT_Block_Casings_ @Override public boolean canCreatureSpawn(final EnumCreatureType type, final IBlockAccess world, final int x, final int y, - final int z) { + final int z) { return false; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocksPipeGearbox.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocksPipeGearbox.java index 17b5507416..ad2b11f924 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocksPipeGearbox.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocksPipeGearbox.java @@ -22,7 +22,7 @@ public class GregtechMetaCasingBlocksPipeGearbox extends GregtechMetaCasingBlock GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".0.name", "Eglin Steel Gear Box Casing"); GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".1.name", "Inconel-792 Gear Box Casing"); GT_LanguageManager - .addStringLocalization(this.getUnlocalizedName() + ".2.name", "Incoloy MA956 Gear Box Casing"); + .addStringLocalization(this.getUnlocalizedName() + ".2.name", "Incoloy MA956 Gear Box Casing"); GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".3.name", "Nitinol-60 Gear Box Casing"); GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".4.name", "Zeron-100 Gear Box Casing"); GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".5.name", "Pikyonium Gear Box Casing"); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaItemCasingsAbstract.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaItemCasingsAbstract.java index d6ebda4199..23d9ab5007 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaItemCasingsAbstract.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaItemCasingsAbstract.java @@ -12,17 +12,17 @@ import gregtech.api.util.GT_LanguageManager; public abstract class GregtechMetaItemCasingsAbstract extends ItemBlock { protected final String mCasing_Centrifuge = GT_LanguageManager - .addStringLocalization("mu.centrifugecasing", "Warning! Standing in the Centrifuge not recommended"); + .addStringLocalization("mu.centrifugecasing", "Warning! Standing in the Centrifuge not recommended"); protected final String mCasing_CokeOven = GT_LanguageManager - .addStringLocalization("mu.cokeoven", "Sturdy and Strong"); + .addStringLocalization("mu.cokeoven", "Sturdy and Strong"); protected final String mCasing_CokeCoil1 = GT_LanguageManager - .addStringLocalization("mu.coil01tooltip", "Base Heating Capacity = 1350 Kelvin"); + .addStringLocalization("mu.coil01tooltip", "Base Heating Capacity = 1350 Kelvin"); protected final String mCasing_CokeCoil2 = GT_LanguageManager - .addStringLocalization("mu.coil02tooltip", "Base Heating Capacity = 2275 Kelvin"); + .addStringLocalization("mu.coil02tooltip", "Base Heating Capacity = 2275 Kelvin"); protected final String mNoMobsToolTip = GT_LanguageManager - .addStringLocalization("gt.nomobspawnsonthisblock", "Mobs cannot Spawn on this Block"); + .addStringLocalization("gt.nomobspawnsonthisblock", "Mobs cannot Spawn on this Block"); protected final String mNoTileEntityToolTip = GT_LanguageManager - .addStringLocalization("gt.notileentityinthisblock", "This is NOT a TileEntity!"); + .addStringLocalization("gt.notileentityinthisblock", "This is NOT a TileEntity!"); public GregtechMetaItemCasingsAbstract(final Block par1) { super(par1); @@ -43,7 +43,7 @@ public abstract class GregtechMetaItemCasingsAbstract extends ItemBlock { @Override public void addInformation(final ItemStack aStack, final EntityPlayer aPlayer, final List aList, - final boolean aF3_H) { + final boolean aF3_H) { super.addInformation(aStack, aPlayer, aList, aF3_H); switch (this.getDamage(aStack)) { case 0: diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMachineCasings.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMachineCasings.java index a8ea05ddbc..473c13f3da 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMachineCasings.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMachineCasings.java @@ -50,12 +50,12 @@ public class GregtechMetaSpecialMachineCasings extends GregtechMetaCasingBlocksA } GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".0.name", "Strong Bronze Machine Casing"); GT_LanguageManager - .addStringLocalization(this.getUnlocalizedName() + ".1.name", "Sturdy Aluminium Machine Casing"); + .addStringLocalization(this.getUnlocalizedName() + ".1.name", "Sturdy Aluminium Machine Casing"); GT_LanguageManager - .addStringLocalization(this.getUnlocalizedName() + ".2.name", "Vigorous Laurenium Machine Casing"); + .addStringLocalization(this.getUnlocalizedName() + ".2.name", "Vigorous Laurenium Machine Casing"); TAE.registerTexture(84, new GTPP_CopiedBlockTexture(this, 6, 2)); GT_LanguageManager - .addStringLocalization(this.getUnlocalizedName() + ".3.name", "Rugged Botmium Machine Casing"); + .addStringLocalization(this.getUnlocalizedName() + ".3.name", "Rugged Botmium Machine Casing"); GregtechItemList.Casing_Machine_Custom_1.set(new ItemStack(this, 1, 0)); GregtechItemList.Casing_Machine_Custom_2.set(new ItemStack(this, 1, 1)); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings.java index 411fef65d3..1d7c853e71 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings.java @@ -42,13 +42,13 @@ public class GregtechMetaSpecialMultiCasings extends GregtechMetaCasingBlocksAbs super(SpecialCasingItemBlock.class, "gtplusplus.blockspecialcasings.1", GT_Material_Casings.INSTANCE); GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".0.name", "Turbine Shaft"); GT_LanguageManager - .addStringLocalization(this.getUnlocalizedName() + ".1.name", "Reinforced Steam Turbine Casing"); + .addStringLocalization(this.getUnlocalizedName() + ".1.name", "Reinforced Steam Turbine Casing"); GT_LanguageManager - .addStringLocalization(this.getUnlocalizedName() + ".2.name", "Reinforced HP Steam Turbine Casing"); + .addStringLocalization(this.getUnlocalizedName() + ".2.name", "Reinforced HP Steam Turbine Casing"); GT_LanguageManager - .addStringLocalization(this.getUnlocalizedName() + ".3.name", "Reinforced Gas Turbine Casing"); + .addStringLocalization(this.getUnlocalizedName() + ".3.name", "Reinforced Gas Turbine Casing"); GT_LanguageManager - .addStringLocalization(this.getUnlocalizedName() + ".4.name", "Reinforced Plasma Turbine Casing"); + .addStringLocalization(this.getUnlocalizedName() + ".4.name", "Reinforced Plasma Turbine Casing"); GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".5.name", "Tesla Containment Casing"); GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".6.name", "Structural Solar Casing"); GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".7.name", "Salt Containment Casing"); @@ -56,14 +56,14 @@ public class GregtechMetaSpecialMultiCasings extends GregtechMetaCasingBlocksAbs GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".9.name", "Flotation Cell Casings"); GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".10.name", "Reinforced Engine Casing"); GT_LanguageManager - .addStringLocalization(this.getUnlocalizedName() + ".11.name", "Molecular Containment Casing"); + .addStringLocalization(this.getUnlocalizedName() + ".11.name", "Molecular Containment Casing"); GT_LanguageManager - .addStringLocalization(this.getUnlocalizedName() + ".12.name", "High Voltage Current Capacitor"); + .addStringLocalization(this.getUnlocalizedName() + ".12.name", "High Voltage Current Capacitor"); GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".13.name", "Particle Containment Casing"); GT_LanguageManager - .addStringLocalization(this.getUnlocalizedName() + ".14.name", "Reinforced Heat Exchanger Casing"); + .addStringLocalization(this.getUnlocalizedName() + ".14.name", "Reinforced Heat Exchanger Casing"); GT_LanguageManager - .addStringLocalization(this.getUnlocalizedName() + ".15.name", "Reinforced SC Turbine Casing"); + .addStringLocalization(this.getUnlocalizedName() + ".15.name", "Reinforced SC Turbine Casing"); TAE.registerTexture(1, 12, new GTPP_CopiedBlockTexture(this, 6, 14)); GregtechItemList.Casing_Turbine_Shaft.set(new ItemStack(this, 1, 0)); @@ -86,9 +86,9 @@ public class GregtechMetaSpecialMultiCasings extends GregtechMetaCasingBlocksAbs @Override @SideOnly(Side.CLIENT) public IIcon getIcon(final IBlockAccess aWorld, final int xCoord, final int yCoord, final int zCoord, - final int ordinalSide) { + final int ordinalSide) { return LargeTurbineTextureHandler - .handleCasingsGT(aWorld, xCoord, yCoord, zCoord, ForgeDirection.getOrientation(ordinalSide), this); + .handleCasingsGT(aWorld, xCoord, yCoord, zCoord, ForgeDirection.getOrientation(ordinalSide), this); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings2.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings2.java index d9ae7fc1c6..9a2912c2c5 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings2.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings2.java @@ -74,7 +74,7 @@ public class GregtechMetaSpecialMultiCasings2 extends GregtechMetaCasingBlocksAb @Override @SideOnly(Side.CLIENT) public IIcon getIcon(final IBlockAccess aWorld, final int xCoord, final int yCoord, final int zCoord, - final int ordinalSide) { + final int ordinalSide) { return getStaticIcon((byte) ordinalSide, (byte) aWorld.getBlockMetadata(xCoord, yCoord, zCoord)); } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java index 7ad9faae2b..e478bf5c18 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java @@ -23,118 +23,118 @@ public class GregtechFluidHandler { Logger.INFO("Adding in our own GT versions of Thermal Foundation Fluids if they do not already exist."); if (!FluidRegistry.isFluidRegistered("cryotheum")) { FluidUtils.addGtFluid( - "cryotheum", - "Gelid Cryotheum", - GT_Materials.Cryotheum, - 4, - -1200, - GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.Cryotheum, 1L), - ItemUtils.getEmptyCell(), - 1000); + "cryotheum", + "Gelid Cryotheum", + GT_Materials.Cryotheum, + 4, + -1200, + GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.Cryotheum, 1L), + ItemUtils.getEmptyCell(), + 1000); } if (!FluidRegistry.isFluidRegistered("pyrotheum")) { FluidUtils.addGtFluid( - "pyrotheum", - "Blazing Pyrotheum", - GT_Materials.Pyrotheum, - 4, - 4000, - GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.Pyrotheum, 1L), - ItemUtils.getEmptyCell(), - 1000); + "pyrotheum", + "Blazing Pyrotheum", + GT_Materials.Pyrotheum, + 4, + 4000, + GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.Pyrotheum, 1L), + ItemUtils.getEmptyCell(), + 1000); } if (!FluidRegistry.isFluidRegistered("ender")) { FluidUtils.addGtFluid( - "ender", - "Resonant Ender", - GT_Materials.Ender, - 4, - 4000, - GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.Ender, 1L), - ItemUtils.getEmptyCell(), - 1000); + "ender", + "Resonant Ender", + GT_Materials.Ender, + 4, + 4000, + GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.Ender, 1L), + ItemUtils.getEmptyCell(), + 1000); } Logger.INFO("Adding in GT Fluids for various nuclear related content."); FluidUtils.addGtFluid( - "hydrofluoricAcid", - "Industrial Strength Hydrofluoric Acid", - GT_Materials.HydrofluoricAcid, - 1, - 120, - GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.HydrofluoricAcid, 1L), - ItemUtils.getEmptyCell(), - 1000, - false); + "hydrofluoricAcid", + "Industrial Strength Hydrofluoric Acid", + GT_Materials.HydrofluoricAcid, + 1, + 120, + GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.HydrofluoricAcid, 1L), + ItemUtils.getEmptyCell(), + 1000, + false); generateIC2FluidCell("HydrofluoricAcid"); FluidUtils.generateFluidNoPrefix( - "SulfurDioxide", - "High Quality Sulfur Dioxide", - 263, - GT_Materials.SulfurDioxide.mRGBa); + "SulfurDioxide", + "High Quality Sulfur Dioxide", + 263, + GT_Materials.SulfurDioxide.mRGBa); FluidUtils.addGtFluid( - "sulfurousAcid", - "Sulfurous Acid", - GT_Materials.SulfurousAcid, - 4, - 75, - GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.SulfurousAcid, 1L), - ItemUtils.getEmptyCell(), - 1000, - false); + "sulfurousAcid", + "Sulfurous Acid", + GT_Materials.SulfurousAcid, + 4, + 75, + GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.SulfurousAcid, 1L), + ItemUtils.getEmptyCell(), + 1000, + false); generateIC2FluidCell("SulfurousAcid"); FluidUtils.addGtFluid( - "sulfuricApatite", - "Sulfuric Apatite Mix", - GT_Materials.SulfuricApatite, - 4, - 500, - GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.SulfuricApatite, 1L), - ItemUtils.getEmptyCell(), - 1000, - false); + "sulfuricApatite", + "Sulfuric Apatite Mix", + GT_Materials.SulfuricApatite, + 4, + 500, + GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.SulfuricApatite, 1L), + ItemUtils.getEmptyCell(), + 1000, + false); generateIC2FluidCell("SulfuricApatite"); // Check for Hydrogen Chloride if (FluidUtils.getFluidStack("hydrogenchloride", 1) == null) { FluidUtils.addGtFluid( - "hydrogenChloride", - "Industrial Strength Hydrogen Chloride", - GT_Materials.HydrogenChloride, - 4, - 75, - GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.HydrogenChloride, 1L), - ItemUtils.getEmptyCell(), - 1000, - false); - generateIC2FluidCell("HydrogenChloride"); - } - - FluidUtils.addGtFluid( - "sulfuricLithium", - "Sulfuric Lithium Mix", - GT_Materials.SulfuricLithium, + "hydrogenChloride", + "Industrial Strength Hydrogen Chloride", + GT_Materials.HydrogenChloride, 4, - 280, - GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.SulfuricLithium, 1L), + 75, + GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.HydrogenChloride, 1L), ItemUtils.getEmptyCell(), 1000, false); + generateIC2FluidCell("HydrogenChloride"); + } + + FluidUtils.addGtFluid( + "sulfuricLithium", + "Sulfuric Lithium Mix", + GT_Materials.SulfuricLithium, + 4, + 280, + GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.SulfuricLithium, 1L), + ItemUtils.getEmptyCell(), + 1000, + false); generateIC2FluidCell("SulfuricLithium"); FluidUtils.addGtFluid( - "lithiumHydroxide", - "Lithium Hydroxide", - GT_Materials.LithiumHydroxide, - 4, - 500, - GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.LithiumHydroxide, 1L), - ItemUtils.getEmptyCell(), - 1000, - false); + "lithiumHydroxide", + "Lithium Hydroxide", + GT_Materials.LithiumHydroxide, + 4, + 500, + GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.LithiumHydroxide, 1L), + ItemUtils.getEmptyCell(), + 1000, + false); generateIC2FluidCell("LithiumHydroxide"); } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler.java index 3409277f91..c85bac7115 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler.java @@ -51,7 +51,7 @@ public class CasingTextureHandler { } public static IIcon handleCasingsGT(final IBlockAccess aWorld, final int xCoord, final int yCoord, final int zCoord, - final ForgeDirection side, final GregtechMetaCasingBlocks thisBlock) { + final ForgeDirection side, final GregtechMetaCasingBlocks thisBlock) { return gregtechX.handleCasingsGT(aWorld, xCoord, yCoord, zCoord, side, thisBlock); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesCentrifugeMultiblock.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesCentrifugeMultiblock.java index f4d0ec0608..058d2a7f1e 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesCentrifugeMultiblock.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesCentrifugeMultiblock.java @@ -52,29 +52,28 @@ public class TexturesCentrifugeMultiblock { private static CustomIcon frontFaceActive_8 = (GT8_9_Active); CustomIcon[] CENTRIFUGE = new CustomIcon[] { frontFace_0, frontFace_1, frontFace_2, frontFace_3, frontFace_4, - frontFace_5, frontFace_6, frontFace_7, frontFace_8 }; + frontFace_5, frontFace_6, frontFace_7, frontFace_8 }; CustomIcon[] CENTRIFUGE_ACTIVE = new CustomIcon[] { frontFaceActive_0, frontFaceActive_1, frontFaceActive_2, - frontFaceActive_3, frontFaceActive_4, frontFaceActive_5, frontFaceActive_6, frontFaceActive_7, - frontFaceActive_8 }; + frontFaceActive_3, frontFaceActive_4, frontFaceActive_5, frontFaceActive_6, frontFaceActive_7, + frontFaceActive_8 }; public IIcon handleCasingsGT(final IBlockAccess aWorld, final int xCoord, final int yCoord, final int zCoord, - final ForgeDirection side, final GregtechMetaCasingBlocks thisBlock) { + final ForgeDirection side, final GregtechMetaCasingBlocks thisBlock) { return this.handleCasingsGT58(aWorld, xCoord, yCoord, zCoord, side, thisBlock); } private static int isCentrifugeControllerWithSide(IBlockAccess aWorld, int aX, int aY, int aZ, - ForgeDirection side) { + ForgeDirection side) { TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ); if (!(tTileEntity instanceof IGregTechTileEntity tTile)) return 0; if (tTile.getMetaTileEntity() instanceof GregtechMetaTileEntity_IndustrialCentrifuge - && tTile.getFrontFacing() == side) - return tTile.isActive() ? 1 : 2; + && tTile.getFrontFacing() == side) return tTile.isActive() ? 1 : 2; return 0; } public IIcon handleCasingsGT58(final IBlockAccess aWorld, final int xCoord, final int yCoord, final int zCoord, - final ForgeDirection side, final GregtechMetaCasingBlocks thisBlock) { + final ForgeDirection side, final GregtechMetaCasingBlocks thisBlock) { final int tMeta = aWorld.getBlockMetadata(xCoord, yCoord, zCoord); final int ordinalSide = side.ordinal(); if (tMeta != 0) { @@ -89,7 +88,7 @@ public class TexturesCentrifugeMultiblock { if (i == 0 && j == 0) continue; if (isCentrifugeControllerWithSide(aWorld, xCoord + j, yCoord, zCoord + i, side) != 0) { IMetaTileEntity tMetaTileEntity = ((IGregTechTileEntity) aWorld - .getTileEntity(xCoord + j, yCoord, zCoord + i)).getMetaTileEntity(); + .getTileEntity(xCoord + j, yCoord, zCoord + i)).getMetaTileEntity(); return getIconByIndex(tMetaTileEntity, 4 - i * 3 - j); } } @@ -101,7 +100,7 @@ public class TexturesCentrifugeMultiblock { if (i == 0 && j == 0) continue; if (isCentrifugeControllerWithSide(aWorld, xCoord + j, yCoord + i, zCoord, side) != 0) { IMetaTileEntity tMetaTileEntity = ((IGregTechTileEntity) aWorld - .getTileEntity(xCoord + j, yCoord + i, zCoord)).getMetaTileEntity(); + .getTileEntity(xCoord + j, yCoord + i, zCoord)).getMetaTileEntity(); return getIconByIndex(tMetaTileEntity, 4 + i * 3 - j * tInvertLeftRightMod); } } @@ -113,7 +112,7 @@ public class TexturesCentrifugeMultiblock { if (i == 0 && j == 0) continue; if (isCentrifugeControllerWithSide(aWorld, xCoord, yCoord + i, zCoord + j, side) != 0) { IMetaTileEntity tMetaTileEntity = ((IGregTechTileEntity) aWorld - .getTileEntity(xCoord, yCoord + i, zCoord + j)).getMetaTileEntity(); + .getTileEntity(xCoord, yCoord + i, zCoord + j)).getMetaTileEntity(); return getIconByIndex(tMetaTileEntity, 4 + i * 3 + j * tInvertLeftRightMod); } } @@ -127,7 +126,8 @@ public class TexturesCentrifugeMultiblock { if (aTile == null) { return false; } else { - return aTile.getBaseMetaTileEntity().isActive(); + return aTile.getBaseMetaTileEntity() + .isActive(); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGrinderMultiblock.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGrinderMultiblock.java index fab36fbcea..e7d09bd308 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGrinderMultiblock.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGrinderMultiblock.java @@ -52,11 +52,11 @@ public class TexturesGrinderMultiblock { private static CustomIcon frontFaceActive_8 = (GT8_9_Active); CustomIcon[] GRINDER = new CustomIcon[] { frontFace_0, frontFace_1, frontFace_2, frontFace_3, frontFace_4, - frontFace_5, frontFace_6, frontFace_7, frontFace_8 }; + frontFace_5, frontFace_6, frontFace_7, frontFace_8 }; CustomIcon[] GRINDER_ACTIVE = new CustomIcon[] { frontFaceActive_0, frontFaceActive_1, frontFaceActive_2, - frontFaceActive_3, frontFaceActive_4, frontFaceActive_5, frontFaceActive_6, frontFaceActive_7, - frontFaceActive_8 }; + frontFaceActive_3, frontFaceActive_4, frontFaceActive_5, frontFaceActive_6, frontFaceActive_7, + frontFaceActive_8 }; private static int isIsaControllerWithSide(IBlockAccess aWorld, int aX, int aY, int aZ, ForgeDirection side) { TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ); @@ -67,7 +67,7 @@ public class TexturesGrinderMultiblock { } public IIcon handleCasingsGT(final IBlockAccess aWorld, final int xCoord, final int yCoord, final int zCoord, - final int ordinalSide, final GregtechMetaCasingBlocks5 ii) { + final int ordinalSide, final GregtechMetaCasingBlocks5 ii) { final int tMeta = aWorld.getBlockMetadata(xCoord, yCoord, zCoord); final ForgeDirection side = ForgeDirection.getOrientation(ordinalSide); if (tMeta != 1) { @@ -81,7 +81,7 @@ public class TexturesGrinderMultiblock { if (i == 0 && j == 0) continue; if (isIsaControllerWithSide(aWorld, xCoord + j, yCoord, zCoord + i, side) != 0) { IMetaTileEntity tMetaTileEntity = ((IGregTechTileEntity) aWorld - .getTileEntity(xCoord + j, yCoord, zCoord + i)).getMetaTileEntity(); + .getTileEntity(xCoord + j, yCoord, zCoord + i)).getMetaTileEntity(); return getIconByIndex(tMetaTileEntity, 4 - i * 3 - j); } } @@ -93,7 +93,7 @@ public class TexturesGrinderMultiblock { if (i == 0 && j == 0) continue; if (isIsaControllerWithSide(aWorld, xCoord + j, yCoord + i, zCoord, side) != 0) { IMetaTileEntity tMetaTileEntity = ((IGregTechTileEntity) aWorld - .getTileEntity(xCoord + j, yCoord + i, zCoord)).getMetaTileEntity(); + .getTileEntity(xCoord + j, yCoord + i, zCoord)).getMetaTileEntity(); return getIconByIndex(tMetaTileEntity, 4 + i * 3 - j * tInvertLeftRightMod); } } @@ -105,7 +105,7 @@ public class TexturesGrinderMultiblock { if (i == 0 && j == 0) continue; if (isIsaControllerWithSide(aWorld, xCoord, yCoord + i, zCoord + j, side) != 0) { IMetaTileEntity tMetaTileEntity = ((IGregTechTileEntity) aWorld - .getTileEntity(xCoord, yCoord + i, zCoord + j)).getMetaTileEntity(); + .getTileEntity(xCoord, yCoord + i, zCoord + j)).getMetaTileEntity(); return getIconByIndex(tMetaTileEntity, 4 + i * 3 + j * tInvertLeftRightMod); } } @@ -119,7 +119,8 @@ public class TexturesGrinderMultiblock { if (aTile == null) { return false; } else { - return aTile.getBaseMetaTileEntity().isActive(); + return aTile.getBaseMetaTileEntity() + .isActive(); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java index 47101dad12..743cd0b85b 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java @@ -55,7 +55,9 @@ public class TexturesGtBlock { @Override public void run() { this.mIcon = GregTech_API.sBlockIcons.registerIcon(this.mModID + ":" + this.mIconName); - Logger.WARNING("FIND ME _ Processing texture: " + this.getTextureFile().getResourcePath()); + Logger.WARNING( + "FIND ME _ Processing texture: " + this.getTextureFile() + .getResourcePath()); } @Override @@ -74,14 +76,14 @@ public class TexturesGtBlock { public static final CustomIcon _PlaceHolder = Internal_PlaceHolder; public static final CustomIcon OVERLAY_ENERGY_OUT_MULTI_BUFFER = new CustomIcon( - "iconsets/OVERLAY_ENERGY_OUT_MULTI_BUFFER"); + "iconsets/OVERLAY_ENERGY_OUT_MULTI_BUFFER"); // Machine Casings // Simple private static final CustomIcon Internal_Casing_Machine_Simple_Top = new CustomIcon("TileEntities/machine_top"); public static final CustomIcon Casing_Machine_Simple_Top = Internal_Casing_Machine_Simple_Top; private static final CustomIcon Internal_Casing_Machine_Simple_Bottom = new CustomIcon( - "TileEntities/machine_bottom"); + "TileEntities/machine_bottom"); public static final CustomIcon Casing_Machine_Simple_Bottom = Internal_Casing_Machine_Simple_Bottom; // Advanced and Ultra private static final CustomIcon Internal_Casing_Machine_Advanced = new CustomIcon("TileEntities/high_adv_machine"); @@ -90,51 +92,51 @@ public class TexturesGtBlock { public static final CustomIcon Casing_Machine_Ultra = Internal_Casing_Machine_Ultra; // Dimensional - Non Overlay private static final CustomIcon Internal_Casing_Machine_Dimensional = new CustomIcon( - "TileEntities/adv_machine_dimensional"); + "TileEntities/adv_machine_dimensional"); public static final CustomIcon Casing_Machine_Dimensional = Internal_Casing_Machine_Dimensional; // Material Casings private static final CustomIcon Internal_Casing_Tantalloy61 = new CustomIcon( - "TileEntities/MACHINE_CASING_STABLE_TANTALLOY61"); + "TileEntities/MACHINE_CASING_STABLE_TANTALLOY61"); public static final CustomIcon Casing_Material_Tantalloy61 = Internal_Casing_Tantalloy61; private static final CustomIcon Internal_Casing_MaragingSteel = new CustomIcon( - "TileEntities/MACHINE_CASING_STABLE_MARAGINGSTEEL"); + "TileEntities/MACHINE_CASING_STABLE_MARAGINGSTEEL"); public static final CustomIcon Casing_Material_MaragingSteel = Internal_Casing_MaragingSteel; private static final CustomIcon Internal_Casing_Stellite = new CustomIcon( - "TileEntities/MACHINE_CASING_STABLE_STELLITE"); + "TileEntities/MACHINE_CASING_STABLE_STELLITE"); public static final CustomIcon Casing_Material_Stellite = Internal_Casing_Stellite; private static final CustomIcon Internal_Casing_Talonite = new CustomIcon( - "TileEntities/MACHINE_CASING_STABLE_TALONITE"); + "TileEntities/MACHINE_CASING_STABLE_TALONITE"); public static final CustomIcon Casing_Material_Talonite = Internal_Casing_Talonite; private static final CustomIcon Internal_Turbine_SC_Casing = new TexturesGtBlock.CustomIcon("iconsets/SC_TURBINE"); public static final CustomIcon Turbine_SC_Material_Casing = Internal_Turbine_SC_Casing; private static final CustomIcon Internal_Casing_Tumbaga = new CustomIcon( - "TileEntities/MACHINE_CASING_STABLE_TUMBAGA"); + "TileEntities/MACHINE_CASING_STABLE_TUMBAGA"); public static final CustomIcon Casing_Material_Tumbaga = Internal_Casing_Tumbaga; private static final CustomIcon Internal_Casing_Zeron100 = new CustomIcon( - "TileEntities/MACHINE_CASING_STABLE_ZERON100"); + "TileEntities/MACHINE_CASING_STABLE_ZERON100"); public static final CustomIcon Casing_Material_Zeron100 = Internal_Casing_Zeron100; private static final CustomIcon Internal_Casing_Potin = new CustomIcon("TileEntities/MACHINE_CASING_STABLE_POTIN"); public static final CustomIcon Casing_Material_Potin = Internal_Casing_Potin; private static final CustomIcon Internal_Casing_Grisium = new CustomIcon( -