diff options
author | Prometheus0000 <prometheus0000000@gmail.com> | 2021-01-06 00:47:32 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-06 00:47:32 -0500 |
commit | c6324633a4491296c0505e59aa7f8747af0c640a (patch) | |
tree | e30c710b6af76a150a56c9b6c3d12ef952045b7c /src/main/java/gregtech/common/blocks | |
parent | af189671431ddb4d126e6800ec810c2c7e846b24 (diff) | |
parent | 326ed7e748c228fa330f5806504eba4914e6bb24 (diff) | |
download | GT5-Unofficial-c6324633a4491296c0505e59aa7f8747af0c640a.tar.gz GT5-Unofficial-c6324633a4491296c0505e59aa7f8747af0c640a.tar.bz2 GT5-Unofficial-c6324633a4491296c0505e59aa7f8747af0c640a.zip |
Merge pull request #21 from GTNewHorizons/experimental
update
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}; } |