aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/render
diff options
context:
space:
mode:
authorbartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>2020-05-13 22:38:39 +0200
committerbartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>2020-05-13 22:38:39 +0200
commit7b94796fa0451a923381fa3858eb87bdfdbf72dc (patch)
tree239ee0ba5bc663d5779d0fa8fa87a1b80d48786b /src/main/java/gregtech/common/render
parent9eca09b4ad46b519e337838a4a6a7c0a378fb56d (diff)
downloadGT5-Unofficial-7b94796fa0451a923381fa3858eb87bdfdbf72dc.tar.gz
GT5-Unofficial-7b94796fa0451a923381fa3858eb87bdfdbf72dc.tar.bz2
GT5-Unofficial-7b94796fa0451a923381fa3858eb87bdfdbf72dc.zip
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>
Diffstat (limited to 'src/main/java/gregtech/common/render')
-rw-r--r--src/main/java/gregtech/common/render/GT_FluidDisplayStackRenderer.java9
1 files changed, 7 insertions, 2 deletions
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);
}
}
}