code improvements

MeteorDevelopment · May 3, 2024 · 2f4d59a · 2f4d59a
1 parent 52eee5c
commit 2f4d59a
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 11 deletions.
diff --git a/src/main/java/meteordevelopment/meteorclient/mixin/WorldRendererMixin.java b/src/main/java/meteordevelopment/meteorclient/mixin/WorldRendererMixin.java
@@ -40,6 +40,8 @@ public abstract class WorldRendererMixin {
     @Shadow
     private Framebuffer entityOutlinesFramebuffer;
 
+    @Unique private ESP esp;
+
     @Shadow
     protected abstract void renderEntity(Entity entity, double cameraX, double cameraY, double cameraZ, float tickDelta, MatrixStack matrices, VertexConsumerProvider vertexConsumers);
 
@@ -105,20 +107,19 @@ private void onRender(MatrixStack matrices, float tickDelta, long limitTime, boo
 
     @ModifyExpressionValue(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/MinecraftClient;hasOutline(Lnet/minecraft/entity/Entity;)Z"))
     private boolean shouldMobGlow(boolean original, @Local Entity entity) {
-    	ESP esp = Modules.get().get(ESP.class);
-    	Color entityGlowColor = esp.getColor(entity);
-    	if (entityGlowColor == null) return original;
-        return esp.isGlow() && !esp.shouldSkip(entity) || original;
+        if (!getESP().isGlow() || getESP().shouldSkip(entity)) return original;
+
+        return getESP().getColor(entity) != null || original;
     }
 
     @WrapOperation(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/OutlineVertexConsumerProvider;setColor(IIII)V"))
     private void setGlowColor(OutlineVertexConsumerProvider instance, int red, int green, int blue, int alpha, Operation<Void> original, @Local LocalRef<Entity> entity) {
-    	ESP esp = Modules.get().get(ESP.class);
-    	Color entityGlowColor = esp.getColor(entity.get());
-        if (esp.isGlow() && !esp.shouldSkip(entity.get()) && entityGlowColor != null) {
-            instance.setColor(entityGlowColor.r, entityGlowColor.g, entityGlowColor.b, entityGlowColor.a);
-        } else {
-            original.call(instance, red, green, blue, alpha);
+        if (!getESP().isGlow() || getESP().shouldSkip(entity.get())) original.call(instance, red, green, blue, alpha);
+        else {
+            Color color = getESP().getColor(entity.get());
+
+            if (color == null) original.call(instance, red, green, blue, alpha);
+            else instance.setColor(color.r, color.g, color.b, color.a);
         }
     }
 
@@ -160,4 +161,13 @@ private static int getLightmapCoordinatesModifySkyLight(int sky) {
     private static int getLightmapCoordinatesModifyBlockLight(int sky) {
         return Math.max(Modules.get().get(Fullbright.class).getLuminance(LightType.BLOCK), sky);
     }
+
+    @Unique
+    private ESP getESP() {
+        if (esp == null) {
+            esp = Modules.get().get(ESP.class);
+        }
+
+        return esp;
+    }
 }
diff --git a/src/main/java/meteordevelopment/meteorclient/systems/modules/render/ESP.java b/src/main/java/meteordevelopment/meteorclient/systems/modules/render/ESP.java
@@ -349,7 +349,7 @@ public String getInfoString() {
     public boolean isShader() {
         return isActive() && mode.get() == Mode.Shader;
     }
-    
+
     public boolean isGlow() {
         return isActive() && mode.get() == Mode.Glow;
     }
@@ -360,6 +360,7 @@ public enum Mode {
         _2D,
         Shader,
         Glow;
+
         @Override
         public String toString() {
             return this == _2D ? "2D" : super.toString();