diff options
Diffstat (limited to 'src/main/java/gregtech/common')
6 files changed, 5 insertions, 18 deletions
diff --git a/src/main/java/gregtech/common/render/GT_TextureBuilder.java b/src/main/java/gregtech/common/render/GT_TextureBuilder.java index f2ff07523c..0971933add 100644 --- a/src/main/java/gregtech/common/render/GT_TextureBuilder.java +++ b/src/main/java/gregtech/common/render/GT_TextureBuilder.java @@ -12,7 +12,7 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraftforge.common.util.ForgeDirection; -@SuppressWarnings("unused") +@SuppressWarnings({"unused", "ClassWithTooManyFields"}) public class GT_TextureBuilder implements ITextureBuilder { private final List<IIconContainer> iconContainerList; private final List<ITexture> textureLayers; @@ -81,14 +81,12 @@ public class GT_TextureBuilder implements ITextureBuilder { @Override public ITextureBuilder useWorldCoord() { - if (fromBlock == null) throw new IllegalStateException("no from block"); this.worldCoord = true; return this; } @Override public ITextureBuilder noWorldCoord() { - if (fromBlock == null) throw new IllegalStateException("no from block"); this.worldCoord = false; return this; } @@ -105,6 +103,9 @@ public class GT_TextureBuilder implements ITextureBuilder { return this; } + /** + * @inheritDoc + */ @Override public ITexture build() { if (fromBlock != null) { @@ -112,6 +113,7 @@ public class GT_TextureBuilder implements ITextureBuilder { return new GT_CopiedCTMBlockTexture(fromBlock, fromSide.ordinal(), fromMeta, rgba, allowAlpha); else return new GT_CopiedBlockTexture(fromBlock, fromSide.ordinal(), fromMeta, rgba, allowAlpha); } + if (worldCoord != null) throw new IllegalStateException("worldCoord without from block"); if (!textureLayers.isEmpty()) return new GT_MultiTexture(textureLayers.toArray(new ITexture[0])); switch (iconContainerList.size()) { case 1: diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Gas.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Gas.java index 18f9ac884e..85e0a1700b 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Gas.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Gas.java @@ -41,16 +41,13 @@ public class GT_MetaTileEntity_LargeTurbine_Gas extends GT_MetaTileEntity_LargeT ? (aActive ? TextureFactory.builder() .addIcon(LARGETURBINE_SS_ACTIVE5) - .extFacing() .build() : hasTurbine() ? TextureFactory.builder() .addIcon(LARGETURBINE_SS5) - .extFacing() .build() : TextureFactory.builder() .addIcon(LARGETURBINE_SS_EMPTY5) - .extFacing() .build()) : casingTexturePages[0][58] }; diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_GasAdvanced.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_GasAdvanced.java index 9bc20e5f6e..727ae5d8fd 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_GasAdvanced.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_GasAdvanced.java @@ -40,16 +40,13 @@ public class GT_MetaTileEntity_LargeTurbine_GasAdvanced extends GT_MetaTileEntit ? (aActive ? TextureFactory.builder() .addIcon(LARGETURBINE_ADVGAS_ACTIVE5) - .extFacing() .build() : hasTurbine() ? TextureFactory.builder() .addIcon(LARGETURBINE_ADVGAS5) - .extFacing() .build() : TextureFactory.builder() .addIcon(LARGETURBINE_ADVGAS_EMPTY5) - .extFacing() .build()) : casingTexturePages[1][57] }; diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_HPSteam.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_HPSteam.java index 709a02af7c..0b56f6f0d7 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_HPSteam.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_HPSteam.java @@ -47,16 +47,13 @@ public class GT_MetaTileEntity_LargeTurbine_HPSteam extends GT_MetaTileEntity_La ? (aActive ? TextureFactory.builder() .addIcon(LARGETURBINE_TI_ACTIVE5) - .extFacing() .build() : hasTurbine() ? TextureFactory.builder() .addIcon(LARGETURBINE_TI5) - .extFacing() .build() : TextureFactory.builder() .addIcon(LARGETURBINE_TI_EMPTY5) - .extFacing() .build()) : casingTexturePages[0][59] }; diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java index f53834af0e..c909fd2af7 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java @@ -49,16 +49,13 @@ public class GT_MetaTileEntity_LargeTurbine_Plasma extends GT_MetaTileEntity_Lar ? (aActive ? TextureFactory.builder() .addIcon(LARGETURBINE_TU_ACTIVE5) - .extFacing() .build() : hasTurbine() ? TextureFactory.builder() .addIcon(LARGETURBINE_TU5) - .extFacing() .build() : TextureFactory.builder() .addIcon(LARGETURBINE_TU_EMPTY5) - .extFacing() .build()) : casingTexturePages[0][60] }; diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java index 3d17b25399..5876a3bf17 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java @@ -48,16 +48,13 @@ public class GT_MetaTileEntity_LargeTurbine_Steam extends GT_MetaTileEntity_Larg ? (aActive ? TextureFactory.builder() .addIcon(LARGETURBINE_ST_ACTIVE5) - .extFacing() .build() : hasTurbine() ? TextureFactory.builder() .addIcon(LARGETURBINE_ST5) - .extFacing() .build() : TextureFactory.builder() .addIcon(LARGETURBINE_ST_EMPTY5) - .extFacing() .build()) : casingTexturePages[0][57] }; |