From d47360ecd7a60374e8ea091560831e07fe6be204 Mon Sep 17 00:00:00 2001
From: Klesti Selimaj <klesti.selimay@icloud.com>
Date: Sat, 7 Mar 2026 23:16:41 +0100
Subject: [PATCH] Minecraft client fix

---
 .../saturnclient/common/IMinecraftClient.java    | 16 ----------------
 .../saturnclient/common/MinecraftProvider.java   |  3 ++-
 .../saturnclient/ui/elements/ImageTexture.java   |  4 ++--
 .../saturnclient/ui/resources/SvgTexture.java    |  4 ++--
 4 files changed, 6 insertions(+), 21 deletions(-)
 delete mode 100644 src/main/java/org/saturnclient/common/IMinecraftClient.java

diff --git a/src/main/java/org/saturnclient/common/IMinecraftClient.java b/src/main/java/org/saturnclient/common/IMinecraftClient.java
deleted file mode 100644
index 89672e2..0000000
--- a/src/main/java/org/saturnclient/common/IMinecraftClient.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.saturnclient.common;
-
-import java.io.File;
-import java.io.InputStream;
-
-import org.saturnclient.common.ref.asset.IdentifierRef;
-import org.saturnclient.common.ref.render.WindowRef;
-
-public interface IMinecraftClient {
-
-    public File getRunDirectory();
-
-    public InputStream getResource(IdentifierRef identifier);
-
-    public WindowRef getWindow();
-}
diff --git a/src/main/java/org/saturnclient/common/MinecraftProvider.java b/src/main/java/org/saturnclient/common/MinecraftProvider.java
index acb3266..7515ca0 100644
--- a/src/main/java/org/saturnclient/common/MinecraftProvider.java
+++ b/src/main/java/org/saturnclient/common/MinecraftProvider.java
@@ -1,6 +1,7 @@
 package org.saturnclient.common;
 
 import org.saturnclient.common.ref.asset.IdentifierRef;
+import org.saturnclient.common.ref.game.MinecraftClientRef;
 import org.saturnclient.ui.SaturnScreen;
 
 import java.awt.image.BufferedImage;
@@ -14,7 +15,7 @@ public abstract class MinecraftProvider {
         Options
     }
 
-    public abstract IMinecraftClient getClient();
+    public abstract MinecraftClientRef getClient();
 
     public abstract void setScreen(SaturnScreen screen);
 
diff --git a/src/main/java/org/saturnclient/ui/elements/ImageTexture.java b/src/main/java/org/saturnclient/ui/elements/ImageTexture.java
index f930ff8..b42f98d 100644
--- a/src/main/java/org/saturnclient/ui/elements/ImageTexture.java
+++ b/src/main/java/org/saturnclient/ui/elements/ImageTexture.java
@@ -1,8 +1,8 @@
 package org.saturnclient.ui.elements;
 
-import org.saturnclient.common.IMinecraftClient;
 import org.saturnclient.common.MinecraftProvider;
 import org.saturnclient.common.ref.asset.IdentifierRef;
+import org.saturnclient.common.ref.game.MinecraftClientRef;
 import org.saturnclient.ui.Element;
 import org.saturnclient.ui.ElementContext;
 import org.saturnclient.ui.RenderScope;
@@ -18,7 +18,7 @@ public class ImageTexture extends Element {
     @Override
     public void render(RenderScope renderScope, ElementContext ctx) {
         if (sprite.toString().endsWith(".svg")) {
-            IMinecraftClient client = MinecraftProvider.PROVIDER.getClient();
+            MinecraftClientRef client = MinecraftProvider.PROVIDER.getClient();
 
             int renderWidth = (int) (width * client.getWindow().getFramebufferWidth() / client.getWindow().getWidth());
             int renderHeight = (int) (height * client.getWindow().getFramebufferHeight()
diff --git a/src/main/java/org/saturnclient/ui/resources/SvgTexture.java b/src/main/java/org/saturnclient/ui/resources/SvgTexture.java
index 434ea55..79ec949 100644
--- a/src/main/java/org/saturnclient/ui/resources/SvgTexture.java
+++ b/src/main/java/org/saturnclient/ui/resources/SvgTexture.java
@@ -10,9 +10,9 @@ import java.util.List;
 import com.kitfox.svg.SVGDiagram;
 import com.kitfox.svg.SVGUniverse;
 
-import org.saturnclient.common.IMinecraftClient;
 import org.saturnclient.common.MinecraftProvider;
 import org.saturnclient.common.ref.asset.IdentifierRef;
+import org.saturnclient.common.ref.game.MinecraftClientRef;
 
 public class SvgTexture {
 
@@ -50,7 +50,7 @@ public class SvgTexture {
         return image;
     }
 
-    public static IdentifierRef getSvg(IMinecraftClient client, IdentifierRef svgImage, int width, int height) {
+    public static IdentifierRef getSvg(MinecraftClientRef client, IdentifierRef svgImage, int width, int height) {
         IdentifierRef id = IdentifierRef
                 .of(svgImage.toString().replaceAll("\\.svg$", (width + "_" + height).toString() + ".png"));