diff options
author | Draknyte1 <Draknyte1@hotmail.com> | 2016-09-01 12:21:33 +1000 |
---|---|---|
committer | Draknyte1 <Draknyte1@hotmail.com> | 2016-09-01 12:21:33 +1000 |
commit | b2f32b27b25d6275510905ec2c3683c4f390a95b (patch) | |
tree | 06b396aeb1e83f7532f0cd1406d572562c1fabf6 /src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/base | |
parent | 64179af9800fd0bf606f4e62e5c5b869128c6a2e (diff) | |
download | GT5-Unofficial-b2f32b27b25d6275510905ec2c3683c4f390a95b.tar.gz GT5-Unofficial-b2f32b27b25d6275510905ec2c3683c4f390a95b.tar.bz2 GT5-Unofficial-b2f32b27b25d6275510905ec2c3683c4f390a95b.zip |
+ Added some better support for the 5.9 branch of Gregtech.
> Added variable method classes which allow 5.7, 5.8 and 5.9 code segments to co-exist without compile or static link errors.
Diffstat (limited to 'src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/base')
-rw-r--r-- | src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/base/lossless/GregtechBaseMetaTileEntityLossless.java | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/base/lossless/GregtechBaseMetaTileEntityLossless.java b/src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/base/lossless/GregtechBaseMetaTileEntityLossless.java index fbe0a64771..f119823e94 100644 --- a/src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/base/lossless/GregtechBaseMetaTileEntityLossless.java +++ b/src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/base/lossless/GregtechBaseMetaTileEntityLossless.java @@ -1004,15 +1004,6 @@ public class GregtechBaseMetaTileEntityLossless extends BaseTileEntity implement return 0; } - @Override - public ITexture[] getTexture(byte aSide) { - ITexture rIcon = getCoverTexture(aSide); - if (rIcon != null) return new ITexture[]{rIcon}; - if (hasValidMetaTileEntity()) - return mMetaTileEntity.getTexture(this, aSide, mFacing, (byte) (mColor - 1), mActive, getOutputRedstoneSignal(aSide) > 0); - return Textures.BlockIcons.ERROR_RENDERING; - } - private boolean isEnergyInputSide(byte aSide) { if (aSide >= 0 && aSide < 6) { if (!getCoverBehaviorAtSide(aSide).letsEnergyIn(aSide, getCoverIDAtSide(aSide), getCoverDataAtSide(aSide), this)) @@ -1846,4 +1837,21 @@ public class GregtechBaseMetaTileEntityLossless extends BaseTileEntity implement public void onEntityCollidedWithBlock(World aWorld, int aX, int aY, int aZ, Entity collider) { mMetaTileEntity.onEntityCollidedWithBlock(aWorld, aX, aY, aZ, collider); } + + + public ITexture[] getTexture(Block arg0, byte aSide) { + ITexture rIcon = getCoverTexture(aSide); + if (rIcon != null) return new ITexture[]{rIcon}; + if (hasValidMetaTileEntity()) + return mMetaTileEntity.getTexture(this, aSide, mFacing, (byte) (mColor - 1), mActive, getOutputRedstoneSignal(aSide) > 0); + return Textures.BlockIcons.ERROR_RENDERING; + } + + public ITexture[] getTexture(byte aSide) { + ITexture rIcon = getCoverTexture(aSide); + if (rIcon != null) return new ITexture[]{rIcon}; + if (hasValidMetaTileEntity()) + return mMetaTileEntity.getTexture(this, aSide, mFacing, (byte) (mColor - 1), mActive, getOutputRedstoneSignal(aSide) > 0); + return Textures.BlockIcons.ERROR_RENDERING; + } }
\ No newline at end of file |