diff options
author | Draknyte1 <Draknyte1@hotmail.com> | 2016-10-07 02:03:46 +1000 |
---|---|---|
committer | Draknyte1 <Draknyte1@hotmail.com> | 2016-10-07 02:03:46 +1000 |
commit | 676a51a4c93713b3498508e13fae0869045f6f49 (patch) | |
tree | ac08d69405c23baadbcc37e9103153f6c06b1324 /src/Java/gregtech | |
parent | 8c6406887cbe6b2d27cead77c6605639d73012ef (diff) | |
download | GT5-Unofficial-676a51a4c93713b3498508e13fae0869045f6f49.tar.gz GT5-Unofficial-676a51a4c93713b3498508e13fae0869045f6f49.tar.bz2 GT5-Unofficial-676a51a4c93713b3498508e13fae0869045f6f49.zip |
+ Added the Bronze and Advanced Work benches from GT4, still hell buggy but a WIP.
// Temporarily added Workbench registration to the Tiered Tanks Loader.
% Added some logging to the Plate Generation.
$ Fixed getTexture() in BaseMetaTileEntityEx.java to now support all branches of Gregtech.
Diffstat (limited to 'src/Java/gregtech')
-rw-r--r-- | src/Java/gregtech/api/metatileentity/BaseMetaTileEntityEx.java | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/Java/gregtech/api/metatileentity/BaseMetaTileEntityEx.java b/src/Java/gregtech/api/metatileentity/BaseMetaTileEntityEx.java index 1669a11f9a..955b7eb045 100644 --- a/src/Java/gregtech/api/metatileentity/BaseMetaTileEntityEx.java +++ b/src/Java/gregtech/api/metatileentity/BaseMetaTileEntityEx.java @@ -1108,7 +1108,7 @@ public class BaseMetaTileEntityEx extends BaseTileEntity implements IGregTechTil return 0; } - @Override + public ITexture[] getTexture(byte aSide) { ITexture rIcon = getCoverTexture(aSide); if (rIcon != null) return new ITexture[]{rIcon}; @@ -1116,6 +1116,15 @@ public class BaseMetaTileEntityEx extends BaseTileEntity implements IGregTechTil return mMetaTileEntity.getTexture(this, aSide, mFacing, (byte) (mColor - 1), mActive, getOutputRedstoneSignal(aSide) > 0); return Textures.BlockIcons.ERROR_RENDERING; } + + + 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; + } private boolean isEnergyInputSide(byte aSide) { if (aSide >= 0 && aSide < 6) { @@ -2078,4 +2087,5 @@ public class BaseMetaTileEntityEx extends BaseTileEntity implements IGregTechTil public void onEntityCollidedWithBlock(World aWorld, int aX, int aY, int aZ, Entity collider) { mMetaTileEntity.onEntityCollidedWithBlock(aWorld, aX, aY, aZ, collider); } + }
\ No newline at end of file |