diff options
| author | OneEyeMaker <oneeyemaker@gmail.com> | 2016-07-26 09:01:16 +0300 |
|---|---|---|
| committer | OneEyeMaker <oneeyemaker@gmail.com> | 2016-07-26 09:01:16 +0300 |
| commit | 9946e904b46dd3ce11abe9745b25dc11852c75b2 (patch) | |
| tree | 68febbecbde5015af62281c15f5dfcd1c3d99d09 /src/main/java/gregtech/api/metatileentity | |
| parent | c4bd35d7cd38db6af45723a359b7de5ffafa68f6 (diff) | |
| parent | 4c20885d144e5b2eaa7177668f71a32ecc694b9f (diff) | |
| download | GT5-Unofficial-9946e904b46dd3ce11abe9745b25dc11852c75b2.tar.gz GT5-Unofficial-9946e904b46dd3ce11abe9745b25dc11852c75b2.tar.bz2 GT5-Unofficial-9946e904b46dd3ce11abe9745b25dc11852c75b2.zip | |
Merge branch 'experimental' into NewFeatures
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()) |