From 55f64675b42ac8d3c557cc850f78664bee006f6f Mon Sep 17 00:00:00 2001 From: Jason Mitchell Date: Sat, 28 Jan 2023 19:32:44 -0800 Subject: [ci skip] spotlessApply with the new settings --- .../blocks/textures/CasingTextureHandler.java | 51 +- .../blocks/textures/CasingTextureHandler2.java | 3 +- .../blocks/textures/CasingTextureHandler3.java | 3 +- .../textures/TexturesCentrifugeMultiblock.java | 70 +-- .../common/blocks/textures/TexturesGregtech58.java | 113 ++-- .../common/blocks/textures/TexturesGregtech59.java | 149 ++--- .../blocks/textures/TexturesGrinderMultiblock.java | 58 +- .../common/blocks/textures/TexturesGtBlock.java | 654 ++++++++++----------- .../blocks/textures/TexturesGtCutomCovers.java | 15 +- .../common/blocks/textures/TexturesGtTools.java | 8 +- .../turbine/LargeTurbineTextureHandler.java | 171 ++---- 11 files changed, 550 insertions(+), 745 deletions(-) (limited to 'src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures') 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 467602ce04..ef2d25cf3e 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 @@ -1,10 +1,11 @@ package gtPlusPlus.xmod.gregtech.common.blocks.textures; -import gregtech.api.enums.Textures; -import gtPlusPlus.xmod.gregtech.common.blocks.GregtechMetaCasingBlocks; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; +import gregtech.api.enums.Textures; +import gtPlusPlus.xmod.gregtech.common.blocks.GregtechMetaCasingBlocks; + public class CasingTextureHandler { // private static final TexturesGregtech59 gregtech59 = new TexturesGregtech59(); @@ -14,46 +15,46 @@ public class CasingTextureHandler { public static IIcon getIcon(final int aSide, final int aMeta) { // Texture ID's. case 0 == ID[57] if ((aMeta >= 0) && (aMeta < 16)) { switch (aMeta) { - // Centrifuge + // Centrifuge case 0: return TexturesGtBlock.Casing_Material_Centrifuge.getIcon(); - // Coke Oven Frame + // Coke Oven Frame case 1: return TexturesGtBlock.Casing_Material_Tantalloy61.getIcon(); - // Coke Oven Casing Tier 1 + // Coke Oven Casing Tier 1 case 2: return Textures.BlockIcons.MACHINE_CASING_FIREBOX_BRONZE.getIcon(); - // Coke Oven Casing Tier 2 + // Coke Oven Casing Tier 2 case 3: return Textures.BlockIcons.MACHINE_CASING_FIREBOX_STEEL.getIcon(); - // Material Press Casings + // Material Press Casings case 4: return Textures.BlockIcons.MACHINE_CASING_STABLE_TITANIUM.getIcon(); - // Electrolyzer Casings + // Electrolyzer Casings case 5: return TexturesGtBlock.Casing_Material_Potin.getIcon(); - // Broken Blue Fusion Casings + // Broken Blue Fusion Casings case 6: return TexturesGtBlock.Casing_Material_MaragingSteel.getIcon(); - // Maceration Stack Casings + // Maceration Stack Casings case 7: return TexturesGtBlock.Casing_Material_Tumbaga.getIcon(); - // Broken Pink Fusion Casings + // Broken Pink Fusion Casings case 8: return TexturesGtBlock.TEXTURE_ORGANIC_PANEL_A_GLOWING.getIcon(); - // Matter Fabricator Casings + // Matter Fabricator Casings case 9: return TexturesGtBlock.TEXTURE_METAL_PANEL_F.getIcon(); - // Iron Blast Fuance Textures + // Iron Blast Fuance Textures case 10: return TexturesGtBlock.Casing_Machine_Simple_Top.getIcon(); - // Multitank Exterior Casing + // Multitank Exterior Casing case 11: return TexturesGtBlock.Casing_Material_Grisium.getIcon(); - // Reactor Casing I + // Reactor Casing I case 12: return TexturesGtBlock.Casing_Material_Stellite.getIcon(); - // Reactor Casing II + // Reactor Casing II case 13: return TexturesGtBlock.Casing_Material_Zeron100.getIcon(); case 14: @@ -68,17 +69,13 @@ public class CasingTextureHandler { return Textures.BlockIcons.MACHINE_CASING_GEARBOX_TUNGSTENSTEEL.getIcon(); } - public static IIcon handleCasingsGT( - final IBlockAccess aWorld, - final int xCoord, - final int yCoord, - final int zCoord, - final int aSide, - final GregtechMetaCasingBlocks thisBlock) { - /*if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK){ - return gregtech59.handleCasingsGT59(aWorld, xCoord, yCoord, zCoord, aSide, thisBlock); - } - return gregtech58.handleCasingsGT58(aWorld, xCoord, yCoord, zCoord, aSide, thisBlock);*/ + public static IIcon handleCasingsGT(final IBlockAccess aWorld, final int xCoord, final int yCoord, final int zCoord, + final int aSide, final GregtechMetaCasingBlocks thisBlock) { + /* + * if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK){ return gregtech59.handleCasingsGT59(aWorld, xCoord, yCoord, + * zCoord, aSide, thisBlock); } return gregtech58.handleCasingsGT58(aWorld, xCoord, yCoord, zCoord, aSide, + * thisBlock); + */ return gregtechX.handleCasingsGT(aWorld, xCoord, yCoord, zCoord, aSide, thisBlock); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler2.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler2.java index 20519c0bb1..1d0f5e0699 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler2.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler2.java @@ -1,8 +1,9 @@ package gtPlusPlus.xmod.gregtech.common.blocks.textures; -import gregtech.api.enums.Textures; import net.minecraft.util.IIcon; +import gregtech.api.enums.Textures; + public class CasingTextureHandler2 { public static IIcon getIcon(final int aSide, final int aMeta) { // Texture ID's. case 0 == ID[57] diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler3.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler3.java index da2a09c7d2..c3d2e90c12 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler3.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler3.java @@ -1,8 +1,9 @@ package gtPlusPlus.xmod.gregtech.common.blocks.textures; -import gtPlusPlus.xmod.gregtech.common.blocks.GregtechMetaCasingBlocks3; import net.minecraft.util.IIcon; +import gtPlusPlus.xmod.gregtech.common.blocks.GregtechMetaCasingBlocks3; + public class CasingTextureHandler3 { public static IIcon getIcon(final int aSide, final int aMeta) { // Texture ID's. case 0 == ID[57] 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 2eef9d37f0..129dbd13cc 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 @@ -1,13 +1,14 @@ package gtPlusPlus.xmod.gregtech.common.blocks.textures; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; +import net.minecraft.world.IBlockAccess; + import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gtPlusPlus.xmod.gregtech.common.blocks.GregtechMetaCasingBlocks; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock.CustomIcon; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.GregtechMetaTileEntity_IndustrialCentrifuge; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; public class TexturesCentrifugeMultiblock { @@ -49,37 +50,15 @@ public class TexturesCentrifugeMultiblock { private static CustomIcon frontFace_8 = (GT8_9); 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 - }; + CustomIcon[] CENTRIFUGE = new CustomIcon[] { frontFace_0, frontFace_1, frontFace_2, frontFace_3, frontFace_4, + 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 - }; + CustomIcon[] CENTRIFUGE_ACTIVE = new CustomIcon[] { frontFaceActive_0, frontFaceActive_1, frontFaceActive_2, + 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 int aSide, - final GregtechMetaCasingBlocks thisBlock) { + public IIcon handleCasingsGT(final IBlockAccess aWorld, final int xCoord, final int yCoord, final int zCoord, + final int aSide, final GregtechMetaCasingBlocks thisBlock) { return this.handleCasingsGT58(aWorld, xCoord, yCoord, zCoord, aSide, thisBlock); } @@ -88,17 +67,13 @@ public class TexturesCentrifugeMultiblock { if (!(tTileEntity instanceof IGregTechTileEntity)) return 0; IGregTechTileEntity tTile = (IGregTechTileEntity) tTileEntity; if (tTile.getMetaTileEntity() instanceof GregtechMetaTileEntity_IndustrialCentrifuge - && tTile.getFrontFacing() == aSide) return tTile.isActive() ? 1 : 2; + && tTile.getFrontFacing() == aSide) + return tTile.isActive() ? 1 : 2; return 0; } - public IIcon handleCasingsGT58( - final IBlockAccess aWorld, - final int xCoord, - final int yCoord, - final int zCoord, - final int aSide, - final GregtechMetaCasingBlocks thisBlock) { + public IIcon handleCasingsGT58(final IBlockAccess aWorld, final int xCoord, final int yCoord, final int zCoord, + final int aSide, final GregtechMetaCasingBlocks thisBlock) { final int tMeta = aWorld.getBlockMetadata(xCoord, yCoord, zCoord); if (tMeta != 0) { return CasingTextureHandler.getIcon(aSide, tMeta); @@ -110,9 +85,8 @@ public class TexturesCentrifugeMultiblock { for (int j = -1; j < 2; j++) { if (i == 0 && j == 0) continue; if (isCentrifugeControllerWithSide(aWorld, xCoord + j, yCoord, zCoord + i, aSide) != 0) { - IMetaTileEntity tMetaTileEntity = ((IGregTechTileEntity) - aWorld.getTileEntity(xCoord + j, yCoord, zCoord + i)) - .getMetaTileEntity(); + IMetaTileEntity tMetaTileEntity = ((IGregTechTileEntity) aWorld + .getTileEntity(xCoord + j, yCoord, zCoord + i)).getMetaTileEntity(); return getIconByIndex(tMetaTileEntity, 4 - i * 3 - j); } } @@ -123,9 +97,8 @@ public class TexturesCentrifugeMultiblock { for (int j = -1; j < 2; j++) { if (i == 0 && j == 0) continue; if (isCentrifugeControllerWithSide(aWorld, xCoord + j, yCoord + i, zCoord, aSide) != 0) { - IMetaTileEntity tMetaTileEntity = ((IGregTechTileEntity) - aWorld.getTileEntity(xCoord + j, yCoord + i, zCoord)) - .getMetaTileEntity(); + IMetaTileEntity tMetaTileEntity = ((IGregTechTileEntity) aWorld + .getTileEntity(xCoord + j, yCoord + i, zCoord)).getMetaTileEntity(); return getIconByIndex(tMetaTileEntity, 4 + i * 3 - j * tInvertLeftRightMod); } } @@ -136,9 +109,8 @@ public class TexturesCentrifugeMultiblock { for (int j = -1; j < 2; j++) { if (i == 0 && j == 0) continue; if (isCentrifugeControllerWithSide(aWorld, xCoord, yCoord + i, zCoord + j, aSide) != 0) { - IMetaTileEntity tMetaTileEntity = ((IGregTechTileEntity) - aWorld.getTileEntity(xCoord, yCoord + i, zCoord + j)) - .getMetaTileEntity(); + IMetaTileEntity tMetaTileEntity = ((IGregTechTileEntity) aWorld + .getTileEntity(xCoord, yCoord + i, zCoord + j)).getMetaTileEntity(); return getIconByIndex(tMetaTileEntity, 4 + i * 3 + j * tInvertLeftRightMod); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGregtech58.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGregtech58.java index 2298e0731e..d8c84f1886 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGregtech58.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGregtech58.java @@ -1,42 +1,43 @@ package gtPlusPlus.xmod.gregtech.common.blocks.textures; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; +import net.minecraft.world.IBlockAccess; + import gregtech.api.enums.Textures; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gtPlusPlus.xmod.gregtech.common.blocks.GregtechMetaCasingBlocks; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.GregtechMetaTileEntity_IndustrialCentrifuge; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; public class TexturesGregtech58 { - private static Textures.BlockIcons.CustomIcon GT8_1_Active = - new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE_ACTIVE1"); + private static Textures.BlockIcons.CustomIcon GT8_1_Active = new Textures.BlockIcons.CustomIcon( + "iconsets/LARGETURBINE_ACTIVE1"); private static Textures.BlockIcons.CustomIcon GT8_1 = new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE1"); - private static Textures.BlockIcons.CustomIcon GT8_2_Active = - new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE_ACTIVE2"); + private static Textures.BlockIcons.CustomIcon GT8_2_Active = new Textures.BlockIcons.CustomIcon( + "iconsets/LARGETURBINE_ACTIVE2"); private static Textures.BlockIcons.CustomIcon GT8_2 = new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE2"); - private static Textures.BlockIcons.CustomIcon GT8_3_Active = - new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE_ACTIVE3"); + private static Textures.BlockIcons.CustomIcon GT8_3_Active = new Textures.BlockIcons.CustomIcon( + "iconsets/LARGETURBINE_ACTIVE3"); private static Textures.BlockIcons.CustomIcon GT8_3 = new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE3"); - private static Textures.BlockIcons.CustomIcon GT8_4_Active = - new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE_ACTIVE4"); + private static Textures.BlockIcons.CustomIcon GT8_4_Active = new Textures.BlockIcons.CustomIcon( + "iconsets/LARGETURBINE_ACTIVE4"); private static Textures.BlockIcons.CustomIcon GT8_4 = new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE4"); - private static Textures.BlockIcons.CustomIcon GT8_5_Active = - new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE_ACTIVE5"); + private static Textures.BlockIcons.CustomIcon GT8_5_Active = new Textures.BlockIcons.CustomIcon( + "iconsets/LARGETURBINE_ACTIVE5"); private static Textures.BlockIcons.CustomIcon GT8_5 = new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE5"); - private static Textures.BlockIcons.CustomIcon GT8_6_Active = - new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE_ACTIVE6"); + private static Textures.BlockIcons.CustomIcon GT8_6_Active = new Textures.BlockIcons.CustomIcon( + "iconsets/LARGETURBINE_ACTIVE6"); private static Textures.BlockIcons.CustomIcon GT8_6 = new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE6"); - private static Textures.BlockIcons.CustomIcon GT8_7_Active = - new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE_ACTIVE7"); + private static Textures.BlockIcons.CustomIcon GT8_7_Active = new Textures.BlockIcons.CustomIcon( + "iconsets/LARGETURBINE_ACTIVE7"); private static Textures.BlockIcons.CustomIcon GT8_7 = new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE7"); - private static Textures.BlockIcons.CustomIcon GT8_8_Active = - new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE_ACTIVE8"); + private static Textures.BlockIcons.CustomIcon GT8_8_Active = new Textures.BlockIcons.CustomIcon( + "iconsets/LARGETURBINE_ACTIVE8"); private static Textures.BlockIcons.CustomIcon GT8_8 = new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE8"); - private static Textures.BlockIcons.CustomIcon GT8_9_Active = - new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE_ACTIVE9"); + private static Textures.BlockIcons.CustomIcon GT8_9_Active = new Textures.BlockIcons.CustomIcon( + "iconsets/LARGETURBINE_ACTIVE9"); private static Textures.BlockIcons.CustomIcon GT8_9 = new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE9"); private static Textures.BlockIcons.CustomIcon frontFace_0 = (GT8_1); @@ -58,47 +59,20 @@ public class TexturesGregtech58 { private static Textures.BlockIcons.CustomIcon frontFace_8 = (GT8_9); private static Textures.BlockIcons.CustomIcon frontFaceActive_8 = (GT8_9_Active); - Textures.BlockIcons.CustomIcon[] TURBINE = new Textures.BlockIcons.CustomIcon[] { - frontFace_0, - frontFace_1, - frontFace_2, - frontFace_3, - frontFace_4, - frontFace_5, - frontFace_6, - frontFace_7, - frontFace_8 - }; + Textures.BlockIcons.CustomIcon[] TURBINE = new Textures.BlockIcons.CustomIcon[] { frontFace_0, frontFace_1, + frontFace_2, frontFace_3, frontFace_4, frontFace_5, frontFace_6, frontFace_7, frontFace_8 }; - Textures.BlockIcons.CustomIcon[] TURBINE_ACTIVE = new Textures.BlockIcons.CustomIcon[] { - frontFaceActive_0, - frontFaceActive_1, - frontFaceActive_2, - frontFaceActive_3, - frontFaceActive_4, - frontFaceActive_5, - frontFaceActive_6, - frontFaceActive_7, - frontFaceActive_8 - }; + Textures.BlockIcons.CustomIcon[] TURBINE_ACTIVE = new Textures.BlockIcons.CustomIcon[] { frontFaceActive_0, + frontFaceActive_1, frontFaceActive_2, 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 int aSide, - final GregtechMetaCasingBlocks thisBlock) { + public IIcon handleCasingsGT(final IBlockAccess aWorld, final int xCoord, final int yCoord, final int zCoord, + final int aSide, final GregtechMetaCasingBlocks thisBlock) { return this.handleCasingsGT58(aWorld, xCoord, yCoord, zCoord, aSide, thisBlock); } - public IIcon handleCasingsGT58( - final IBlockAccess aWorld, - final int xCoord, - final int yCoord, - final int zCoord, - final int aSide, - final GregtechMetaCasingBlocks thisBlock) { + public IIcon handleCasingsGT58(final IBlockAccess aWorld, final int xCoord, final int yCoord, final int zCoord, + final int aSide, final GregtechMetaCasingBlocks thisBlock) { final int tMeta = aWorld.getBlockMetadata(xCoord, yCoord, zCoord); if (((tMeta != 6) && (tMeta != 8) && (tMeta != 0))) { return CasingTextureHandler.getIcon(aSide, tMeta); @@ -275,19 +249,18 @@ public class TexturesGregtech58 { return Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL.getIcon(); } 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 (aSide) { case 0: if (tConnectedSides[0]) { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGregtech59.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGregtech59.java index 990db20285..45de7da05f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGregtech59.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGregtech59.java @@ -1,52 +1,53 @@ package gtPlusPlus.xmod.gregtech.common.blocks.textures; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; +import net.minecraft.world.IBlockAccess; + import gregtech.api.enums.Textures; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gtPlusPlus.xmod.gregtech.common.blocks.GregtechMetaCasingBlocks; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.GregtechMetaTileEntity_IndustrialCentrifuge; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; public class TexturesGregtech59 { - private static Textures.BlockIcons.CustomIcon GT8_1_Active = - new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE_ST_ACTIVE1"); - private static Textures.BlockIcons.CustomIcon GT8_1 = - new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE_ST1"); - private static Textures.BlockIcons.CustomIcon GT8_2_Active = - new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE_ST_ACTIVE2"); - private static Textures.BlockIcons.CustomIcon GT8_2 = - new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE_ST2"); - private static Textures.BlockIcons.CustomIcon GT8_3_Active = - new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE_ST_ACTIVE3"); - private static Textures.BlockIcons.CustomIcon GT8_3 = - new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE_ST3"); - private static Textures.BlockIcons.CustomIcon GT8_4_Active = - new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE_ST_ACTIVE4"); - private static Textures.BlockIcons.CustomIcon GT8_4 = - new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE_ST4"); - private static Textures.BlockIcons.CustomIcon GT8_5_Active = - new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE_ST_ACTIVE5"); - private static Textures.BlockIcons.CustomIcon GT8_5 = - new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE_ST5"); - private static Textures.BlockIcons.CustomIcon GT8_6_Active = - new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE_ST_ACTIVE6"); - private static Textures.BlockIcons.CustomIcon GT8_6 = - new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE_ST6"); - private static Textures.BlockIcons.CustomIcon GT8_7_Active = - new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE_ST_ACTIVE7"); - private static Textures.BlockIcons.CustomIcon GT8_7 = - new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE_ST7"); - private static Textures.BlockIcons.CustomIcon GT8_8_Active = - new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE_ST_ACTIVE8"); - private static Textures.BlockIcons.CustomIcon GT8_8 = - new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE_ST8"); - private static Textures.BlockIcons.CustomIcon GT8_9_Active = - new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE_ST_ACTIVE9"); - private static Textures.BlockIcons.CustomIcon GT8_9 = - new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE_ST9"); + private static Textures.BlockIcons.CustomIcon GT8_1_Active = new Textures.BlockIcons.CustomIcon( + "iconsets/LARGETURBINE_ST_ACTIVE1"); + private static Textures.BlockIcons.CustomIcon GT8_1 = new Textures.BlockIcons.CustomIcon( + "iconsets/LARGETURBINE_ST1"); + private static Textures.BlockIcons.CustomIcon GT8_2_Active = new Textures.BlockIcons.CustomIcon( + "iconsets/LARGETURBINE_ST_ACTIVE2"); + private static Textures.BlockIcons.CustomIcon GT8_2 = new Textures.BlockIcons.CustomIcon( + "iconsets/LARGETURBINE_ST2"); + private static Textures.BlockIcons.CustomIcon GT8_3_Active = new Textures.BlockIcons.CustomIcon( + "iconsets/LARGETURBINE_ST_ACTIVE3"); + private static Textures.BlockIcons.CustomIcon GT8_3 = new Textures.BlockIcons.CustomIcon( + "iconsets/LARGETURBINE_ST3"); + private static Textures.BlockIcons.CustomIcon GT8_4_Active = new Textures.BlockIcons.CustomIcon( + "iconsets/LARGETURBINE_ST_ACTIVE4"); + private static Textures.BlockIcons.CustomIcon GT8_4 = new Textures.BlockIcons.CustomIcon( + "iconsets/LARGETURBINE_ST4"); + private static Textures.BlockIcons.CustomIcon GT8_5_Active = new Textures.BlockIcons.CustomIcon( + "iconsets/LARGETURBINE_ST_ACTIVE5"); + private static Textures.BlockIcons.CustomIcon GT8_5 = new Textures.BlockIcons.CustomIcon( + "iconsets/LARGETURBINE_ST5"); + private static Textures.BlockIcons.CustomIcon GT8_6_Active = new Textures.BlockIcons.CustomIcon( + "iconsets/LARGETURBINE_ST_ACTIVE6"); + private static Textures.BlockIcons.CustomIcon GT8_6 = new Textures.BlockIcons.CustomIcon( + "iconsets/LARGETURBINE_ST6"); + private static Textures.BlockIcons.CustomIcon GT8_7_Active = new Textures.BlockIcons.CustomIcon( + "iconsets/LARGETURBINE_ST_ACTIVE7"); + private static Textures.BlockIcons.CustomIcon GT8_7 = new Textures.BlockIcons.CustomIcon( + "iconsets/LARGETURBINE_ST7"); + private static Textures.BlockIcons.CustomIcon GT8_8_Active = new Textures.BlockIcons.CustomIcon( + "iconsets/LARGETURBINE_ST_ACTIVE8"); + private static Textures.BlockIcons.CustomIcon GT8_8 = new Textures.BlockIcons.CustomIcon( + "iconsets/LARGETURBINE_ST8"); + private static Textures.BlockIcons.CustomIcon GT8_9_Active = new Textures.BlockIcons.CustomIcon( + "iconsets/LARGETURBINE_ST_ACTIVE9"); + private static Textures.BlockIcons.CustomIcon GT8_9 = new Textures.BlockIcons.CustomIcon( + "iconsets/LARGETURBINE_ST9"); private static Textures.BlockIcons.CustomIcon frontFace_0 = (GT8_1); private static Textures.BlockIcons.CustomIcon frontFaceActive_0 = (GT8_1_Active); @@ -67,47 +68,20 @@ public class TexturesGregtech59 { private static Textures.BlockIcons.CustomIcon frontFace_8 = (GT8_9); private static Textures.BlockIcons.CustomIcon frontFaceActive_8 = (GT8_9_Active); - Textures.BlockIcons.CustomIcon[] TURBINE = new Textures.BlockIcons.CustomIcon[] { - frontFace_0, - frontFace_1, - frontFace_2, - frontFace_3, - frontFace_4, - frontFace_5, - frontFace_6, - frontFace_7, - frontFace_8 - }; + Textures.BlockIcons.CustomIcon[] TURBINE = new Textures.BlockIcons.CustomIcon[] { frontFace_0, frontFace_1, + frontFace_2, frontFace_3, frontFace_4, frontFace_5, frontFace_6, frontFace_7, frontFace_8 }; - Textures.BlockIcons.CustomIcon[] TURBINE_ACTIVE = new Textures.BlockIcons.CustomIcon[] { - frontFaceActive_0, - frontFaceActive_1, - frontFaceActive_2, - frontFaceActive_3, - frontFaceActive_4, - frontFaceActive_5, - frontFaceActive_6, - frontFaceActive_7, - frontFaceActive_8 - }; + Textures.BlockIcons.CustomIcon[] TURBINE_ACTIVE = new Textures.BlockIcons.CustomIcon[] { frontFaceActive_0, + frontFaceActive_1, frontFaceActive_2, 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 int aSide, - final GregtechMetaCasingBlocks thisBlock) { + public IIcon handleCasingsGT(final IBlockAccess aWorld, final int xCoord, final int yCoord, final int zCoord, + final int aSide, final GregtechMetaCasingBlocks thisBlock) { return this.handleCasingsGT59(aWorld, xCoord, yCoord, zCoord, aSide, thisBlock); } - public IIcon handleCasingsGT59( - final IBlockAccess aWorld, - final int xCoord, - final int yCoord, - final int zCoord, - final int aSide, - final GregtechMetaCasingBlocks thisBlock) { + public IIcon handleCasingsGT59(final IBlockAccess aWorld, final int xCoord, final int yCoord, final int zCoord, + final int aSide, final GregtechMetaCasingBlocks thisBlock) { final int tMeta = aWorld.getBlockMetadata(xCoord, yCoord, zCoord); if (((tMeta != 6) && (tMeta != 8) && (tMeta != 0))) { return CasingTextureHandler.getIcon(aSide, tMeta); @@ -284,19 +258,18 @@ public class TexturesGregtech59 { return Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL.getIcon(); } 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 (aSide) { case 0: if (tConnectedSides[0]) { 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 e2d304572a..9e6c66fd93 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 @@ -1,13 +1,14 @@ package gtPlusPlus.xmod.gregtech.common.blocks.textures; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; +import net.minecraft.world.IBlockAccess; + import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gtPlusPlus.xmod.gregtech.common.blocks.GregtechMetaCasingBlocks5; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock.CustomIcon; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.GregtechMetaTileEntity_IsaMill; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; public class TexturesGrinderMultiblock { @@ -49,29 +50,12 @@ public class TexturesGrinderMultiblock { private static CustomIcon frontFace_8 = (GT8_9); 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 - }; + CustomIcon[] GRINDER = new CustomIcon[] { frontFace_0, frontFace_1, frontFace_2, frontFace_3, frontFace_4, + 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 - }; + CustomIcon[] GRINDER_ACTIVE = new CustomIcon[] { frontFaceActive_0, frontFaceActive_1, frontFaceActive_2, + frontFaceActive_3, frontFaceActive_4, frontFaceActive_5, frontFaceActive_6, frontFaceActive_7, + frontFaceActive_8 }; private static int isIsaControllerWithSide(IBlockAccess aWorld, int aX, int aY, int aZ, int aSide) { TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ); @@ -82,13 +66,8 @@ public class TexturesGrinderMultiblock { return 0; } - public IIcon handleCasingsGT( - final IBlockAccess aWorld, - final int xCoord, - final int yCoord, - final int zCoord, - final int aSide, - final GregtechMetaCasingBlocks5 ii) { + public IIcon handleCasingsGT(final IBlockAccess aWorld, final int xCoord, final int yCoord, final int zCoord, + final int aSide, final GregtechMetaCasingBlocks5 ii) { final int tMeta = aWorld.getBlockMetadata(xCoord, yCoord, zCoord); if (tMeta != 1) { return GregtechMetaCasingBlocks5.getStaticIcon(aSide, tMeta); @@ -100,9 +79,8 @@ public class TexturesGrinderMultiblock { for (int j = -1; j < 2; j++) { if (i == 0 && j == 0) continue; if (isIsaControllerWithSide(aWorld, xCoord + j, yCoord, zCoord + i, aSide) != 0) { - IMetaTileEntity tMetaTileEntity = ((IGregTechTileEntity) - aWorld.getTileEntity(xCoord + j, yCoord, zCoord + i)) - .getMetaTileEntity(); + IMetaTileEntity tMetaTileEntity = ((IGregTechTileEntity) aWorld + .getTileEntity(xCoord + j, yCoord, zCoord + i)).getMetaTileEntity(); return getIconByIndex(tMetaTileEntity, 4 - i * 3 - j); } } @@ -113,9 +91,8 @@ public class TexturesGrinderMultiblock { for (int j = -1; j < 2; j++) { if (i == 0 && j == 0) continue; if (isIsaControllerWithSide(aWorld, xCoord + j, yCoord + i, zCoord, aSide) != 0) { - IMetaTileEntity tMetaTileEntity = ((IGregTechTileEntity) - aWorld.getTileEntity(xCoord + j, yCoord + i, zCoord)) - .getMetaTileEntity(); + IMetaTileEntity tMetaTileEntity = ((IGregTechTileEntity) aWorld + .getTileEntity(xCoord + j, yCoord + i, zCoord)).getMetaTileEntity(); return getIconByIndex(tMetaTileEntity, 4 + i * 3 - j * tInvertLeftRightMod); } } @@ -126,9 +103,8 @@ public class TexturesGrinderMultiblock { for (int j = -1; j < 2; j++) { if (i == 0 && j == 0) continue; if (isIsaControllerWithSide(aWorld, xCoord, yCoord + i, zCoord + j, aSide) != 0) { - IMetaTileEntity tMetaTileEntity = ((IGregTechTileEntity) - aWorld.getTileEntity(xCoord, yCoord + i, zCoord + j)) - .getMetaTileEntity(); + IMetaTileEntity tMetaTileEntity = ((IGregTechTileEntity) aWorld + .getTileEntity(xCoord, yCoord + i, zCoord + j)).getMetaTileEntity(); return getIconByIndex(tMetaTileEntity, 4 + i * 3 + j * tInvertLeftRightMod); } } 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 9ee32bcaa6..aede466688 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 @@ -1,5 +1,9 @@ package gtPlusPlus.xmod.gregtech.common.blocks.textures; +import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.util.IIcon; +import net.minecraft.util.ResourceLocation; + import gregtech.api.GregTech_API; import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.ITexture; @@ -7,9 +11,6 @@ import gregtech.api.objects.GT_RenderedTexture; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.core.lib.CORE; -import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.util.IIcon; -import net.minecraft.util.ResourceLocation; public class TexturesGtBlock { @@ -17,8 +18,7 @@ public class TexturesGtBlock { private static AutoMap mCustomiconMap = new AutoMap(); - static { - } + static {} // public static ITexture[] CASING_BLOCKS_GTPP = new ITexture[256]; @@ -27,6 +27,7 @@ public class TexturesGtBlock { */ public static class CustomIcon implements IIconContainer, Runnable { + protected IIcon mIcon; protected String mIconName; protected String mModID; @@ -56,8 +57,7 @@ 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 @@ -67,6 +67,7 @@ public class TexturesGtBlock { } public static class VanillaIcon implements IIconContainer, Runnable { + protected IIcon mIcon; protected String mIconName; @@ -103,9 +104,8 @@ public class TexturesGtBlock { } /* - * Add Some Custom Textures below. - * I am not sure whether or not I need to declare them as such, but better to be safe than sorry. - * Right? + * Add Some Custom Textures below. I am not sure whether or not I need to declare them as such, but better to be + * safe than sorry. Right? */ // Vanilla Textures @@ -117,15 +117,15 @@ public class TexturesGtBlock { // Energy overlays public static final CustomIcon OVERLAY_ENERGY_OUT_BUFFER = new CustomIcon("iconsets/OVERLAY_ENERGY_OUT_BUFFER"); - public static final CustomIcon OVERLAY_ENERGY_OUT_MULTI_BUFFER = - new CustomIcon("iconsets/OVERLAY_ENERGY_OUT_MULTI_BUFFER"); + public static final CustomIcon OVERLAY_ENERGY_OUT_MULTI_BUFFER = new CustomIcon( + "iconsets/OVERLAY_ENERGY_OUT_MULTI_BUFFER"); // Wooden Shelf and Compartment Overlays public static final CustomIcon OVERLAY_WOODEN_SHELF_FRONT = new CustomIcon("TileEntities/Compartment/wood_shelf"); - public static final CustomIcon OVERLAY_WOODEN_SHELF_CANS_FRONT = - new CustomIcon("TileEntities/Compartment/wood_shelf_cans"); - public static final CustomIcon OVERLAY_WOODEN_SHELF_PAPER_FRONT = - new CustomIcon("TileEntities/Compartment/wood_shelf_paper"); + public static final CustomIcon OVERLAY_WOODEN_SHELF_CANS_FRONT = new CustomIcon( + "TileEntities/Compartment/wood_shelf_cans"); + public static final CustomIcon OVERLAY_WOODEN_SHELF_PAPER_FRONT = new CustomIcon( + "TileEntities/Compartment/wood_shelf_paper"); public static final CustomIcon OVERLAY_CABINET_1 = new CustomIcon("TileEntities/Compartment/0"); public static final CustomIcon OVERLAY_CABINET_2 = new CustomIcon("TileEntities/Compartment/1"); public static final CustomIcon OVERLAY_CABINET_3 = new CustomIcon("TileEntities/Compartment/2"); @@ -160,19 +160,19 @@ public class TexturesGtBlock { public static final CustomIcon OVERLAY_COMPARTMENT_16 = new CustomIcon("TileEntities/Compartment/31"); // Controllers - private static final CustomIcon Internal_Casing_Fusion_Simple_Front = - new CustomIcon("TileEntities/MACHINE_CASING_FUSION_FRONT"); + private static final CustomIcon Internal_Casing_Fusion_Simple_Front = new CustomIcon( + "TileEntities/MACHINE_CASING_FUSION_FRONT"); public static final CustomIcon Casing_Fusion_Simple_Front = Internal_Casing_Fusion_Simple_Front; - private static final CustomIcon Internal_Casing_Fusion_Simple_Front_Active = - new CustomIcon("TileEntities/MACHINE_CASING_FUSION_FRONT_ACTIVE"); + private static final CustomIcon Internal_Casing_Fusion_Simple_Front_Active = new CustomIcon( + "TileEntities/MACHINE_CASING_FUSION_FRONT_ACTIVE"); public static final CustomIcon Casing_Fusion_Simple_Front_Active = Internal_Casing_Fusion_Simple_Front_Active; // 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"); + private static final CustomIcon Internal_Casing_Machine_Simple_Bottom = new CustomIcon( + "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"); @@ -180,90 +180,90 @@ public class TexturesGtBlock { private static final CustomIcon Internal_Casing_Machine_Ultra = new CustomIcon("TileEntities/adv_machine_lesu"); 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"); + private static final CustomIcon Internal_Casing_Machine_Dimensional = new CustomIcon( + "TileEntities/adv_machine_dimensional"); public static final CustomIcon Casing_Machine_Dimensional = Internal_Casing_Machine_Dimensional; - private static final CustomIcon Internal_Casing_Machine_Dimensional_Adv = - new CustomIcon("TileEntities/high_adv_machine_dimensional"); + private static final CustomIcon Internal_Casing_Machine_Dimensional_Adv = new CustomIcon( + "TileEntities/high_adv_machine_dimensional"); public static final CustomIcon Casing_Machine_Dimensional_Adv = Internal_Casing_Machine_Dimensional_Adv; // Material Casings - private static final CustomIcon Internal_Casing_Tantalloy61 = - new CustomIcon("TileEntities/MACHINE_CASING_STABLE_TANTALLOY61"); + private static final CustomIcon Internal_Casing_Tantalloy61 = new CustomIcon( + "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"); + private static final CustomIcon Internal_Casing_MaragingSteel = new CustomIcon( + "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"); + private static final CustomIcon Internal_Casing_Stellite = new CustomIcon( + "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"); + private static final CustomIcon Internal_Casing_Talonite = new CustomIcon( + "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"); + private static final CustomIcon Internal_Casing_Tumbaga = new CustomIcon( + "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"); + private static final CustomIcon Internal_Casing_Zeron100 = new CustomIcon( + "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("TileEntities/MACHINE_CASING_STABLE_GRISIUM"); + private static final CustomIcon Internal_Casing_Grisium = new CustomIcon( + "TileEntities/MACHINE_CASING_STABLE_GRISIUM"); public static final CustomIcon Casing_Material_Grisium = Internal_Casing_Grisium; - private static final CustomIcon Internal_Casing_RedSteel = - new CustomIcon("TileEntities/MACHINE_CASING_STABLE_RED_STEEL"); + private static final CustomIcon Internal_Casing_RedSteel = new CustomIcon( + "TileEntities/MACHINE_CASING_STABLE_RED_STEEL"); public static final CustomIcon Casing_Material_RedSteel = Internal_Casing_RedSteel; - private static final CustomIcon Internal_Casing_Incoloy020 = - new CustomIcon("TileEntities/MACHINE_CASING_STABLE_INCOLOY_020"); + private static final CustomIcon Internal_Casing_Incoloy020 = new CustomIcon( + "TileEntities/MACHINE_CASING_STABLE_INCOLOY_020"); public static final CustomIcon Casing_Material_Incoloy020 = Internal_Casing_Incoloy020; - private static final CustomIcon Internal_Casing_IncoloyDS = - new CustomIcon("TileEntities/MACHINE_CASING_STABLE_INCOLOY_DS"); + private static final CustomIcon Internal_Casing_IncoloyDS = new CustomIcon( + "TileEntities/MACHINE_CASING_STABLE_INCOLOY_DS"); public static final CustomIcon Casing_Material_IncoloyDS = Internal_Casing_IncoloyDS; - private static final CustomIcon Internal_Casing_IncoloyMA956 = - new CustomIcon("TileEntities/MACHINE_CASING_STABLE_INCOLOY_MA956"); + private static final CustomIcon Internal_Casing_IncoloyMA956 = new CustomIcon( + "TileEntities/MACHINE_CASING_STABLE_INCOLOY_MA956"); public static final CustomIcon Casing_Material_IncoloyMA956 = Internal_Casing_IncoloyMA956; - private static final CustomIcon Internal_Casing_ZirconiumCarbide = - new CustomIcon("TileEntities/MACHINE_CASING_STABLE_ZIRCONIUM_CARBIDE"); + private static final CustomIcon Internal_Casing_ZirconiumCarbide = new CustomIcon( + "TileEntities/MACHINE_CASING_STABLE_ZIRCONIUM_CARBIDE"); public static final CustomIcon Casing_Material_ZirconiumCarbide = Internal_Casing_ZirconiumCarbide; - private static final CustomIcon Internal_Casing_HastelloyX = - new CustomIcon("TileEntities/MACHINE_CASING_STABLE_HASTELLOY_X"); + private static final CustomIcon Internal_Casing_HastelloyX = new CustomIcon( + "TileEntities/MACHINE_CASING_STABLE_HASTELLOY_X"); public static final CustomIcon Casing_Material_HastelloyX = Internal_Casing_HastelloyX; - private static final CustomIcon Internal_Casing_HastelloyN = - new CustomIcon("TileEntities/MACHINE_CASING_STABLE_HASTELLOY_N"); + private static final CustomIcon Internal_Casing_HastelloyN = new CustomIcon( + "TileEntities/MACHINE_CASING_STABLE_HASTELLOY_N"); public static final CustomIcon Casing_Material_HastelloyN = Internal_Casing_HastelloyN; - private static final CustomIcon Internal_Casing_Fluid_IncoloyDS = - new CustomIcon("TileEntities/MACHINE_CASING_FLUID_INCOLOY_DS"); + private static final CustomIcon Internal_Casing_Fluid_IncoloyDS = new CustomIcon( + "TileEntities/MACHINE_CASING_FLUID_INCOLOY_DS"); public static final CustomIcon Casing_Material_Fluid_IncoloyDS = Internal_Casing_Fluid_IncoloyDS; private static final CustomIcon Internal_Casing_Laurenium = new CustomIcon("TileEntities/MACHINE_CASING_LAURENIUM"); public static final CustomIcon Casing_Material_Laurenium = Internal_Casing_Laurenium; // Trinium Alloys - public static final CustomIcon Casing_Trinium_Titanium = - new CustomIcon("TileEntities/MACHINE_CASING_STABLE_TRINIUM_TITANIUM"); - public static final CustomIcon Casing_Trinium_Naquadah = - new CustomIcon("TileEntities/MACHINE_CASING_STABLE_TRINIUM_NAQUADAH"); - public static final CustomIcon Casing_Trinium_Naquadah_Vent = - new CustomIcon("TileEntities/MACHINE_CASING_STABLE_TRINIUM_NAQUADAH_VENT"); - public static final CustomIcon Casing_Trinium_Naquadah_Carbon = - new CustomIcon("TileEntities/MACHINE_CASING_STABLE_TRINIUM_NAQUADAH_CARBON"); + public static final CustomIcon Casing_Trinium_Titanium = new CustomIcon( + "TileEntities/MACHINE_CASING_STABLE_TRINIUM_TITANIUM"); + public static final CustomIcon Casing_Trinium_Naquadah = new CustomIcon( + "TileEntities/MACHINE_CASING_STABLE_TRINIUM_NAQUADAH"); + public static final CustomIcon Casing_Trinium_Naquadah_Vent = new CustomIcon( + "TileEntities/MACHINE_CASING_STABLE_TRINIUM_NAQUADAH_VENT"); + public static final CustomIcon Casing_Trinium_Naquadah_Carbon = new CustomIcon( + "TileEntities/MACHINE_CASING_STABLE_TRINIUM_NAQUADAH_CARBON"); // Material Machine/Firebox Casings - private static final CustomIcon Internal_Casing_Staballoy_Firebox = - new CustomIcon("TileEntities/MACHINE_CASING_FIREBOX_STABALLOY"); + private static final CustomIcon Internal_Casing_Staballoy_Firebox = new CustomIcon( + "TileEntities/MACHINE_CASING_FIREBOX_STABALLOY"); public static final CustomIcon Casing_Staballoy_Firebox = Internal_Casing_Staballoy_Firebox; // Misc Casings - private static final CustomIcon Internal_Casing_Machine_Redstone_Off = - new CustomIcon("TileEntities/cover_redstone_conductor"); + private static final CustomIcon Internal_Casing_Machine_Redstone_Off = new CustomIcon( + "TileEntities/cover_redstone_conductor"); public static final CustomIcon Casing_Machine_Redstone_Off = Internal_Casing_Machine_Redstone_Off; - private static final CustomIcon Internal_Casing_Machine_Redstone_On = - new CustomIcon("TileEntities/cover_redstone_emitter"); + private static final CustomIcon Internal_Casing_Machine_Redstone_On = new CustomIcon( + "TileEntities/cover_redstone_emitter"); public static final CustomIcon Casing_Machine_Redstone_On = Internal_Casing_Machine_Redstone_On; // Redox Cells @@ -287,8 +287,8 @@ public class TexturesGtBlock { public static final CustomIcon Casing_Modulator_4 = new CustomIcon("special/block_8"); // Centrifuge Casing - private static final CustomIcon Internal_Casing_Centrifuge = - new CustomIcon("TileEntities/MACHINE_CASING_CENTRIFUGE"); + private static final CustomIcon Internal_Casing_Centrifuge = new CustomIcon( + "TileEntities/MACHINE_CASING_CENTRIFUGE"); public static final CustomIcon Casing_Material_Centrifuge = Internal_Casing_Centrifuge; // Quantum Force Transformer Casing @@ -311,8 +311,8 @@ public class TexturesGtBlock { // MACHINE_CASING_FARM_MANAGER_STRUCTURAL // Farm Manager Casings - private static final CustomIcon Internal_Casing_Machine_Farm_Manager = - new CustomIcon("TileEntities/MACHINE_CASING_FARM_MANAGER_STRUCTURAL"); + private static final CustomIcon Internal_Casing_Machine_Farm_Manager = new CustomIcon( + "TileEntities/MACHINE_CASING_FARM_MANAGER_STRUCTURAL"); public static final CustomIcon Casing_Machine_Farm_Manager = Internal_Casing_Machine_Farm_Manager; // Acacia_Log private static final CustomIcon Internal_Casing_Machine_Acacia_Log = new CustomIcon("TileEntities/log_acacia_top"); @@ -324,8 +324,8 @@ public class TexturesGtBlock { // Structural Blocks private static final CustomIcon Internal_Casing_Machine_Metal_Grate_A = new CustomIcon("chrono/MetalGrate"); public static final CustomIcon Casing_Machine_Metal_Grate_A = Internal_Casing_Machine_Metal_Grate_A; - private static final CustomIcon Internal_Casing_Machine_Metal_Grate_A_Solid = - new CustomIcon("chrono/MetalGrateA_Solid"); + private static final CustomIcon Internal_Casing_Machine_Metal_Grate_A_Solid = new CustomIcon( + "chrono/MetalGrateA_Solid"); public static final CustomIcon Casing_Machine_Metal_Grate_A_Solid = Internal_Casing_Machine_Metal_Grate_A_Solid; private static final CustomIcon Internal_Casing_Machine_Metal_Grate_B = new CustomIcon("chrono/MetalGrate2"); public static final CustomIcon Casing_Machine_Metal_Grate_B = Internal_Casing_Machine_Metal_Grate_B; @@ -361,59 +361,59 @@ public class TexturesGtBlock { public static final CustomIcon Overlay_Machine_Cyber_B = Internal_Overlay_Machine_Cyber_B; public static final CustomIcon TEXTURE_CASING_AMAZON = new CustomIcon("TileEntities/CASING_AMAZON"); - public static final CustomIcon TEXTURE_CASING_ADVANCED_CRYOGENIC = - new CustomIcon("TileEntities/MACHINE_CASING_ADVANCED_CRYOGENIC"); - public static final CustomIcon TEXTURE_CASING_ADVANCED_VOLCNUS = - new CustomIcon("TileEntities/MACHINE_CASING_ADVANCED_VOLCANUS"); + public static final CustomIcon TEXTURE_CASING_ADVANCED_CRYOGENIC = new CustomIcon( + "TileEntities/MACHINE_CASING_ADVANCED_CRYOGENIC"); + public static final CustomIcon TEXTURE_CASING_ADVANCED_VOLCNUS = new CustomIcon( + "TileEntities/MACHINE_CASING_ADVANCED_VOLCANUS"); public static final CustomIcon TEXTURE_CASING_ROCKETDYNE = new CustomIcon("TileEntities/MACHINE_CASING_ROCKETDYNE"); - public static final CustomIcon TEXTURE_CASING_GRINDING_MILL = - new CustomIcon("TileEntities/MACHINE_CASING_GRINDING_FACTORY"); + public static final CustomIcon TEXTURE_CASING_GRINDING_MILL = new CustomIcon( + "TileEntities/MACHINE_CASING_GRINDING_FACTORY"); public static final CustomIcon TEXTURE_CASING_FLOTATION = new CustomIcon("TileEntities/MACHINE_CASING_FLOTATION"); // Custom Pipes public static final CustomIcon TEXTURE_PIPE_GRINDING_MILL = new CustomIcon("TileEntities/MACHINE_CASING_PIPE_T1"); public static final CustomIcon TEXTURE_PIPE_GENERIC = new CustomIcon("iconsets/MACHINE_CASING_PIPE_GENERIC"); - public static final CustomIcon TEXTURE_PIPE_T1_BABBIT_ALLOY = - new CustomIcon("iconsets/MACHINE_CASING_PIPE_BABBIT_ALLOY"); - public static final CustomIcon TEXTURE_PIPE_T2_INCONEL_690 = - new CustomIcon("iconsets/MACHINE_CASING_PIPE_INCONEL_690"); + public static final CustomIcon TEXTURE_PIPE_T1_BABBIT_ALLOY = new CustomIcon( + "iconsets/MACHINE_CASING_PIPE_BABBIT_ALLOY"); + public static final CustomIcon TEXTURE_PIPE_T2_INCONEL_690 = new CustomIcon( + "iconsets/MACHINE_CASING_PIPE_INCONEL_690"); public static final CustomIcon TEXTURE_PIPE_T3_STELLITE = new CustomIcon("iconsets/MACHINE_CASING_PIPE_STELLITE"); - public static final CustomIcon TEXTURE_PIPE_T4_NITINOL_60 = - new CustomIcon("iconsets/MACHINE_CASING_PIPE_NITINOL_60"); + public static final CustomIcon TEXTURE_PIPE_T4_NITINOL_60 = new CustomIcon( + "iconsets/MACHINE_CASING_PIPE_NITINOL_60"); public static final CustomIcon TEXTURE_PIPE_T5_LAFIUM = new CustomIcon("iconsets/MACHINE_CASING_PIPE_LAFIUM"); public static final CustomIcon TEXTURE_PIPE_T6_CINOBITE = new CustomIcon("iconsets/MACHINE_CASING_PIPE_CINOBITE"); - public static final CustomIcon TEXTURE_PIPE_T7_TITANSTEEL = - new CustomIcon("iconsets/MACHINE_CASING_PIPE_TITANSTEEL"); + public static final CustomIcon TEXTURE_PIPE_T7_TITANSTEEL = new CustomIcon( + "iconsets/MACHINE_CASING_PIPE_TITANSTEEL"); public static final CustomIcon TEXTURE_PIPE_T8_ABYSSAL = new CustomIcon("iconsets/MACHINE_CASING_PIPE_ABYSSAL"); // Custom Gearboxes - public static final CustomIcon TEXTURE_GEARBOX_GRINDING_MILL = - new CustomIcon("TileEntities/MACHINE_CASING_GEARBOX_T1"); + public static final CustomIcon TEXTURE_GEARBOX_GRINDING_MILL = new CustomIcon( + "TileEntities/MACHINE_CASING_GEARBOX_T1"); public static final CustomIcon TEXTURE_GEARBOX_GENERIC = new CustomIcon("iconsets/MACHINE_CASING_GEARBOX_GENERIC"); - public static final CustomIcon TEXTURE_GEARBOX_T1_EGLIN_STEEL = - new CustomIcon("iconsets/MACHINE_CASING_GEARBOX_EGLIN_STEEL"); - public static final CustomIcon TEXTURE_GEARBOX_T2_INCONEL_792 = - new CustomIcon("iconsets/MACHINE_CASING_GEARBOX_INCONEL_792"); - public static final CustomIcon TEXTURE_GEARBOX_T3_INCOLOY_MA956 = - new CustomIcon("iconsets/MACHINE_CASING_GEARBOX_INCOLOY_MA956"); - public static final CustomIcon TEXTURE_GEARBOX_T4_NITINOL_60 = - new CustomIcon("iconsets/MACHINE_CASING_GEARBOX_NITINOL_60"); - public static final CustomIcon TEXTURE_GEARBOX_T5_ZERON_100 = - new CustomIcon("iconsets/MACHINE_CASING_GEARBOX_ZERON_100"); - public static final CustomIcon TEXTURE_GEARBOX_T6_PIKYONIUM = - new CustomIcon("iconsets/MACHINE_CASING_GEARBOX_PIKYONIUM"); - public static final CustomIcon TEXTURE_GEARBOX_T7_TITANSTEEL = - new CustomIcon("iconsets/MACHINE_CASING_GEARBOX_TITANSTEEL"); - public static final CustomIcon TEXTURE_GEARBOX_T8_ABYSSAL = - new CustomIcon("iconsets/MACHINE_CASING_GEARBOX_ABYSSAL"); + public static final CustomIcon TEXTURE_GEARBOX_T1_EGLIN_STEEL = new CustomIcon( + "iconsets/MACHINE_CASING_GEARBOX_EGLIN_STEEL"); + public static final CustomIcon TEXTURE_GEARBOX_T2_INCONEL_792 = new CustomIcon( + "iconsets/MACHINE_CASING_GEARBOX_INCONEL_792"); + public static final CustomIcon TEXTURE_GEARBOX_T3_INCOLOY_MA956 = new CustomIcon( + "iconsets/MACHINE_CASING_GEARBOX_INCOLOY_MA956"); + public static final CustomIcon TEXTURE_GEARBOX_T4_NITINOL_60 = new CustomIcon( + "iconsets/MACHINE_CASING_GEARBOX_NITINO