From 97c099c2ae8e5ba00ded45751f1b643a67e00e81 Mon Sep 17 00:00:00 2001
From: thatsIch <thatsIch@mail.de>
Date: Wed, 11 Nov 2015 21:29:34 +0100
Subject: [PATCH] Fixes #1970: Lighting was not re-enabled when looking at an
 inscriber

---
 .../render/blocks/RenderBlockInscriber.java   | 24 +++++++++++++++----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/main/java/appeng/client/render/blocks/RenderBlockInscriber.java b/src/main/java/appeng/client/render/blocks/RenderBlockInscriber.java
index 8e991212..743c8519 100644
--- a/src/main/java/appeng/client/render/blocks/RenderBlockInscriber.java
+++ b/src/main/java/appeng/client/render/blocks/RenderBlockInscriber.java
@@ -56,6 +56,8 @@ import appeng.util.Platform;
  */
 public class RenderBlockInscriber extends BaseBlockRender<BlockInscriber, TileInscriber>
 {
+	private static final float ITEM_RENDER_SCALE = 1.0f / 1.1f;
+
 
 	public RenderBlockInscriber()
 	{
@@ -155,6 +157,8 @@ public class RenderBlockInscriber extends BaseBlockRender<BlockInscriber, TileIn
 		GL11.glColor4f( 1.0F, 1.0F, 1.0F, 1.0F );
 		GL11.glDisable( GL11.GL_LIGHTING );
 		GL11.glDisable( GL12.GL_RESCALE_NORMAL );
+
+		// render sides of stamps
 		GL11.glCullFace( GL11.GL_FRONT );
 
 		final Minecraft mc = Minecraft.getMinecraft();
@@ -255,9 +259,17 @@ public class RenderBlockInscriber extends BaseBlockRender<BlockInscriber, TileIn
 		}
 		else
 		{
+			GL11.glColor4f( 1.0F, 1.0F, 1.0F, 1.0F );
+
+			GL11.glDisable( GL11.GL_LIGHTING );
+			GL11.glDisable( GL12.GL_RESCALE_NORMAL );
+
 			this.renderItem( tile.getStackInSlot( 0 ), press, block, tile, tess, x, y, z, f, renderer );
 			this.renderItem( tile.getStackInSlot( 1 ), -press, block, tile, tess, x, y, z, f, renderer );
 			this.renderItem( tile.getStackInSlot( 2 ), 0.0f, block, tile, tess, x, y, z, f, renderer );
+
+			GL11.glEnable( GL11.GL_LIGHTING );
+			GL11.glEnable( GL12.GL_RESCALE_NORMAL );
 		}
 	}
 
@@ -267,18 +279,24 @@ public class RenderBlockInscriber extends BaseBlockRender<BlockInscriber, TileIn
 		{
 			sis = sis.copy();
 			GL11.glPushMatrix();
+			// fix to inscriber
 			this.applyTESRRotation( x, y, z, tile.getForward(), tile.getUp() );
 
 			try
 			{
+				// move to center
 				GL11.glTranslatef( 0.5f, 0.5f + o, 0.5f );
-				GL11.glScalef( 1.0f / 1.1f, 1.0f / 1.1f, 1.0f / 1.1f );
+
+				// set scale
+				GL11.glScalef( ITEM_RENDER_SCALE, ITEM_RENDER_SCALE, ITEM_RENDER_SCALE );
 				GL11.glScalef( 1.0f, 1.0f, 1.0f );
 
 				final Block blk = Block.getBlockFromItem( sis.getItem() );
 
+				// is a block
 				if( sis.getItemSpriteNumber() == 0 && block != null && RenderBlocks.renderItemIn3d( blk.getRenderType() ) )
 				{
+					// rotate block in angle to make it more plastic
 					GL11.glRotatef( 25.0f, 1.0f, 0.0f, 0.0f );
 					GL11.glRotatef( 15.0f, 0.0f, 1.0f, 0.0f );
 					GL11.glRotatef( 30.0f, 0.0f, 1.0f, 0.0f );
@@ -293,10 +311,6 @@ public class RenderBlockInscriber extends BaseBlockRender<BlockInscriber, TileIn
 
 				OpenGlHelper.setLightmapTextureCoords( OpenGlHelper.lightmapTexUnit, var11, var12 );
 
-				GL11.glColor4f( 1.0F, 1.0F, 1.0F, 1.0F );
-
-				GL11.glDisable( GL11.GL_LIGHTING );
-				GL11.glDisable( GL12.GL_RESCALE_NORMAL );
 				tess.setColorOpaque_F( 1.0f, 1.0f, 1.0f );
 
 				this.doRenderItem( sis, tile );