diff --git a/src/main/java/appeng/client/render/BaseBlockRender.java b/src/main/java/appeng/client/render/BaseBlockRender.java index b60b90cf7..1af5a882f 100644 --- a/src/main/java/appeng/client/render/BaseBlockRender.java +++ b/src/main/java/appeng/client/render/BaseBlockRender.java @@ -754,7 +754,6 @@ public class BaseBlockRender GL11.glTranslated( x + 0.5, y + 0.5, z + 0.5 ); GL11.glMultMatrix( this.rotMat ); GL11.glTranslated( -0.5, -0.5, -0.5 ); - GL11.glCullFace( GL11.GL_FRONT ); } else { diff --git a/src/main/java/appeng/client/render/TESRWrapper.java b/src/main/java/appeng/client/render/TESRWrapper.java index d0ff700c2..9c0280b91 100644 --- a/src/main/java/appeng/client/render/TESRWrapper.java +++ b/src/main/java/appeng/client/render/TESRWrapper.java @@ -41,7 +41,7 @@ public class TESRWrapper extends TileEntitySpecialRenderer public final RenderBlocks renderBlocksInstance = new RenderBlocks(); - final BaseBlockRender blkRender; + private final BaseBlockRender blkRender; private final double maxDistance; public TESRWrapper( BaseBlockRender render ) @@ -69,12 +69,10 @@ public class TESRWrapper extends TileEntitySpecialRenderer try { GL11.glPushMatrix(); - GL11.glPushAttrib( GL11.GL_ALL_ATTRIB_BITS ); this.renderBlocksInstance.blockAccess = te.getWorldObj(); this.blkRender.renderTile( (AEBaseBlock) b, (AEBaseTile) te, tess, x, y, z, f, this.renderBlocksInstance ); - GL11.glPopAttrib(); GL11.glPopMatrix(); } catch( Throwable t ) diff --git a/src/main/java/appeng/client/render/blocks/RenderBlockCharger.java b/src/main/java/appeng/client/render/blocks/RenderBlockCharger.java index 94740c810..31cdcce04 100644 --- a/src/main/java/appeng/client/render/blocks/RenderBlockCharger.java +++ b/src/main/java/appeng/client/render/blocks/RenderBlockCharger.java @@ -54,7 +54,7 @@ public class RenderBlockCharger extends BaseBlockRender { - final ModelChest model = new ModelChest(); + private final static ResourceLocation SKY_STONE_CHEST = new ResourceLocation( "appliedenergistics2", "textures/models/skychest.png" ); + private final static ResourceLocation SKY_BLOCK_CHEST = new ResourceLocation( "appliedenergistics2", "textures/models/skyblockchest.png" ); + private final static ResourceLocation METADATA_TO_TEXTURE[] = new ResourceLocation[] { SKY_STONE_CHEST, SKY_BLOCK_CHEST }; + + private final ModelChest model = new ModelChest(); public RenderBlockSkyChest() { @@ -48,22 +53,15 @@ public class RenderBlockSkyChest extends BaseBlockRender 0 ) { @@ -146,9 +136,13 @@ public class RenderBlockSkyChest extends BaseBlockRender