From 2dea4509f7ac036ba4dc49c0da8e303a762dad4c Mon Sep 17 00:00:00 2001 From: MineGame159 Date: Thu, 25 Apr 2024 18:27:15 +0200 Subject: [PATCH] Fix nametag rendering --- .../meteorclient/mixin/GameRendererMixin.java | 2 +- .../systems/modules/player/PotionSpoof.java | 7 ------- .../meteorclient/utils/render/NametagUtils.java | 10 +++++----- 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/src/main/java/meteordevelopment/meteorclient/mixin/GameRendererMixin.java b/src/main/java/meteordevelopment/meteorclient/mixin/GameRendererMixin.java index 511baf0ccc..5eeb4c42ad 100644 --- a/src/main/java/meteordevelopment/meteorclient/mixin/GameRendererMixin.java +++ b/src/main/java/meteordevelopment/meteorclient/mixin/GameRendererMixin.java @@ -84,7 +84,7 @@ private void onRenderWorld(float tickDelta, long limitTime, CallbackInfo ci, boo // Call utility classes RenderUtils.updateScreenCenter(); - NametagUtils.onRender(matrixStack, matrix4f); + NametagUtils.onRender(matrix4f2); // Update model view matrix diff --git a/src/main/java/meteordevelopment/meteorclient/systems/modules/player/PotionSpoof.java b/src/main/java/meteordevelopment/meteorclient/systems/modules/player/PotionSpoof.java index e1ec804568..a24a3271e5 100644 --- a/src/main/java/meteordevelopment/meteorclient/systems/modules/player/PotionSpoof.java +++ b/src/main/java/meteordevelopment/meteorclient/systems/modules/player/PotionSpoof.java @@ -50,13 +50,6 @@ public class PotionSpoof extends Module { .build() ); - public final Setting applyGravity = sgGeneral.add(new BoolSetting.Builder() - .name("gravity") - .description("Applies gravity when levitating.") - .defaultValue(false) - .build() - ); - public PotionSpoof() { super(Categories.Player, "potion-spoof", "Spoofs potion statuses for you. SOME effects DO NOT work."); } diff --git a/src/main/java/meteordevelopment/meteorclient/utils/render/NametagUtils.java b/src/main/java/meteordevelopment/meteorclient/utils/render/NametagUtils.java index 8758dec30b..5c39aa3aa1 100644 --- a/src/main/java/meteordevelopment/meteorclient/utils/render/NametagUtils.java +++ b/src/main/java/meteordevelopment/meteorclient/utils/render/NametagUtils.java @@ -23,8 +23,8 @@ public class NametagUtils { private static final Vector4f pmMat4 = new Vector4f(); private static final Vector3d camera = new Vector3d(); private static final Vector3d cameraNegated = new Vector3d(); - private static Matrix4f model; - private static Matrix4f projection; + private static final Matrix4f model = new Matrix4f(); + private static final Matrix4f projection = new Matrix4f(); private static double windowScale; public static double scale; @@ -32,9 +32,9 @@ public class NametagUtils { private NametagUtils() { } - public static void onRender(MatrixStack matrices, Matrix4f projection) { - model = new Matrix4f(matrices.peek().getPositionMatrix()); - NametagUtils.projection = projection; + public static void onRender(Matrix4f modelView) { + model.set(modelView); + NametagUtils.projection.set(RenderSystem.getProjectionMatrix()); Utils.set(camera, mc.gameRenderer.getCamera().getPos()); cameraNegated.set(camera);