refactor

Author: Wide-Cat

src/main/java/meteordevelopment/meteorclient/mixin/GameRendererMixin.java

@@ -9,8 +9,8 @@
 import com.llamalad7.mixinextras.injector.ModifyReturnValue;
 import com.llamalad7.mixinextras.sugar.Local;
 import com.mojang.blaze3d.systems.RenderSystem;
-import meteordevelopment.meteorclient.MixinPlugin;
 import meteordevelopment.meteorclient.MeteorClient;
+import meteordevelopment.meteorclient.MixinPlugin;
 import meteordevelopment.meteorclient.events.render.GetFovEvent;
 import meteordevelopment.meteorclient.events.render.Render3DEvent;
 import meteordevelopment.meteorclient.events.render.RenderAfterWorldEvent;
@@ -27,6 +27,7 @@
 import meteordevelopment.meteorclient.utils.render.CustomBannerGuiElementRenderer;
 import meteordevelopment.meteorclient.utils.render.NametagUtils;
 import meteordevelopment.meteorclient.utils.render.RenderUtils;
+import net.irisshaders.iris.api.v0.IrisApi;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.render.GuiRenderer;
@@ -128,16 +129,15 @@ private void onRenderWorld(RenderTickCounter tickCounter, CallbackInfo ci, @Loca
 
         matrices.push();
         tiltViewWhenHurt(matrices, camera.getLastTickProgress());
-        if (client.options.getBobView().getValue())
-            bobView(matrices, camera.getLastTickProgress());
+        if (client.options.getBobView().getValue()) bobView(matrices, camera.getLastTickProgress());
 
         Matrix4f inverseBob = new Matrix4f(matrices.peek().getPositionMatrix()).invert();
         RenderSystem.getModelViewStack().mul(inverseBob);
         matrices.pop();
 
         // Call utility classes (apply bob correction when Iris shaders are active)
 
-        Matrix4f correctedPosition = MixinPlugin.isIrisPresent && RenderUtils.isShaderPackInUse() ? new Matrix4f(position).mul(inverseBob) : position;
+        Matrix4f correctedPosition = (MixinPlugin.isIrisPresent && IrisApi.getInstance().isShaderPackInUse()) ? new Matrix4f(position).mul(inverseBob) : position;
         RenderUtils.updateScreenCenter(projection, correctedPosition);
         NametagUtils.onRender(position);
 

src/main/java/meteordevelopment/meteorclient/utils/render/RenderUtils.java

@@ -14,7 +14,6 @@
 import meteordevelopment.meteorclient.utils.misc.Pool;
 import meteordevelopment.meteorclient.utils.render.color.Color;
 import meteordevelopment.orbit.EventHandler;
-import net.irisshaders.iris.api.v0.IrisApi;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.math.BlockPos;
@@ -42,10 +41,6 @@ public static void init() {
         MeteorClient.EVENT_BUS.subscribe(RenderUtils.class);
     }
 
-    public static boolean isShaderPackInUse() {
-        return IrisApi.getInstance().isShaderPackInUse();
-    }
-
     // Items
     public static void drawItem(DrawContext drawContext, ItemStack itemStack, int x, int y, float scale, boolean overlay, String countOverride, boolean disableGuiScale) {
         Matrix3x2fStack matrices = drawContext.getMatrices();