Use the new malilib RenderWrap class

huanli233 · Feb 4, 2024 · 069acea · 069acea
1 parent 61260fa
commit 069acea
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 27 deletions.
diff --git a/src/main/java/minihud/event/RenderHandler.java b/src/main/java/minihud/event/RenderHandler.java
@@ -13,7 +13,6 @@
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.network.NetworkPlayerInfo;
-import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.chunk.RenderChunk;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityList;
@@ -48,6 +47,7 @@
 import malilib.util.game.wrap.EntityWrap;
 import malilib.util.game.wrap.GameUtils;
 import malilib.util.game.wrap.RegistryUtils;
+import malilib.util.game.wrap.RenderWrap;
 import malilib.util.position.BlockPos;
 import malilib.util.position.Direction;
 import malilib.util.position.HitResult;
@@ -173,8 +173,8 @@ public static void fixDebugRendererState()
     {
         if (Configs.Generic.FIX_VANILLA_DEBUG_RENDERERS.getBooleanValue())
         {
-            GlStateManager.disableLighting();
-            //RenderUtils.color(1, 1, 1, 1);
+            RenderWrap.disableLighting();
+            //RenderWrap.color(1, 1, 1, 1);
             //OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, 240f, 240f);
         }
     }

diff --git a/src/main/java/minihud/mixin/info_lines/GuiSubtitleOverlayMixin.java b/src/main/java/minihud/mixin/info_lines/GuiSubtitleOverlayMixin.java
@@ -8,8 +8,9 @@
 
 import net.minecraft.client.gui.Gui;
 import net.minecraft.client.gui.GuiSubtitleOverlay;
-import net.minecraft.client.renderer.GlStateManager;
 
+import malilib.render.RenderContext;
+import malilib.util.game.wrap.RenderWrap;
 import minihud.config.Configs;
 import minihud.event.RenderHandler;
 
@@ -32,7 +33,7 @@ private void nudgeSubtitleOverlay(CallbackInfo ci)
 
             if (offset != 0)
             {
-                GlStateManager.translate(0, offset, 0);
+                RenderWrap.translate(0, offset, 0, RenderContext.DUMMY);
             }
         }
     }

diff --git a/src/main/java/minihud/renderer/OverlayRenderer.java b/src/main/java/minihud/renderer/OverlayRenderer.java
@@ -3,22 +3,21 @@
 import java.util.Collections;
 import org.lwjgl.opengl.GL11;
 
-import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemBlock;
 
 import malilib.render.RenderContext;
-import malilib.render.RenderUtils;
 import malilib.render.ShapeRenderUtils;
 import malilib.render.TextRenderUtils;
 import malilib.render.buffer.VanillaWrappingVertexBuilder;
 import malilib.render.buffer.VertexBuilder;
 import malilib.util.data.Color4f;
 import malilib.util.game.wrap.EntityWrap;
 import malilib.util.game.wrap.GameUtils;
+import malilib.util.game.wrap.RenderWrap;
 import malilib.util.inventory.InventoryUtils;
 import minihud.config.Configs;
 import minihud.config.RendererToggle;
