Config structure update

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

@@ -2,18 +2,12 @@ package org.saturnclient.saturnclient;
 
 import net.fabricmc.api.ModInitializer;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents;
-import net.minecraft.client.font.TextRenderer;
-import net.minecraft.util.math.ColorHelper;
 import org.saturnclient.saturnclient.auth.SaturnSocket;
 import org.saturnclient.saturnclient.config.ConfigManager;
-import org.saturnclient.saturnclient.config.Property;
 import org.saturnclient.saturnclient.cosmetics.Hats;
 import org.saturnclient.saturnclient.cosmetics.cloaks.Cloaks;
 import org.saturnclient.saturnclient.event.KeyInputHandler;
 import org.saturnclient.saturnmods.ModManager;
-import org.saturnclient.ui.SaturnAnimation;
-import org.saturnclient.ui.SaturnUi;
-import org.saturnclient.ui.animations.FadeIn;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -25,35 +19,6 @@ public class SaturnClient implements ModInitializer {
     public static final String MOD_ID = "saturnclient";
     public static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID);
 
-    public static ConfigManager config = new ConfigManager("Saturn Client");
-
-    public static Property<Integer> COLOR = config.property(
-            "Primary color",
-            new Property<Integer>(
-                    ColorHelper.getArgb(255, 251, 60, 79),
-                    Property.PropertyType.HEX));
-
-    public static Property<Integer> NORMAL = config.property(
-            "Default color",
-            new Property<Integer>(
-                    ColorHelper.getArgb(255, 182, 182, 182),
-                    Property.PropertyType.HEX));
-
-    public static int WHITE = ColorHelper.getArgb(255, 255, 255, 255);
-    public static TextRenderer textRenderer = null;
-
-    public static int getWhite(float alpha) {
-        return ((int) (alpha * 255) << 24) | (NORMAL.value & 0x00FFFFFF);
-    }
-
-    public static int getColor(boolean hovering, float alpha) {
-        return SaturnUi.getAlpha(hovering ? SaturnClient.COLOR.value : NORMAL.value, alpha);
-    }
-
-    public static SaturnAnimation[] getAnimations() {
-        return new SaturnAnimation[] { new FadeIn(1) };
-    }
-
     @Override
     public void onInitialize() {
         LOGGER.info("Initializing " + MOD_ID);

src/main/java/org/saturnclient/saturnclient/SaturnClientConfig.java

@@ -0,0 +1,41 @@
+package org.saturnclient.saturnclient;
+
+import org.saturnclient.saturnclient.config.Property;
+import org.saturnclient.saturnclient.config.ConfigManager;
+import org.saturnclient.ui.SaturnAnimation;
+import org.saturnclient.ui.SaturnUi;
+import org.saturnclient.ui.animations.FadeIn;
+
+import net.minecraft.client.font.TextRenderer;
+import net.minecraft.util.math.ColorHelper;
+
+public class SaturnClientConfig {
+    public static ConfigManager config = new ConfigManager("Saturn Client");
+
+    public static Property<Integer> COLOR = config.property(
+            "Primary color",
+            new Property<Integer>(
+                    ColorHelper.getArgb(255, 251, 60, 79),
+                    Property.PropertyType.HEX));
+
+    public static Property<Integer> NORMAL = config.property(
+            "Default color",
+            new Property<Integer>(
+                    ColorHelper.getArgb(255, 182, 182, 182),
+                    Property.PropertyType.HEX));
+
+    public static int WHITE = ColorHelper.getArgb(255, 255, 255, 255);
+    public static TextRenderer textRenderer = null;
+
+    public static int getWhite(float alpha) {
+        return ((int) (alpha * 255) << 24) | (NORMAL.value & 0x00FFFFFF);
+    }
+
+    public static int getColor(boolean hovering, float alpha) {
+        return SaturnUi.getAlpha(hovering ? COLOR.value : NORMAL.value, alpha);
+    }
+
+    public static SaturnAnimation[] getAnimations() {
+        return new SaturnAnimation[] { new FadeIn(1) };
+    }
+}

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

@@ -4,13 +4,11 @@ import java.io.*;
 import java.net.Socket;
 import java.util.HashMap;
 import java.util.Map;
-
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents;
 import net.minecraft.client.MinecraftClient;
-
-import org.saturnclient.saturnclient.SaturnClient;
 import org.saturnclient.saturnclient.cosmetics.Hats;
 import org.saturnclient.saturnclient.cosmetics.cloaks.Cloaks;
+import org.saturnclient.saturnclient.SaturnClient;
 
 public class SaturnSocket {
 

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

@@ -1,7 +1,6 @@
 package org.saturnclient.saturnclient.cosmetics.cloaks;
 
 import net.minecraft.util.Identifier;
-import org.saturnclient.saturnclient.SaturnClient;
 import org.saturnclient.saturnclient.auth.SaturnSocket;
 import org.saturnclient.saturnclient.cosmetics.cloaks.utils.AnimatedCloakData;
 import org.saturnclient.saturnclient.cosmetics.cloaks.utils.IdentifierUtils;
@@ -13,6 +12,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
+import org.saturnclient.saturnclient.SaturnClient;
 
 /**
  * Manages the cloak system for Saturn Client.

src/main/java/org/saturnclient/saturnclient/menus/CloaksMenu.java

@@ -1,7 +1,7 @@
 package org.saturnclient.saturnclient.menus;
 
 import net.minecraft.text.Text;
-import org.saturnclient.saturnclient.SaturnClient;
+import org.saturnclient.saturnclient.SaturnClientConfig;
 import org.saturnclient.saturnclient.auth.SaturnSocket;
 import org.saturnclient.saturnclient.config.Property;
 import org.saturnclient.saturnclient.cosmetics.cloaks.Cloaks;
@@ -36,7 +36,7 @@ public class CloaksMenu extends SaturnUi {
                         .setY(rectY)
                         .setWidth(rectWidth)
                         .setHeight(rectHeight)
-                        .setAnimations(SaturnClient.getAnimations()));
+                        .setAnimations(SaturnClientConfig.getAnimations()));
 
         int tabsX = (width - 43) / 2;
         int tabsY = rectY - 17;
@@ -47,7 +47,7 @@ public class CloaksMenu extends SaturnUi {
                         .setY(tabsY)
                         .setWidth(43)
                         .setHeight(15)
-                        .setAnimations(SaturnClient.getAnimations()));
+                        .setAnimations(SaturnClientConfig.getAnimations()));
 
         draw(
                 new SaturnInputBox(search, rectX + rectWidth - 72, tabsY, 70).onUpdate(() -> {
@@ -56,7 +56,7 @@ public class CloaksMenu extends SaturnUi {
                 })
                         .setHeight(15)
                         .setWidth(72)
-                        .setAnimations(SaturnClient.getAnimations()));
+                        .setAnimations(SaturnClientConfig.getAnimations()));
 
         int tabSize = 9;
         tabsX = (width - tabSize) / 2;
@@ -68,7 +68,7 @@ public class CloaksMenu extends SaturnUi {
                         .setY(tabsY + 4)
                         .setWidth(tabSize)
                         .setHeight(7)
-                        .setAnimations(SaturnClient.getAnimations()));
+                        .setAnimations(SaturnClientConfig.getAnimations()));
 
         draw(
                 new SaturnClickableImage(Textures.CLOAK, () -> {
@@ -79,7 +79,7 @@ public class CloaksMenu extends SaturnUi {
                         .setY(tabsY + 3)
                         .setWidth(tabSize)
                         .setHeight(tabSize)
-                        .setAnimations(SaturnClient.getAnimations()));
+                        .setAnimations(SaturnClientConfig.getAnimations()));
 
         draw(
                 new SaturnClickableImage(Textures.SEARCH, () -> {
@@ -89,7 +89,7 @@ public class CloaksMenu extends SaturnUi {
                         .setY(tabsY + 3)
                         .setWidth(tabSize)
                         .setHeight(tabSize)
-                        .setAnimations(SaturnClient.getAnimations()));
+                        .setAnimations(SaturnClientConfig.getAnimations()));
 
         scroll = new SaturnScroll();
 
@@ -100,7 +100,7 @@ public class CloaksMenu extends SaturnUi {
                 .setY(rectY + 10)
                 .setWidth(rectWidth - 17)
                 .setHeight(rectHeight - 10)
-                .setAnimations(SaturnClient.getAnimations()));
+                .setAnimations(SaturnClientConfig.getAnimations()));
 
         super.init();
     }

src/main/java/org/saturnclient/saturnclient/menus/ConfigEditor.java

@@ -2,7 +2,7 @@ package org.saturnclient.saturnclient.menus;
 
 import java.util.Map;
 import net.minecraft.text.Text;
-import org.saturnclient.saturnclient.SaturnClient;
+import org.saturnclient.saturnclient.SaturnClientConfig;
 import org.saturnclient.saturnclient.config.ConfigManager;
 import org.saturnclient.saturnclient.config.Property;
 import org.saturnclient.ui.SaturnUi;
@@ -40,7 +40,7 @@ public class ConfigEditor extends SaturnUi {
                         .setY(rectY)
                         .setWidth(rectWidth)
                         .setHeight(rectHeight)
-                        .setAnimations(SaturnClient.getAnimations()));
+                        .setAnimations(SaturnClientConfig.getAnimations()));
 
         draw(
                 new SaturnImageButton(Textures.CLOSE, 9, 9, () -> {
@@ -50,7 +50,7 @@ public class ConfigEditor extends SaturnUi {
                         .setY(rectY - 15)
                         .setWidth(13)
                         .setHeight(13)
-                        .setAnimations(SaturnClient.getAnimations()));
+                        .setAnimations(SaturnClientConfig.getAnimations()));
 
         SaturnScroll configScroll = new SaturnScroll();
 
@@ -65,7 +65,7 @@ public class ConfigEditor extends SaturnUi {
                         .setY(rectY + 10)
                         .setWidth(rectWidth - 17)
                         .setHeight(rectHeight - 10)
-                        .setAnimations(SaturnClient.getAnimations()));
+                        .setAnimations(SaturnClientConfig.getAnimations()));
 
         super.init();
     }

src/main/java/org/saturnclient/saturnclient/menus/HatsMenu.java

@@ -1,7 +1,7 @@
 package org.saturnclient.saturnclient.menus;
 
 import net.minecraft.text.Text;
-import org.saturnclient.saturnclient.SaturnClient;
+import org.saturnclient.saturnclient.SaturnClientConfig;
 import org.saturnclient.saturnclient.auth.SaturnSocket;
 import org.saturnclient.saturnclient.cosmetics.Hats;
 import org.saturnclient.ui.SaturnUi;
@@ -31,7 +31,7 @@ public class HatsMenu extends SaturnUi {
                         .setY(rectY)
                         .setWidth(rectWidth)
                         .setHeight(rectHeight)
-                        .setAnimations(SaturnClient.getAnimations()));
+                        .setAnimations(SaturnClientConfig.getAnimations()));
 
         int tabsX = (width - 43) / 2;
         int tabsY = rectY - 17;
@@ -42,7 +42,7 @@ public class HatsMenu extends SaturnUi {
                         .setY(tabsY)
                         .setWidth(43)
                         .setHeight(15)
-                        .setAnimations(SaturnClient.getAnimations()));
+                        .setAnimations(SaturnClientConfig.getAnimations()));
 
         int tabSize = 9;
         tabsX = (width - tabSize) / 2;
@@ -55,7 +55,7 @@ public class HatsMenu extends SaturnUi {
                         .setY(tabsY + 4)
                         .setWidth(tabSize)
                         .setHeight(7)
-                        .setAnimations(SaturnClient.getAnimations()));
+                        .setAnimations(SaturnClientConfig.getAnimations()));
 
         draw(
                 new SaturnClickableImage(Textures.CLOAK, () -> {
@@ -65,7 +65,7 @@ public class HatsMenu extends SaturnUi {
                         .setY(tabsY + 3)
                         .setWidth(tabSize)
                         .setHeight(tabSize)
-                        .setAnimations(SaturnClient.getAnimations()));
+                        .setAnimations(SaturnClientConfig.getAnimations()));
 
         draw(
                 new SaturnClickableImage(Textures.SEARCH, () -> {
@@ -75,7 +75,7 @@ public class HatsMenu extends SaturnUi {
                         .setY(tabsY + 3)
                         .setWidth(tabSize)
                         .setHeight(tabSize)
-                        .setAnimations(SaturnClient.getAnimations()));
+                        .setAnimations(SaturnClientConfig.getAnimations()));
 
         int hatSize = 32;
 
@@ -119,7 +119,7 @@ public class HatsMenu extends SaturnUi {
                         .setY(rectY + 10)
                         .setWidth(rectWidth - 17)
                         .setHeight(rectHeight - 10)
-                        .setAnimations(SaturnClient.getAnimations()));
+                        .setAnimations(SaturnClientConfig.getAnimations()));
 
         super.init();
     }

src/main/java/org/saturnclient/saturnclient/menus/MainMenu.java

@@ -2,7 +2,7 @@ package org.saturnclient.saturnclient.menus;
 
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.text.Text;
-import org.saturnclient.saturnclient.SaturnClient;
+import org.saturnclient.saturnclient.SaturnClientConfig;
 import org.saturnclient.ui.SaturnUi;
 import org.saturnclient.ui.Textures;
 import org.saturnclient.ui.animations.FadeIn;
@@ -19,7 +19,7 @@ public class MainMenu extends SaturnUi {
 
     @Override
     protected void init() {
-        SaturnClient.textRenderer = MinecraftClient.getInstance().textRenderer;
+        SaturnClientConfig.textRenderer = MinecraftClient.getInstance().textRenderer;
 
         int buttonWidth = 96;
         int buttonHeight = 25;

src/main/java/org/saturnclient/saturnclient/menus/ModMenu.java

@@ -1,7 +1,7 @@
 package org.saturnclient.saturnclient.menus;
 
 import net.minecraft.text.Text;
-import org.saturnclient.saturnclient.SaturnClient;
+import org.saturnclient.saturnclient.SaturnClientConfig;
 import org.saturnclient.saturnclient.config.ConfigManager;
 import org.saturnclient.saturnclient.config.Property;
 import org.saturnclient.saturnmods.ModManager;
@@ -36,7 +36,7 @@ public class ModMenu extends SaturnUi {
                         .setY(rectY)
                         .setWidth(rectWidth)
                         .setHeight(rectHeight)
-                        .setAnimations(SaturnClient.getAnimations()));
+                        .setAnimations(SaturnClientConfig.getAnimations()));
 
         int tabsX = (width - 43) / 2;
         int tabsY = rectY - 17;
@@ -47,7 +47,7 @@ public class ModMenu extends SaturnUi {
                         .setY(tabsY)
                         .setWidth(43)
                         .setHeight(15)
-                        .setAnimations(SaturnClient.getAnimations()));
+                        .setAnimations(SaturnClientConfig.getAnimations()));
 
         draw(
                 new SaturnInputBox(search, rectX + rectWidth - 72, tabsY, 70).onUpdate(() -> {
@@ -56,7 +56,7 @@ public class ModMenu extends SaturnUi {
                 })
                         .setHeight(15)
                         .setWidth(72)
-                        .setAnimations(SaturnClient.getAnimations()));
+                        .setAnimations(SaturnClientConfig.getAnimations()));
 
         int tabSize = 9;
         tabsX = (width - tabSize) / 2;
@@ -68,7 +68,7 @@ public class ModMenu extends SaturnUi {
                         .setY(tabsY + 3)
                         .setWidth(tabSize)
                         .setHeight(tabSize)
-                        .setAnimations(SaturnClient.getAnimations()));
+                        .setAnimations(SaturnClientConfig.getAnimations()));
 
         draw(
                 new SaturnClickableImage(Textures.MODS_TAB, () -> {
@@ -78,7 +78,7 @@ public class ModMenu extends SaturnUi {
                         .setY(tabsY + 3)
                         .setWidth(tabSize)
                         .setHeight(tabSize)
-                        .setAnimations(SaturnClient.getAnimations()));
+                        .setAnimations(SaturnClientConfig.getAnimations()));
 
         draw(
                 new SaturnClickableImage(Textures.SEARCH, () -> {
@@ -88,7 +88,7 @@ public class ModMenu extends SaturnUi {
                         .setY(tabsY + 3)
                         .setWidth(tabSize)
                         .setHeight(tabSize)
-                        .setAnimations(SaturnClient.getAnimations()));
+                        .setAnimations(SaturnClientConfig.getAnimations()));
 
         scroll = new SaturnScroll();
 
@@ -99,7 +99,7 @@ public class ModMenu extends SaturnUi {
                 .setY(rectY + 10)
                 .setWidth(rectWidth - 17)
                 .setHeight(rectHeight - 20)
-                .setAnimations(SaturnClient.getAnimations()));
+                .setAnimations(SaturnClientConfig.getAnimations()));
 
         super.init();
     }

src/main/java/org/saturnclient/saturnclient/menus/SaturnConfigEditor.java

@@ -1,6 +1,6 @@
 package org.saturnclient.saturnclient.menus;
 
-import org.saturnclient.saturnclient.SaturnClient;
+import org.saturnclient.saturnclient.SaturnClientConfig;
 import org.saturnclient.ui.Textures;
 import org.saturnclient.ui.widgets.SaturnClickableImage;
 import org.saturnclient.ui.widgets.SaturnSprite;
@@ -8,7 +8,7 @@ import org.saturnclient.ui.widgets.SaturnSprite;
 public class SaturnConfigEditor extends ConfigEditor {
 
     public SaturnConfigEditor() {
-        super(SaturnClient.config);
+        super(SaturnClientConfig.config);
     }
 
     @Override
@@ -25,7 +25,7 @@ public class SaturnConfigEditor extends ConfigEditor {
                         .setY(tabsY)
                         .setWidth(43)
                         .setHeight(15)
-                        .setAnimations(SaturnClient.getAnimations()));
+                        .setAnimations(SaturnClientConfig.getAnimations()));
 
         int tabSize = 9;
         tabsX = (width - tabSize) / 2;
@@ -37,7 +37,7 @@ public class SaturnConfigEditor extends ConfigEditor {
                         .setY(tabsY + 3)
                         .setWidth(tabSize)
                         .setHeight(tabSize)
-                        .setAnimations(SaturnClient.getAnimations()));
+                        .setAnimations(SaturnClientConfig.getAnimations()));
 
         draw(
                 new SaturnClickableImage(Textures.MODS_TAB, () -> {
@@ -47,7 +47,7 @@ public class SaturnConfigEditor extends ConfigEditor {
                         .setY(tabsY + 3)
                         .setWidth(tabSize)
                         .setHeight(tabSize)
-                        .setAnimations(SaturnClient.getAnimations()));
+                        .setAnimations(SaturnClientConfig.getAnimations()));
 
         draw(
                 new SaturnClickableImage(Textures.SEARCH, () -> {
@@ -57,7 +57,7 @@ public class SaturnConfigEditor extends ConfigEditor {
                         .setY(tabsY + 3)
                         .setWidth(tabSize)
                         .setHeight(tabSize)
-                        .setAnimations(SaturnClient.getAnimations()));
+                        .setAnimations(SaturnClientConfig.getAnimations()));
 
         super.init();
     }

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

@@ -4,7 +4,7 @@ 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.*;
 
@@ -25,7 +25,7 @@ public class ModManager {
 
             if (textRenderer != null &&
                     !(client.currentScreen instanceof HudEditor)) {
-                SaturnClient.textRenderer = textRenderer;
+                SaturnClientConfig.textRenderer = textRenderer;
 
                 for (SaturnMod m : MODS) {
                     if (m instanceof HudMod && m.isEnabled()) {

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

@@ -8,7 +8,7 @@ import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
 import net.minecraft.util.Identifier;
-import org.saturnclient.saturnclient.SaturnClient;
+import org.saturnclient.saturnclient.SaturnClientConfig;
 import org.saturnclient.saturnclient.config.ConfigManager;
 import org.saturnclient.saturnclient.config.Property;
 import org.saturnclient.saturnmods.HudMod;
@@ -21,20 +21,17 @@ public class ArmorDisplay implements SaturnMod, HudMod {
     private static ConfigManager config = new ConfigManager("armor");
     public static Property<Boolean> enabled = config.property(
             "Enabled",
-        new Property<>(false)
+            new Property<>(false));
-    );
     private static ModDimensions dimensions = new ModDimensions(
             config,
             0,
             0,
             34,
-        75
+            75);
-    );
 
     public static Property<Integer> fgColor = config.property(
             "Foreground color",
-        new Property<>(SaturnClient.WHITE, Property.PropertyType.HEX)
+            new Property<>(SaturnClientConfig.WHITE, Property.PropertyType.HEX));
-    );
 
     private boolean renderItem(DrawContext context, ItemStack item, int y) {
         if (item.isEmpty()) {
@@ -53,13 +50,12 @@ public class ArmorDisplay implements SaturnMod, HudMod {
             matrices.scale(0.8f, 0.8f, 0f);
 
             context.drawText(
-                SaturnClient.textRenderer,
+                    SaturnClientConfig.textRenderer,
                     "" + (item.getMaxDamage() - item.getDamage()),
                     0,
                     0,
                     fgColor.value,
-                false
+                    false);
-            );
 
             matrices.pop();
         }

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

@@ -4,7 +4,7 @@ import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.util.Identifier;
-import org.saturnclient.saturnclient.SaturnClient;
+import org.saturnclient.saturnclient.SaturnClientConfig;
 import org.saturnclient.saturnclient.config.ConfigManager;
 import org.saturnclient.saturnclient.config.Property;
 import org.saturnclient.saturnmods.HudMod;
@@ -22,12 +22,12 @@ public class Coordinates implements SaturnMod, HudMod {
 
     public static Property<Integer> fgColor = config.property(
             "Foreground color",
-            new Property<>(SaturnClient.WHITE, Property.PropertyType.HEX));
+            new Property<>(SaturnClientConfig.WHITE, Property.PropertyType.HEX));
 
     public Coordinates() {
         // Ensure fgColor has a value
         if (fgColor.value == null) {
-            fgColor.value = SaturnClient.WHITE;
+            fgColor.value = SaturnClientConfig.WHITE;
         }
     }
 
@@ -37,16 +37,16 @@ public class Coordinates implements SaturnMod, HudMod {
         int playerZ = 83;
 
         context.drawText(
-                SaturnClient.textRenderer,
+                SaturnClientConfig.textRenderer,
                 playerX + " " + playerY + " " + playerZ,
                 0,
                 0,
                 fgColor.value,
                 false);
 
-        dimensions.width = SaturnClient.textRenderer.getWidth(
+        dimensions.width = SaturnClientConfig.textRenderer.getWidth(
                 playerX + " " + playerY + " " + playerZ);
-        dimensions.height = SaturnClient.textRenderer.fontHeight;
+        dimensions.height = SaturnClientConfig.textRenderer.fontHeight;
     }
 
     public void render(DrawContext context) {
@@ -56,7 +56,7 @@ public class Coordinates implements SaturnMod, HudMod {
         int playerZ = (int) player.getZ();
 
         context.drawText(
-                SaturnClient.textRenderer,
+                SaturnClientConfig.textRenderer,
                 playerX + " " + playerY + " " + playerZ,
                 0,
                 0,

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

@@ -3,7 +3,7 @@ package org.saturnclient.saturnmods.mods;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.util.Identifier;
-import org.saturnclient.saturnclient.SaturnClient;
+import org.saturnclient.saturnclient.SaturnClientConfig;
 import org.saturnclient.saturnclient.config.ConfigManager;
 import org.saturnclient.saturnclient.config.Property;
 import org.saturnclient.saturnmods.HudMod;
@@ -17,21 +17,18 @@ public class FpsDisplay implements SaturnMod, HudMod {
 
     public static Property<Boolean> enabled = config.property(
             "Enabled",
-        new Property<>(false)
+            new Property<>(false));
-    );
 
     public static ModDimensions dimensions = new ModDimensions(
             config,
             0,
             0,
             40,
-        8
+            8);
-    );
 
     public static Property<Integer> fgColor = config.property(
             "Foreground color",
-        new Property<>(SaturnClient.WHITE, Property.PropertyType.HEX)
+            new Property<>(SaturnClientConfig.WHITE, Property.PropertyType.HEX));
-    );
 
     @Override
     public ModDimensions getDimensions() {
@@ -43,13 +40,12 @@ public class FpsDisplay implements SaturnMod, HudMod {
         int fps = 128;
 
         context.drawText(
-            SaturnClient.textRenderer,
+                SaturnClientConfig.textRenderer,
                 String.valueOf(fps) + " FPS",
                 0,
                 0,
                 fgColor.value,
-            false
+                false);
-        );
     }
 
     @Override
@@ -57,13 +53,12 @@ public class FpsDisplay implements SaturnMod, HudMod {
         int fps = MinecraftClient.getInstance().getCurrentFps();
 
         context.drawText(
-            SaturnClient.textRenderer,
+                SaturnClientConfig.textRenderer,
                 String.valueOf(fps) + " FPS",
                 0,
                 0,
                 fgColor.value,
-            false
+                false);
-        );
     }
 
     @Override

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

@@ -1,7 +1,7 @@
 package org.saturnclient.saturnmods.mods;
 
 import net.minecraft.util.Identifier;
-import org.saturnclient.saturnclient.SaturnClient;
+import org.saturnclient.saturnclient.SaturnClientConfig;
 import org.saturnclient.saturnclient.config.ConfigManager;
 import org.saturnclient.saturnclient.config.Property;
 import org.saturnclient.saturnmods.SaturnMod;
@@ -22,11 +22,11 @@ public class Particles implements SaturnMod {
 
     public static Property<Integer> totem_1 = totem.property(
             "Totem particle color 1",
-            new Property<>(SaturnClient.COLOR.value, Property.PropertyType.HEX));
+            new Property<>(SaturnClientConfig.COLOR.value, Property.PropertyType.HEX));
 
     public static Property<Integer> totem_2 = totem.property(
             "Totem particle color 2",
-            new Property<>(SaturnClient.COLOR.value, Property.PropertyType.HEX));
+            new Property<>(SaturnClientConfig.COLOR.value, Property.PropertyType.HEX));
 
     @Override
     public boolean isEnabled() {

src/main/java/org/saturnclient/ui/SaturnUi.java

@@ -254,8 +254,8 @@ public class SaturnUi extends Screen {
 
     public void saturnTick() {
         synchronized (scheduler) {
-            if (f < 20.0f) {
+            if (f < 15.0f) {
-                f += 1.0f;
+                f += 0.25f;
             }
         }
         synchronized (widgets) {

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

@@ -4,7 +4,8 @@ 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;
 import org.saturnclient.ui.SaturnUi;
 import org.saturnclient.ui.SaturnWidget;
@@ -59,7 +60,7 @@ public class SaturnFloat extends SaturnWidget {
                         text.substring(cursorPosition);
 
                 prop.value = text.isEmpty() ? 0 : Float.parseFloat(text);
-                org.saturnclient.saturnclient.config.ConfigManager.save();
+                ConfigManager.save();
 
                 cursorPosition++;
             }
@@ -78,7 +79,7 @@ public class SaturnFloat extends SaturnWidget {
                     cursorPosition = 1;
                 }
                 prop.value = Float.parseFloat(text);
-                org.saturnclient.saturnclient.config.ConfigManager.save();
+                ConfigManager.save();
             }
         } else if (keyCode == GLFW.GLFW_KEY_LEFT) {
             if (cursorPosition > 0) {
@@ -110,8 +111,8 @@ public class SaturnFloat extends SaturnWidget {
                 this.width,
                 this.height,
                 focused
-                        ? SaturnClient.COLOR.value
+                        ? SaturnClientConfig.COLOR.value
-                        : SaturnClient.getWhite(this.alpha));
+                        : SaturnClientConfig.getWhite(this.alpha));
 
         int scrollOffset = getScrollOffset();
         String visibleText = getVisibleText(scrollOffset);

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

@@ -4,7 +4,8 @@ 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;
 import org.saturnclient.ui.SaturnUi;
 import org.saturnclient.ui.SaturnWidget;
@@ -42,7 +43,7 @@ public class SaturnHex extends SaturnWidget {
 
             if (text.length() == 7) { // Only update value when full hex is entered
                 prop.value = hexToInt(text);
-                org.saturnclient.saturnclient.config.ConfigManager.save();
+                ConfigManager.save();
             }
         }
     }
@@ -66,7 +67,7 @@ public class SaturnHex extends SaturnWidget {
 
         if (text.length() == 7) { // Update only when valid hex
             prop.value = hexToInt(text);
-            org.saturnclient.saturnclient.config.ConfigManager.save();
+            ConfigManager.save();
         }
     }
 
@@ -89,8 +90,8 @@ public class SaturnHex extends SaturnWidget {
                 this.width,
                 this.height,
                 focused
-                        ? SaturnClient.COLOR.value
+                        ? SaturnClientConfig.COLOR.value
-                        : SaturnClient.getWhite(this.alpha));
+                        : SaturnClientConfig.getWhite(this.alpha));
 
         int textColor = focused ? 0xFFFFFF : 0xAAAAAA;
         context.drawText(

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

@@ -4,7 +4,8 @@ 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;
 import org.saturnclient.ui.SaturnUi;
 import org.saturnclient.ui.SaturnWidget;
@@ -59,7 +60,7 @@ public class SaturnInteger extends SaturnWidget {
                         text.substring(cursorPosition);
 
                 prop.value = text.isEmpty() ? 0 : Integer.parseInt(text);
-                org.saturnclient.saturnclient.config.ConfigManager.save();
+                ConfigManager.save();
 
                 cursorPosition++;
             }
@@ -78,7 +79,7 @@ public class SaturnInteger extends SaturnWidget {
                     cursorPosition = 1;
                 }
                 prop.value = Integer.parseInt(text);
-                org.saturnclient.saturnclient.config.ConfigManager.save();
+                ConfigManager.save();
             }
         } else if (keyCode == GLFW.GLFW_KEY_LEFT) {
             if (cursorPosition > 0) {
@@ -110,8 +111,8 @@ public class SaturnInteger extends SaturnWidget {
                 this.width,
                 this.height,
                 focused
-                        ? SaturnClient.COLOR.value
+                        ? SaturnClientConfig.COLOR.value
-                        : SaturnClient.getWhite(this.alpha));
+                        : SaturnClientConfig.getWhite(this.alpha));
 
         int scrollOffset = getScrollOffset();
         String visibleText = getVisibleText(scrollOffset);

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

@@ -2,7 +2,7 @@ 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;
 import org.saturnclient.ui.SaturnUi;
@@ -28,8 +28,8 @@ public class SaturnModComp extends SaturnWidget {
                 boolean hovering_settings = settingsHovering(mouseX, mouseY);
 
                 int color = !hovering_settings && (enabled || hovering)
-                ? SaturnClient.COLOR.value
+                                ? SaturnClientConfig.COLOR.value
-                : SaturnClient.getWhite(alpha);
+                                : SaturnClientConfig.getWhite(alpha);
 
                 int size = 12;
 
@@ -41,7 +41,7 @@ public class SaturnModComp extends SaturnWidget {
                                         0,
                                         86,
                                         20,
-                    SaturnClient.COLOR.value);
+                                        SaturnClientConfig.COLOR.value);
                 }
 
                 SaturnUi.drawHighResTexture(
@@ -63,10 +63,10 @@ public class SaturnModComp extends SaturnWidget {
                                 color);
 
                 context.drawText(
-                SaturnClient.textRenderer,
+                                SaturnClientConfig.textRenderer,
                                 SaturnUi.text(mod.getName()),
                                 20,
-                (21 - SaturnClient.textRenderer.fontHeight) / 2,
+                                (21 - SaturnClientConfig.textRenderer.fontHeight) / 2,
                                 color,
                                 false);
 
@@ -78,8 +78,8 @@ public class SaturnModComp extends SaturnWidget {
                                 7,
                                 7,
                                 hovering_settings
-                        ? SaturnClient.COLOR.value
+                                                ? SaturnClientConfig.COLOR.value
-                        : SaturnClient.getWhite(alpha));
+                                                : SaturnClientConfig.getWhite(alpha));
         }
 
         @Override

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

@@ -4,7 +4,7 @@ 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.Property;
 import org.saturnclient.ui.SaturnUi;
 import org.saturnclient.ui.SaturnWidget;
@@ -88,8 +88,8 @@ public class SaturnString extends SaturnWidget {
                 this.width,
                 this.height,
                 focused
-                        ? SaturnClient.COLOR.value
+                        ? SaturnClientConfig.COLOR.value
-                        : SaturnClient.getWhite(this.alpha));
+                        : SaturnClientConfig.getWhite(this.alpha));
 
         int scrollOffset = getScrollOffset();
         String visibleText = getVisibleText(scrollOffset);

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

@@ -2,7 +2,8 @@ package org.saturnclient.ui.components;
 
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.render.RenderLayer;
-import org.saturnclient.saturnclient.SaturnClient;
+import org.saturnclient.saturnclient.SaturnClientConfig;
+import org.saturnclient.saturnclient.config.ConfigManager;
 import org.saturnclient.saturnclient.config.Property;
 import org.saturnclient.ui.SaturnWidget;
 import org.saturnclient.ui.Textures;
@@ -24,8 +25,8 @@ public class SaturnToggle extends SaturnWidget {
             int mouseX,
             int mouseY) {
         int color = prop.value
-                ? SaturnClient.COLOR.value
+                ? SaturnClientConfig.COLOR.value
-                : SaturnClient.getWhite(alpha);
+                : SaturnClientConfig.getWhite(alpha);
         int w = 13;
         int h = 6;
         int s = 8;
@@ -60,6 +61,6 @@ public class SaturnToggle extends SaturnWidget {
     @Override
     public void click(int mouseX, int mouseY) {
         prop.value = !prop.value;
-        org.saturnclient.saturnclient.config.ConfigManager.save();
+        ConfigManager.save();
     }
 }

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

@@ -5,7 +5,7 @@ import java.util.function.Consumer;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.DrawContext;
 
-import org.saturnclient.saturnclient.SaturnClient;
+import org.saturnclient.saturnclient.SaturnClientConfig;
 import org.saturnclient.ui.SaturnUi;
 import org.saturnclient.ui.SaturnWidget;
 import org.saturnclient.ui.Textures;
@@ -47,7 +47,7 @@ public class SaturnButton extends SaturnWidget {
                     0,
                     this.width,
                     this.height,
-                    SaturnClient.getColor(hovering, alpha));
+                    SaturnClientConfig.getColor(hovering, alpha));
 
             if (hovering) {
                 if (hoverAlpha == 0.0f)
@@ -60,7 +60,7 @@ public class SaturnButton extends SaturnWidget {
                         0,
                         this.width,
                         this.height,
-                        SaturnClient.getColor(hovering, alpha));
+                        SaturnClientConfig.getColor(hovering, alpha));
             } else {
                 hoverAlpha = 0.0f;
             }
@@ -77,7 +77,7 @@ public class SaturnButton extends SaturnWidget {
                             2),
                     ((this.height - minecraftClient.textRenderer.fontHeight + 1) /
                             2),
-                    SaturnClient.getColor(hovering, alpha),
+                    SaturnClientConfig.getColor(hovering, alpha),
                     false);
         }
     }

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

@@ -3,7 +3,7 @@ package org.saturnclient.ui.widgets;
 import java.util.function.Consumer;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.util.Identifier;
-import org.saturnclient.saturnclient.SaturnClient;
+import org.saturnclient.saturnclient.SaturnClientConfig;
 import org.saturnclient.ui.SaturnUi;
 import org.saturnclient.ui.SaturnWidget;
 
@@ -45,7 +45,7 @@ public class SaturnClickableImage extends SaturnWidget {
                 0,
                 width,
                 height,
-                SaturnClient.getColor(hovering || selected, alpha));
+                SaturnClientConfig.getColor(hovering || selected, alpha));
     }
 
     @Override

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

@@ -3,7 +3,7 @@ package org.saturnclient.ui.widgets;
 import java.util.function.Consumer;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.util.Identifier;
-import org.saturnclient.saturnclient.SaturnClient;
+import org.saturnclient.saturnclient.SaturnClientConfig;
 import org.saturnclient.ui.SaturnUi;
 import org.saturnclient.ui.SaturnWidget;
 
@@ -39,7 +39,7 @@ public class SaturnClickableSprite extends SaturnWidget {
                 0,
                 this.width,
                 this.height,
-                SaturnClient.getColor(hovering, alpha));
+                SaturnClientConfig.getColor(hovering, alpha));
     }
 
     @Override

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

@@ -4,7 +4,7 @@ import java.util.function.Consumer;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.render.RenderLayer;
 import net.minecraft.util.Identifier;
-import org.saturnclient.saturnclient.SaturnClient;
+import org.saturnclient.saturnclient.SaturnClientConfig;
 import org.saturnclient.ui.SaturnUi;
 import org.saturnclient.ui.SaturnWidget;
 import org.saturnclient.ui.Textures;
@@ -59,7 +59,7 @@ public class SaturnImageButton extends SaturnWidget {
                 0,
                 this.width,
                 this.height,
-                SaturnClient.getColor(hovering, alpha));
+                SaturnClientConfig.getColor(hovering, alpha));
 
         if (hovering) {
             SaturnUi.drawHighResGuiTexture(
@@ -69,7 +69,7 @@ public class SaturnImageButton extends SaturnWidget {
                     0,
                     this.width,
                     this.height,
-                    SaturnClient.getColor(hovering, alpha));
+                    SaturnClientConfig.getColor(hovering, alpha));
         }
 
         context.drawTexture(
@@ -83,7 +83,7 @@ public class SaturnImageButton extends SaturnWidget {
                 imageHeight,
                 imageWidth,
                 imageHeight,
-                SaturnClient.getColor(hovering, alpha));
+                SaturnClientConfig.getColor(hovering, alpha));
     }
 
     @Override

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

@@ -7,7 +7,7 @@ import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.util.math.MatrixStack;
 
 import org.lwjgl.glfw.GLFW;
-import org.saturnclient.saturnclient.SaturnClient;
+import org.saturnclient.saturnclient.SaturnClientConfig;
 import org.saturnclient.saturnclient.config.Property;
 import org.saturnclient.ui.SaturnUi;
 import org.saturnclient.ui.Textures;
@@ -97,8 +97,8 @@ public class SaturnInputBox extends SaturnWidget {
                 this.width,
                 this.height,
                 focused
-                        ? SaturnClient.COLOR.value
+                        ? SaturnClientConfig.COLOR.value
-                        : SaturnClient.getWhite(this.alpha));
+                        : SaturnClientConfig.getWhite(this.alpha));
 
         if (hovering || focused) {
             SaturnUi.drawHighResGuiTexture(
@@ -109,8 +109,8 @@ public class SaturnInputBox extends SaturnWidget {
                     this.width,
                     this.height,
                     hovering
-                            ? SaturnClient.COLOR.value
+                            ? SaturnClientConfig.COLOR.value
-                            : SaturnClient.getWhite(this.alpha));
+                            : SaturnClientConfig.getWhite(this.alpha));
         }
 
         MatrixStack matrices = context.getMatrices();
@@ -125,8 +125,8 @@ public class SaturnInputBox extends SaturnWidget {
                     9,
                     9,
                     hovering
-                            ? SaturnClient.COLOR.value
+                            ? SaturnClientConfig.COLOR.value
-                            : SaturnClient.getWhite(this.alpha));
+                            : SaturnClientConfig.getWhite(this.alpha));
 
             matrices.scale(0.9f, 0.9f, 1.0f);
 
@@ -136,8 +136,8 @@ public class SaturnInputBox extends SaturnWidget {
                     14,
                     textRenderer.fontHeight / 2 + 1,
                     hovering
-                            ? SaturnClient.COLOR.value
+                            ? SaturnClientConfig.COLOR.value
-                            : SaturnClient.getWhite(this.alpha),
+                            : SaturnClientConfig.getWhite(this.alpha),
                     false);
         }
 

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

@@ -1,7 +1,7 @@
 package org.saturnclient.ui.widgets;
 
 import net.minecraft.client.gui.DrawContext;
-import org.saturnclient.saturnclient.SaturnClient;
+import org.saturnclient.saturnclient.SaturnClientConfig;
 import org.saturnclient.ui.SaturnUi;
 import org.saturnclient.ui.SaturnWidget;
 
@@ -11,8 +11,8 @@ public class SaturnText extends SaturnWidget {
 
     public SaturnText(String text) {
         this.text = text;
-        this.width = SaturnClient.textRenderer.getWidth(SaturnUi.text(text));
+        this.width = SaturnClientConfig.textRenderer.getWidth(SaturnUi.text(text));
-        this.height = SaturnClient.textRenderer.fontHeight;
+        this.height = SaturnClientConfig.textRenderer.fontHeight;
     }
 
     public SaturnText(String text, int color) {
@@ -26,11 +26,11 @@ public class SaturnText extends SaturnWidget {
             int mouseX,
             int mouseY) {
         context.drawText(
-                SaturnClient.textRenderer,
+                SaturnClientConfig.textRenderer,
                 SaturnUi.text(text),
                 0,
                 0,
-                SaturnClient.getColor(hovering, alpha),
+                SaturnClientConfig.getColor(hovering, alpha),
                 false);
     }
 }