From c39d5ca20352f16b2174496551f9020af66acb38 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Sat, 10 Jan 2015 05:26:35 -0500 Subject: [PATCH] Reverse render order of glow block textures --- .../chisel/client/render/BlockGlowRenderer.java | 7 ++++--- .../com/cricketcraft/chisel/compat/VariationCompat.java | 4 +--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/cricketcraft/chisel/client/render/BlockGlowRenderer.java b/src/main/java/com/cricketcraft/chisel/client/render/BlockGlowRenderer.java index 432dcd97..84127aee 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/BlockGlowRenderer.java +++ b/src/main/java/com/cricketcraft/chisel/client/render/BlockGlowRenderer.java @@ -25,20 +25,21 @@ public class BlockGlowRenderer implements ISimpleBlockRenderingHandler { @Override public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) { GL11.glTranslatef(-0.5F, -0.5F, -0.5F); - Drawing.drawBlock(block, metadata, renderer); GeneralClient.setGLColorFromInt(ItemDye.field_150922_c[metadata]); GL11.glDisable(GL11.GL_LIGHTING); Drawing.drawBlock(block, ((BlockCarvableGlow)block).getGlowTexture(), renderer); - GL11.glTranslatef(0.5F, 0.5F, 0.5F); GL11.glEnable(GL11.GL_LIGHTING); + GL11.glColor3f(1, 1, 1); + Drawing.drawBlock(block, metadata, renderer); + GL11.glTranslatef(0.5F, 0.5F, 0.5F); } @Override public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { - renderer.renderStandardBlock(block, x, y, z); Tessellator.instance.setColorOpaque_I(ItemDye.field_150922_c[world.getBlockMetadata(x, y, z)]); Tessellator.instance.setBrightness(0xF000F0); Drawing.renderAllFaces(renderer, block, x, y, z, ((BlockCarvableGlow) block).getGlowTexture()); + renderer.renderStandardBlock(block, x, y, z); return true; } diff --git a/src/main/java/com/cricketcraft/chisel/compat/VariationCompat.java b/src/main/java/com/cricketcraft/chisel/compat/VariationCompat.java index 47b057cd..15c82c3a 100644 --- a/src/main/java/com/cricketcraft/chisel/compat/VariationCompat.java +++ b/src/main/java/com/cricketcraft/chisel/compat/VariationCompat.java @@ -35,9 +35,7 @@ public class VariationCompat { for (int i = 0; i < 16; i++) { blocks.add(Triple.of(block, i, "limestone")); } - - // TODO geostrata - + registerAll(blocks); }