diff options
| author | Blood-Asp <bloodasphendrik@gmail.com> | 2016-07-26 00:56:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-26 00:56:21 +0200 |
| commit | bd51aba156acafbe19ffb561bf74422c246c1834 (patch) | |
| tree | 5f4f2df2b5f50abd597eb4009d499ef6dba872cd /src/main/java/gregtech/api/metatileentity | |
| parent | 5a15ee7e4ae224c485c1ed5f126a6eb35c7c2beb (diff) | |
| parent | 3bbd32136f9a5845503609a32251edc0c5653c2d (diff) | |
| download | GT5-Unofficial-bd51aba156acafbe19ffb561bf74422c246c1834.tar.gz GT5-Unofficial-bd51aba156acafbe19ffb561bf74422c246c1834.tar.bz2 GT5-Unofficial-bd51aba156acafbe19ffb561bf74422c246c1834.zip | |
Merge pull request #576 from Muramasa-/UBCSupport
UBC Support / Ore System Restructure
Diffstat (limited to 'src/main/java/gregtech/api/metatileentity')
| -rw-r--r-- | src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java | 3 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java b/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java index 7af0c9ad22..91201a2a8d 100644 --- a/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java +++ b/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java @@ -9,6 +9,7 @@ import gregtech.api.interfaces.tileentity.IPipeRenderedTileEntity; import gregtech.api.net.GT_Packet_TileEntity; import gregtech.api.objects.GT_ItemStack; import gregtech.api.util.*; +import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; @@ -705,7 +706,7 @@ public class BaseMetaPipeEntity extends BaseTileEntity implements IGregTechTileE } @Override - public ITexture[] getTexture(byte aSide) { + public ITexture[] getTexture(Block aBlock, byte aSide) { ITexture rIcon = getCoverTexture(aSide); if (rIcon != null) return new ITexture[]{rIcon}; return getTextureUncovered(aSide); diff --git a/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java b/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java index 1470ac733d..9917ca62d7 100644 --- a/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java +++ b/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java @@ -1001,7 +1001,7 @@ public class BaseMetaTileEntity extends BaseTileEntity implements IGregTechTileE } @Override - public ITexture[] getTexture(byte aSide) { + public ITexture[] getTexture(Block aBlock, byte aSide) { ITexture rIcon = getCoverTexture(aSide); if (rIcon != null) return new ITexture[]{rIcon}; if (hasValidMetaTileEntity()) |