Use helper wrapper methods for most usages of translate

mekanism · Jul 8, 2019 · 7236647 · 7236647
1 parent b629954
commit 7236647
Show file tree

Hide file tree

Showing 71 changed files with 241 additions and 240 deletions.
diff --git a/src/main/java/mekanism/client/entity/ParticleLaser.java b/src/main/java/mekanism/client/entity/ParticleLaser.java
@@ -46,7 +46,7 @@ public void renderParticle(BufferBuilder buffer, Entity entityIn, float partialT
         float newY = (float) (prevPosY + (posY - prevPosY) * (double) partialTicks - interpPosY);
         float newZ = (float) (prevPosZ + (posZ - prevPosZ) * (double) partialTicks - interpPosZ);
 
-        GlStateManager.translate(newX, newY, newZ);
+        renderHelper.translate(newX, newY, newZ);
 
         switch (direction) {
             case UP:

diff --git a/src/main/java/mekanism/client/gui/GuiSeismicReader.java b/src/main/java/mekanism/client/gui/GuiSeismicReader.java
@@ -73,10 +73,10 @@ public void drawScreen(int mouseX, int mouseY, float partialTick) {
 
         // Fix the overlapping if > 100
         renderHelper.addMatrix(); //We need a matrix for this
-        GlStateManager.translate(guiWidth + 48, guiHeight + 87, 0);
+        renderHelper.translateXY(guiWidth + 48, guiHeight + 87);
 
         if (currentLayer >= 100) {
-            GlStateManager.translate(0, 1, 0);
+            renderHelper.translateY(1);
             renderHelper.scale(0.7F);
         }
 
@@ -91,16 +91,14 @@ public void drawScreen(int mouseX, int mouseY, float partialTick) {
             if (0 <= layer && layer < blockList.size()) {
                 ItemStack stack = new ItemStack(blockList.get(layer).getRight(), 1, blockList.get(layer).getLeft());
 
-                MekanismRenderHelper stackRenderHelper = new MekanismRenderHelper(true);
-                GlStateManager.translate(centralX - 2, centralY - i * 16 + (22 * 2), 0);
+                MekanismRenderHelper stackRenderHelper = new MekanismRenderHelper(true).translateXY(centralX - 2, centralY - i * 16 + (22 * 2));
 
                 if (i < 4) {
-                    GlStateManager.translate(0.2f, 2.5f, 0);
+                    stackRenderHelper.translateXY(0.2F, 2.5F);
                 }
 
                 if (i != 4) {
-                    GlStateManager.translate(1.5f, 0, 0);
-                    stackRenderHelper.scale(0.8F);
+                    stackRenderHelper.translateX(1.5F).scale(0.8F);
                 }
 
                 stackRenderHelper.enableGUIStandardItemLighting();
@@ -118,9 +116,7 @@ public void drawScreen(int mouseX, int mouseY, float partialTick) {
             int lengthX = fontRenderer.getStringWidth(capitalised);
             float renderScale = lengthX > 53 ? 53f / lengthX : 1.0f;
 
-            MekanismRenderHelper nameRenderHelper = new MekanismRenderHelper(true);
-            GlStateManager.translate(guiWidth + 72, guiHeight + 16, 0);
-            nameRenderHelper.scale(renderScale);
+            MekanismRenderHelper nameRenderHelper = new MekanismRenderHelper(true).translateXY(guiWidth + 72, guiHeight + 16).scale(renderScale);
             fontRenderer.drawString(capitalised, 0, 0, 0x919191);
             nameRenderHelper.cleanup();
 
@@ -149,8 +145,7 @@ public void drawScreen(int mouseX, int mouseY, float partialTick) {
         }
 
         MekanismRenderHelper abundancy = new MekanismRenderHelper(true);
-        GlStateManager.translate(guiWidth + 72, guiHeight + 26, 0);
-        abundancy.scale(0.70F);
+        abundancy.translateXY(guiWidth + 72, guiHeight + 26).scale(0.70F);
         fontRenderer.drawString(LangUtils.localize("gui.abundancy") + ": " + frequency, 0, 0, 0x919191);
         abundancy.cleanup();
         super.drawScreen(mouseX, mouseY, partialTick);

diff --git a/src/main/java/mekanism/client/jei/gas/GasStackRenderer.java b/src/main/java/mekanism/client/jei/gas/GasStackRenderer.java
@@ -12,7 +12,6 @@
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.renderer.BufferBuilder;
-import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.client.renderer.texture.TextureMap;
@@ -88,10 +87,9 @@ public void render(Minecraft minecraft, final int xPosition, final int yPosition
         MekanismRenderHelper renderHelper = new MekanismRenderHelper().enableBlend().enableAlpha();
         drawGas(minecraft, xPosition, yPosition, gasStack);
         if (overlay != null) {
-            GlStateManager.pushMatrix();
-            GlStateManager.translate(0, 0, 200);
+            MekanismRenderHelper overlayRenderHelper = new MekanismRenderHelper(true).translateZ(200);
             overlay.draw(minecraft, xPosition, yPosition);
-            GlStateManager.popMatrix();
+            overlayRenderHelper.cleanup();
         }
         renderHelper.cleanup();
     }

diff --git a/src/main/java/mekanism/client/model/ModelBalloon.java b/src/main/java/mekanism/client/model/ModelBalloon.java
@@ -4,7 +4,6 @@
 import mekanism.client.render.MekanismRenderHelper;
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelRenderer;
-import net.minecraft.client.renderer.GlStateManager;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
@@ -54,8 +53,7 @@ public ModelBalloon() {
     }
 
     public void render(float size, EnumColor color) {
-        MekanismRenderHelper renderHelper = new MekanismRenderHelper(true).color(color).scale(1.5F);
-        GlStateManager.translate(0, -0.07F, 0);
+        MekanismRenderHelper renderHelper = new MekanismRenderHelper(true).color(color).scale(1.5F).translateY(-0.07F);
 
         Balloon2.render(size);
         Balloon1.render(size);

diff --git a/src/main/java/mekanism/client/model/ModelDigitalMiner.java b/src/main/java/mekanism/client/model/ModelDigitalMiner.java
@@ -5,7 +5,6 @@
 import mekanism.common.util.MekanismUtils.ResourceType;
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelRenderer;
-import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.texture.TextureManager;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.fml.relauncher.Side;
@@ -429,9 +428,7 @@ public void render(float size, boolean on, TextureManager manager, boolean rende
         }
 
         manager.bindTexture(on ? OVERLAY_ON : OVERLAY_OFF);
-        renderHelper.scale(1.001F);
-        GlStateManager.translate(-0.0011F, -0.0011F, -0.0011F);
-        renderHelper.enableGlow();
+        renderHelper.scale(1.001F).translateAll(-0.0011F).enableGlow();
 
         doRender(size);
 

diff --git a/src/main/java/mekanism/client/model/ModelEnergyCube.java b/src/main/java/mekanism/client/model/ModelEnergyCube.java
@@ -8,7 +8,6 @@
 import mekanism.common.util.MekanismUtils.ResourceType;
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelRenderer;
-import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.texture.TextureManager;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.ResourceLocation;
@@ -374,8 +373,7 @@ public void render(float size, EnergyCubeTier tier, TextureManager manager, bool
             corner1.render(size);
         }
 
-        MekanismRenderHelper renderHelper = new MekanismRenderHelper(true).scale(1.001F);
-        GlStateManager.translate(0, -0.0061F, 0);
+        MekanismRenderHelper renderHelper = new MekanismRenderHelper(true).scale(1.001F).translateY(-0.0061F);
         manager.bindTexture(RenderEnergyCube.resources.get(tier));
         renderHelper.enableGlow();
 

diff --git a/src/main/java/mekanism/client/model/ModelQuantumEntangloporter.java b/src/main/java/mekanism/client/model/ModelQuantumEntangloporter.java
@@ -1,12 +1,10 @@
 package mekanism.client.model;
 
 import mekanism.client.render.MekanismRenderHelper;
-import mekanism.client.render.MekanismRenderer;
 import mekanism.common.util.MekanismUtils;
 import mekanism.common.util.MekanismUtils.ResourceType;
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelRenderer;
-import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.texture.TextureManager;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.fml.relauncher.Side;
@@ -320,9 +318,7 @@ public void render(float size, TextureManager manager, boolean renderMain) {
         }
 
         manager.bindTexture(OVERLAY);
-        renderHelper.scale(1.001F);
-        GlStateManager.translate(0, -0.0011F, 0);
-        renderHelper.enableGlow();
+        renderHelper.scale(1.001F).translateY(-0.0011F).enableGlow();
 
         doRender(size);
 

diff --git a/src/main/java/mekanism/client/model/ModelResistiveHeater.java b/src/main/java/mekanism/client/model/ModelResistiveHeater.java
@@ -1,12 +1,10 @@
 package mekanism.client.model;
 
 import mekanism.client.render.MekanismRenderHelper;
-import mekanism.client.render.MekanismRenderer;
 import mekanism.common.util.MekanismUtils;
 import mekanism.common.util.MekanismUtils.ResourceType;
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelRenderer;
-import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.texture.TextureManager;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.fml.relauncher.Side;
@@ -173,9 +171,7 @@ public void render(float size, boolean on, TextureManager manager, boolean rende
         }
 
         manager.bindTexture(on ? OVERLAY_ON : OVERLAY_OFF);
-        renderHelper.scale(1.001F);
-        GlStateManager.translate(0, -0.0011F, 0);
-        renderHelper.enableGlow();
+        renderHelper.scale(1.001F).translateY(-0.0011F).enableGlow();
 
         doRender(size);
 

diff --git a/src/main/java/mekanism/client/model/ModelSecurityDesk.java b/src/main/java/mekanism/client/model/ModelSecurityDesk.java
@@ -1,12 +1,10 @@
 package mekanism.client.model;
 
 import mekanism.client.render.MekanismRenderHelper;
-import mekanism.client.render.MekanismRenderer;
 import mekanism.common.util.MekanismUtils;
 import mekanism.common.util.MekanismUtils.ResourceType;
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelRenderer;
-import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.texture.TextureManager;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.fml.relauncher.Side;
@@ -100,9 +98,7 @@ public void render(float size, TextureManager manager) {
         doRender(size);
 
         manager.bindTexture(OVERLAY);
-        renderHelper.scale(1.001F);
-        GlStateManager.translate(0, -0.0011F, 0);
-        renderHelper.enableGlow();
+        renderHelper.scale(1.001F).translateY(-0.0011F).enableGlow();
 
         doRender(size);
 

diff --git a/src/main/java/mekanism/client/render/MekanismRenderHelper.java b/src/main/java/mekanism/client/render/MekanismRenderHelper.java
@@ -146,6 +146,73 @@ public MekanismRenderHelper scale(double scale) {
         return scale(scale, scale, scale);
     }
 
+    public MekanismRenderHelper translate(float x, float y, float z) {
+        GlStateManager.translate(x, y, z);
+        return this;
+    }
+
+    public MekanismRenderHelper translate(double x, double y, double z) {
+        GlStateManager.translate(x, y, z);
+        return this;
+    }
+
+    public MekanismRenderHelper translateXY(float x, float y) {
+        return translate(x, y, 0);
+    }
+
+    public MekanismRenderHelper translateXY(double x, double y) {
+        return translate(x, y, 0);
+    }
+
+    public MekanismRenderHelper translateXZ(float x, float z) {
+        return translate(x, 0, z);
+    }
+
+    public MekanismRenderHelper translateXZ(double x, double z) {
+        GlStateManager.translate(x, 0, z);
+        return this;
+    }
+
+    public MekanismRenderHelper translateYZ(float y, float z) {
+        return translate(0, y, z);
+    }
+
+    public MekanismRenderHelper translateYZ(double y, double z) {
+        return translate(0, y, z);
+    }
+
+    public MekanismRenderHelper translateAll(float t) {
+        return translate(t, t, t);
+    }
+
+    public MekanismRenderHelper translateAll(double t) {
+        return translate(t, t, t);
+    }
+
+    public MekanismRenderHelper translateX(float x) {
+        return translate(x, 0, 0);
+    }
+
+    public MekanismRenderHelper translateX(double x) {
+        return translate(x, 0, 0);
+    }
+
+    public MekanismRenderHelper translateY(float y) {
+        return translate(0, y, 0);
+    }
+
+    public MekanismRenderHelper translateY(double y) {
+        return translate(0, y, 0);
+    }
+
+    public MekanismRenderHelper translateZ(float z) {
+        return translate(0, 0, z);
+    }
+
+    public MekanismRenderHelper translateZ(double z) {
+        return translate(0, 0, z);
+    }
+
     //Color
     public MekanismRenderHelper colorMask(boolean red, boolean green, boolean blue, boolean alpha) {
         //TODO: If all true then don't set colorMasked

diff --git a/src/main/java/mekanism/client/render/MekanismRenderer.java b/src/main/java/mekanism/client/render/MekanismRenderer.java
@@ -206,10 +206,9 @@ public static void renderObject(Model3D object) {
             return;
         }
 
-        GlStateManager.pushMatrix();
-        GlStateManager.translate(object.minX, object.minY, object.minZ);
+        MekanismRenderHelper renderHelper = new MekanismRenderHelper(true).translate(object.minX, object.minY, object.minZ);
         RenderResizableCuboid.INSTANCE.renderCube(object);
-        GlStateManager.popMatrix();
+        renderHelper.cleanup();
     }
 
     public static void bindTexture(ResourceLocation texture) {

diff --git a/src/main/java/mekanism/client/render/MinerVisualRenderer.java b/src/main/java/mekanism/client/render/MinerVisualRenderer.java
@@ -10,7 +10,6 @@
 import mekanism.client.render.MekanismRenderer.Model3D;
 import mekanism.common.tile.TileEntityDigitalMiner;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
 import net.minecraft.init.Blocks;
 
@@ -21,9 +20,8 @@ public final class MinerVisualRenderer {
     private static Map<MinerRenderData, DisplayInteger> cachedVisuals = new HashMap<>();
 
     public static void render(TileEntityDigitalMiner miner) {
-        MekanismRenderHelper renderHelper = new MekanismRenderHelper(true);
-        GlStateManager.translate(getX(miner.getPos().getX()), getY(miner.getPos().getY()), getZ(miner.getPos().getZ()));
-        renderHelper.enableBlendPreset().enableGlow().enableCull().colorAlpha(0.8F);
+        MekanismRenderHelper renderHelper = new MekanismRenderHelper(true)
+              .translate(getX(miner.getPos().getX()), getY(miner.getPos().getY()), getZ(miner.getPos().getZ())).enableBlendPreset().enableGlow().enableCull().colorAlpha(0.8F);
         mc.getTextureManager().bindTexture(MekanismRenderer.getBlocksTexture());
         getList(new MinerRenderData(miner)).render();
         renderHelper.cleanup();

diff --git a/src/main/java/mekanism/client/render/ModelCustomArmor.java b/src/main/java/mekanism/client/render/ModelCustomArmor.java
@@ -11,7 +11,6 @@
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.model.ModelBiped;
 import net.minecraft.client.model.ModelRenderer;
-import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.inventory.EntityEquipmentSlot;
@@ -183,8 +182,7 @@ public ModelCustom(ModelCustomArmor base, ModelRenderer renderer) {
         @Override
         public void render(float size) {
             if (ModelCustomArmor.this.modelType != null) {
-                MekanismRenderHelper renderHelper = new MekanismRenderHelper(true);
-                GlStateManager.translate(0, 0, 0.06F);
+                MekanismRenderHelper renderHelper = new MekanismRenderHelper(true).translateZ(0.06F);
                 mc.renderEngine.bindTexture(modelType.resource);
                 if (useModel(biped.modelType, partRender, biped)) {
                     if (biped.modelType == ArmorModel.JETPACK) {
@@ -194,15 +192,15 @@ public void render(float size) {
                     } else if (biped.modelType == ArmorModel.SCUBATANK) {
                         ArmorModel.scubaTankModel.render(0.0625F);
                     } else if (biped.modelType == ArmorModel.GASMASK) {
-                        GlStateManager.translate(0, 0, -0.05F);
+                        renderHelper.translateZ(-0.05F);
                         ArmorModel.gasMaskModel.render(0.0625F);
                     } else if (biped.modelType == ArmorModel.FREERUNNERS) {
                         renderHelper.scale(1.02F);
                         if (partRender == biped.bipedLeftLeg) {
-                            GlStateManager.translate(-0.1375F, -0.75F, -0.0625F);
+                            renderHelper.translate(-0.1375F, -0.75F, -0.0625F);
                             ArmorModel.freeRunnersModel.renderLeft(0.0625F);
                         } else if (partRender == biped.bipedRightLeg) {
-                            GlStateManager.translate(0.1375F, -0.75F, -0.0625F);
+                            renderHelper.translate(0.1375F, -0.75F, -0.0625F);
                             ArmorModel.freeRunnersModel.renderRight(0.0625F);
                         }
                     }

diff --git a/src/main/java/mekanism/client/render/RenderResizableCuboid.java b/src/main/java/mekanism/client/render/RenderResizableCuboid.java
@@ -129,10 +129,9 @@ public static double getValue(Vec3d vector, Axis axis) {
      * This will render a cuboid from its middle.
      */
     public void renderCubeFromCentre(Model3D cuboid) {
-        GlStateManager.pushMatrix();
-        GlStateManager.translate(-cuboid.sizeX() / 2d, -cuboid.sizeY() / 2d, -cuboid.sizeZ() / 2d);
+        MekanismRenderHelper renderHelper = new MekanismRenderHelper(true).translate(-cuboid.sizeX() / 2D, -cuboid.sizeY() / 2D, -cuboid.sizeZ() / 2D);
         renderCube(cuboid, EnumShadeArgument.NONE, null, null, null);
-        GlStateManager.popMatrix();
+        renderHelper.cleanup();
     }
 
     public void renderCube(Model3D cuboid) {

diff --git a/src/main/java/mekanism/client/render/entity/RenderBalloon.java b/src/main/java/mekanism/client/render/entity/RenderBalloon.java
@@ -3,6 +3,7 @@
 import javax.annotation.Nonnull;
 import mekanism.api.EnumColor;
 import mekanism.client.model.ModelBalloon;
+import mekanism.client.render.MekanismRenderHelper;
 import mekanism.common.entity.EntityBalloon;
 import mekanism.common.util.MekanismUtils;
 import mekanism.common.util.MekanismUtils.ResourceType;
@@ -51,11 +52,10 @@ public void doRender(@Nonnull EntityBalloon balloon, double x, double y, double
     }
 
     public void render(EnumColor color, double x, double y, double z) {
-        GlStateManager.pushMatrix();
-        GlStateManager.translate(x, y, z);
+        MekanismRenderHelper renderHelper = new MekanismRenderHelper(true).translate(x, y, z);
         GlStateManager.rotate(180, 1, 0, 0);
         mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "Balloon.png"));
         model.render(0.0625F, color);
-        GlStateManager.popMatrix();
+        renderHelper.cleanup();
     }
 }