aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures
diff options
context:
space:
mode:
authorJason Mitchell <mitchej@gmail.com>2023-01-28 19:32:44 -0800
committerJason Mitchell <mitchej@gmail.com>2023-01-28 19:32:44 -0800
commit55f64675b42ac8d3c557cc850f78664bee006f6f (patch)
tree2afd26dd3d5e6f763119bc192b57c66a1a075922 /src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures
parent0f5dfd01b877b6a1019e0671b88d07974aae68c0 (diff)
downloadGT5-Unofficial-55f64675b42ac8d3c557cc850f78664bee006f6f.tar.gz
GT5-Unofficial-55f64675b42ac8d3c557cc850f78664bee006f6f.tar.bz2
GT5-Unofficial-55f64675b42ac8d3c557cc850f78664bee006f6f.zip
[ci skip] spotlessApply with the new settings
Diffstat (limited to 'src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures')
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler.java51
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler2.java3
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler3.java3
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesCentrifugeMultiblock.java70
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGregtech58.java113
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGregtech59.java149
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGrinderMultiblock.java58
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java654
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtCutomCovers.java15
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtTools.java8
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/turbine/LargeTurbineTextureHandler.java171
11 files changed, 550 insertions, 745 deletions
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;