From 52b0cabc0b170c2af21115ad8fc192edbb5a2124 Mon Sep 17 00:00:00 2001 From: Glease <4586901+Glease@users.noreply.github.com> Date: Thu, 18 Aug 2022 16:38:02 +0800 Subject: [PATCH] collapse continuous glPushAttrib into one call (#82) --- .../enderio/conduit/render/ConduitBundleRenderer.java | 4 +--- .../java/crazypants/enderio/machine/capbank/GuiCapBank.java | 4 +--- .../crazypants/enderio/machine/hypercube/GuiHyperCube.java | 4 +--- .../crazypants/enderio/machine/power/GuiCapacitorBank.java | 4 +--- .../enderio/teleport/anchor/TravelEntitySpecialRenderer.java | 4 +--- 5 files changed, 5 insertions(+), 15 deletions(-) diff --git a/src/main/java/crazypants/enderio/conduit/render/ConduitBundleRenderer.java b/src/main/java/crazypants/enderio/conduit/render/ConduitBundleRenderer.java index 58785d82..e22d38d0 100644 --- a/src/main/java/crazypants/enderio/conduit/render/ConduitBundleRenderer.java +++ b/src/main/java/crazypants/enderio/conduit/render/ConduitBundleRenderer.java @@ -71,8 +71,7 @@ public class ConduitBundleRenderer extends TileEntitySpecialRenderer implements RenderUtil.bindBlockTexture(); - GL11.glPushAttrib(GL11.GL_ENABLE_BIT); - GL11.glPushAttrib(GL11.GL_LIGHTING_BIT); + GL11.glPushAttrib(GL11.GL_ENABLE_BIT | GL11.GL_LIGHTING_BIT); GL11.glEnable(GL12.GL_RESCALE_NORMAL); GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); @@ -94,7 +93,6 @@ public class ConduitBundleRenderer extends TileEntitySpecialRenderer implements GL11.glShadeModel(GL11.GL_FLAT); GL11.glPopMatrix(); GL11.glPopAttrib(); - GL11.glPopAttrib(); } } diff --git a/src/main/java/crazypants/enderio/machine/capbank/GuiCapBank.java b/src/main/java/crazypants/enderio/machine/capbank/GuiCapBank.java index 5e7be9cf..2ad56282 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/GuiCapBank.java +++ b/src/main/java/crazypants/enderio/machine/capbank/GuiCapBank.java @@ -282,11 +282,9 @@ public class GuiCapBank extends GuiContainerBaseEIO { @SuppressWarnings("rawtypes") @Override public void drawHoveringText(List par1List, int par2, int par3, FontRenderer font) { - GL11.glPushAttrib(GL11.GL_ENABLE_BIT); - GL11.glPushAttrib(GL11.GL_LIGHTING_BIT); + GL11.glPushAttrib(GL11.GL_ENABLE_BIT | GL11.GL_LIGHTING_BIT); super.drawHoveringText(par1List, par2 + 24, par3, font); GL11.glPopAttrib(); - GL11.glPopAttrib(); } @Override diff --git a/src/main/java/crazypants/enderio/machine/hypercube/GuiHyperCube.java b/src/main/java/crazypants/enderio/machine/hypercube/GuiHyperCube.java index 8214ce67..52266c38 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/GuiHyperCube.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/GuiHyperCube.java @@ -405,11 +405,9 @@ public class GuiHyperCube extends GuiContainerBaseEIO { @Override public void drawHoveringText(List par1List, int par2, int par3, FontRenderer font) { - GL11.glPushAttrib(GL11.GL_ENABLE_BIT); - GL11.glPushAttrib(GL11.GL_LIGHTING_BIT); + GL11.glPushAttrib(GL11.GL_ENABLE_BIT | GL11.GL_LIGHTING_BIT); super.drawHoveringText(par1List, par2, par3, font); GL11.glPopAttrib(); - GL11.glPopAttrib(); } @Override diff --git a/src/main/java/crazypants/enderio/machine/power/GuiCapacitorBank.java b/src/main/java/crazypants/enderio/machine/power/GuiCapacitorBank.java index 9e47a31f..cc9cdbd7 100644 --- a/src/main/java/crazypants/enderio/machine/power/GuiCapacitorBank.java +++ b/src/main/java/crazypants/enderio/machine/power/GuiCapacitorBank.java @@ -295,11 +295,9 @@ public class GuiCapacitorBank extends GuiContainerBaseEIO { @Override public void drawHoveringText(List par1List, int par2, int par3, FontRenderer font) { - GL11.glPushAttrib(GL11.GL_ENABLE_BIT); - GL11.glPushAttrib(GL11.GL_LIGHTING_BIT); + GL11.glPushAttrib(GL11.GL_ENABLE_BIT | GL11.GL_LIGHTING_BIT); super.drawHoveringText(par1List, par2 + 24, par3, font); GL11.glPopAttrib(); - GL11.glPopAttrib(); } @Override diff --git a/src/main/java/crazypants/enderio/teleport/anchor/TravelEntitySpecialRenderer.java b/src/main/java/crazypants/enderio/teleport/anchor/TravelEntitySpecialRenderer.java index 666ee471..b97963eb 100644 --- a/src/main/java/crazypants/enderio/teleport/anchor/TravelEntitySpecialRenderer.java +++ b/src/main/java/crazypants/enderio/teleport/anchor/TravelEntitySpecialRenderer.java @@ -80,8 +80,7 @@ public class TravelEntitySpecialRenderer extends TileEntitySpecialRenderer { Minecraft.getMinecraft().entityRenderer.disableLightmap(0); RenderUtil.bindBlockTexture(); - GL11.glPushAttrib(GL11.GL_ENABLE_BIT); - GL11.glPushAttrib(GL11.GL_LIGHTING_BIT); + GL11.glPushAttrib(GL11.GL_ENABLE_BIT | GL11.GL_LIGHTING_BIT); GL11.glEnable(GL12.GL_RESCALE_NORMAL); @@ -115,7 +114,6 @@ public class TravelEntitySpecialRenderer extends TileEntitySpecialRenderer { renderLabel(tileentity, x, y, z, ta, sf); - GL11.glPopAttrib(); GL11.glPopAttrib(); Minecraft.getMinecraft().entityRenderer.enableLightmap(0);