@@ -154,16 +153,16 @@ private static void renderBeaconBoxForPlayer(EntityPlayer player, double dx, dou
         double maxZ = z + range + 1;
         Color4f color = OverlayRendererBeaconRange.getColorForLevel(level);
 
-        GlStateManager.enableAlpha();
-        GlStateManager.alphaFunc(GL11.GL_GREATER, 0.01F);
-        GlStateManager.disableCull();
-        GlStateManager.disableLighting();
-        GlStateManager.enableDepth();
-        GlStateManager.depthMask(false);
-        GlStateManager.doPolygonOffset(-3f, -3f);
-        GlStateManager.enablePolygonOffset();
-        GlStateManager.glLineWidth(1f);
-        RenderUtils.color(1f, 1f, 1f, 1f);
+        RenderWrap.enableAlpha();
+        RenderWrap.alphaFunc(GL11.GL_GREATER, 0.01F);
+        RenderWrap.disableCull();
+        RenderWrap.disableLighting();
+        RenderWrap.enableDepthTest();
+        RenderWrap.depthMask(false);
+        RenderWrap.polygonOffset(-3f, -3f);
+        RenderWrap.enablePolygonOffset();
+        RenderWrap.lineWidth(1f);
+        RenderWrap.color(1f, 1f, 1f, 1f);
 
         VertexBuilder quadBuilder = VanillaWrappingVertexBuilder.coloredQuads();
         ShapeRenderUtils.renderBoxSideQuads(minX, minY, minZ, maxX, maxY, maxZ, color.withAlpha(0.3f), quadBuilder);
@@ -173,8 +172,8 @@ private static void renderBeaconBoxForPlayer(EntityPlayer player, double dx, dou
         ShapeRenderUtils.renderBoxEdgeLines(minX, minY, minZ, maxX, maxY, maxZ, color.withAlpha(1f), lineBuilder);
         lineBuilder.draw();
 
-        GlStateManager.doPolygonOffset(0f, 0f);
-        GlStateManager.disablePolygonOffset();
-        GlStateManager.enableCull();
+        RenderWrap.polygonOffset(0f, 0f);
+        RenderWrap.disablePolygonOffset();
+        RenderWrap.enableCull();
     }
 }
diff --git a/src/main/java/minihud/renderer/OverlayRendererLightLevel.java b/src/main/java/minihud/renderer/OverlayRendererLightLevel.java
@@ -16,13 +16,13 @@
 
 import malilib.config.option.ColorConfig;
 import malilib.config.option.Vec2dConfig;
-import malilib.render.RenderUtils;
 import malilib.render.buffer.VertexBuilder;
 import malilib.render.overlay.VboRenderObject;
 import malilib.util.data.Color4f;
 import malilib.util.data.Identifier;
 import malilib.util.game.wrap.EntityWrap;
 import malilib.util.game.wrap.GameUtils;
+import malilib.util.game.wrap.RenderWrap;
 import malilib.util.position.BlockPos;
 import malilib.util.position.Direction;
 import malilib.util.position.Vec3d;
@@ -82,7 +82,7 @@ protected void preRender()
     {
         super.preRender();
 
-        RenderUtils.bindTexture(NUMBER_TEXTURE);
+        RenderWrap.bindTexture(NUMBER_TEXTURE);
     }
 
     @Override

diff --git a/src/main/java/minihud/renderer/shapes/ShapeCircleBase.java b/src/main/java/minihud/renderer/shapes/ShapeCircleBase.java
@@ -8,7 +8,6 @@
 import com.google.gson.JsonPrimitive;
 import org.lwjgl.opengl.GL11;
 
-import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.entity.Entity;
 
 import malilib.config.value.BaseOptionListConfigValue;
@@ -19,6 +18,7 @@
 import malilib.util.data.json.JsonUtils;
 import malilib.util.game.wrap.EntityWrap;
 import malilib.util.game.wrap.GameUtils;
+import malilib.util.game.wrap.RenderWrap;
 import malilib.util.position.BlockPos;
 import malilib.util.position.Direction;
 import malilib.util.position.LayerRange;
@@ -164,12 +164,12 @@ public void draw()
         this.quadRenderer.draw();
 
         // Render the lines as quads with glPolygonMode(GL_LINE)
-        GlStateManager.glPolygonMode(GL11.GL_FRONT_AND_BACK, GL11.GL_LINE);
-        GlStateManager.disableBlend();
+        RenderWrap.polygonMode(GL11.GL_FRONT_AND_BACK, GL11.GL_LINE);
+        RenderWrap.disableBlend();
         this.quadRenderer.draw();
 
-        GlStateManager.glPolygonMode(GL11.GL_FRONT_AND_BACK, GL11.GL_FILL);
-        GlStateManager.enableBlend();
+        RenderWrap.polygonMode(GL11.GL_FRONT_AND_BACK, GL11.GL_FILL);
+        RenderWrap.enableBlend();
 
         this.postRender();
     }