Separate Minecraft dependant and non-dependant code

2 files changed, 7 insertions, 8 deletions

diff --git a/src/main/java/cc/polyfrost/oneconfig/hud/Hud.java b/src/main/java/cc/polyfrost/oneconfig/hud/Hud.java
index 62cfb2e..9c9a005 100644
--- a/src/main/java/cc/polyfrost/oneconfig/hud/Hud.java
+++ b/src/main/java/cc/polyfrost/oneconfig/hud/Hud.java
@@ -1,13 +1,11 @@
 package cc.polyfrost.oneconfig.hud;
 
+import cc.polyfrost.oneconfig.config.Config;
 import cc.polyfrost.oneconfig.config.annotations.Switch;
 import cc.polyfrost.oneconfig.config.core.OneColor;
 import cc.polyfrost.oneconfig.gui.OneConfigGui;
-import cc.polyfrost.oneconfig.libs.universal.UMinecraft;
-import cc.polyfrost.oneconfig.libs.universal.UScreen;
+import cc.polyfrost.oneconfig.platform.Platform;
 import cc.polyfrost.oneconfig.renderer.RenderManager;
-import cc.polyfrost.oneconfig.config.Config;
-import net.minecraft.client.gui.GuiChat;
 
 /**
  * Represents a HUD element in OneConfig.
@@ -175,9 +173,9 @@ public abstract class Hud {
      * @param background If background should be drawn or not
      */
     public void drawAll(float x, float y, float scale, boolean background) {
-        if (!showInGuis && UScreen.getCurrentScreen() != null && !(UScreen.getCurrentScreen() instanceof OneConfigGui)) return;
-        if (!showInChat && UScreen.getCurrentScreen() instanceof GuiChat) return;
-        if (!showInDebug && UMinecraft.getSettings().showDebugInfo) return;
+        if (!showInGuis && Platform.getGuiPlatform().getCurrentScreen() != null && !(Platform.getGuiPlatform().getCurrentScreen() instanceof OneConfigGui)) return;
+        if (!showInChat && Platform.getGuiPlatform().isInChat()) return;
+        if (!showInDebug && Platform.getGuiPlatform().isInDebug()) return;
         if (background && drawBackground()) drawBackground(x, y, getWidth(scale), getHeight(scale), scale);
         draw((int) (x + paddingX * scale / 2f), (int) (y + paddingY * scale / 2f), scale);
     }
diff --git a/src/main/java/cc/polyfrost/oneconfig/hud/TextHud.java b/src/main/java/cc/polyfrost/oneconfig/hud/TextHud.java
index ab00139..3b74c4c 100644
--- a/src/main/java/cc/polyfrost/oneconfig/hud/TextHud.java
+++ b/src/main/java/cc/polyfrost/oneconfig/hud/TextHud.java
@@ -9,6 +9,7 @@ import cc.polyfrost.oneconfig.events.event.TickEvent;
 import cc.polyfrost.oneconfig.internal.hud.HudCore;
 import cc.polyfrost.oneconfig.libs.eventbus.Subscribe;
 import cc.polyfrost.oneconfig.libs.universal.UMinecraft;
+import cc.polyfrost.oneconfig.platform.Platform;
 import cc.polyfrost.oneconfig.renderer.RenderManager;
 
 import java.util.ArrayList;
@@ -83,7 +84,7 @@ public abstract class TextHud extends Hud {
         width = 0;
         for (String line : lines) {
             RenderManager.drawScaledString(line, x, textY, color.getRGB(), RenderManager.TextType.toType(textType), scale);
-            width = Math.max(width, UMinecraft.getFontRenderer().getStringWidth(line));
+            width = Math.max(width, Platform.getGLPlatform().getStringWidth(line));
             textY += 12 * scale;
         }
         height = (int) ((textY - y) / scale - 3);