diff options
| author | Martin Robertz <dream-master@gmx.net> | 2021-01-07 17:11:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-07 17:11:47 +0100 |
| commit | 27cbc7364bdd0f8563946d31c54df2bd21bc8b8d (patch) | |
| tree | 9d06d58b5bf6dca2c72d0da68f79c19602a50836 /src/main/java/gregtech/common/blocks | |
| parent | ecc644c221b8b218cac431f66468882580504e7d (diff) | |
| parent | 67074a4aaf64a6d43f893c2860113dbc336d3e45 (diff) | |
| download | GT5-Unofficial-27cbc7364bdd0f8563946d31c54df2bd21bc8b8d.tar.gz GT5-Unofficial-27cbc7364bdd0f8563946d31c54df2bd21bc8b8d.tar.bz2 GT5-Unofficial-27cbc7364bdd0f8563946d31c54df2bd21bc8b8d.zip | |
Merge branch 'experimental' into GT-Tools
Diffstat (limited to 'src/main/java/gregtech/common/blocks')
| -rw-r--r-- | src/main/java/gregtech/common/blocks/GT_TileEntity_Ores.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/gregtech/common/blocks/GT_TileEntity_Ores.java b/src/main/java/gregtech/common/blocks/GT_TileEntity_Ores.java index 2eb100599b..5cdb042551 100644 --- a/src/main/java/gregtech/common/blocks/GT_TileEntity_Ores.java +++ b/src/main/java/gregtech/common/blocks/GT_TileEntity_Ores.java @@ -8,6 +8,7 @@ import gregtech.api.enums.OrePrefixes; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.ITexturedTileEntity; import gregtech.api.objects.GT_CopiedBlockTexture; +import gregtech.api.objects.GT_StdRenderedTexture; import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.objects.XSTR; import gregtech.api.util.GT_OreDictUnificator; @@ -276,7 +277,7 @@ public class GT_TileEntity_Ores extends TileEntity implements ITexturedTileEntit public ITexture[] getTexture(Block aBlock, byte aSide) { Materials aMaterial = GregTech_API.sGeneratedMaterials[(this.mMetaData % 1000)]; if ((aMaterial != null) && (this.mMetaData < 32000)) { - GT_RenderedTexture aIconSet = new GT_RenderedTexture(aMaterial.mIconSet.mTextures[this.mMetaData / 16000 == 0 ? OrePrefixes.ore.mTextureIndex : OrePrefixes.oreSmall.mTextureIndex], aMaterial.mRGBa); + GT_StdRenderedTexture aIconSet = new GT_StdRenderedTexture(aMaterial.mIconSet.mTextures[this.mMetaData / 16000 == 0 ? OrePrefixes.ore.mTextureIndex : OrePrefixes.oreSmall.mTextureIndex], aMaterial.mRGBa); if (aBlock instanceof GT_Block_Ores_Abstract) { return new ITexture[]{((GT_Block_Ores_Abstract) aBlock).getTextureSet()[((this.mMetaData / 1000) % 16)], aIconSet}; } |