From 7eca6c1a107aed92227a34c0669f712a80aa69c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20N=C3=BCcke?= <florian@nuecke.de>
Date: Thu, 26 May 2016 19:57:30 +0200
Subject: [PATCH] Fix lighting issues with print preview in 3d printer.

---
 .../client/renderer/tileentity/PrinterRenderer.scala  | 11 ++++++-----
 src/main/scala/li/cil/oc/common/block/Printer.scala   |  1 -
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/scala/li/cil/oc/client/renderer/tileentity/PrinterRenderer.scala b/src/main/scala/li/cil/oc/client/renderer/tileentity/PrinterRenderer.scala
index 406e832b9..66c1c2c22 100644
--- a/src/main/scala/li/cil/oc/client/renderer/tileentity/PrinterRenderer.scala
+++ b/src/main/scala/li/cil/oc/client/renderer/tileentity/PrinterRenderer.scala
@@ -6,9 +6,9 @@ import li.cil.oc.util.RenderState
 import net.minecraft.client.Minecraft
 import net.minecraft.client.renderer.GlStateManager
 import net.minecraft.client.renderer.OpenGlHelper
+import net.minecraft.client.renderer.RenderHelper
 import net.minecraft.client.renderer.block.model.ItemCameraTransforms
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer
-import net.minecraft.entity.item.EntityItem
 
 object PrinterRenderer extends TileEntitySpecialRenderer[Printer] {
   override def renderTileEntityAt(printer: Printer, x: Double, y: Double, z: Double, f: Float, damage: Int) {
@@ -25,14 +25,15 @@ object PrinterRenderer extends TileEntitySpecialRenderer[Printer] {
       GlStateManager.rotate((System.currentTimeMillis() % 20000) / 20000f * 360, 0, 1, 0)
       GlStateManager.scale(0.75, 0.75, 0.75)
 
+      RenderHelper.enableStandardItemLighting()
+
       val brightness = printer.world.getCombinedLight(printer.getPos, 0)
       OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, brightness % 65536, brightness / 65536)
 
-      // This is very 'meh', but item frames do it like this, too!
-      val entity = new EntityItem(printer.world, 0, 0, 0, stack)
-      entity.hoverStart = 0
       Textures.Block.bind()
-      Minecraft.getMinecraft.getRenderItem.renderItem(entity.getEntityItem, ItemCameraTransforms.TransformType.FIXED)
+      Minecraft.getMinecraft.getRenderItem.renderItem(stack, ItemCameraTransforms.TransformType.FIXED)
+
+      RenderHelper.disableStandardItemLighting()
 
       GlStateManager.popMatrix()
       RenderState.popAttrib()
diff --git a/src/main/scala/li/cil/oc/common/block/Printer.scala b/src/main/scala/li/cil/oc/common/block/Printer.scala
index 0dc6d0218..cfd44775a 100644
--- a/src/main/scala/li/cil/oc/common/block/Printer.scala
+++ b/src/main/scala/li/cil/oc/common/block/Printer.scala
@@ -2,7 +2,6 @@ package li.cil.oc.common.block
 
 import li.cil.oc.common.GuiType
 import li.cil.oc.common.tileentity
-import net.minecraft.block.state.IBlockState
 import net.minecraft.util.BlockPos
 import net.minecraft.util.EnumFacing
 import net.minecraft.world.IBlockAccess