added name tags

build.gradle

@@ -43,7 +43,7 @@ processResources {
     }
 }
 
-def targetJavaVersion = 17
+def targetJavaVersion = 21
 tasks.withType(JavaCompile).configureEach {
     it.options.encoding = "UTF-8"
     if (targetJavaVersion >= 10 || JavaVersion.current().isJava10Compatible()) {

gradle.properties

@@ -8,7 +8,7 @@ org.gradle.jvmargs=-Xmx1G
 	loader_version=0.16.10
 
 # Mod Properties
-	mod_version = 0.0.1-alpha0
+	mod_version = 0.0.1-alpha1
 	maven_group = me.iipho3nix
 	archives_base_name = saturnclient
 

src/main/java/org/saturnclient/modules/HudMod.java

@@ -1,4 +1,4 @@
-package org.saturnclient.saturnmods;
+package org.saturnclient.modules;
 
 import net.minecraft.client.gui.DrawContext;
 

src/main/java/org/saturnclient/modules/ModDimensions.java

@@ -1,4 +1,4 @@
-package org.saturnclient.saturnmods;
+package org.saturnclient.modules;
 
 import org.saturnclient.saturnclient.config.ConfigManager;
 import org.saturnclient.saturnclient.config.Property;

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

@@ -0,0 +1,57 @@
+package org.saturnclient.modules;
+
+import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
+import net.fabricmc.fabric.api.client.rendering.v1.HudRenderCallback;
+import net.minecraft.client.font.TextRenderer;
+import net.minecraft.client.util.math.MatrixStack;
+
+import org.saturnclient.modules.mods.*;
+import org.saturnclient.saturnclient.SaturnClient;
+import org.saturnclient.saturnclient.menus.HudEditor;
+import org.saturnclient.saturnclient.mixin.DrawContextAccessor;
+import org.saturnclient.ui2.RenderScope;
+
+public class ModManager {
+    public static Module[] MODS = {
+        new Crosshair()
+    };
+
+    public static void init() {
+        ClientTickEvents.END_CLIENT_TICK.register(client -> {
+            for (Module m : MODS) {
+                if (m.isEnabled()) {
+                    m.tick();
+                }
+            }
+        });
+
+        HudRenderCallback.EVENT.register((context, _o) -> {
+            TextRenderer textRenderer = SaturnClient.client.textRenderer;
+
+            if (textRenderer != null &&
+                    !(SaturnClient.client.currentScreen instanceof HudEditor)) {
+                RenderScope renderScope = new RenderScope(context.getMatrices(),
+                    ((DrawContextAccessor) context).getVertexConsumers());
+
+                for (Module m : MODS) {
+                    if (m instanceof HudMod && m.isEnabled()) {
+                        ModDimensions dim = ((HudMod) m).getDimensions();
+
+                        MatrixStack matrices = context.getMatrices();
+                        matrices.push();
+
+                        matrices.translate(dim.x.value, (float) dim.y.value, 0);
+
+                        matrices.scale(dim.scale.value, dim.scale.value, 1.0f);
+
+                        ((HudMod) m).render(context);
+
+                        matrices.pop();
+                    } else {
+                        m.render(renderScope);
+                    }
+                }
+            }
+        });
+    }
+}

src/main/java/org/saturnclient/modules/Module.java

@@ -0,0 +1,51 @@
+package org.saturnclient.modules;
+
+import org.saturnclient.saturnclient.config.ConfigManager;
+import org.saturnclient.saturnclient.config.NamedProperty;
+import org.saturnclient.ui.Textures;
+import org.saturnclient.ui2.RenderScope;
+
+import net.minecraft.util.Identifier;
+
+public abstract class Module {
+    private final String name;
+    private final String namespace;
+    private final ConfigManager configManager;
+
+    public Module(String name, String namespace, NamedProperty<?>... props) {
+        this.name = name;
+        this.namespace = namespace;
+
+        configManager = new ConfigManager(name);
+
+        for (NamedProperty<?> prop : props) {
+            configManager.property(prop.name, prop.prop);
+        }
+    }
+
+    public Module(ConfigManager config, String name, String namespace) {
+        this.name = name;
+        this.namespace = namespace;
+
+        configManager = config;
+    }
+
+    public void render(RenderScope scope) {}
+    public void tick() {}
+
+    public abstract boolean isEnabled();
+
+    public abstract void setEnabled(boolean e);
+
+    public final String getName() {
+        return name;
+    }
+    
+    public Identifier getIconTexture() {
+        return Textures.getModIcon(namespace);
+    }
+
+    public ConfigManager getConfig() {
+        return configManager;
+    }
+}

src/main/java/org/saturnclient/modules/mods/Crosshair.java

@@ -0,0 +1,44 @@
+package org.saturnclient.modules.mods;
+
+import org.saturnclient.modules.Module;
+import org.saturnclient.saturnclient.SaturnClient;
+import org.saturnclient.saturnclient.config.Property;
+import org.saturnclient.ui2.RenderScope;
+import org.saturnclient.ui2.resources.Textures;
+
+import net.minecraft.client.render.RenderLayer;
+
+public class Crosshair extends Module {
+    public static Property<Boolean> enabled = new Property<>(false);
+    public static Property<Boolean> range_indicator = new Property<>(false);
+
+    public Crosshair() {
+        super("Crosshair", "crosshair", enabled.named("Enabled"), range_indicator.named("Range Indicator"));
+    }
+
+    @Override
+    public void render(RenderScope scope) {
+        if (enabled.value
+                && range_indicator.value
+                && SaturnClient.client.targetedEntity != null
+                && SaturnClient.client.targetedEntity.isAlive()) {
+            int scaledWidth = 15;
+            int scaledHeight = 15;
+
+            scope.drawTexture(RenderLayer::getCrosshair, Textures.CROSSHAIR_RANGE,
+                    (scope.getScaledWindowWidth() - scaledWidth) / 2,
+                    (scope.getScaledWindowHeight() - scaledHeight) / 2, 0.0F, 0.0F, scaledWidth, scaledHeight,
+                    scaledWidth, scaledHeight);
+        }
+    }
+
+    @Override
+    public boolean isEnabled() {
+        return enabled.value;
+    }
+
+    @Override
+    public void setEnabled(boolean e) {
+        enabled.value = e;
+    }
+}

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

@@ -3,16 +3,18 @@ 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.modules.ModManager;
 import org.saturnclient.saturnclient.auth.Auth;
 import org.saturnclient.saturnclient.config.ConfigManager;
+import org.saturnclient.saturnclient.config.ThemeManager;
 import org.saturnclient.saturnclient.cosmetics.Hats;
 import org.saturnclient.saturnclient.cosmetics.cloaks.Cloaks;
 import org.saturnclient.saturnclient.event.KeyInputHandler;
 import org.saturnclient.saturnclient.menus.SaturnMenu;
 import org.saturnclient.saturnclient.menus.SaturnTitleScreen;
-import org.saturnclient.saturnmods.ModManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -25,25 +27,29 @@ 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();
+        SaturnClientConfig.init();
+        ThemeManager.load();
         ConfigManager.load();
-
+        
-        ClientLifecycleEvents.CLIENT_STOPPING.register(_o -> ConfigManager.save());
+        ClientLifecycleEvents.CLIENT_STOPPING.register(_o -> {ConfigManager.save(); ThemeManager.save();});
         ScreenEvents.BEFORE_INIT.register((client, screen, scaledWidth, scaledHeight) -> {
             if (SaturnClientConfig.saturnTitleScreen.value && screen instanceof TitleScreen
-                    && !(screen instanceof SaturnMenu)) {
+            && !(screen instanceof SaturnMenu)) {
                 client.setScreen(new SaturnTitleScreen());
             }
         });
-
+        
         SpecialModelLoaderEvents.LOAD_SCOPE.register(() -> {
             return (resourceManager, location) -> MOD_ID.equals(location.getNamespace());
         });
-
+        
         KeyInputHandler.register();
         if (Auth.authenticate()) {
             Cloaks.initialize();

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

@@ -7,35 +7,30 @@ import org.saturnclient.ui.SaturnUi;
 import org.saturnclient.ui.Textures;
 import org.saturnclient.ui.animations.FadeIn;
 
-import net.minecraft.client.font.TextRenderer;
+import net.minecraft.util.Formatting;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.ColorHelper;
 
 public class SaturnClientConfig {
-    public static ConfigManager config = new ConfigManager("Saturn Client");
+    public static ConfigManager config;
 
-    public static Property<Integer> color = config.property(
+    public static Property<Integer> color =
-            "Primary color",
             new Property<>(
                     ColorHelper.getArgb(255, 251, 60, 79),
-                    Property.PropertyType.HEX));
+                    Property.PropertyType.HEX);
 
-    public static Property<Integer> normal = config.property(
+    public static Property<Integer> normal =
-            "Default color",
             new Property<>(
                     ColorHelper.getArgb(255, 182, 182, 182),
-                    Property.PropertyType.HEX));
+                    Property.PropertyType.HEX);
 
-    public static Property<Boolean> realisticLogo = config.property(
+    public static Property<Boolean> realisticLogo =
-            "Realistic logo",
+            new Property<>(false);
-            new Property<>(false));
 
-    public static Property<Boolean> saturnTitleScreen = config.property(
+    public static Property<Boolean> saturnTitleScreen = 
-            "Saturn client title screen",
+            new Property<>(true);
-            new Property<>(true));
 
     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);
@@ -56,4 +51,30 @@ public class SaturnClientConfig {
     public static String getSaturnIndicator() {
         return realisticLogo.value ? "" : "";
     }
+
+    /*
+     * Gets the icon color of a specific individual, here are the different colors
+     * 
+     * - Owner: Dark Red
+     * - Admin: Red
+     * - Partners: Gold
+     * - Contributor: Aqua
+     * - Other/player: White
+    */
+    public static Formatting getIconColor(String uuid) {
+        if (uuid.equals("d362a04228bd49e1a807ae74dbe8aba9")) {
+            return Formatting.DARK_RED; // Owner
+        }
+
+        return Formatting.WHITE;
+    }
+
+    public static void init() {
+        config = new ConfigManager("Saturn Client");
+
+        config.property("Primary color", color);
+        config.property("Default color", normal);
+        config.property("Realistic logo", realisticLogo);
+        config.property("Saturn client title screen", saturnTitleScreen);
+    }
 }

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

@@ -3,7 +3,6 @@ package org.saturnclient.saturnclient.auth;
 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.cosmetics.Hats;
 import org.saturnclient.saturnclient.cosmetics.cloaks.Cloaks;
 import org.saturnclient.saturnclient.SaturnClient;
@@ -22,13 +21,12 @@ public class Auth {
         ClientLifecycleEvents.CLIENT_STOPPING.register(_o -> close());
 
         try {
-            MinecraftClient client = MinecraftClient.getInstance();
+            if (SaturnClient.client.getSession() == null) {
-            if (client.getSession() == null) {
                 SaturnClient.LOGGER.error("No active Minecraft session found");
                 return false;
             }
 
-            String accessToken = client.getSession().getAccessToken();
+            String accessToken = SaturnClient.client.getSession().getAccessToken();
             SaturnClient.LOGGER.info("Authenticating");
 
             Network.init();
@@ -55,7 +53,7 @@ public class Auth {
 
             Cloaks.loadCloak(uuid);
 
-            playerNames.put(client.getSession().getUsername(), uuid);
+            playerNames.put(SaturnClient.client.getSession().getUsername(), uuid);
 
             afterAuth();
 
@@ -184,7 +182,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

@@ -2,8 +2,9 @@ package org.saturnclient.saturnclient.auth;
 
 import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
-import net.minecraft.client.MinecraftClient;
+import org.saturnclient.saturnclient.SaturnClient;
 import net.minecraft.client.network.PlayerListEntry;
+import net.minecraft.client.MinecraftClient;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -19,7 +20,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

@@ -12,13 +12,12 @@ import java.nio.file.Files;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
-import net.minecraft.client.MinecraftClient;
 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<>();
 
@@ -27,6 +26,7 @@ public class ConfigManager {
     public ConfigManager(String namespace) {
         currentMap = new LinkedHashMap<>();
         properties.put(namespace, currentMap);
+        System.out.println("Created namespace: " + namespace);
     }
 
     public ConfigManager(ConfigManager config, String namespace) {
@@ -36,10 +36,12 @@ public class ConfigManager {
         config.property(namespace, namespaceProperty);
         // Update the parent's state
         config.currentMap.put(namespace, namespaceProperty);
+        System.out.println("Created sub-namespace: " + namespace);
     }
 
     // Generic method to store any type of property
     public <T> Property<T> property(String name, Property<T> value) {
+        System.out.println("Adding property: " + name);
         currentMap.put(name, value);
         return value;
     }
@@ -56,6 +58,7 @@ public class ConfigManager {
                     new String(Files.readAllBytes(configFile.toPath()))).getAsJsonObject();
 
             for (String namespace : properties.keySet()) {
+                SaturnClient.LOGGER.info("Loading namespace: " + namespace);
                 JsonElement configElement = jsonObject.get(namespace);
 
                 if (configElement == null)
@@ -77,6 +80,8 @@ public class ConfigManager {
 
     @SuppressWarnings("unchecked")
     private static void loadProperties(JsonObject config, Map<String, Property<?>> propertyMap) {
+        SaturnClient.LOGGER.info("Loading properties: " + propertyMap);
+
         for (String propertyName : propertyMap.keySet()) {
             JsonElement c = config.get(propertyName);
 

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

@@ -0,0 +1,11 @@
+package org.saturnclient.saturnclient.config;
+
+public class NamedProperty<T> {
+    public String name;
+    public Property<T> prop;
+
+    public NamedProperty(String name, Property<T> value) {
+        this.name = name;
+        this.prop = value;
+    }
+}

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

@@ -139,4 +139,19 @@ public class Property<T> {
     public static boolean valueIsNamespace(Object obj) {
         return obj instanceof Map;
     }
+
+    @SuppressWarnings("unchecked")
+    public void setValue(Object value) {
+        this.value = (T) value;
+    }
+
+    @SuppressWarnings("unchecked")
+    public void setValue(Object value, Object defaultValue) {
+        this.value = (T) value;
+        this.defaultValue = (T) defaultValue;
+    }
+
+    public NamedProperty<T> named(String name) {
+        return new NamedProperty<>(name, this);
+    }
 }

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

@@ -0,0 +1,224 @@
+package org.saturnclient.saturnclient.config;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import org.saturnclient.saturnclient.SaturnClient;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import com.google.gson.JsonPrimitive;
+
+public class ThemeManager {
+    
+    private static File themeFile = new File(
+            SaturnClient.client.runDirectory,
+            "saturn.theme.json");
+    private static Map<String, Map<String, Property<?>>> properties = new HashMap<>();
+
+    // private Map<String, Map<String, Property<?>>> states;
+    private Map<String, Property<?>> currentStyling;
+    private String state;
+    private String[] states;
+    private String namespace;
+
+    public ThemeManager(String namespace, String... states) {
+        // this.states = new LinkedHashMap<>();
+        this.namespace = namespace;
+        this.states = states;
+        currentStyling = new LinkedHashMap<>();
+
+        properties.put(namespace, new LinkedHashMap<>());
+
+        for (String s : states) {
+            properties.put(namespace+"@"+s, new LinkedHashMap<>());
+        }
+    }
+
+    public void setState(String state) {
+            this.state = state;
+
+            if (this.state != null) {
+                for (Map.Entry<String, Property<?>> tProp : properties.get(namespace+"@"+state).entrySet()) {
+                    currentStyling.get(tProp.getKey()).setValue(tProp.getValue().value);
+                }
+            } else {
+                for (Map.Entry<String, Property<?>> tProp : properties.get(namespace).entrySet()) {
+                    currentStyling.get(tProp.getKey()).setValue(tProp.getValue().value);
+                }
+            }
+    }
+
+    // Generic method to store any type of property
+    public <T> Property<T> property(String name, Property<T> prop) {
+        for (String state : states) {
+            properties.get(namespace+"@"+state).put(name, new Property<T>(prop.value));
+        }
+
+        properties.get(namespace).put(name, new Property<T>(prop.value));
+        currentStyling.put(name, prop);
+
+        return prop;
+    }
+
+    public <T> void propertyStateDefault(String state, String name, T value) {
+        properties.get(namespace+"@"+state).get(name).setValue(value, value); // sets the current and default value
+    }
+
+    public static void load() {
+        try {
+            SaturnClient.LOGGER.info("Starting to load theme...");
+            if (!themeFile.exists()) {
+                themeFile.createNewFile();
+                Files.write(themeFile.toPath(), "{}".getBytes());
+            }
+
+            JsonObject jsonObject = JsonParser.parseString(
+                    new String(Files.readAllBytes(themeFile.toPath()))).getAsJsonObject();
+
+            for (String namespace : properties.keySet()) {
+                JsonElement themeElement = jsonObject.get(namespace);
+
+                if (themeElement == null)
+                    continue;
+
+                JsonObject theme = jsonObject.get(namespace).getAsJsonObject();
+
+                if (theme == null) {
+                    continue;
+                }
+
+                Map<String, Property<?>> propertyMap = properties.get(namespace);
+                loadProperties(theme, propertyMap);
+            }
+        } catch (IOException e) {
+            SaturnClient.LOGGER.error("Error reading the theme file", e);
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    private static void loadProperties(JsonObject theme, Map<String, Property<?>> propertyMap) {
+        for (String propertyName : propertyMap.keySet()) {
+            JsonElement c = theme.get(propertyName);
+
+            if (c == null) {
+                continue;
+            }
+
+            Property<?> p = propertyMap.get(propertyName);
+            if (p.matchesJson(c)) {
+                if (p.getType() == Property.PropertyType.NAMESPACE) {
+                    // Handle nested namespace
+                    JsonObject nestedTheme = c.getAsJsonObject();
+                    Map<String, Property<?>> nestedProperties = p.getNamespaceValue();
+                    loadProperties(nestedTheme, nestedProperties);
+                } else {
+                    // Handle regular properties
+                    switch (p.getType()) {
+                        case BOOLEAN:
+                            ((Property<Boolean>) p).value = c.getAsBoolean();
+                            break;
+                        case INTEGER:
+                            ((Property<Integer>) p).value = c.getAsInt();
+                            break;
+                        case FLOAT:
+                            ((Property<Float>) p).value = c.getAsFloat();
+                            break;
+                        case STRING:
+                            ((Property<String>) p).value = c.getAsString();
+                            break;
+                        case HEX:
+                            ((Property<Integer>) p).value = c.getAsInt();
+                            break;
+                        default:
+                            break;
+                    }
+                }
+            } else {
+                SaturnClient.LOGGER.warn(
+                        "Property does not match JSON: " + propertyName);
+            }
+        }
+    }
+
+    public static void save() {
+        try {
+            SaturnClient.LOGGER.info("Starting to save theme...");
+
+            JsonObject jsonObject = new JsonObject();
+
+            // Iterate through all namespaces and their properties
+            for (String namespace : properties.keySet()) {
+                JsonObject namespaceTheme = new JsonObject();
+                Map<String, Property<?>> propertyMap = properties.get(namespace);
+
+                // Save properties for this namespace
+                saveProperties(namespaceTheme, propertyMap);
+
+                // Add the namespace theme to the main JSON object
+                jsonObject.add(namespace, namespaceTheme);
+            }
+
+            // Format the json so it can easily be edited
+            Gson gson = new GsonBuilder().setPrettyPrinting().create();
+            String formattedJson = gson.toJson(jsonObject);
+
+            // Write the JSON object to the theme file
+            Files.write(themeFile.toPath(), formattedJson.getBytes());
+            SaturnClient.LOGGER.info("Theme saved successfully.");
+        } catch (IOException e) {
+            SaturnClient.LOGGER.error("Error saving the theme file", e);
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    private static void saveProperties(JsonObject theme, Map<String, Property<?>> propertyMap) {
+        // Iterate through each property in the namespace
+        for (String propertyName : propertyMap.keySet()) {
+            Property<?> property = propertyMap.get(propertyName);
+            JsonElement propertyValue = null;
+
+            if (property.getType() == Property.PropertyType.NAMESPACE) {
+                // Handle nested namespace
+                JsonObject nestedTheme = new JsonObject();
+                Map<String, Property<?>> nestedProperties = (Map<String, Property<?>>) property.value;
+                saveProperties(nestedTheme, nestedProperties);
+                propertyValue = nestedTheme;
+            } else {
+                // Convert the property value based on its type
+                switch (property.getType()) {
+                    case BOOLEAN:
+                        propertyValue = new JsonPrimitive((Boolean) property.value);
+                        break;
+                    case INTEGER:
+                        propertyValue = new JsonPrimitive((Integer) property.value);
+                        break;
+                    case FLOAT:
+                        propertyValue = new JsonPrimitive((Float) property.value);
+                        break;
+                    case STRING:
+                        propertyValue = new JsonPrimitive((String) property.value);
+                        break;
+                    case HEX:
+                        propertyValue = new JsonPrimitive((Integer) property.value);
+                        break;
+                    default:
+                        SaturnClient.LOGGER.warn(
+                                "Unknown property type for: " + propertyName);
+                        break;
+                }
+            }
+
+            if (propertyValue != null) {
+                theme.add(propertyName, propertyValue);
+            }
+        }
+    }
+}

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

@@ -3,7 +3,7 @@ package org.saturnclient.saturnclient.cosmetics;
 import org.saturnclient.saturnclient.auth.SaturnPlayer;
 import org.saturnclient.saturnclient.auth.Auth;
 
-import net.minecraft.client.MinecraftClient;
+import org.saturnclient.saturnclient.SaturnClient;
 import net.minecraft.client.render.OverlayTexture;
 import net.minecraft.client.render.VertexConsumerProvider;
 import net.minecraft.client.render.entity.feature.FeatureRenderer;
@@ -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(() -> {
+                                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"));
+                    SaturnClient.client.execute(() -> loadStaticCloak(player.cloak + ".png"));
                 }
             }
         }

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

@@ -1,6 +1,6 @@
 package org.saturnclient.saturnclient.cosmetics.cloaks.utils;
 
-import net.minecraft.client.MinecraftClient;
+import org.saturnclient.saturnclient.SaturnClient;
 import net.minecraft.client.texture.NativeImage;
 import net.minecraft.client.texture.NativeImageBackedTexture;
 import net.minecraft.util.Identifier;
@@ -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/event/KeyInputHandler.java

@@ -3,10 +3,12 @@ package org.saturnclient.saturnclient.event;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
 import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
 import net.minecraft.client.option.KeyBinding;
-import net.minecraft.client.option.Perspective;
+// import net.minecraft.client.option.Perspective;
 import net.minecraft.client.util.InputUtil;
-import org.saturnclient.saturnclient.menus.SaturnMenu;
+
-import org.saturnclient.saturnmods.mods.FreeLook;
+// import org.saturnclient.modules.mods.FreeLook;
+import org.saturnclient.saturnclient.menus.ModMenu;
+// import org.saturnclient.saturnclient.menus.SaturnMenu;
 import org.lwjgl.glfw.GLFW;
 
 /**
@@ -19,9 +21,9 @@ public class KeyInputHandler {
     private static final int DEFAULT_MENU_KEY = GLFW.GLFW_KEY_RIGHT_SHIFT;
     private static KeyBinding mainMenuKeyBinding;
 
-    private static final String FREELOOK_KEY_ID = "key.saturnclient.freelook";
+    // private static final String FREELOOK_KEY_ID = "key.saturnclient.freelook";
-    private static final int FREELOOK_KEY = GLFW.GLFW_KEY_M;
+    // private static final int FREELOOK_KEY = GLFW.GLFW_KEY_M;
-    private static KeyBinding freelookKeyBinding;
+    // private static KeyBinding freelookKeyBinding;
 
     /**
      * Registers all keybindings and their associated event handlers.
@@ -35,38 +37,39 @@ public class KeyInputHandler {
                 DEFAULT_MENU_KEY,
                 KEY_CATEGORY));
 
-        freelookKeyBinding = KeyBindingHelper.registerKeyBinding(new KeyBinding(
+        // freelookKeyBinding = KeyBindingHelper.registerKeyBinding(new KeyBinding(
-                FREELOOK_KEY_ID,
+        //         FREELOOK_KEY_ID,
-                InputUtil.Type.KEYSYM,
+        //         InputUtil.Type.KEYSYM,
-                FREELOOK_KEY,
+        //         FREELOOK_KEY,
-                KEY_CATEGORY));
+        //         KEY_CATEGORY));
 
         // Register the event handler for the main menu key
         ClientTickEvents.END_CLIENT_TICK.register(client -> {
             if (mainMenuKeyBinding.wasPressed()) {
-                client.setScreen(new SaturnMenu());
+                client.setScreen(new ModMenu());
-            } else if (freelookKeyBinding.wasPressed() && FreeLook.enabled.value && FreeLook.toggle.value) {
-                FreeLook.isFreeLooking = !FreeLook.isFreeLooking;
-                if (FreeLook.isFreeLooking) {
-                    FreeLook.lastPerspective = client.options.getPerspective();
-                    client.options.setPerspective(Perspective.THIRD_PERSON_BACK);
-                } else if (FreeLook.lastPerspective != null) {
-                    client.options.setPerspective(FreeLook.lastPerspective);
-                    FreeLook.lastPerspective = null;
-                }
-            } else if (FreeLook.enabled.value && !FreeLook.toggle.value) {
-                if (freelookKeyBinding.isPressed()) {
-                    if (!FreeLook.isFreeLooking) {
-                        FreeLook.lastPerspective = client.options.getPerspective();
-                        client.options.setPerspective(Perspective.THIRD_PERSON_BACK);
-                        FreeLook.isFreeLooking = true;
-                    }
-                } else if (FreeLook.isFreeLooking && FreeLook.lastPerspective != null) {
-                    client.options.setPerspective(FreeLook.lastPerspective);
-                    FreeLook.isFreeLooking = false;
-                    FreeLook.lastPerspective = null;
-                }
             }
+            // else if (freelookKeyBinding.wasPressed() && FreeLook.enabled.value && FreeLook.toggle.value) {
+            //     FreeLook.isFreeLooking = !FreeLook.isFreeLooking;
+            //     if (FreeLook.isFreeLooking) {
+            //         FreeLook.lastPerspective = client.options.getPerspective();
+            //         client.options.setPerspective(Perspective.THIRD_PERSON_BACK);
+            //     } else if (FreeLook.lastPerspective != null) {
+            //         client.options.setPerspective(FreeLook.lastPerspective);
+            //         FreeLook.lastPerspective = null;
+            //     }
+            // } else if (FreeLook.enabled.value && !FreeLook.toggle.value) {
+            //     if (freelookKeyBinding.isPressed()) {
+            //         if (!FreeLook.isFreeLooking) {
+            //             FreeLook.lastPerspective = client.options.getPerspective();
+            //             client.options.setPerspective(Perspective.THIRD_PERSON_BACK);
+            //             FreeLook.isFreeLooking = true;
+            //         }
+            //     } else if (FreeLook.isFreeLooking && FreeLook.lastPerspective != null) {
+            //         client.options.setPerspective(FreeLook.lastPerspective);
+            //         FreeLook.isFreeLooking = false;
+            //         FreeLook.lastPerspective = null;
+            //     }
+            // }
         });
     }
 }

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

@@ -5,11 +5,11 @@ import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.text.Text;
 
+import org.saturnclient.modules.HudMod;
+import org.saturnclient.modules.ModDimensions;
+import org.saturnclient.modules.ModManager;
+import org.saturnclient.modules.Module;
 import org.saturnclient.saturnclient.config.ConfigManager;
-import org.saturnclient.saturnmods.HudMod;
-import org.saturnclient.saturnmods.ModDimensions;
-import org.saturnclient.saturnmods.ModManager;
-import org.saturnclient.saturnmods.SaturnMod;
 import org.saturnclient.ui.SaturnUi;
 
 import java.util.ArrayList;
@@ -24,7 +24,7 @@ public class HudEditor extends Screen {
 
     public HudEditor() {
         super(Text.literal("HUD Editor"));
-        for (SaturnMod m : ModManager.MODS) {
+        for (Module m : ModManager.MODS) {
             if (m.isEnabled() && m instanceof HudMod) {
                 hudMods.add((HudMod) m);
             }

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

@@ -1,11 +1,12 @@
 package org.saturnclient.saturnclient.menus;
 
 import net.minecraft.text.Text;
+
+import org.saturnclient.modules.ModManager;
+import org.saturnclient.modules.Module;
 import org.saturnclient.saturnclient.SaturnClientConfig;
 import org.saturnclient.saturnclient.config.ConfigManager;
 import org.saturnclient.saturnclient.config.Property;
-import org.saturnclient.saturnmods.ModManager;
-import org.saturnclient.saturnmods.SaturnMod;
 import org.saturnclient.ui.SaturnUi;
 import org.saturnclient.ui.Textures;
 import org.saturnclient.ui.components.SaturnModComp;
@@ -117,7 +118,7 @@ public class ModMenu extends SaturnUi {
 
         String[] searchTokens = search.value.toLowerCase().split("\\ ");
 
-        outer: for (SaturnMod mod : ModManager.MODS) {
+        outer: for (Module mod : ModManager.MODS) {
             String modName = mod.getName().toLowerCase();
             for (String searchToken : searchTokens) {
                 if (!modName.contains(searchToken)) {

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

@@ -1,77 +1,13 @@
 package org.saturnclient.saturnclient.menus;
 
-import net.minecraft.client.MinecraftClient;
+import org.saturnclient.ui2.SaturnScreen;
-import net.minecraft.text.Text;
 
-import org.saturnclient.saturnclient.SaturnClientConfig;
+public class SaturnMenu extends SaturnScreen {
-import org.saturnclient.ui.SaturnUi;
-import org.saturnclient.ui.Textures;
-import org.saturnclient.ui.animations.FadeIn;
-import org.saturnclient.ui.animations.Slide;
-import org.saturnclient.ui.widgets.SaturnButton;
-import org.saturnclient.ui.widgets.SaturnImage;
-import org.saturnclient.ui.widgets.SaturnImageButton;
-
-public class SaturnMenu extends SaturnUi {
     public SaturnMenu() {
-        super(Text.literal("Saturn Client"));
+        super("Saturn Client");
     }
 
     @Override
-    protected void init() {
+    public void ui() {
-        SaturnClientConfig.textRenderer = MinecraftClient.getInstance().textRenderer;
-
-        int buttonWidth = 96;
-        int buttonHeight = 25;
-
-        draw(
-                new SaturnButton("Mods", () -> {
-                    client.setScreen(new ModMenu());
-                })
-                        .setX((width - buttonWidth) / 2)
-                        .setY((height - buttonHeight) / 2)
-                        .setWidth(buttonWidth)
-                        .setHeight(buttonHeight)
-                        .setAnimations(new FadeIn(2)));
-
-        draw(
-                new SaturnImageButton(Textures.HUD_ICON, 14, 14, () -> {
-                    client.setScreen(new HudEditor());
-                })
-                        .setX((width - buttonWidth - (buttonHeight * 2) - 6) / 2)
-                        .setY((height - buttonHeight) / 2)
-                        .setWidth(buttonHeight)
-                        .setHeight(buttonHeight)
-                        .setAnimations(new FadeIn(2)));
-
-        draw(
-                new SaturnImageButton(Textures.COSMETICS, 14, 14, () -> {
-                    client.setScreen(new CloaksMenu());
-                })
-                        .setX((width / 2) + (buttonWidth / 2) + 3)
-                        .setY((height - buttonHeight) / 2)
-                        .setWidth(buttonHeight)
-                        .setHeight(buttonHeight)
-                        .setAnimations(new FadeIn(2)));
-
-        int logoSize = 49;
-
-        draw(
-                new SaturnImage(Textures.LOGO_TEXT)
-                        .setX((width - logoSize) / 2)
-                        .setY((height - 8) / 2 - 23)
-                        .setWidth(logoSize)
-                        .setHeight(8)
-                        .setAnimations(new FadeIn(2)));
-
-        draw(
-                new SaturnImage(SaturnClientConfig.getLogo())
-                        .setX((width - logoSize) / 2)
-                        .setY(height / 2 - logoSize - 24)
-                        .setWidth(logoSize)
-                        .setHeight(logoSize)
-                        .setAnimations(new Slide(2, 14)));
-
-        super.init();
     }
 }

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

@@ -7,6 +7,7 @@ import org.saturnclient.ui.animations.FadeIn;
 import org.saturnclient.ui.animations.Slide;
 import org.saturnclient.ui.widgets.SaturnButton;
 import org.saturnclient.ui.widgets.SaturnImage;
+import org.saturnclient.ui2.screens.ShiftMenu;
 
 import net.minecraft.client.gui.screen.multiplayer.MultiplayerScreen;
 import net.minecraft.client.gui.screen.option.OptionsScreen;
@@ -69,7 +70,7 @@ public class SaturnTitleScreen extends SaturnUi {
         bY += 20;
 
         draw(new SaturnButton("SATURN OPTIONS", () -> {
-            client.setScreen(new SaturnMenu());
+            client.setScreen(new ShiftMenu());
         }).setBold(true).setWidth(210).setHeight(26).setX(bX).setY(bY).setScale(0.69f));
 
         super.init();

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

@@ -1,47 +0,0 @@
-package org.saturnclient.saturnclient.mixin;
-
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.render.Camera;
-
-import org.saturnclient.saturnclient.mod_utils.CameraOverriddenEntity;
-import org.saturnclient.saturnmods.mods.FreeLook;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Unique;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-import net.minecraft.client.network.ClientPlayerEntity;
-import net.minecraft.entity.Entity;
-import net.minecraft.world.BlockView;
-
-@Mixin(Camera.class)
-public abstract class CameraMixin {
-    @Unique
-    boolean firstTime = true;
-
-    @Shadow
-    protected abstract void setRotation(float yaw, float pitch);
-
-    @Inject(method = "update", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/Camera;setRotation(FF)V", ordinal = 1, shift = At.Shift.AFTER))
-    public void lockRotation(BlockView focusedBlock, Entity cameraEntity, boolean isThirdPerson, boolean isFrontFacing,
-            float tickDelta, CallbackInfo ci) {
-        if (FreeLook.isFreeLooking && cameraEntity instanceof ClientPlayerEntity) {
-            CameraOverriddenEntity cameraOverriddenEntity = (CameraOverriddenEntity) cameraEntity;
-
-            if (firstTime && MinecraftClient.getInstance().player != null) {
-                cameraOverriddenEntity.freelook$setCameraPitch(MinecraftClient.getInstance().player.getPitch());
-                cameraOverriddenEntity.freelook$setCameraYaw(MinecraftClient.getInstance().player.getYaw());
-                firstTime = false;
-            }
-            this.setRotation(cameraOverriddenEntity.freelook$getCameraYaw(),
-                    cameraOverriddenEntity.freelook$getCameraPitch());
-
-        }
-        if (!FreeLook.isFreeLooking && cameraEntity instanceof ClientPlayerEntity) {
-            firstTime = true;
-        }
-    }
-
-}

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

@@ -1,47 +0,0 @@
-/*
- * Code from: https://github.com/Selyss
- * Repo: https://github.com/Selyss/CrosshairIndicator/tree/main
-*/
-
-package org.saturnclient.saturnclient.mixin;
-
-import com.mojang.blaze3d.systems.RenderSystem;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.render.RenderLayer;
-import net.minecraft.client.render.RenderTickCounter;
-import net.minecraft.util.Identifier;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.Unique;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import net.minecraft.client.gui.hud.InGameHud;
-import net.minecraft.client.gui.DrawContext;
-
-@Mixin(InGameHud.class)
-public class Crosshair {
-    @Shadow
-    @Final
-    private MinecraftClient client;
-    @Unique
-    Identifier textureLocation = Identifier.of("saturnclient", "textures/gui/hud/crosshair_range.png");
-
-    @Inject(method = "renderCrosshair", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/DrawContext;drawGuiTexture(Ljava/util/function/Function;Lnet/minecraft/util/Identifier;IIII)V", ordinal = 0))
-    private void drawCrosshair(DrawContext context, RenderTickCounter tickCounter, CallbackInfo ci) {
-        if (org.saturnclient.saturnmods.mods.Crosshair.enabled.value
-                && org.saturnclient.saturnmods.mods.Crosshair.range_indicator.value
-                && this.client.targetedEntity != null
-                && this.client.targetedEntity.isAlive()) {
-            RenderSystem.setShaderTexture(0, textureLocation);
-            int scaledWidth = 15;
-            int scaledHeight = 15;
-
-            context.drawTexture(RenderLayer::getCrosshair, textureLocation,
-                    (context.getScaledWindowWidth() - scaledWidth) / 2,
-                    (context.getScaledWindowHeight() - scaledHeight) / 2, 0.0F, 0.0F, scaledWidth, scaledHeight,
-                    scaledWidth, scaledHeight);
-        }
-    }
-}

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

@@ -0,0 +1,12 @@
+package org.saturnclient.saturnclient.mixin;
+
+import net.minecraft.client.gui.DrawContext;
+import net.minecraft.client.render.VertexConsumerProvider;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+@Mixin(DrawContext.class)
+public interface DrawContextAccessor {
+    @Accessor("vertexConsumers")
+    VertexConsumerProvider.Immediate getVertexConsumers();
+}

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

@@ -1,62 +0,0 @@
-package org.saturnclient.saturnclient.mixin;
-
-import net.minecraft.client.network.ClientPlayerEntity;
-import net.minecraft.entity.Entity;
-import net.minecraft.util.math.MathHelper;
-
-import org.saturnclient.saturnclient.mod_utils.CameraOverriddenEntity;
-import org.saturnclient.saturnmods.mods.FreeLook;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Unique;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-@Mixin(Entity.class)
-public class EntityMixin implements CameraOverriddenEntity {
-    @Unique
-    private float cameraPitch;
-
-    @Unique
-    private float cameraYaw;
-
-    @Inject(method = "changeLookDirection", at = @At("HEAD"), cancellable = true)
-    public void changeCameraLookDirection(double xDelta, double yDelta, CallbackInfo ci) {
-        // noinspection ConstantValue// IntelliJ is incorrect here, this code block is
-        // reachable
-        if (FreeLook.isFreeLooking && (Object) this instanceof ClientPlayerEntity) {
-            double pitchDelta = (yDelta * 0.15);
-            double yawDelta = (xDelta * 0.15);
-
-            this.cameraPitch = MathHelper.clamp(this.cameraPitch + (float) pitchDelta, -90.0f, 90.0f);
-            this.cameraYaw += (float) yawDelta;
-
-            ci.cancel();
-
-        }
-    }
-
-    @Override
-    @Unique
-    public float freelook$getCameraPitch() {
-        return this.cameraPitch;
-    }
-
-    @Override
-    @Unique
-    public float freelook$getCameraYaw() {
-        return this.cameraYaw;
-    }
-
-    @Override
-    @Unique
-    public void freelook$setCameraPitch(float pitch) {
-        this.cameraPitch = pitch;
-    }
-
-    @Override
-    @Unique
-    public void freelook$setCameraYaw(float yaw) {
-        this.cameraYaw = yaw;
-    }
-}

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

@@ -1,6 +1,6 @@
 package org.saturnclient.saturnclient.mixin;
 
-import net.minecraft.client.MinecraftClient;
+import org.saturnclient.saturnclient.SaturnClient;
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.font.TextRenderer.TextLayerType;
 import net.minecraft.client.render.VertexConsumerProvider;
@@ -9,7 +9,9 @@ import net.minecraft.client.render.entity.EntityRenderer;
 import net.minecraft.client.render.entity.state.EntityRenderState;
 import net.minecraft.client.render.entity.state.PlayerEntityRenderState;
 import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.text.MutableText;
 import net.minecraft.text.Text;
+import net.minecraft.util.Formatting;
 import net.minecraft.util.math.Vec3d;
 
 import org.saturnclient.saturnclient.SaturnClientConfig;
@@ -34,20 +36,32 @@ public abstract class NameTagMixin<S extends EntityRenderState> {
     @Inject(method = "renderLabelIfPresent(Lnet/minecraft/client/render/entity/state/EntityRenderState;Lnet/minecraft/text/Text;Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;I)V", at = @At("HEAD"), cancellable = true)
     private void onRenderLabelIfPresent(S state, Text text, MatrixStack matrices,
             VertexConsumerProvider vertexConsumers, int light, CallbackInfo ci) {
-        if (isSaturn(state)) {
+
-            renderLabel(state, Text.literal(SaturnClientConfig.getSaturnIndicator()).append(text), matrices,
+        String uuid = isSaturn(state);
+
+        if (uuid != null) {
+            MutableText iconText = Text.literal(SaturnClientConfig.getSaturnIndicator())
+            .styled(style -> style.withColor(SaturnClientConfig.getIconColor(uuid)));
+        
+            Text nameText = text.copy().styled(style -> style.withColor(Formatting.WHITE));
+
+            renderLabel(state, iconText.append(nameText), matrices,
                     vertexConsumers, light);
+
             ci.cancel();
         }
     }
 
-    private boolean isSaturn(S state) {
+    private String isSaturn(S state) {
         if (state instanceof PlayerEntityRenderState) {
             String name = ((PlayerEntityRenderState) state).name;
             String uuid = Auth.playerNames.get(name);
-            return uuid != null && Auth.players.containsKey(uuid);
+            if (Auth.players.containsKey(uuid)) {
+                return uuid;
+            }
         }
-        return false;
+
+        return null;
     }
 
     private void renderLabel(S state, Text text, MatrixStack matrices,
@@ -61,9 +75,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/saturnclient/mixin/TabListMixin.java

@@ -1,7 +1,10 @@
 package org.saturnclient.saturnclient.mixin;
 
 import net.minecraft.client.network.PlayerListEntry;
+import net.minecraft.text.MutableText;
 import net.minecraft.text.Text;
+import net.minecraft.util.Formatting;
+
 import org.jetbrains.annotations.Nullable;
 import org.saturnclient.saturnclient.SaturnClientConfig;
 import org.saturnclient.saturnclient.auth.Auth;
@@ -29,7 +32,11 @@ public abstract class TabListMixin {
         String name = profile.getName();
         String uuid = profile.getId().toString().replaceAll("-", "");
 
-        return Text.literal(
+        MutableText iconText = Text.literal(SaturnClientConfig.getSaturnIndicator())
-                Auth.players.containsKey(uuid) ? SaturnClientConfig.getSaturnIndicator() + name : name);
+            .styled(style -> style.withColor(SaturnClientConfig.getIconColor(uuid)));
+        
+        Text nameText = Text.literal(name).styled(style -> style.withColor(Formatting.WHITE));
+
+        return Auth.players.containsKey(uuid) ? iconText.append(nameText) : Text.literal(name);
     }
 }

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

@@ -1,37 +0,0 @@
-package org.saturnclient.saturnclient.mixin;
-
-import net.minecraft.client.particle.AnimatedParticle;
-import net.minecraft.client.particle.SpriteProvider;
-import net.minecraft.client.particle.TotemParticle;
-import net.minecraft.client.world.ClientWorld;
-import net.minecraft.util.math.ColorHelper;
-
-import org.saturnclient.saturnmods.mods.Particles;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-@Mixin(TotemParticle.class)
-public class TotemParticleMixin extends AnimatedParticle {
-    protected TotemParticleMixin(ClientWorld world, double x, double y, double z, SpriteProvider spriteProvider,
-            float upwardsAcceleration) {
-        super(world, x, y, z, spriteProvider, upwardsAcceleration);
-    }
-
-    @Inject(at = @At("TAIL"), method = "<init>")
-    private void colorChanger(ClientWorld world, double x, double y, double z, double velocityX, double velocityY,
-            double velocityZ, SpriteProvider spriteProvider, CallbackInfo ci) {
-        if (Particles.enabled.value && Particles.totem_enabled.value) {
-            if (this.random.nextInt(2) == 0) {
-                this.setColor(ColorHelper.getRedFloat(Particles.totem_1.value),
-                        ColorHelper.getGreenFloat(Particles.totem_1.value),
-                        ColorHelper.getBlueFloat(Particles.totem_1.value));
-            } else {
-                this.setColor(ColorHelper.getRedFloat(Particles.totem_2.value),
-                        ColorHelper.getGreenFloat(Particles.totem_2.value),
-                        ColorHelper.getBlueFloat(Particles.totem_2.value));
-            }
-        }
-    }
-}

src/main/java/org/saturnclient/saturnclient/mod_utils/CameraOverriddenEntity.java

@@ -1,9 +0,0 @@
-package org.saturnclient.saturnclient.mod_utils;
-
-public interface CameraOverriddenEntity {
-    float freelook$getCameraPitch();
-	float freelook$getCameraYaw();
-
-	void freelook$setCameraPitch(float pitch);
-	void freelook$setCameraYaw(float yaw);
-}

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

@@ -1,50 +0,0 @@
-package org.saturnclient.saturnmods;
-
-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.SaturnClientConfig;
-import org.saturnclient.saturnclient.menus.HudEditor;
-import org.saturnclient.saturnmods.mods.*;
-
-public class ModManager {
-
-    public static SaturnMod[] MODS = {
-            new Coordinates(),
-            new ArmorDisplay(),
-            new FpsDisplay(),
-            new Particles(),
-            new Crosshair(),
-            new FreeLook()
-    };
-
-    public static void init() {
-        HudRenderCallback.EVENT.register((context, _o) -> {
-            MinecraftClient client = MinecraftClient.getInstance();
-            TextRenderer textRenderer = client.textRenderer;
-
-            if (textRenderer != null &&
-                    !(client.currentScreen instanceof HudEditor)) {
-                SaturnClientConfig.textRenderer = textRenderer;
-
-                for (SaturnMod m : MODS) {
-                    if (m instanceof HudMod && m.isEnabled()) {
-                        ModDimensions dim = ((HudMod) m).getDimensions();
-
-                        MatrixStack matrices = context.getMatrices();
-                        matrices.push();
-
-                        matrices.translate(dim.x.value, (float) dim.y.value, 0);
-
-                        matrices.scale(dim.scale.value, dim.scale.value, 1.0f);
-
-                        ((HudMod) m).render(context);
-
-                        matrices.pop();
-                    }
-                }
-            }
-        });
-    }
-}

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

@@ -1,17 +0,0 @@
-package org.saturnclient.saturnmods;
-
-import org.saturnclient.saturnclient.config.ConfigManager;
-
-import net.minecraft.util.Identifier;
-
-public interface SaturnMod {
-    public boolean isEnabled();
-
-    public void setEnabled(boolean e);
-
-    public String getName();
-
-    public Identifier getIconTexture();
-
-    public ConfigManager getConfig();
-}

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

@@ -1,130 +0,0 @@
-package org.saturnclient.saturnmods.mods;
-
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.gui.DrawContext;
-import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.entity.EquipmentSlot;
-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.SaturnClientConfig;
-import org.saturnclient.saturnclient.config.ConfigManager;
-import org.saturnclient.saturnclient.config.Property;
-import org.saturnclient.saturnmods.HudMod;
-import org.saturnclient.saturnmods.ModDimensions;
-import org.saturnclient.saturnmods.SaturnMod;
-import org.saturnclient.ui.Textures;
-
-public class ArmorDisplay implements SaturnMod, HudMod {
-
-    private static ConfigManager config = new ConfigManager("Armor Display");
-    public static Property<Boolean> enabled = config.property(
-            "Enabled",
-            new Property<>(false));
-    private static ModDimensions dimensions = new ModDimensions(
-            config,
-            0,
-            0,
-            34,
-            75);
-
-    public static Property<Integer> fgColor = config.property(
-            "Foreground color",
-            new Property<>(SaturnClientConfig.WHITE, Property.PropertyType.HEX));
-
-    private boolean renderItem(DrawContext context, ItemStack item, int y) {
-        if (item.isEmpty()) {
-            return false;
-        }
-
-        context.drawItem(item, 0, y);
-
-        if (item.getMaxDamage() > 0) {
-            MatrixStack matrices = context.getMatrices();
-
-            matrices.push();
-
-            matrices.translate(17, y + 5, 0);
-
-            matrices.scale(0.8f, 0.8f, 0f);
-
-            context.drawText(
-                    SaturnClientConfig.textRenderer,
-                    "" + (item.getMaxDamage() - item.getDamage()),
-                    0,
-                    0,
-                    fgColor.value,
-                    false);
-
-            matrices.pop();
-        }
-
-        return true;
-    }
-
-    @Override
-    public void render(DrawContext context) {
-        PlayerEntity player = MinecraftClient.getInstance().player;
-        ItemStack[] items = {
-                player.getEquippedStack(EquipmentSlot.MAINHAND),
-                player.getEquippedStack(EquipmentSlot.FEET),
-                player.getEquippedStack(EquipmentSlot.LEGS),
-                player.getEquippedStack(EquipmentSlot.CHEST),
-                player.getEquippedStack(EquipmentSlot.HEAD),
-        };
-
-        int y = 60;
-
-        for (ItemStack item : items) {
-            if (renderItem(context, item, y)) {
-                y -= 15;
-            }
-        }
-    }
-
-    @Override
-    public void renderDummy(DrawContext context) {
-        ItemStack[] items = {
-                new ItemStack(Items.DIAMOND_SWORD),
-                new ItemStack(Items.DIAMOND_BOOTS),
-                new ItemStack(Items.DIAMOND_LEGGINGS),
-                new ItemStack(Items.DIAMOND_CHESTPLATE),
-                new ItemStack(Items.DIAMOND_HELMET),
-        };
-
-        int y = 60;
-
-        for (ItemStack item : items) {
-            if (renderItem(context, item, y)) {
-                y -= 15;
-            }
-        }
-    }
-
-    public String getName() {
-        return "Armor display";
-    }
-
-    @Override
-    public Identifier getIconTexture() {
-        return Textures.getModIcon("armor");
-    }
-
-    public ModDimensions getDimensions() {
-        return dimensions;
-    }
-
-    public boolean isEnabled() {
-        return enabled.value;
-    }
-
-    public void setEnabled(boolean e) {
-        enabled.value = e;
-    }
-
-    @Override
-    public ConfigManager getConfig() {
-        return config;
-    }
-}

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

@@ -1,92 +0,0 @@
-package org.saturnclient.saturnmods.mods;
-
-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.SaturnClientConfig;
-import org.saturnclient.saturnclient.config.ConfigManager;
-import org.saturnclient.saturnclient.config.Property;
-import org.saturnclient.saturnmods.HudMod;
-import org.saturnclient.saturnmods.ModDimensions;
-import org.saturnclient.saturnmods.SaturnMod;
-import org.saturnclient.ui.Textures;
-
-public class Coordinates implements SaturnMod, HudMod {
-
-    private static ConfigManager config = new ConfigManager("Coordinates");
-    public static Property<Boolean> enabled = config.property(
-            "Enabled",
-            new Property<>(false));
-    private static ModDimensions dimensions = new ModDimensions(config);
-
-    public static Property<Integer> fgColor = config.property(
-            "Foreground color",
-            new Property<>(SaturnClientConfig.WHITE, Property.PropertyType.HEX));
-
-    public Coordinates() {
-        // Ensure fgColor has a value
-        if (fgColor.value == null) {
-            fgColor.value = SaturnClientConfig.WHITE;
-        }
-    }
-
-    public void renderDummy(DrawContext context) {
-        int playerX = 124;
-        int playerY = 69;
-        int playerZ = 83;
-
-        context.drawText(
-                SaturnClientConfig.textRenderer,
-                playerX + " " + playerY + " " + playerZ,
-                0,
-                0,
-                fgColor.value,
-                false);
-
-        dimensions.width = SaturnClientConfig.textRenderer.getWidth(
-                playerX + " " + playerY + " " + playerZ);
-        dimensions.height = SaturnClientConfig.textRenderer.fontHeight;
-    }
-
-    public void render(DrawContext context) {
-        PlayerEntity player = MinecraftClient.getInstance().player;
-        int playerX = (int) player.getX();
-        int playerY = (int) player.getY();
-        int playerZ = (int) player.getZ();
-
-        context.drawText(
-                SaturnClientConfig.textRenderer,
-                playerX + " " + playerY + " " + playerZ,
-                0,
-                0,
-                fgColor.value,
-                false);
-    }
-
-    public String getName() {
-        return "Coords";
-    }
-
-    @Override
-    public Identifier getIconTexture() {
-        return Textures.getModIcon("coords");
-    }
-
-    public ModDimensions getDimensions() {
-        return dimensions;
-    }
-
-    public boolean isEnabled() {
-        return enabled.value;
-    }
-
-    public void setEnabled(boolean e) {
-        enabled.value = e;
-    }
-
-    @Override
-    public ConfigManager getConfig() {
-        return config;
-    }
-}

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

@@ -1,44 +0,0 @@
-package org.saturnclient.saturnmods.mods;
-
-import net.minecraft.util.Identifier;
-import org.saturnclient.saturnclient.config.ConfigManager;
-import org.saturnclient.saturnclient.config.Property;
-import org.saturnclient.saturnmods.SaturnMod;
-import org.saturnclient.ui.Textures;
-
-public class Crosshair implements SaturnMod {
-    public static ConfigManager config = new ConfigManager("Crosshair");
-
-    public static Property<Boolean> enabled = config.property(
-            "Enabled",
-            new Property<>(false));
-
-    public static Property<Boolean> range_indicator = config.property(
-            "Hit range indicator",
-            new Property<>(false));
-
-    @Override
-    public boolean isEnabled() {
-        return enabled.value;
-    }
-
-    @Override
-    public void setEnabled(boolean e) {
-        enabled.value = e;
-    }
-
-    @Override
-    public String getName() {
-        return "Crosshair";
-    }
-
-    @Override
-    public Identifier getIconTexture() {
-        return Textures.getModIcon("crosshair");
-    }
-
-    @Override
-    public ConfigManager getConfig() {
-        return config;
-    }
-}

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

@@ -1,88 +0,0 @@
-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.SaturnClientConfig;
-import org.saturnclient.saturnclient.config.ConfigManager;
-import org.saturnclient.saturnclient.config.Property;
-import org.saturnclient.saturnmods.HudMod;
-import org.saturnclient.saturnmods.ModDimensions;
-import org.saturnclient.saturnmods.SaturnMod;
-import org.saturnclient.ui.Textures;
-
-public class FpsDisplay implements SaturnMod, HudMod {
-
-    public static ConfigManager config = new ConfigManager("Fps Display");
-
-    public static Property<Boolean> enabled = config.property(
-            "Enabled",
-            new Property<>(false));
-
-    public static ModDimensions dimensions = new ModDimensions(
-            config,
-            0,
-            0,
-            40,
-            8);
-
-    public static Property<Integer> fgColor = config.property(
-            "Foreground color",
-            new Property<>(SaturnClientConfig.WHITE, Property.PropertyType.HEX));
-
-    @Override
-    public ModDimensions getDimensions() {
-        return dimensions;
-    }
-
-    @Override
-    public void renderDummy(DrawContext context) {
-        int fps = 128;
-
-        context.drawText(
-                SaturnClientConfig.textRenderer,
-                String.valueOf(fps) + " FPS",
-                0,
-                0,
-                fgColor.value,
-                false);
-    }
-
-    @Override
-    public void render(DrawContext context) {
-        int fps = MinecraftClient.getInstance().getCurrentFps();
-
-        context.drawText(
-                SaturnClientConfig.textRenderer,
-                String.valueOf(fps) + " FPS",
-                0,
-                0,
-                fgColor.value,
-                false);
-    }
-
-    @Override
-    public boolean isEnabled() {
-        return enabled.value;
-    }
-
-    @Override
-    public void setEnabled(boolean e) {
-        enabled.value = e;
-    }
-
-    @Override
-    public String getName() {
-        return "Fps Display";
-    }
-
-    @Override
-    public Identifier getIconTexture() {
-        return Textures.getModIcon("fps");
-    }
-
-    @Override
-    public ConfigManager getConfig() {
-        return config;
-    }
-}

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

@@ -1,46 +0,0 @@
-package org.saturnclient.saturnmods.mods;
-
-import org.saturnclient.saturnclient.config.ConfigManager;
-import org.saturnclient.saturnclient.config.Property;
-import org.saturnclient.saturnmods.SaturnMod;
-import org.saturnclient.ui.Textures;
-
-import net.minecraft.client.option.Perspective;
-import net.minecraft.util.Identifier;
-
-public class FreeLook implements SaturnMod {
-    public static boolean isFreeLooking = false;
-    public static Perspective lastPerspective = null;
-
-    private static ConfigManager config = new ConfigManager("Free Look");
-    public static Property<Boolean> enabled = config.property(
-            "Enabled",
-            new Property<>(false));
-
-    public static Property<Boolean> toggle = config.property(
-            "Toggle Free Look",
-            new Property<>(false));
-
-    public boolean isEnabled() {
-        return enabled.value;
-    }
-
-    public void setEnabled(boolean e) {
-        enabled.value = e;
-    }
-
-    @Override
-    public ConfigManager getConfig() {
-        return config;
-    }
-
-    @Override
-    public Identifier getIconTexture() {
-        return Textures.getModIcon("freelook");
-    }
-
-    @Override
-    public String getName() {
-        return "Free Look";
-    }
-}

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

@@ -1,55 +0,0 @@
-package org.saturnclient.saturnmods.mods;
-
-import net.minecraft.util.Identifier;
-import org.saturnclient.saturnclient.SaturnClientConfig;
-import org.saturnclient.saturnclient.config.ConfigManager;
-import org.saturnclient.saturnclient.config.Property;
-import org.saturnclient.saturnmods.SaturnMod;
-import org.saturnclient.ui.Textures;
-
-public class Particles implements SaturnMod {
-    public static ConfigManager config = new ConfigManager("Particles");
-
-    public static Property<Boolean> enabled = config.property(
-            "Enabled",
-            new Property<>(false));
-
-    public static ConfigManager totem = new ConfigManager(config, "Totem particles");
-
-    public static Property<Boolean> totem_enabled = totem.property(
-            "Change totem color",
-            new Property<>(false));
-
-    public static Property<Integer> totem_1 = totem.property(
-            "Totem particle color 1",
-            new Property<>(SaturnClientConfig.color.value, Property.PropertyType.HEX));
-
-    public static Property<Integer> totem_2 = totem.property(
-            "Totem particle color 2",
-            new Property<>(SaturnClientConfig.color.value, Property.PropertyType.HEX));
-
-    @Override
-    public boolean isEnabled() {
-        return enabled.value;
-    }
-
-    @Override
-    public void setEnabled(boolean e) {
-        enabled.value = e;
-    }
-
-    @Override
-    public String getName() {
-        return "Particles";
-    }
-
-    @Override
-    public Identifier getIconTexture() {
-        return Textures.getModIcon("particles");
-    }
-
-    @Override
-    public ConfigManager getConfig() {
-        return config;
-    }
-}

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

@@ -1,6 +1,6 @@
 package org.saturnclient.ui.components;
 
-import net.minecraft.client.MinecraftClient;
+import org.saturnclient.saturnclient.SaturnClient;
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.gui.DrawContext;
 import org.lwjgl.glfw.GLFW;
@@ -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

@@ -1,6 +1,6 @@
 package org.saturnclient.ui.components;
 
-import net.minecraft.client.MinecraftClient;
+import org.saturnclient.saturnclient.SaturnClient;
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.gui.DrawContext;
 import org.lwjgl.glfw.GLFW;
@@ -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,19 +1,20 @@
 package org.saturnclient.ui.components;
 
-import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.DrawContext;
+
+import org.saturnclient.modules.Module;
+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;
 import org.saturnclient.ui.SaturnWidget;
 import org.saturnclient.ui.Textures;
 
 public class SaturnModComp extends SaturnWidget {
 
-    SaturnMod mod;
+    Module mod;
 
-    public SaturnModComp(SaturnMod mod) {
+    public SaturnModComp(Module mod) {
         this.mod = mod;
     }
 
@@ -63,10 +64,10 @@ public class SaturnModComp extends SaturnWidget {
                 color);
 
         context.drawText(
-                SaturnClientConfig.textRenderer,
+                SaturnClient.client.textRenderer,
                 SaturnUi.text(mod.getName()),
                 20,
-                (21 - SaturnClientConfig.textRenderer.fontHeight) / 2,
+                (21 - SaturnClient.client.textRenderer.fontHeight) / 2,
                 color,
                 false);
 
@@ -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

@@ -1,6 +1,6 @@
 package org.saturnclient.ui.components;
 
-import net.minecraft.client.MinecraftClient;
+import org.saturnclient.saturnclient.SaturnClient;
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.gui.DrawContext;
 import org.lwjgl.glfw.GLFW;
@@ -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

@@ -4,7 +4,7 @@ import org.jetbrains.annotations.Nullable;
 import org.joml.Quaternionf;
 import org.joml.Vector3f;
 import org.saturnclient.ui.SaturnWidget;
-import net.minecraft.client.MinecraftClient;
+import org.saturnclient.saturnclient.SaturnClient;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.render.DiffuseLighting;
 import net.minecraft.client.render.entity.EntityRenderDispatcher;
@@ -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

@@ -2,7 +2,7 @@ package org.saturnclient.ui.widgets;
 
 import com.mojang.blaze3d.systems.RenderSystem;
 import java.util.function.Consumer;
-import net.minecraft.client.MinecraftClient;
+import org.saturnclient.saturnclient.SaturnClient;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.text.Text;
 
@@ -10,6 +10,8 @@ import org.saturnclient.saturnclient.SaturnClientConfig;
 import org.saturnclient.ui.SaturnUi;
 import org.saturnclient.ui.SaturnWidget;
 import org.saturnclient.ui.Textures;
+import net.minecraft.client.MinecraftClient;
+
 
 public class SaturnButton extends SaturnWidget {
 
@@ -37,7 +39,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

@@ -1,7 +1,7 @@
 package org.saturnclient.ui.widgets;
 
 import org.saturnclient.ui.SaturnWidget;
-import net.minecraft.client.MinecraftClient;
+import org.saturnclient.saturnclient.SaturnClient;
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.util.math.MatrixStack;
@@ -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/ui/widgets/SaturnText.java

@@ -1,6 +1,8 @@
 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 +13,8 @@ public class SaturnText extends SaturnWidget {
 
     public SaturnText(String text) {
         this.text = text;
-        this.width = SaturnClientConfig.textRenderer.getWidth(SaturnUi.text(text));
+        this.width = SaturnClient.client.textRenderer.getWidth(SaturnUi.text(text));
-        this.height = SaturnClientConfig.textRenderer.fontHeight;
+        this.height = SaturnClient.client.textRenderer.fontHeight;
     }
 
     public SaturnText(String text, int color) {
@@ -26,7 +28,7 @@ public class SaturnText extends SaturnWidget {
             int mouseX,
             int mouseY) {
         context.drawText(
-                SaturnClientConfig.textRenderer,
+            SaturnClient.client.textRenderer,
                 SaturnUi.text(text),
                 0,
                 0,

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

@@ -0,0 +1,39 @@
+package org.saturnclient.ui2;
+
+public class Element {
+    protected int x;
+    protected int y;
+    protected int width;
+    protected int height;
+    public boolean focused;
+
+    public void render(RenderScope renderScope, RenderContext ctx) {
+    }
+
+    public void click(int mouseX, int mouseY) {
+    }
+
+    public final void dimensions(int width, int height) {
+        this.width = width;
+        this.height = height;
+    }
+
+    public final void position(int x, int y) {
+        this.x = x;
+        this.y = y;
+    }
+
+    public final Element center(int w, int h) {
+        this.x = (w - width) / 2;
+        this.y = (h - height) / 2;
+
+        return this;
+    }
+
+    public final Element centerOffset(int w, int h, int offsetX, int offsetY) {
+        this.x = (w - width) / 2 + offsetX;
+        this.y = (h - height) / 2 + offsetY;
+
+        return this;
+    }
+}

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

@@ -0,0 +1,23 @@
+package org.saturnclient.ui2;
+
+public class RenderContext {
+    public int mouseX, mouseY;
+    public int elementX, elementY;
+    public int elementWidth, elementHeight;
+
+    public RenderContext(int mouseX, int mouseY, Element e) {
+        this.mouseX = mouseX;
+        this.mouseY = mouseY;
+        this.elementX = e.x;
+        this.elementY = e.y;
+        this.elementWidth = e.width;
+        this.elementHeight = e.height;
+    }
+
+    public boolean isHovering() {
+        return mouseX >= elementX &&
+               mouseX <= elementX + elementWidth &&
+               mouseY >= elementY &&
+               mouseY <= elementY + elementHeight;
+    }
+}

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

@@ -0,0 +1,175 @@
+package org.saturnclient.ui2;
+
+import java.util.function.Function;
+
+import org.joml.Matrix4f;
+import org.saturnclient.ui2.resources.Fonts;
+import com.mojang.blaze3d.systems.RenderSystem;
+
+import org.saturnclient.saturnclient.SaturnClient;
+import net.minecraft.client.font.TextRenderer;
+import net.minecraft.client.font.TextRenderer.TextLayerType;
+import net.minecraft.client.render.RenderLayer;
+import net.minecraft.client.render.VertexConsumer;
+import net.minecraft.client.render.VertexConsumerProvider;
+import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.math.RotationAxis;
+
+public class RenderScope {
+    public MatrixStack matrices;
+    public VertexConsumerProvider.Immediate vertexConsumers;
+    private int opacity = 255 << 24;
+
+    public RenderScope(MatrixStack matrices, VertexConsumerProvider.Immediate vertexConsumers) {
+        this.matrices = matrices;
+        this.vertexConsumers = vertexConsumers;
+    }
+
+    public void setOpacity(float alpha) {
+        this.opacity = (int) (alpha * 255) << 24;
+    }
+
+    public int getColor(int color) {
+        return opacity | (color & 0x00FFFFFF);
+    }
+
+    public void drawRect(int x, int y, int width, int height, int color) {
+        color = getColor(color);
+        Matrix4f matrix4f = this.matrices.peek().getPositionMatrix();
+
+        int x1 = x;
+        int x2 = x + width;
+        int y1 = y;
+        int y2 = y + height;
+
+        int i;
+        if (x1 < x2) {
+            i = x1;
+            x1 = x2;
+            x2 = i;
+        }
+
+        if (y1 < y2) {
+            i = y1;
+            y1 = y2;
+            y2 = i;
+        }
+
+        VertexConsumer vertexConsumer = this.vertexConsumers.getBuffer(RenderLayer.getGui());
+        vertexConsumer.vertex(matrix4f, (float) x1, (float) y1, 0).color(color);
+        vertexConsumer.vertex(matrix4f, (float) x1, (float) y2, 0).color(color);
+        vertexConsumer.vertex(matrix4f, (float) x2, (float) y2, 0).color(color);
+        vertexConsumer.vertex(matrix4f, (float) x2, (float) y1, 0).color(color);
+    }
+
+    public void drawText(String text, int x, int y, boolean bold, int color) {
+        color = getColor(color);
+
+        Identifier font = bold ? Fonts.PANTON_BOLD : Fonts.PANTON;
+
+        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);
+    }
+
+    public void drawRoundedCorner(int width, int height, int radius, int color) {
+        int w = width * 20;
+        int h = height * 20;
+    
+        for (int y = 0; y < h; y++) {
+            int startX = 0;
+    
+            if (y < radius) {
+                double dy = radius - y - 0.5;
+                double dx = Math.sqrt(Math.max(0, radius * radius - dy * dy));
+                startX = radius - (int) dx;
+            }
+    
+            this.drawRect(startX, y, w - startX, 1, color);
+        }
+    }    
+
+    private void drawRoundedSide(int cornerWidth, int cornerHeight, int radius, int color) {
+        // Top
+        this.matrices.push();
+
+        this.matrices.scale(0.05f, 0.05f, 1.0f);
+
+        this.drawRoundedCorner(cornerWidth, cornerHeight, radius * 10, color);
+
+        this.matrices.pop();
+
+        // Bottom
+        this.matrices.push();
+
+        this.matrices.translate(cornerWidth, cornerHeight * 2, 0);
+
+        this.matrices.multiply(RotationAxis.NEGATIVE_Z.rotationDegrees(90));
+
+        this.matrices.translate(0, -cornerWidth, 0);
+
+        this.matrices.scale(0.05f, 0.05f, 1.0f);
+
+        this.drawRoundedCorner(cornerHeight, cornerWidth, radius * 10, color);
+
+        this.matrices.pop();
+    }
+
+    public void drawRoundedRectangle(int x, int y, int width, int height, int radius, int color) {
+        int cornerWidth = width / 2;
+        int cornerHeight = height / 2;
+
+        this.matrices.push();
+
+        this.matrices.translate(x, y, 0);
+
+        this.drawRoundedSide(cornerWidth, cornerHeight, radius, color);
+
+        this.matrices.translate(cornerWidth * 2, cornerHeight * 2, 0);
+
+        this.matrices.multiply(RotationAxis.NEGATIVE_Z.rotationDegrees(180));
+
+        this.matrices.translate(0, 0, 0);
+
+        this.drawRoundedSide(cornerWidth, cornerHeight, radius, color);
+
+        this.matrices.pop();
+    }
+
+    public int getScaledWindowWidth() {
+        return SaturnClient.client.getWindow().getScaledWidth();
+     }
+  
+     public int getScaledWindowHeight() {
+        return SaturnClient.client.getWindow().getScaledHeight();
+     }
+
+     public void drawTexture(Function<Identifier, RenderLayer> renderLayers, Identifier sprite, int x, int y, float u, float v, int width, int height, int textureWidth, int textureHeight, int color) {
+        this.drawTexture(renderLayers, sprite, x, y, u, v, width, height, width, height, textureWidth, textureHeight, color);
+     }
+  
+     public void drawTexture(Function<Identifier, RenderLayer> renderLayers, Identifier sprite, int x, int y, float u, float v, int width, int height, int textureWidth, int textureHeight) {
+        this.drawTexture(renderLayers, sprite, x, y, u, v, width, height, width, height, textureWidth, textureHeight);
+     }
+  
+     public void drawTexture(Function<Identifier, RenderLayer> renderLayers, Identifier sprite, int x, int y, float u, float v, int width, int height, int regionWith, int regionHeight, int textureWidth, int textureHeight) {
+        this.drawTexture(renderLayers, sprite, x, y, u, v, width, height, regionWith, regionHeight, textureWidth, textureHeight, -1);
+     }
+  
+     public void drawTexture(Function<Identifier, RenderLayer> renderLayers, Identifier sprite, int x, int y, float u, float v, int width, int height, int regionWidth, int regionHeight, int textureWidth, int textureHeight, int color) {
+        this.drawTexturedQuad(renderLayers, sprite, x, x + width, y, y + height, (u + 0.0F) / (float)textureWidth, (u + (float)regionWidth) / (float)textureWidth, (v + 0.0F) / (float)textureHeight, (v + (float)regionHeight) / (float)textureHeight, color);
+     }
+  
+     private void drawTexturedQuad(Function<Identifier, RenderLayer> renderLayers, Identifier sprite, int x1, int x2, int y1, int y2, float u1, float u2, float v1, float v2, int color) {
+        RenderSystem.setShaderTexture(0, sprite);
+
+        RenderLayer renderLayer = (RenderLayer)renderLayers.apply(sprite);
+        Matrix4f matrix4f = this.matrices.peek().getPositionMatrix();
+        VertexConsumer vertexConsumer = this.vertexConsumers.getBuffer(renderLayer);
+        vertexConsumer.vertex(matrix4f, (float)x1, (float)y1, 0.0F).texture(u1, v1).color(color);
+        vertexConsumer.vertex(matrix4f, (float)x1, (float)y2, 0.0F).texture(u1, v2).color(color);
+        vertexConsumer.vertex(matrix4f, (float)x2, (float)y2, 0.0F).texture(u2, v2).color(color);
+        vertexConsumer.vertex(matrix4f, (float)x2, (float)y1, 0.0F).texture(u2, v1).color(color);
+     }
+}

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

@@ -0,0 +1,72 @@
+package org.saturnclient.ui2;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.saturnclient.saturnclient.config.ThemeManager;
+import org.saturnclient.saturnclient.mixin.DrawContextAccessor;
+
+import net.minecraft.client.gui.DrawContext;
+import net.minecraft.client.gui.screen.Screen;
+import net.minecraft.text.Text;
+
+public class SaturnScreen extends Screen {
+    protected List<Element> elements = new ArrayList<>();
+
+    public SaturnScreen(String title) {
+        super(Text.literal(title));
+        ThemeManager.load();
+    }
+
+    public void draw(Element element) {
+        synchronized (elements) {
+            elements.add(element);
+        }
+    }
+
+    @Override
+    protected void init() {
+        ui(); // abstraction to render the saturn ui and also render extra stuff here
+    }
+
+    public void ui() {
+    }
+
+    @Override
+    public void render(DrawContext context, int mouseX, int mouseY, float delta) {
+        // We are using a Abstracted RenderScope because older minecraft versions don't
+        // use DrawContext
+        RenderScope renderScope = new RenderScope(context.getMatrices(),
+                ((DrawContextAccessor) context).getVertexConsumers());
+
+        renderScope.matrices.push();
+
+        for (Element element : elements) {
+            renderScope.matrices.push();
+            renderScope.matrices.translate(element.x, element.y, 0);
+            element.render(renderScope, new RenderContext(mouseX, mouseY, element));
+            renderScope.matrices.pop();
+        }
+
+        renderScope.matrices.pop();
+    }
+
+    @Override
+    public boolean mouseClicked(double mouseX, double mouseY, int button) {
+        if (button == 0) {
+            for (Element element : new ArrayList<>(elements)) {
+                element.focused = false;
+
+                int adjustedMouseX = (int) mouseX - element.x;
+                int adjustedMouseY = (int) mouseY - element.y;
+
+                if (Utils.isHovering(adjustedMouseX, adjustedMouseY, element.width, element.height)) {
+                    element.focused = true;
+                    element.click(adjustedMouseX, adjustedMouseY);
+                }
+            }
+        }
+
+        return false;
+    }
+}

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

@@ -0,0 +1,10 @@
+package org.saturnclient.ui2;
+
+public class Utils {
+    public static boolean isHovering(int mouseX, int mouseY, int elementWidth, int elementHeight) {
+        return mouseX >= 0 &&
+               mouseX <= elementWidth &&
+               mouseY >= 0 &&
+               mouseY <= elementHeight;
+    }
+}

src/main/java/org/saturnclient/ui2/elements/Button.java

@@ -0,0 +1,51 @@
+package org.saturnclient.ui2.elements;
+
+import org.saturnclient.saturnclient.config.Property;
+import org.saturnclient.saturnclient.config.ThemeManager;
+import org.saturnclient.ui2.Element;
+import org.saturnclient.ui2.RenderContext;
+import org.saturnclient.ui2.RenderScope;
+import org.saturnclient.ui2.resources.Fonts;
+
+import net.minecraft.util.Identifier;
+
+public class Button extends Element {
+    private static ThemeManager theme = new ThemeManager("Button", "hovering");
+    private static Property<Integer> bgColor = theme.property("bg-color", new Property<Integer>(0xFF000000));
+    private static Property<Integer> fgColor = theme.property("fg-color", new Property<Integer>(0xFFFFFFFF));
+    private static Property<Boolean> bold = theme.property("fg-bold", new Property<Boolean>(false));
+
+    static {
+        theme.propertyStateDefault("hovering", "fg-color", 0xFFFF0000);
+    }
+
+    private String text;
+    private Identifier font;
+    private Runnable onClick;
+
+    public Button(String text, Runnable onClick) {
+        this.text = text;
+        this.font = Fonts.getFont(bold.value);
+        this.onClick = onClick;
+        this.dimensions(Fonts.getWidth(text, font)+ 25 , Fonts.getHeight() + 10);
+    }
+
+    @Override
+    public void render(RenderScope renderScope, RenderContext ctx) {
+        if (ctx.isHovering()) {
+            theme.setState("hovering");
+        } else {
+            theme.setState(null);
+        }
+        renderScope.drawRoundedRectangle(0, 0, width, height, 10, bgColor.value);
+
+        renderScope.drawText(text, width / 2 - Fonts.getWidth(text, font) / 2, height / 2 - Fonts.getHeight() / 2, bold.value, fgColor.value);
+    }
+
+    @Override
+    public void click(int mouseX, int mouseY) {
+        if (onClick != null) {
+            onClick.run();
+        }
+    }
+}

src/main/java/org/saturnclient/ui2/elements/Text.java

@@ -0,0 +1,18 @@
+package org.saturnclient.ui2.elements;
+
+import org.saturnclient.ui2.Element;
+import org.saturnclient.ui2.RenderContext;
+import org.saturnclient.ui2.RenderScope;
+
+public class Text extends Element {
+    private String text;
+
+    public Text(String text) {
+        this.text = text;
+    }
+
+    @Override
+    public void render(RenderScope renderScope, RenderContext ctx) {
+        renderScope.drawText(this.text, this.x, this.y, false, 0xFFFFFFFF);
+    }
+}

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

@@ -0,0 +1,33 @@
+package org.saturnclient.ui2.resources;
+
+import org.saturnclient.saturnclient.SaturnClient;
+import net.minecraft.text.Style;
+import net.minecraft.text.Text;
+import net.minecraft.util.Identifier;
+
+public class Fonts {
+    public static final Identifier PANTON = Identifier.of("saturnclient", "panton");
+    public static final Identifier PANTON_BOLD = Identifier.of("saturnclient", "panton_bold");
+
+    public static Identifier getFont(boolean bold) {
+        if (bold) {
+            return PANTON_BOLD;
+        } else {
+            return PANTON;
+        }
+    }
+    
+    public static Text setFont(String text, Identifier font) {
+        return Text.literal(text).setStyle(
+            Style.EMPTY.withFont(font));
+    }
+
+    public static int getWidth(String text, Identifier font) {
+        return SaturnClient.client.textRenderer.getWidth(Text.literal(text).setStyle(
+            Style.EMPTY.withFont(font)));
+    }
+
+    public static int getHeight() {
+        return SaturnClient.client.textRenderer.fontHeight;
+    }
+}

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

@@ -0,0 +1,7 @@
+package org.saturnclient.ui2.resources;
+
+import net.minecraft.util.Identifier;
+
+public class Textures {
+    public static final Identifier CROSSHAIR_RANGE = Identifier.of("saturnclient", "textures/gui/hud/crosshair_range.png");
+}

src/main/java/org/saturnclient/ui2/screens/ShiftMenu.java

@@ -0,0 +1,18 @@
+package org.saturnclient.ui2.screens;
+
+import org.saturnclient.saturnclient.SaturnClient;
+import org.saturnclient.ui2.SaturnScreen;
+import org.saturnclient.ui2.elements.Button;
+
+public class ShiftMenu extends SaturnScreen {
+    public ShiftMenu() {
+        super("Shift Menu");
+    }
+
+    @Override
+    public void ui() {
+        draw(new Button("Click Me!", () -> {
+            SaturnClient.LOGGER.info("Clicked!");
+        }).center(width, height));
+    }
+}

src/main/resources/saturnclient.mixins.json

@@ -2,17 +2,14 @@
   "required": true,
   "minVersion": "0.8",
   "package": "org.saturnclient.saturnclient.mixin",
-  "compatibilityLevel": "JAVA_17",
+  "compatibilityLevel": "JAVA_21",
   "client": [
     "TabListMixin",
     "NameTagMixin",
     "PlayerEntityRendererMixin",
     "WhoAmI",
     "SaturnReload",
-    "TotemParticleMixin",
+    "DrawContextAccessor"
-    "Crosshair",
-    "EntityMixin",
-    "CameraMixin"
   ],
   "injectors": {
     "defaultRequire": 1