From 7b94796fa0451a923381fa3858eb87bdfdbf72dc Mon Sep 17 00:00:00 2001
From: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
Date: Wed, 13 May 2020 22:38:39 +0200
Subject: FluidRenderer Fixes + Made GT_FluidDisplayItem.getIconFromDamage
 NEVER return null + Made GT_FluidDisplayStackRenderer reset its OpenGL calls
 before returning

Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
---
 .../gregtech/common/render/GT_FluidDisplayStackRenderer.java     | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'src/main/java/gregtech/common/render/GT_FluidDisplayStackRenderer.java')

diff --git a/src/main/java/gregtech/common/render/GT_FluidDisplayStackRenderer.java b/src/main/java/gregtech/common/render/GT_FluidDisplayStackRenderer.java
index 06c186d127..ef5d8287ba 100644
--- a/src/main/java/gregtech/common/render/GT_FluidDisplayStackRenderer.java
+++ b/src/main/java/gregtech/common/render/GT_FluidDisplayStackRenderer.java
@@ -29,7 +29,7 @@ public class GT_FluidDisplayStackRenderer implements IItemRenderer {
     }
 
     @Override
-    public boolean shouldUseRenderHelper (ItemRenderType type, ItemStack item, ItemRendererHelper helper)
+    public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper)
     {
         //not sure what this does.
         return false;
@@ -59,8 +59,11 @@ public class GT_FluidDisplayStackRenderer implements IItemRenderer {
         tess.addVertexWithUV( 0,  0, 0, x_min, y_min);
         tess.draw();
 
-        if(item.getTagCompound() == null)
+        if(item.getTagCompound() == null) {
+            GL11.glDisable(GL11.GL_BLEND);
+            GL11.glDisable(GL11.GL_ALPHA_TEST);
             return;
+        }
 
         // Render Fluid amount text
         long fluidAmount = item.getTagCompound().getLong("mFluidDisplayAmount");
@@ -87,6 +90,8 @@ public class GT_FluidDisplayStackRenderer implements IItemRenderer {
             GL11.glScalef(smallTextScale, smallTextScale, 1.0f);
 
             fontRender.drawString( amountString, 0, (int) (16/smallTextScale) - fontRender.FONT_HEIGHT + 1, 0xFFFFFF, true);
+            GL11.glScalef(1f, 1f, 1f);
+            GL11.glDisable(GL11.GL_ALPHA_TEST);
         }
     }
 }
-- 
cgit