replaced getInstance with .client

src/main/java/org/saturnclient/saturnclient/SaturnClient.java

@@ -3,6 +3,7 @@ package org.saturnclient.saturnclient;
 import net.fabricmc.api.ModInitializer;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents;
 import net.fabricmc.fabric.api.client.screen.v1.ScreenEvents;
+import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.TitleScreen;
 
 import org.saturnclient.saturnclient.auth.Auth;
@@ -26,10 +27,12 @@ public class SaturnClient implements ModInitializer {
 
     public static final String MOD_ID = "saturnclient";
     public static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID);
+    public static MinecraftClient client;
 
     @Override
     public void onInitialize() {
         LOGGER.info("Initializing " + MOD_ID);
+        client = MinecraftClient.getInstance();
         ModManager.init();
         ConfigManager.load();
         ThemeManager.load();

src/main/java/org/saturnclient/saturnclient/auth/Auth.java

@@ -22,7 +22,7 @@ public class Auth {
         ClientLifecycleEvents.CLIENT_STOPPING.register(_o -> close());
 
         try {
-            MinecraftClient client = MinecraftClient.getInstance();
+            MinecraftClient client = SaturnClient.client;
             if (client.getSession() == null) {
                 SaturnClient.LOGGER.error("No active Minecraft session found");
                 return false;
@@ -184,7 +184,7 @@ public class Auth {
     public static void sendReload() {
         for (Map.Entry<String, String> player : playerNames.entrySet()) {
             if (players.containsKey(player.getValue()) && !player.getValue().equals(uuid)) {
-                MinecraftClient.getInstance().player.networkHandler
+                SaturnClient.client.player.networkHandler
                         .sendChatCommand("msg " + player.getKey() + " "
                                 + "$SATURN_RELOAD if you are seeing this as a player, please report this to https://github.com/saturnclientmc/saturnclient/issues");
                 ;

src/main/java/org/saturnclient/saturnclient/auth/PlayerTracker.java

@@ -19,7 +19,7 @@ public class PlayerTracker {
         ClientPlayConnectionEvents.JOIN.register((handler, sender, client) -> {
             trackedPlayers.clear();
             client.execute(() -> {
-                checkForNewPlayers(MinecraftClient.getInstance());
+                checkForNewPlayers(SaturnClient.client);
             });
         });
 

src/main/java/org/saturnclient/saturnclient/config/ConfigManager.java

@@ -18,7 +18,7 @@ import org.saturnclient.saturnclient.SaturnClient;
 public class ConfigManager {
 
     private static File configFile = new File(
-            MinecraftClient.getInstance().runDirectory,
+            SaturnClient.client.runDirectory,
             "saturn.json");
     private static Map<String, Map<String, Property<?>>> properties = new HashMap<>();
 

src/main/java/org/saturnclient/saturnclient/config/ThemeManager.java

@@ -21,7 +21,7 @@ import net.minecraft.client.MinecraftClient;
 public class ThemeManager {
     
     private static File themeFile = new File(
-            MinecraftClient.getInstance().runDirectory,
+            SaturnClient.client.runDirectory,
             "saturn.theme.json");
     private static Map<String, Map<String, Property<?>>> properties = new HashMap<>();
 

src/main/java/org/saturnclient/saturnclient/cosmetics/HatFeatureRenderer.java

@@ -48,7 +48,7 @@ public class HatFeatureRenderer extends FeatureRenderer<PlayerEntityRenderState,
             customHat.set(DataComponentTypes.EQUIPPABLE,
                     EquippableComponent.builder(EquipmentSlot.HEAD).build());
 
-            ItemRenderer itemRenderer = MinecraftClient.getInstance().getItemRenderer();
+            ItemRenderer itemRenderer = SaturnClient.client.getItemRenderer();
 
             itemRenderer.renderItem(
                     customHat,

src/main/java/org/saturnclient/saturnclient/cosmetics/cloaks/Cloaks.java

@@ -96,7 +96,7 @@ public class Cloaks {
                                 }
 
                                 // Register textures on main thread
-                                net.minecraft.client.MinecraftClient.getInstance().execute(() -> {
+                                net.minecraft.client.SaturnClient.client.execute(() -> {
                                     try {
                                         List<AnimatedCloakData> animatedFrames = new ArrayList<>();
                                         for (int i = 0; i < frameCount; i++) {
@@ -118,7 +118,7 @@ public class Cloaks {
                         }
                     }).start();
                 } else {
-                    net.minecraft.client.MinecraftClient.getInstance().execute(() -> loadStaticCloak(player.cloak + ".png"));
+                    net.minecraft.client.SaturnClient.client.execute(() -> loadStaticCloak(player.cloak + ".png"));
                 }
             }
         }

src/main/java/org/saturnclient/saturnclient/cosmetics/cloaks/utils/IdentifierUtils.java

@@ -20,7 +20,7 @@ public class IdentifierUtils {
             ByteBuffer bb = BufferUtils.createByteBuffer(bytes.length).put(bytes);
             bb.flip();
             NativeImageBackedTexture nibt = new NativeImageBackedTexture(NativeImage.read(bb));
-            MinecraftClient.getInstance().getTextureManager().registerTexture(i, nibt);
+            SaturnClient.client.getTextureManager().registerTexture(i, nibt);
         } catch (Exception e) {
             e.printStackTrace();
         }

src/main/java/org/saturnclient/saturnclient/mixin/CameraMixin.java

@@ -30,9 +30,9 @@ public abstract class CameraMixin {
         if (FreeLook.isFreeLooking && cameraEntity instanceof ClientPlayerEntity) {
             CameraOverriddenEntity cameraOverriddenEntity = (CameraOverriddenEntity) cameraEntity;
 
-            if (firstTime && MinecraftClient.getInstance().player != null) {
+            if (firstTime && SaturnClient.client.player != null) {
-                cameraOverriddenEntity.freelook$setCameraPitch(MinecraftClient.getInstance().player.getPitch());
+                cameraOverriddenEntity.freelook$setCameraPitch(SaturnClient.client.player.getPitch());
-                cameraOverriddenEntity.freelook$setCameraYaw(MinecraftClient.getInstance().player.getYaw());
+                cameraOverriddenEntity.freelook$setCameraYaw(SaturnClient.client.player.getYaw());
                 firstTime = false;
             }
             this.setRotation(cameraOverriddenEntity.freelook$getCameraYaw(),

src/main/java/org/saturnclient/saturnclient/mixin/NameTagMixin.java

@@ -61,9 +61,9 @@ public abstract class NameTagMixin<S extends EntityRenderState> {
             matrices.multiply(this.dispatcher.getRotation());
             matrices.scale(0.025F, -0.025F, 0.025F);
             Matrix4f matrix4f = matrices.peek().getPositionMatrix();
-            TextRenderer textRenderer = MinecraftClient.getInstance().textRenderer;
+            TextRenderer textRenderer = SaturnClient.client.textRenderer;
             float f = (float) (-textRenderer.getWidth(text)) / 2.0F;
-            int j = (int) (MinecraftClient.getInstance().options.getTextBackgroundOpacity(0.25F) * 255.0F) << 24;
+            int j = (int) (SaturnClient.client.options.getTextBackgroundOpacity(0.25F) * 255.0F) << 24;
             textRenderer.draw(text, f, (float) i, -2130706433, false, matrix4f, vertexConsumers,
                     bl ? TextLayerType.SEE_THROUGH : TextLayerType.NORMAL, j, light);
             if (bl) {

src/main/java/org/saturnclient/saturnmods/ModManager.java

@@ -1,9 +1,12 @@
 package org.saturnclient.saturnmods;
 
+import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
 import net.fabricmc.fabric.api.client.rendering.v1.HudRenderCallback;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.util.math.MatrixStack;
+
+import org.saturnclient.saturnclient.SaturnClient;
 import org.saturnclient.saturnclient.SaturnClientConfig;
 import org.saturnclient.saturnclient.menus.HudEditor;
 import org.saturnclient.saturnmods.mods.*;
@@ -20,8 +23,12 @@ public class ModManager {
     };
 
     public static void init() {
+        ClientTickEvents.START_CLIENT_TICK.register(client -> {
+
+        });
+
         HudRenderCallback.EVENT.register((context, _o) -> {
-            MinecraftClient client = MinecraftClient.getInstance();
+            MinecraftClient client = SaturnClient.client;
             TextRenderer textRenderer = client.textRenderer;
 
             if (textRenderer != null &&

src/main/java/org/saturnclient/saturnmods/mods/ArmorDisplay.java

@@ -65,7 +65,7 @@ public class ArmorDisplay implements SaturnMod, HudMod {
 
     @Override
     public void render(DrawContext context) {
-        PlayerEntity player = MinecraftClient.getInstance().player;
+        PlayerEntity player = SaturnClient.client.player;
         ItemStack[] items = {
                 player.getEquippedStack(EquipmentSlot.MAINHAND),
                 player.getEquippedStack(EquipmentSlot.FEET),

src/main/java/org/saturnclient/saturnmods/mods/Coordinates.java

@@ -50,7 +50,7 @@ public class Coordinates implements SaturnMod, HudMod {
     }
 
     public void render(DrawContext context) {
-        PlayerEntity player = MinecraftClient.getInstance().player;
+        PlayerEntity player = SaturnClient.client.player;
         int playerX = (int) player.getX();
         int playerY = (int) player.getY();
         int playerZ = (int) player.getZ();

src/main/java/org/saturnclient/saturnmods/mods/FpsDisplay.java

@@ -50,7 +50,7 @@ public class FpsDisplay implements SaturnMod, HudMod {
 
     @Override
     public void render(DrawContext context) {
-        int fps = MinecraftClient.getInstance().getCurrentFps();
+        int fps = SaturnClient.client.getCurrentFps();
 
         context.drawText(
                 SaturnClientConfig.textRenderer,

src/main/java/org/saturnclient/ui/components/SaturnFloat.java

@@ -16,7 +16,7 @@ public class SaturnFloat extends SaturnWidget {
     String text = "";
     public Property<Float> prop;
     public int cursorPosition = 0;
-    private TextRenderer textRenderer = MinecraftClient.getInstance().textRenderer;
+    private TextRenderer textRenderer = SaturnClient.client.textRenderer;
 
     public SaturnFloat(Property<Float> prop, int x, int y, int width) {
         this.x = x;

src/main/java/org/saturnclient/ui/components/SaturnHex.java

@@ -16,7 +16,7 @@ public class SaturnHex extends SaturnWidget {
     private String text = "#"; // Always starts with '#'
     public Property<Integer> prop;
     public int cursorPosition = 1; // After '#'
-    private final TextRenderer textRenderer = MinecraftClient.getInstance().textRenderer;
+    private final TextRenderer textRenderer = SaturnClient.client.textRenderer;
 
     public SaturnHex(Property<Integer> prop, int x, int y, int width) {
         this.x = x;

src/main/java/org/saturnclient/ui/components/SaturnInteger.java

@@ -1,9 +1,8 @@
 package org.saturnclient.ui.components;
 
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.gui.DrawContext;
 import org.lwjgl.glfw.GLFW;
+import org.saturnclient.saturnclient.SaturnClient;
 import org.saturnclient.saturnclient.SaturnClientConfig;
 import org.saturnclient.saturnclient.config.ConfigManager;
 import org.saturnclient.saturnclient.config.Property;
@@ -16,7 +15,6 @@ public class SaturnInteger extends SaturnWidget {
     String text = "";
     public Property<Integer> prop;
     public int cursorPosition = 0;
-    private TextRenderer textRenderer = MinecraftClient.getInstance().textRenderer;
 
     public SaturnInteger(Property<Integer> prop, int x, int y, int width) {
         this.x = x;
@@ -24,7 +22,7 @@ public class SaturnInteger extends SaturnWidget {
         this.width = width;
         this.prop = prop;
         this.text = String.valueOf(prop.value);
-        this.height = textRenderer.fontHeight + 4;
+        this.height = SaturnClient.client.textRenderer.fontHeight + 4;
         this.scale = 0.8f;
     }
 
@@ -37,7 +35,7 @@ public class SaturnInteger extends SaturnWidget {
         int textWidth = 0;
 
         for (int i = 0; i < visibleText.length(); i++) {
-            textWidth = textRenderer.getWidth(visibleText.substring(0, i + 1));
+            textWidth = SaturnClient.client.textRenderer.getWidth(visibleText.substring(0, i + 1));
 
             if (textWidth > mouseX) {
                 break;
@@ -119,7 +117,7 @@ public class SaturnInteger extends SaturnWidget {
 
         int textColor = focused ? 0xFFFFFF : 0xAAAAAA;
         context.drawText(
-                textRenderer,
+                SaturnClient.client.textRenderer,
                 SaturnUi.text(visibleText),
                 2,
                 2,
@@ -128,14 +126,14 @@ public class SaturnInteger extends SaturnWidget {
 
         if (focused) {
             int cursorX = 2 +
-                    textRenderer.getWidth(
+                    SaturnClient.client.textRenderer.getWidth(
                             SaturnUi.text(
                                     visibleText.substring(0, cursorPosition - scrollOffset)));
             context.fill(
                     cursorX,
                     2,
                     cursorX + 1,
-                    textRenderer.fontHeight + 4,
+                    SaturnClient.client.textRenderer.fontHeight + 4,
                     0xFFFFFFFF);
         }
     }
@@ -155,7 +153,7 @@ public class SaturnInteger extends SaturnWidget {
         int maxWidth = width - 4; // Available width for text
         while (offset < cursorPosition) { // Ensure cursor remains visible
             String visibleText = text.substring(offset, cursorPosition);
-            if (textRenderer.getWidth(SaturnUi.text(visibleText)) > maxWidth) {
+            if (SaturnClient.client.textRenderer.getWidth(SaturnUi.text(visibleText)) > maxWidth) {
                 offset++;
             } else {
                 break;
@@ -169,7 +167,7 @@ public class SaturnInteger extends SaturnWidget {
 
         // Ensure text does not overflow past the available width
         for (int i = 1; i <= visibleText.length(); i++) {
-            if (textRenderer.getWidth(
+            if (SaturnClient.client.textRenderer.getWidth(
                     SaturnUi.text(visibleText.substring(0, i))) > width - 4) {
                 return visibleText.substring(0, i - 1); // Trim overflow
             }

src/main/java/org/saturnclient/ui/components/SaturnModComp.java

@@ -1,7 +1,8 @@
 package org.saturnclient.ui.components;
 
-import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.DrawContext;
+
+import org.saturnclient.saturnclient.SaturnClient;
 import org.saturnclient.saturnclient.SaturnClientConfig;
 import org.saturnclient.saturnclient.menus.ConfigEditor;
 import org.saturnclient.saturnmods.SaturnMod;
@@ -85,7 +86,7 @@ public class SaturnModComp extends SaturnWidget {
     @Override
     public void click(int mouseX, int mouseY) {
         if (settingsHovering(mouseX, mouseY)) {
-            MinecraftClient.getInstance()
+            SaturnClient.client
                     .setScreen(new ConfigEditor(mod.getConfig()));
         } else {
             mod.setEnabled(!mod.isEnabled());

src/main/java/org/saturnclient/ui/components/SaturnString.java

@@ -14,7 +14,7 @@ public class SaturnString extends SaturnWidget {
 
     public Property<String> prop;
     public int cursorPosition = 0;
-    private TextRenderer textRenderer = MinecraftClient.getInstance().textRenderer;
+    private TextRenderer textRenderer = SaturnClient.client.textRenderer;
 
     public SaturnString(Property<String> prop, int x, int y, int width) {
         this.x = x;

src/main/java/org/saturnclient/ui/components/SkinPreview.java

@@ -56,7 +56,7 @@ public class SkinPreview extends SaturnWidget {
         context.getMatrices().multiply(quaternionf);
         context.draw();
         DiffuseLighting.method_34742();
-        EntityRenderDispatcher entityRenderDispatcher = MinecraftClient.getInstance().getEntityRenderDispatcher();
+        EntityRenderDispatcher entityRenderDispatcher = SaturnClient.client.getEntityRenderDispatcher();
 
         entityRenderDispatcher.setRenderShadows(false);
         context.draw((vertexConsumers) -> {
@@ -71,7 +71,7 @@ public class SkinPreview extends SaturnWidget {
 
     @Override
     public void render(DrawContext context, boolean hovering, int mouseX, int mouseY) {
-        LivingEntity entity = MinecraftClient.getInstance().player;
+        LivingEntity entity = SaturnClient.client.player;
         if (entity != null) {
             drawEntity(context, 0, 0, 75, 78, 30, 0.0625F, mouseX, mouseY, entity, -30.0f, true);
         }

src/main/java/org/saturnclient/ui/widgets/SaturnButton.java

@@ -37,7 +37,7 @@ public class SaturnButton extends SaturnWidget {
             boolean hovering,
             int mouseX,
             int mouseY) {
-        MinecraftClient minecraftClient = MinecraftClient.getInstance();
+        MinecraftClient minecraftClient = SaturnClient.client;
 
         if (background) {
             RenderSystem.setShaderTexture(0, Textures.BUTTON);

src/main/java/org/saturnclient/ui/widgets/SaturnInputBox.java

@@ -14,7 +14,7 @@ import org.saturnclient.ui.Textures;
 
 public class SaturnInputBox extends SaturnWidget {
 
-    private TextRenderer textRenderer = MinecraftClient.getInstance().textRenderer;
+    private TextRenderer textRenderer = SaturnClient.client.textRenderer;
     private int tick = 0;
     private boolean cursorVisible = true;
 

src/main/java/org/saturnclient/ui2/RenderScope.java

@@ -65,7 +65,7 @@ public class RenderScope {
 
         Identifier font = bold ? Fonts.PANTON_BOLD : Fonts.PANTON;
 
-        TextRenderer textRenderer = MinecraftClient.getInstance().textRenderer;
+        TextRenderer textRenderer = SaturnClient.client.textRenderer;
         textRenderer.draw(Fonts.setFont(text, font), (float) x, (float) y, color, false, this.matrices.peek().getPositionMatrix(),
                 this.vertexConsumers, TextLayerType.NORMAL, 0, 15728880);
     }

src/main/java/org/saturnclient/ui2/resources/Fonts.java

@@ -23,11 +23,11 @@ public class Fonts {
     }
 
     public static int getWidth(String text, Identifier font) {
-        return MinecraftClient.getInstance().textRenderer.getWidth(Text.literal(text).setStyle(
+        return SaturnClient.client.textRenderer.getWidth(Text.literal(text).setStyle(
             Style.EMPTY.withFont(font)));
     }
 
     public static int getHeight() {
-        return MinecraftClient.getInstance().textRenderer.fontHeight;
+        return SaturnClient.client.textRenderer.fontHeight;
     }
 }