diff options
| author | Blood Asp <Blood@Asp> | 2015-04-27 23:38:12 +0200 |
|---|---|---|
| committer | Blood Asp <Blood@Asp> | 2015-04-27 23:38:12 +0200 |
| commit | 7c0de38a9fe24ef60ab328e074432881ce4fbda4 (patch) | |
| tree | c5b0a5bf9b78c1951e7f6375c91cc20423c05201 /main/java/gregtech/common/tileentities/boilers | |
| parent | f1610b1721ed22fcbd4cafb61b0867d8611c00f6 (diff) | |
| download | GT5-Unofficial-7c0de38a9fe24ef60ab328e074432881ce4fbda4.tar.gz GT5-Unofficial-7c0de38a9fe24ef60ab328e074432881ce4fbda4.tar.bz2 GT5-Unofficial-7c0de38a9fe24ef60ab328e074432881ce4fbda4.zip | |
Add and fix
More Bugfixes, Soldering Iron and Magic Energy Absorber
Diffstat (limited to 'main/java/gregtech/common/tileentities/boilers')
| -rw-r--r-- | main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler.java | 3 | ||||
| -rw-r--r-- | main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Solar.java | 9 |
2 files changed, 7 insertions, 5 deletions
diff --git a/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler.java b/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler.java index 8852a6bde0..64b452e60c 100644 --- a/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler.java +++ b/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler.java @@ -42,7 +42,8 @@ public abstract class GT_MetaTileEntity_Boiler public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) { - ITexture[] tmp = mTextures[(aSide==aFacing?(aActive?4:3):aSide==GT_Utility.getOppositeSide(aFacing)?2:aSide==0?0:aSide==1?1:2)][aColorIndex+1]; + ITexture[] tmp = mTextures[aSide >= 2 ? aSide != aFacing ? 2 : ((byte)(aActive ? 4 : 3)) : aSide][aColorIndex + 1]; + //mTextures[(aSide==aFacing?(aActive?4:3):aSide==GT_Utility.getOppositeSide(aFacing)?2:aSide==0?0:aSide==1?1:2)][aColorIndex+1]; if(aSide!=aFacing&&tmp.length==2){ tmp = new ITexture[]{tmp[0]}; } diff --git a/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Solar.java b/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Solar.java index 7105315eb6..2d298fed43 100644 --- a/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Solar.java +++ b/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Solar.java @@ -8,6 +8,7 @@ import gregtech.api.enums.Textures; /* 7: */ import gregtech.api.metatileentity.MetaTileEntity;
/* 8: */ import gregtech.api.objects.GT_RenderedTexture;
/* 9: */ import gregtech.api.util.GT_ModHandler;
+import gregtech.api.util.GT_Utility;
/* 10: */ import gregtech.common.gui.GT_Container_Boiler;
/* 11: */ import gregtech.common.gui.GT_GUIContainer_Boiler;
/* 12: */ import net.minecraft.entity.player.InventoryPlayer;
@@ -37,18 +38,18 @@ import gregtech.api.enums.Textures; /* 36: */ {ITexture[] tmp0 ={ new GT_RenderedTexture(Textures.BlockIcons.MACHINE_BRONZEBRICKS_BOTTOM, Dyes.getModulation(i, Dyes._NULL.mRGBa)) };
/* 37: 30 */ rTextures[0][(i + 1)] = tmp0;
/* 38: 31 */ ITexture[] tmp1 ={ new GT_RenderedTexture(Textures.BlockIcons.MACHINE_BRONZEBRICKS_TOP, Dyes.getModulation(i, Dyes._NULL.mRGBa)), new GT_RenderedTexture(Textures.BlockIcons.BOILER_SOLAR) };
-rTextures[1][(i + 1)] = tmp1;
+ rTextures[1][(i + 1)] = tmp1;
/* 39: 32 */ ITexture[] tmp2 ={ new GT_RenderedTexture(Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE, Dyes.getModulation(i, Dyes._NULL.mRGBa)) };
-rTextures[2][(i + 1)] = tmp2;
+ rTextures[2][(i + 1)] = tmp2;
/* 40: 33 */ ITexture[] tmp3 ={ new GT_RenderedTexture(Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE, Dyes.getModulation(i, Dyes._NULL.mRGBa)), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE) };
-rTextures[3][(i + 1)] = tmp3;
+ rTextures[3][(i + 1)] = tmp3;
/* 41: */ }
/* 42: 35 */ return rTextures;
/* 43: */ }
/* 44: */
/* 45: */ public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone)
/* 46: */ {
-/* 47: 40 */ return this.mTextures[2][(aColorIndex + 1)];
+ return mTextures[aSide >= 2 ? ((byte)(aSide != aFacing ? 2 : 3)) : aSide][aColorIndex + 1];
/* 48: */ }
/* 49: */
/* 50: */ public int maxProgresstime()
|