Improved structure

versions/1.21.4/src/main/java/org/saturnclient/impl/Fonts.java

@@ -1,4 +1,4 @@
-package org.saturnclient.saturnclient.impl;
+package org.saturnclient.impl;
 
 import org.saturnclient.saturnclient.SaturnClient;
 import net.minecraft.text.Style;

versions/1.21.4/src/main/java/org/saturnclient/impl/SaturnClientProvider.java

@@ -1,4 +1,4 @@
-package org.saturnclient.saturnclient.impl;
+package org.saturnclient.impl;
 
 import java.awt.image.BufferedImage;
 

versions/1.21.4/src/main/java/org/saturnclient/impl/mixins/MatrixStackMixin.java

@@ -1,4 +1,4 @@
-package org.saturnclient.saturnclient.mixin;
+package org.saturnclient.impl.mixins;
 
 import org.joml.Quaternionf;
 import org.saturnclient.common.minecraft.bindings.SaturnQuaternionf;

versions/1.21.4/src/main/java/org/saturnclient/impl/mixins/MinecraftClientMixin.java

@@ -1,14 +1,16 @@
-package org.saturnclient.saturnclient.mixin;
+package org.saturnclient.impl.mixins;
 
 import java.io.File;
 import java.io.InputStream;
 
 import org.saturnclient.common.minecraft.IMinecraftClient;
 import org.saturnclient.common.minecraft.bindings.SaturnIdentifier;
+import org.saturnclient.common.minecraft.render.IWindow;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 
 import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.util.Window;
 import net.minecraft.resource.ReloadableResourceManagerImpl;
 import net.minecraft.util.Identifier;
 
@@ -17,6 +19,9 @@ public class MinecraftClientMixin implements IMinecraftClient {
     @Shadow
     public File runDirectory;
 
+    @Shadow
+    private Window window;
+
     @Shadow
     public ReloadableResourceManagerImpl resourceManager;
 
@@ -33,4 +38,9 @@ public class MinecraftClientMixin implements IMinecraftClient {
             return null;
         }
     }
+
+    @Override
+    public IWindow getWindow() {
+        return (IWindow) (Object) this.window;
+    }
 }

versions/1.21.4/src/main/java/org/saturnclient/impl/mixins/WindowMixin.java

@@ -0,0 +1,22 @@
+package org.saturnclient.impl.mixins;
+
+import org.saturnclient.common.minecraft.render.IWindow;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+
+import net.minecraft.client.util.Window;
+
+@Mixin(Window.class)
+public abstract class WindowMixin implements IWindow {
+    @Shadow
+    public abstract int getWidth();
+
+    @Shadow
+    public abstract int getHeight();
+
+    @Shadow
+    public abstract int getFramebufferWidth();
+
+    @Shadow
+    public abstract int getFramebufferHeight();
+}

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

@@ -9,13 +9,13 @@ import net.minecraft.client.util.math.MatrixStack;
 import org.saturnclient.cosmetics.Emotes;
 import org.saturnclient.cosmetics.cloak.Cloaks;
 import org.saturnclient.cosmetics.hat.Hats;
+import org.saturnclient.impl.SaturnClientProvider;
 import org.saturnclient.modules.ModManager;
 import org.saturnclient.saturnclient.client.ServiceClient;
 import org.saturnclient.common.minecraft.MinecraftProvider;
 import org.saturnclient.config.Config;
 import org.saturnclient.config.manager.ConfigManager;
 import org.saturnclient.saturnclient.event.KeyInputHandler;
-import org.saturnclient.saturnclient.impl.SaturnClientProvider;
 import org.saturnclient.saturnclient.mixin.DrawContextAccessor;
 import org.saturnclient.ui.ElementRenderer;
 import org.saturnclient.ui.RenderScope;

versions/1.21.4/src/main/java/org/saturnclient/ui/RenderScopeImpl.java

@@ -128,7 +128,7 @@ public class RenderScopeImpl implements RenderScope {
             matrices.translate(x, y + (i * Fonts.getHeight()), 0);
             matrices.scale(scale, scale, 1.0f);
             TextRenderer textRenderer = SaturnClient.client.textRenderer;
-            textRenderer.draw(org.saturnclient.saturnclient.impl.Fonts.setFont(line, font), 0,
+            textRenderer.draw(org.saturnclient.impl.Fonts.setFont(line, font), 0,
                     font == 0 ? 1 : 7, color, false,
                     this.matrices.peek().getPositionMatrix(),
                     this.vertexConsumers, TextLayerType.NORMAL, 0, 15728880);

versions/1.21.4/src/main/resources/fabric.mod.json

@@ -17,7 +17,8 @@
   },
   "mixins": [
     "saturnclient.mixins.json",
-    "mods.mixins.json"
+    "mods.mixins.json",
+    "impl.mixins.json"
   ],
   "depends": {
     "fabricloader": ">=${loader_version}",

versions/1.21.4/src/main/resources/impl.mixins.json

@@ -0,0 +1,14 @@
+{
+  "required": true,
+  "minVersion": "0.8",
+  "package": "org.saturnclient.impl.mixins",
+  "compatibilityLevel": "JAVA_21",
+  "client": [
+    "MinecraftClientMixin",
+    "MatrixStackMixin",
+    "WindowMixin"
+  ],
+  "injectors": {
+    "defaultRequire": 1
+  }
+}

versions/1.21.4/src/main/resources/saturnclient.mixins.json

@@ -10,9 +10,7 @@
     "WhoAmI",
     "DrawContextAccessor",
     "SplashOverlayMixin",
-    "SetScreenMixin",
-    "MinecraftClientMixin",
-    "MatrixStackMixin"
+    "SetScreenMixin"
   ],
   "injectors": {
     "defaultRequire": 1