From 4bcd2ce8243430d76792ec24ac90b00e6190d31a Mon Sep 17 00:00:00 2001 From: Léa Gris Date: Sat, 20 Mar 2021 01:55:39 +0100 Subject: feat(cover): handles transparent covers Add support for transparent covers (glass plate) on all GT Machines: - See pipes, wires, cables through transparent covers - Layer transparent covers over full-block pipes and machines --- .../gregtech/api/interfaces/tileentity/IPipeRenderedTileEntity.java | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/main/java/gregtech/api/interfaces') diff --git a/src/main/java/gregtech/api/interfaces/tileentity/IPipeRenderedTileEntity.java b/src/main/java/gregtech/api/interfaces/tileentity/IPipeRenderedTileEntity.java index 909f4077f0..1c6e40359f 100644 --- a/src/main/java/gregtech/api/interfaces/tileentity/IPipeRenderedTileEntity.java +++ b/src/main/java/gregtech/api/interfaces/tileentity/IPipeRenderedTileEntity.java @@ -1,6 +1,7 @@ package gregtech.api.interfaces.tileentity; import gregtech.api.interfaces.ITexture; +import net.minecraft.block.Block; public interface IPipeRenderedTileEntity extends ICoverable, ITexturedTileEntity { float getThickNess(); @@ -8,4 +9,6 @@ public interface IPipeRenderedTileEntity extends ICoverable, ITexturedTileEntity byte getConnections(); ITexture[] getTextureUncovered(byte aSide); + + ITexture[] getTextureCovered(Block aBlock, byte aSide); } \ No newline at end of file -- cgit From dce652fbb9c3bab6f5ea7cd302a1c914dde376e5 Mon Sep 17 00:00:00 2001 From: Léa Gris Date: Sat, 20 Mar 2021 10:58:26 +0100 Subject: fix(interface): add default getTextureCovered Implement requested change: https://github.com/GTNewHorizons/GT5-Unofficial/pull/469#discussion_r598084051 A default method body is required for older add-ons implementing the old interface without a `getTextureCovered` method, or those would crash when rendering their covered full-size pipes. --- .../gregtech/api/interfaces/tileentity/IPipeRenderedTileEntity.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/main/java/gregtech/api/interfaces') diff --git a/src/main/java/gregtech/api/interfaces/tileentity/IPipeRenderedTileEntity.java b/src/main/java/gregtech/api/interfaces/tileentity/IPipeRenderedTileEntity.java index 1c6e40359f..78f70a6d90 100644 --- a/src/main/java/gregtech/api/interfaces/tileentity/IPipeRenderedTileEntity.java +++ b/src/main/java/gregtech/api/interfaces/tileentity/IPipeRenderedTileEntity.java @@ -10,5 +10,7 @@ public interface IPipeRenderedTileEntity extends ICoverable, ITexturedTileEntity ITexture[] getTextureUncovered(byte aSide); - ITexture[] getTextureCovered(Block aBlock, byte aSide); + default ITexture[] getTextureCovered(Block aBlock, byte aSide) { + return getTextureUncovered(aSide); + }; } \ No newline at end of file -- cgit From 3eb38ad6336b6a3f765e6965b0a6794475ceecc6 Mon Sep 17 00:00:00 2001 From: Léa Gris Date: Sat, 20 Mar 2021 11:23:04 +0100 Subject: quickfix: remove useless Block argument Pipes don't use a block texture, only ore blocks use these and they don't implement IPipeRenderedTileEntity and are not covered either ^^ --- .../api/interfaces/tileentity/IPipeRenderedTileEntity.java | 2 +- .../java/gregtech/api/metatileentity/BaseMetaPipeEntity.java | 2 +- src/main/java/gregtech/common/render/GT_Renderer_Block.java | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src/main/java/gregtech/api/interfaces') diff --git a/src/main/java/gregtech/api/interfaces/tileentity/IPipeRenderedTileEntity.java b/src/main/java/gregtech/api/interfaces/tileentity/IPipeRenderedTileEntity.java index 78f70a6d90..8392616f34 100644 --- a/src/main/java/gregtech/api/interfaces/tileentity/IPipeRenderedTileEntity.java +++ b/src/main/java/gregtech/api/interfaces/tileentity/IPipeRenderedTileEntity.java @@ -10,7 +10,7 @@ public interface IPipeRenderedTileEntity extends ICoverable, ITexturedTileEntity ITexture[] getTextureUncovered(byte aSide); - default ITexture[] getTextureCovered(Block aBlock, byte aSide) { + default ITexture[] getTextureCovered(byte aSide) { return getTextureUncovered(aSide); }; } \ No newline at end of file diff --git a/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java b/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java index 7985aae217..26fee68f2b 100644 --- a/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java +++ b/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java @@ -784,7 +784,7 @@ public class BaseMetaPipeEntity extends BaseTileEntity implements IGregTechTileE } @Override - public ITexture[] getTextureCovered(Block aBlock, byte aSide) { + public ITexture[] getTextureCovered(byte aSide) { ITexture coverTexture = getCoverTexture(aSide); ITexture[] textureUncovered = getTextureUncovered(aSide); ITexture[] textureCovered; diff --git a/src/main/java/gregtech/common/render/GT_Renderer_Block.java b/src/main/java/gregtech/common/render/GT_Renderer_Block.java index 2f00eff17f..e95f508d80 100644 --- a/src/main/java/gregtech/common/render/GT_Renderer_Block.java +++ b/src/main/java/gregtech/common/render/GT_Renderer_Block.java @@ -120,12 +120,12 @@ public class GT_Renderer_Block implements ISimpleBlockRenderingHandler { TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ); if ((tTileEntity instanceof IPipeRenderedTileEntity)) { return renderStandardBlock(aWorld, aX, aY, aZ, aBlock, aRenderer, new ITexture[][]{ - ((IPipeRenderedTileEntity) tTileEntity).getTextureCovered(aBlock, (byte) 0), - ((IPipeRenderedTileEntity) tTileEntity).getTextureCovered(aBlock, (byte) 1), - ((IPipeRenderedTileEntity) tTileEntity).getTextureCovered(aBlock, (byte) 2), - ((IPipeRenderedTileEntity) tTileEntity).getTextureCovered(aBlock, (byte) 3), - ((IPipeRenderedTileEntity) tTileEntity).getTextureCovered(aBlock, (byte) 4), - ((IPipeRenderedTileEntity) tTileEntity).getTextureCovered(aBlock, (byte) 5)}); + ((IPipeRenderedTileEntity) tTileEntity).getTextureCovered((byte) 0), + ((IPipeRenderedTileEntity) tTileEntity).getTextureCovered((byte) 1), + ((IPipeRenderedTileEntity) tTileEntity).getTextureCovered((byte) 2), + ((IPipeRenderedTileEntity) tTileEntity).getTextureCovered((byte) 3), + ((IPipeRenderedTileEntity) tTileEntity).getTextureCovered((byte) 4), + ((IPipeRenderedTileEntity) tTileEntity).getTextureCovered((byte) 5)}); } if ((tTileEntity instanceof ITexturedTileEntity)) { return renderStandardBlock(aWorld, aX, aY, aZ, aBlock, aRenderer, new ITexture[][]{ -- cgit