From 22c575f06a3f2c360d94781fdad542b8a0bdd6bb Mon Sep 17 00:00:00 2001 From: AlgorithmX2 Date: Wed, 12 Feb 2014 23:33:27 -0600 Subject: [PATCH] Facades now render the correct texture on each side. --- client/render/RenderBlocksWorkaround.java | 10 ++++++++++ facade/FacadePart.java | 15 +++++++++++++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/client/render/RenderBlocksWorkaround.java b/client/render/RenderBlocksWorkaround.java index 83a73d496..4c78755ec 100644 --- a/client/render/RenderBlocksWorkaround.java +++ b/client/render/RenderBlocksWorkaround.java @@ -108,6 +108,16 @@ public class RenderBlocksWorkaround extends RenderBlocks rXPos = rXNeg = rYPos = rYNeg = rZPos = rZNeg = ico; } + public void setTexture(IIcon rYNeg, IIcon rYPos, IIcon rZNeg, IIcon rZPos, IIcon rXNeg, IIcon rXPos) + { + this.rXPos = rXPos; + this.rXNeg = rXNeg; + this.rYPos = rYPos; + this.rYNeg = rYNeg; + this.rZPos = rZPos; + this.rZNeg = rZNeg; + } + public boolean renderStandardBlockNoCalculations(Block b, int x, int y, int z) { Tessellator.instance.setBrightness( bXPos ); diff --git a/facade/FacadePart.java b/facade/FacadePart.java index 9509c4c62..81d7d02da 100644 --- a/facade/FacadePart.java +++ b/facade/FacadePart.java @@ -153,11 +153,22 @@ public class FacadePart implements IFacadePart rbw.calculations = false; rbw.faces = EnumSet.allOf( ForgeDirection.class ); - ((RenderBlocksWorkaround) renderer).setTexture( blk.getIcon( side.ordinal(), ib.getMetadata( randomItem.getItemDamage() ) ) ); + ((RenderBlocksWorkaround) renderer).setTexture( + blk.getIcon( ForgeDirection.DOWN.ordinal(), ib.getMetadata( randomItem.getItemDamage() ) ), + blk.getIcon( ForgeDirection.UP.ordinal(), ib.getMetadata( randomItem.getItemDamage() ) ), + blk.getIcon( ForgeDirection.NORTH.ordinal(), ib.getMetadata( randomItem.getItemDamage() ) ), + blk.getIcon( ForgeDirection.SOUTH.ordinal(), ib.getMetadata( randomItem.getItemDamage() ) ), + blk.getIcon( ForgeDirection.WEST.ordinal(), ib.getMetadata( randomItem.getItemDamage() ) ), + blk.getIcon( ForgeDirection.EAST.ordinal(), ib.getMetadata( randomItem.getItemDamage() ) ) ); } else { - instance.setTexture( blk.getIcon( side.ordinal(), ib.getMetadata( randomItem.getItemDamage() ) ) ); + instance.setTexture( blk.getIcon( ForgeDirection.DOWN.ordinal(), ib.getMetadata( randomItem.getItemDamage() ) ), + blk.getIcon( ForgeDirection.UP.ordinal(), ib.getMetadata( randomItem.getItemDamage() ) ), + blk.getIcon( ForgeDirection.NORTH.ordinal(), ib.getMetadata( randomItem.getItemDamage() ) ), + blk.getIcon( ForgeDirection.SOUTH.ordinal(), ib.getMetadata( randomItem.getItemDamage() ) ), + blk.getIcon( ForgeDirection.WEST.ordinal(), ib.getMetadata( randomItem.getItemDamage() ) ), + blk.getIcon( ForgeDirection.EAST.ordinal(), ib.getMetadata( randomItem.getItemDamage() ) ) ); } if ( busBounds == null )