Merge pull request #65 from saturnclientmc/improved-build-configs

Improved build configs
Shared versioning
2026-03-28 21:13:48 +01:00 · 2026-03-28 21:11:08 +01:00 · 2026-03-28 21:00:53 +01:00 · 2026-03-28 20:56:40 +01:00 · 2026-03-28 20:54:05 +01:00 · 2026-03-26 23:57:35 +01:00
404 changed files with 10261 additions and 20388 deletions
@@ -1,12 +0,0 @@
-<factorypath>
-    <factorypathentry kind="EXTJAR" id="/Users/klestiselimaj/.gradle/caches/modules-2/files-2.1/io.github.llamalad7/mixinextras-fabric/0.4.1/8d1a9e96afb990367fa1f904d17580d164da72e3/mixinextras-fabric-0.4.1.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="EXTJAR" id="/Users/klestiselimaj/.gradle/caches/modules-2/files-2.1/org.ow2.asm/asm-analysis/9.7.1/f97a3b319f0ed6a8cd944dc79060d3912a28985f/asm-analysis-9.7.1.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="EXTJAR" id="/Users/klestiselimaj/.gradle/caches/modules-2/files-2.1/net.fabricmc/fabric-mixin-compile-extensions/0.6.0/6fda0c85c419f0a259da017a1424f27507eb30f0/fabric-mixin-compile-extensions-0.6.0.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="EXTJAR" id="/Users/klestiselimaj/.gradle/caches/modules-2/files-2.1/net.fabricmc/mapping-io/0.2.1/2a1aeedce104191bbb9e39e26abfbfeaf9b0590b/mapping-io-0.2.1.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="EXTJAR" id="/Users/klestiselimaj/.gradle/caches/modules-2/files-2.1/org.ow2.asm/asm-tree/9.7.1/3a53139787663b139de76b627fca0084ab60d32c/asm-tree-9.7.1.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="EXTJAR" id="/Users/klestiselimaj/.gradle/caches/fabric-loom/1.21.4/net.fabricmc.yarn.1_21_4.1.21.4+build.7-v2/mappings.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="EXTJAR" id="/Users/klestiselimaj/.gradle/caches/modules-2/files-2.1/net.fabricmc/sponge-mixin/0.15.4+mixin.0.8.7/6a12aacc794f1078458433116e9ed42c1cc98096/sponge-mixin-0.15.4+mixin.0.8.7.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="EXTJAR" id="/Users/klestiselimaj/.gradle/caches/modules-2/files-2.1/org.ow2.asm/asm/9.7.1/f0ed132a49244b042cd0e15702ab9f2ce3cc8436/asm-9.7.1.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="EXTJAR" id="/Users/klestiselimaj/.gradle/caches/modules-2/files-2.1/org.ow2.asm/asm-util/9.7.1/9e23359b598ec6b74b23e53110dd5c577adf2243/asm-util-9.7.1.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="EXTJAR" id="/Users/klestiselimaj/.gradle/caches/modules-2/files-2.1/org.ow2.asm/asm-commons/9.7.1/406c6a2225cfe1819f102a161e54cc16a5c24f75/asm-commons-9.7.1.jar" enabled="true" runInBatchMode="false"/>
-</factorypath>
@@ -1,45 +0,0 @@
-name: Automate Gradlew Build
-
-on:
-  workflow_dispatch:
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Set up JDK 21
-        uses: actions/setup-java@v4
-        with:
-          distribution: "temurin"
-          java-version: "21"
-          check-latest: true
-
-      - name: Set up Gradle
-        uses: gradle/actions/setup-gradle@v3
-        with:
-          gradle-home-cache-cleanup: false
-
-      - name: Grant execute permission for gradlew
-        run: chmod +x gradlew
-
-      - name: Build (release)
-        run: ./gradlew clean build -x test --no-daemon --stacktrace
-    
-      - name: Remove sources JARs
-        run: |
-          rm -f build/libs/*sources*.jar
-          echo "Removed sources JARs from build/libs"
-
-      - name: Upload build artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: saturnclient-latest
-          path: build/libs/saturnclient-*.jar
-          if-no-files-found: error
@@ -1,52 +0,0 @@
-name: Push Builds
-
-on:
-  push:
-    branches: [ "master" ]
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Set up JDK 21
-        uses: actions/setup-java@v4
-        with:
-          distribution: "temurin"
-          java-version: "21"
-
-      - name: Set up Gradle
-        uses: gradle/actions/setup-gradle@v3
-        with:
-          gradle-home-cache-cleanup: false
-
-      - name: Grant execute permission for gradlew
-        run: chmod +x gradlew
-
-      - name: Build
-        run: ./gradlew clean build -x test --no-daemon --stacktrace
-
-      - name: Remove sources JARs
-        run: |
-          rm -f build/libs/*sources*.jar
-          echo "Removed sources JARs from build/libs"
-
-      - name: Create timestamped JAR
-        run: |
-          TIMESTAMP=$(date -u +"%Y%m%d-%H%M%S")
-          MAIN_JAR=$(ls build/libs/saturnclient-*.jar | head -1)
-          cp "$MAIN_JAR" "saturnclient-${TIMESTAMP}.jar"
-          echo "Created: saturnclient-${TIMESTAMP}.jar"
-
-      - name: Upload timestamped artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: saturnclient-${{ github.run_number }}
-          path: saturnclient-*.jar
-          if-no-files-found: error
@@ -0,0 +1,3 @@
+[submodule "common"]
+	path = common
+	url = https://github.com/saturnclientmc/common.git
@@ -1,6 +1,6 @@
 # Licenses

-This project is under [Apache-2.0](https://www.apache.org/licenses/LICENSE-2.0), but a lot of code taken from other open source projects that are under other licenses that need to be mentioned due to legal reasons.
+This project is under [Apache-2.0](https://www.apache.org/licenses/LICENSE-2.0), but a lot of code taken from other open source projects that are under other licenses that need to be mentioned due to legal or ethical reasons.

 | File                                                                                    | License                                                     |
 | --------------------------------------------------------------------------------------- | ----------------------------------------------------------- |
@@ -1,19 +1,70 @@
 <p align="center">
-  <img src="src/main/resources/assets/saturnclient/icon.png" alt="OSUI" width="150px"/>
+  <img src="https://raw.github.com/saturnclientmc/common/master/src/main/resources/assets/saturnclient/textures/logo/logo.png" alt="Saturn Client Logo" width="150px"/>
 </p>

 <h1 align="center">Saturn Client</h1>

 <p align="center">
-  <b>Saturn Client is a free and open source Minecraft client</b>
+  <b>A free and open-source Minecraft client.</b><br/>
+  Built with performance, customization, and community in mind.
 </p>

-![image](https://github.com/user-attachments/assets/b0b23e72-c2eb-49aa-b49c-4d3cc4d60fcc)
+<p align="center">
+  <img src="screenshot.png" alt="Saturn Client Screenshot"/>
+</p>

-# Credits
+---

- Cloak rendering: `IIpho3nix` & `Dhyan Blum`
- Who Am I: `FokshaWasTaken`
- Panorama: https://www.planetminecraft.com/texture-pack/minecraft-cavesand-cliffs-part-ii-main-menu-panorama/
+## ✨ About

-If any of the code or assets are in your name and you want to remove them, please submit an issue, we are still in alpha to have any artists so we would also appreciate if you could help us make some cosmetics
+Saturn Client is a free, open-source Minecraft client designed to enhance the gameplay experience while staying lightweight and customizable.
+Our goal is to build a clean, optimized client that the community can contribute to and improve together.
+
+Saturn is currently trying to support multiple versions of minecraft, so please report any issues you are experiencing.
+
+---
+
+## 🚀 Features
+
+- Free cosmetics that don't require real money
+- Clean and modern UI with animations
+- Ongoing performance improvements
+- Open-source and community-driven
+
+---
+
+## 🤝 Contributing
+
+We welcome contributions of all kinds:
+
+- Code improvements
+- Bug fixes
+- UI enhancements
+- Cosmetic designs
+- Suggestions and feedback
+
+If you're an artist or designer interested in helping with cosmetics or visual assets, we’d love to collaborate.
+
+---
+
+## 🙌 Credits
+
+- **Cloak Rendering:** `IIpho3nix` & Saturn
+- **Who Am I:** `FokshaWasTaken`
+- **Panorama:**  
+  https://www.planetminecraft.com/texture-pack/minecraft-cavesand-cliffs-part-ii-main-menu-panorama/
+
+If any code or assets belong to you and you would like them removed, please open an issue.  
+We aim to properly credit all contributors and respect original creators of their respective art.
+
+---
+
+## 📜 License
+
+Saturn Client is free and open-source using **Apache-2.0**
+
+---
+
+<p align="center">
+  Made with ❤️ by the Saturn Client team
+</p>
@@ -0,0 +1,3 @@
+# Version guide
+
+This guide will help you to add or edit minecraft versions.
@@ -1,193 +1,64 @@
-/*
- * ================================================================
- * Saturn Client - Fabric Mod Build Configuration
- * ================================================================
- *
- * This build file configures:
- *  - Fabric Loom (Minecraft mod development)
- *  - Dependency management
- *  - Resource processing
- *  - Java toolchain (Java 21)
- *  - Publishing setup
- *
- * All version values are defined in gradle.properties.
- * ================================================================
- */
-
-plugins {
-    // Fabric mod development plugin
-    id 'fabric-loom' version '1.9-SNAPSHOT'
-
-    // Maven publishing support
-    id 'maven-publish'
-}
-
-/*
- * ================================================================
- * Project Metadata
- * ================================================================
- */
-
-version = project.mod_version
-group   = project.maven_group
-
-/*
- * ================================================================
- * Repositories
- * ================================================================
- * All dependency sources.
- */
-repositories {
-    // Fabric
-    maven { url 'https://maven.fabricmc.net/' }
-
-    // JitPack (GitHub releases)
-    maven { url 'https://jitpack.io' }
-
-    // Parchment mappings (if needed later)
-    maven { url 'https://maven.parchmentmc.org' }
-
-    // Special Model Loader
-    maven { name = "FelNull Maven"; url = "https://maven.felnull.dev" }
-
-    // Player Animation Library
-    maven { name = "KosmX Maven"; url = 'https://maven.kosmx.dev/' }
-
-    // Central repository
-    mavenCentral()
-}
-
-/*
- * ================================================================
- * Dependencies
- * ================================================================
- */
-dependencies {
-
-    // ─────────────────────────────────────────────
-    // Minecraft Core
-    // ─────────────────────────────────────────────
-    minecraft "com.mojang:minecraft:${project.minecraft_version}"
-
-    // Yarn mappings (named mappings for dev environment)
-    mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
-
-    // Fabric Loader
-    modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
-
-    // Fabric API
-    modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
-
-
-    // ─────────────────────────────────────────────
-    // Rendering / Model Libraries
-    // ─────────────────────────────────────────────
-
-    // Special Model Loader (included inside your mod jar)
-    modApi "dev.felnull:special-model-loader:1.4.0+pre.1"
-    include "dev.felnull:special-model-loader:1.4.0+pre.1"
-
-    // SVG Rendering Library
-    include implementation("com.formdev:svgSalamander:1.1.4")
-
-
-    // ─────────────────────────────────────────────
-    // Animation
-    // ─────────────────────────────────────────────
-
-    // Player Animation Library (bundled into your mod)
-    include modImplementation(
-        "dev.kosmx.player-anim:player-animation-lib-fabric:${project.player_anim}"
-    )
-
-    // Optional: BendyLib (only if you directly use it)
-    // include modRuntimeOnly(
-    //     "io.github.kosmx.bendy-lib:bendy-lib-fabric:${project.bendylib_version}"
-    // )
-
-
-    // ─────────────────────────────────────────────
-    // External Libraries
-    // ─────────────────────────────────────────────
-
-    // Session Java (auth/session handling)
-    include implementation("com.github.selimaj-dev:session-java:0.1.6")
-}
-
-
-/*
- * ================================================================
- * Resource Processing
- * ================================================================
- * Injects version values into fabric.mod.json.
- */
-processResources {
-    inputs.property "version", project.version
-    inputs.property "minecraft_version", project.minecraft_version
-    inputs.property "loader_version", project.loader_version
-    filteringCharset "UTF-8"
-
-    filesMatching("fabric.mod.json") {
-        expand(
-                "version": project.version,
-                "minecraft_version": project.minecraft_version,
-                "loader_version": project.loader_version
-        )
-    }
-}
-
-
-/*
- * ================================================================
- * Java Configuration
- * ================================================================
- * Targeting Java 21.
- */
-def targetJavaVersion = 21
-
-tasks.withType(JavaCompile).configureEach {
-    options.encoding = "UTF-8"
-    options.release.set(targetJavaVersion)
-}
-
-java {
-    toolchain.languageVersion = JavaLanguageVersion.of(targetJavaVersion)
-
-    archivesBaseName = project.archives_base_name
-    withSourcesJar()
-}
-
-
-/*
- * ================================================================
- * Jar Packaging
- * ================================================================
- * Includes LICENSE and NOTICE inside the final jar.
- */
-jar {
-    from("LICENSE") {
-        rename { "${it}_${project.archivesBaseName}" }
-    }
-    from("NOTICE") {
-        rename { "${it}_${project.archivesBaseName}" }
-    }
-}
-
-
-/*
- * ================================================================
- * Publishing
- * ================================================================
- * Configured but no remote repository defined yet.
- */
-publishing {
-    publications {
-        mavenJava(MavenPublication) {
-            from components.java
-        }
-    }
+subprojects {
+    apply plugin: "java"

    repositories {
-        // Add publishing repository here when needed
+        maven { url "https://maven.fabricmc.net/" }
+        maven { url "https://jitpack.io" }
+        mavenCentral()
    }
-}
+
+    dependencies {
+        implementation "de.javagl:obj:0.4.0"
+        implementation "com.formdev:svgSalamander:1.1.4"
+        implementation 'com.fasterxml.jackson.core:jackson-databind:2.17.0'
+        implementation 'com.fasterxml.jackson.core:jackson-annotations:2.17.0'
+        implementation 'com.fasterxml.jackson.core:jackson-core:2.17.0'
+    }
+}
+
+configure(subprojects.findAll { it.name != "common" }) {
+    dependencies {
+        implementation project(":common")
+
+        sourceSets {
+            main {
+                resources {
+                    srcDir project(":common").file("src/main/resources")
+                }
+            }
+        }
+    }
+}
+
+tasks.register("buildAll") {
+    group = "build"
+    description = "Builds all subprojects and collects their remapped jars"
+
+    // Only build remapped jars (not full build)
+    dependsOn subprojects.collect { proj ->
+        proj.tasks.matching { it.name == "remapJar" }
+    }
+
+    doLast {
+        def outputDir = file("$buildDir/allJars")
+        outputDir.mkdirs()
+
+        subprojects.each { proj ->
+            def remapTask = proj.tasks.findByName("remapJar")
+
+            if (remapTask != null) {
+                def jarFile = remapTask.archiveFile.get().asFile
+
+                if (jarFile.exists() && !jarFile.name.contains("sources")) {
+                    copy {
+                        from jarFile
+                        into outputDir
+                        rename { "${jarFile.name}" }
+                    }
+                }
+            }
+        }
+
+        println "All remapped jars collected in: $outputDir"
+    }
+}
@@ -1,18 +1,7 @@
-# Done to increase the memory available to gradle.
-org.gradle.jvmargs=-Xmx1G -XX:+UseParallelGC
-
-org.gradle.daemon=true
+org.gradle.jvmargs=-Xmx3G
 org.gradle.parallel=true
-org.gradle.configureondemand=true
-org.gradle.caching=true

-minecraft_version=1.21.4
-yarn_mappings=1.21.4+build.7
-loader_version=0.16.10
-fabric_version=0.114.0+1.21.4
+# IntelliJ IDEA is not yet fully compatible with configuration cache, see: https://github.com/FabricMC/fabric-loom/issues/1349
+org.gradle.configuration-cache=false

-mod_version = 0.0.7-beta1
-maven_group = org.saturnclient
-archives_base_name = saturnclient
-
-player_anim = 2.0.3+1.21.4
+mod_version=0.1.0-beta
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
@@ -1,7 +1,7 @@
 #!/bin/sh

 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -114,7 +114,6 @@ case "$( uname )" in                #(
  NONSTOP* )        nonstop=true ;;
 esac

-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar


 # Determine the Java command to use to start the JVM.
@@ -172,7 +171,6 @@ fi
 # For Cygwin or MSYS, switch paths to Windows format before running java
 if "$cygwin" || "$msys" ; then
    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )

    JAVACMD=$( cygpath --unix "$JAVACMD" )

@@ -212,8 +210,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

 set -- \
        "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
        "$@"

 # Stop when "xargs" is not available.
@@ -70,11 +70,10 @@ goto fail
 :execute
@rem Setup the command line

-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar


@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*

 :end
@rem End local scope for the variables with windows NT shell
@@ -1,9 +1,21 @@
 pluginManagement {
    repositories {
-        maven {
-            name = 'Fabric'
-            url = 'https://maven.fabricmc.net/'
-        }
+        maven { url "https://maven.fabricmc.net/" }
        gradlePluginPortal()
+        mavenCentral()
    }
 }
+
+rootProject.name = "saturn-client"
+
+include("common")
+
+def versionsDir = file("versions")
+
+versionsDir.eachDir { dir ->
+    def version = dir.name
+    def projectName = "mc-${version}"
+
+    include(projectName)
+    project(":${projectName}").projectDir = dir
+}
@@ -1,11 +0,0 @@
-package org.saturnclient.modules;
-
-import org.saturnclient.ui2.RenderScope;
-
-public interface HudMod {
-    public ModDimensions getDimensions();
-
-    public void renderDummy(RenderScope scope);
-
-    public void renderHud(RenderScope scope);
-}
@@ -1,54 +0,0 @@
-package org.saturnclient.modules;
-
-import java.util.Map;
-
-import org.saturnclient.saturnclient.config.manager.Property;
-import org.saturnclient.saturnclient.config.manager.Property.NamedProperty;
-
-public class ModDimensions {
-    public Property<Integer> x = Property.integer(0);
-    public Property<Integer> y = Property.integer(0);
-    public Property<Float> scale = Property.floatProp(1.0f);
-    public Property<Integer> bgColor = Property.color(0x00000000);
-    public Property<Integer> fgColor = Property.color(0xFFffffff);
-    public Property<Integer> radius = Property.integer(0);
-    public Property<Integer> font = Property.font(0);
-    public boolean renderBackground = true;
-
-    public int width = 0;
-    public int height = 0;
-
-    public NamedProperty<Map<String, Property<?>>> prop() {
-        return Property.namespace(Map.of(
-                "X", x,
-                "Y", y,
-                "Scale", scale,
-                "Background Color", bgColor,
-                "Foreground Color", fgColor,
-                "Corner Radius", radius,
-                "Font", font)).named("In-Game Display");
-    }
-
-    public ModDimensions() {
-    }
-
-    public ModDimensions(int width, int height) {
-        this.width = width;
-        this.height = height;
-    }
-
-    public ModDimensions(int x, int y, int width, int height) {
-        this.x.value = x;
-        this.y.value = y;
-        this.width = width;
-        this.height = height;
-    }
-
-    public ModDimensions(int x, int y, int width, int height, float scale) {
-        this.x.value = x;
-        this.y.value = y;
-        this.scale.value = scale;
-        this.width = width;
-        this.height = height;
-    }
-}
@@ -1,60 +0,0 @@
-package org.saturnclient.modules;
-
-import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.saturnclient.modules.mods.*;
-
-public class ModManager {
-    public static final List<Module> ENABLED_MODS = new ArrayList<>();
-    public static final Module[] ALL_MODS = {
-            new Crosshair(),
-            new AutoSprint(),
-            new ArmorDisplay(),
-            new Fps(),
-            new StatusEffects(),
-            new Coordinates(),
-            new Freelook(),
-            new Keystrokes(),
-            new Fullbright(),
-            new NoFog(),
-            new DayCounter(),
-            new Speedometer(),
-            new Zoom(),
-            new HealthDisplay(),
-            new Nametags(),
-            new Ping(),
-            new Tps(),
-            new Clock()
-    };
-
-    public static void init() {
-        // Pre-filter enabled modules to avoid checking every tick
-        updateEnabledModules();
-
-        ClientTickEvents.END_CLIENT_TICK.register(client -> {
-            // Only iterate over enabled modules
-            for (Module m : ENABLED_MODS) {
-                m.tick();
-            }
-        });
-    }
-
-    public static synchronized void updateEnabledModules() {
-        ENABLED_MODS.clear();
-        for (Module m : ALL_MODS) {
-            if (m.isEnabled()) {
-                ENABLED_MODS.add(m);
-            }
-        }
-    }
-
-    public static Module[] getAllMods() {
-        return ALL_MODS;
-    }
-
-    public static void refreshEnabledModules() {
-        updateEnabledModules();
-    }
-}
@@ -1,60 +0,0 @@
-package org.saturnclient.modules;
-
-import org.saturnclient.ui2.resources.Textures;
-import org.saturnclient.saturnclient.config.manager.ConfigManager;
-import org.saturnclient.saturnclient.config.manager.Property.NamedProperty;
-import org.saturnclient.ui2.RenderScope;
-
-import net.minecraft.util.Identifier;
-
-public abstract class Module {
-    private final ModuleDetails details;
-    private final ConfigManager configManager;
-
-    public Module(ModuleDetails details, NamedProperty<?>... props) {
-        this.details = details;
-        configManager = new ConfigManager(details.name);
-        for (NamedProperty<?> prop : props) {
-            configManager.property(prop.name, prop.prop);
-        }
-    }
-
-    public void render(RenderScope scope) {
-    }
-
-    public void tick() {
-    }
-
-    public abstract boolean isEnabled();
-
-    public final void setEnabled(boolean e) {
-        onEnabled(e);
-        ModManager.updateEnabledModules();
-    }
-
-    public abstract void onEnabled(boolean e);
-
-    public final String getName() {
-        return details.name;
-    }
-
-    public Identifier getIconTexture() {
-        return Textures.getModIcon(details.namespace);
-    }
-
-    public ConfigManager getConfig() {
-        return configManager;
-    }
-
-    public String getDescription() {
-        return details.description;
-    }
-
-    public String[] getTags() {
-        return details.tags;
-    }
-
-    public String getVersion() {
-        return details.version;
-    }
-}
@@ -1,39 +0,0 @@
-package org.saturnclient.modules;
-
-public class ModuleDetails {
-    public String name;
-    public String namespace;
-    public String description;
-    public String version;
-    public String[] tags = {};
-
-    public ModuleDetails(String name, String namespace) {
-        this.name = name;
-        this.namespace = namespace;
-    }
-
-    public ModuleDetails name(String name) {
-        this.name = name;
-        return this;
-    }
-
-    public ModuleDetails namespace(String namespace) {
-        this.namespace = namespace;
-        return this;
-    }
-
-    public ModuleDetails description(String description) {
-        this.description = description;
-        return this;
-    }
-
-    public ModuleDetails version(String version) {
-        this.version = version;
-        return this;
-    }
-
-    public ModuleDetails tags(String... tags) {
-        this.tags = tags;
-        return this;
-    }
-}
@@ -1,6 +0,0 @@
-# Credits
-### Freelook
- https://github.com/Celibistrial/freelook
- https://modrinth.com/mod/freelook
-
-**The other mods are coded by us, if you have a concern or we missed something feel free to submit a issue with the credits tag**
@@ -1,102 +0,0 @@
-package org.saturnclient.modules.mods;
-
-import org.saturnclient.modules.HudMod;
-import org.saturnclient.modules.ModDimensions;
-import org.saturnclient.modules.Module;
-import org.saturnclient.modules.ModuleDetails;
-import org.saturnclient.saturnclient.SaturnClient;
-import org.saturnclient.saturnclient.config.manager.Property;
-import org.saturnclient.ui2.RenderScope;
-
-import net.minecraft.entity.EquipmentSlot;
-import net.minecraft.item.ItemStack;
-import net.minecraft.item.Items;
-
-public class ArmorDisplay extends Module implements HudMod {
-    private static Property<Boolean> enabled = Property.bool(false);
-    private static ModDimensions dimensions = new ModDimensions(40, 75);
-    private static Property<Boolean> useMainHand = Property.bool(false);
-
-    public ArmorDisplay() {
-        super(new ModuleDetails("Armor Display", "armor")
-                .description("Displays armor durability")
-                .version("v0.1.0")
-                .tags("Utility"),
-                enabled.named("Enabled"),
-                useMainHand.named("Use Main Hand"),
-                dimensions.prop());
-    }
-
-    public void renderArmor(RenderScope scope, ItemStack mainHand, ItemStack helmet, ItemStack chestplate,
-            ItemStack leggings, ItemStack boots) {
-        int row = 0;
-
-        if (useMainHand.value && !mainHand.isEmpty()) {
-            scope.drawItem(mainHand, 0, 15 * row);
-            renderHealth(scope, row, mainHand.getMaxDamage(), mainHand.getDamage());
-            row++;
-        }
-
-        if (!helmet.isEmpty()) {
-            scope.drawItem(helmet, 0, 15 * row);
-            renderHealth(scope, row, helmet.getMaxDamage(), helmet.getDamage());
-            row++;
-        }
-
-        if (!chestplate.isEmpty()) {
-            scope.drawItem(chestplate, 0, 15 * row);
-            renderHealth(scope, row, chestplate.getMaxDamage(), chestplate.getDamage());
-            row++;
-        }
-        if (!leggings.isEmpty()) {
-            scope.drawItem(leggings, 0, 15 * row);
-            renderHealth(scope, row, leggings.getMaxDamage(), leggings.getDamage());
-            row++;
-        }
-
-        if (!boots.isEmpty()) {
-            scope.drawItem(boots, 0, 15 * row);
-            renderHealth(scope, row, boots.getMaxDamage(), boots.getDamage());
-            row++;
-        }
-    }
-
-    public void renderHealth(RenderScope scope, int i, int max_damage, int damage) {
-        if (max_damage > 0) {
-            scope.drawText(0.5f, "" + (max_damage - damage), 17, (15 * i) + 3, dimensions.font.value,
-                    dimensions.fgColor.value);
-        }
-    }
-
-    @Override
-    public void renderHud(RenderScope scope) {
-        renderArmor(scope,
-                SaturnClient.client.player.getEquippedStack(EquipmentSlot.MAINHAND),
-                SaturnClient.client.player.getEquippedStack(EquipmentSlot.HEAD),
-                SaturnClient.client.player.getEquippedStack(EquipmentSlot.CHEST),
-                SaturnClient.client.player.getEquippedStack(EquipmentSlot.LEGS),
-                SaturnClient.client.player.getEquippedStack(EquipmentSlot.FEET));
-    }
-
-    @Override
-    public void renderDummy(RenderScope scope) {
-        renderArmor(scope, new ItemStack(Items.DIAMOND_SWORD), new ItemStack(Items.DIAMOND_HELMET),
-                new ItemStack(Items.DIAMOND_CHESTPLATE),
-                new ItemStack(Items.DIAMOND_LEGGINGS), new ItemStack(Items.DIAMOND_BOOTS));
-    }
-
-    @Override
-    public ModDimensions getDimensions() {
-        return dimensions;
-    }
-
-    @Override
-    public boolean isEnabled() {
-        return enabled.value;
-    }
-
-    @Override
-    public void onEnabled(boolean e) {
-        enabled.value = e;
-    }
-}
@@ -1,46 +0,0 @@
-package org.saturnclient.modules.mods;
-
-import java.util.Objects;
-
-import org.saturnclient.modules.Module;
-import org.saturnclient.modules.ModuleDetails;
-import org.saturnclient.saturnclient.SaturnClient;
-import org.saturnclient.saturnclient.config.manager.Property;
-
-public class AutoSprint extends Module {
-    private static Property<Boolean> enabled = Property.bool(false);
-
-    public AutoSprint() {
-        super(
-            new ModuleDetails("Auto Sprint", "sprint")
-            .description("Makes the player always sprint")
-            .tags("Movement")
-            .version("v0.1.0"),
-            enabled.named("Enabled"));
-    }
-
-    @Override
-    public void tick() {
-        if (SaturnClient.client.player == null || SaturnClient.client.getNetworkHandler() == null) {
-            return;
-        }
-        if (SaturnClient.client.options.forwardKey.isPressed() 
-            && !SaturnClient.client.options.backKey.isPressed() 
-            && !SaturnClient.client.player.isSneaking() 
-            && !SaturnClient.client.player.horizontalCollision 
-            && !SaturnClient.client.player.isUsingItem()) {
-
-            Objects.requireNonNull(SaturnClient.client.player).setSprinting(true);
-        }
-    }
-
-    @Override
-    public boolean isEnabled() {
-        return enabled.value;
-    }
-
-    @Override
-    public void onEnabled(boolean e) {
-        enabled.value = e;
-    }
-}
@@ -1,77 +0,0 @@
-package org.saturnclient.modules.mods;
-
-import java.time.format.DateTimeFormatter;
-import java.time.LocalTime;
-
-import org.saturnclient.modules.HudMod;
-import org.saturnclient.modules.ModDimensions;
-import org.saturnclient.modules.Module;
-import org.saturnclient.modules.ModuleDetails;
-import org.saturnclient.saturnclient.config.manager.Property;
-import org.saturnclient.ui2.RenderScope;
-import org.saturnclient.ui2.resources.Fonts;
-
-public class Clock extends Module implements HudMod {
-    private static Property<Boolean> enabled = Property.bool(false);
-    private static Property<Integer> format = Property.select(0, "24 hour", "12 hour");
-    private static Property<Boolean> seconds = Property.bool(false);
-    private static ModDimensions dimensions = new ModDimensions(60, Fonts.getHeight());
-
-    public Clock() {
-        super(new ModuleDetails("Clock", "clock")
-            .description("Displays the current real-world time")
-            .version("v0.1.0")
-            .tags("Utility"),
-            enabled.named("Enabled"),
-            format.named("Format"),
-            seconds.named("Show seconds"),
-            dimensions.prop()
-        );
-    }
-
-    @Override
-    public void renderDummy(RenderScope scope) {
-        renderClock(scope);
-    }
-
-    @Override
-    public void renderHud(RenderScope scope) {
-        renderClock(scope);
-    }
-
-    public void renderClock(RenderScope scope) {
-        String text = "";
-        LocalTime currentTime = LocalTime.now();
-
-        switch (format.value) {
-            case 0:
-                if (seconds.value) { text = currentTime.format(DateTimeFormatter.ofPattern("HH:mm:ss")); }
-                else { text = currentTime.format(DateTimeFormatter.ofPattern("HH:mm")); }
-                break;
-            case 1: 
-                if (seconds.value) { text = currentTime.format(DateTimeFormatter.ofPattern("hh:mm:ss a")); }
-                else { text = currentTime.format(DateTimeFormatter.ofPattern("hh:mm a")); }
-                break;
-        }
-
-        scope.drawText(text,
-            0, 0, dimensions.font.value, dimensions.fgColor.value);
-        dimensions.width = Fonts.getWidth(text, dimensions.font.value);
-        dimensions.height = 18 * text.split("\n").length;
-    }
-
-    @Override
-    public boolean isEnabled() {
-        return enabled.value;
-    }
-
-    @Override
-    public ModDimensions getDimensions() {
-        return dimensions;
-    }
-
-    @Override
-    public void onEnabled(boolean e) {
-        enabled.value = e;
-    }
-}
@@ -1,75 +0,0 @@
-package org.saturnclient.modules.mods;
-
-import org.saturnclient.modules.HudMod;
-import org.saturnclient.modules.ModDimensions;
-import org.saturnclient.modules.Module;
-import org.saturnclient.modules.ModuleDetails;
-import org.saturnclient.saturnclient.SaturnClient;
-import org.saturnclient.saturnclient.config.manager.Property;
-import org.saturnclient.ui2.RenderScope;
-import org.saturnclient.ui2.resources.Fonts;
-
-import net.minecraft.util.math.Vec3d;
-
-public class Coordinates extends Module implements HudMod {
-    private static Property<Boolean> enabled = Property.bool(false);
-    private static Property<Integer> displayMethod = Property.select(0, "Flat", "Flat annotated", "Newline", "Newline annotated");
-    private static ModDimensions dimensions = new ModDimensions(40, 18);
-
-    public Coordinates() {
-        super(new ModuleDetails("Coordinates", "coords")
-            .description("Displays your current coordinates")
-            .version("v0.1.0")
-            .tags("Utility"),
-            enabled.named("Enabled"),
-            displayMethod.named("Display Method"),
-            dimensions.prop()
-        );
-    }
-
-    @Override
-    public void renderDummy(RenderScope scope) {
-        renderCoords(532, 69, 253, scope);
-    }
-
-    @Override
-    public void renderHud(RenderScope scope) {
-        Vec3d pos = SaturnClient.client.player.getPos();
-        renderCoords((int) pos.x, (int) pos.y, (int) pos.z, scope);
-    }
-
-    public void renderCoords(int x, int y, int z, RenderScope scope) {
-        String f = "%d %d %d"; // Flat
-        switch (displayMethod.value) {
-            case 1: // Flat annotated
-                f = "X: %d Y: %d Z: %d";
-                break;
-            case 2: // Newline
-                f = "%d\n%d\n%d";
-                break;
-            case 3: // Newline annotated
-                f = "X: %d\nY: %d\nZ: %d";
-                break;
-        }
-        String text = String.format(f, x, y, z);
-        scope.drawText(text,
-            0, 0, dimensions.font.value, dimensions.fgColor.value);
-        dimensions.width = Fonts.getWidth(text, dimensions.font.value);
-        dimensions.height = 18 * text.split("\n").length;
-    }
-
-    @Override
-    public boolean isEnabled() {
-        return enabled.value;
-    }
-
-    @Override
-    public ModDimensions getDimensions() {
-        return dimensions;
-    }
-
-    @Override
-    public void onEnabled(boolean e) {
-        enabled.value = e;
-    }
-}
@@ -1,48 +0,0 @@
-package org.saturnclient.modules.mods;
-
-import org.saturnclient.modules.Module;
-import org.saturnclient.modules.ModuleDetails;
-import org.saturnclient.saturnclient.SaturnClient;
-import org.saturnclient.saturnclient.config.manager.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 = Property.bool(false);
-
-    public Crosshair() {
-        super(
-            new ModuleDetails("Crosshair", "crosshair")
-            .description("Changes the crosshair if you're aiming at a entity")
-            .tags("Visuals", "Utility")
-            .version("v0.1.0"),
-            enabled.named("Enabled"));
-    }
-
-    @Override
-    public void render(RenderScope scope) {
-        if (enabled.value
-                && SaturnClient.client.targetedEntity != null
-                && SaturnClient.client.targetedEntity.isAlive()) {
-            int scaledWidth = 15;
-            int scaledHeight = 15;
-
-            scope.setRenderLayer(RenderLayer::getCrosshair);
-            scope.drawTexture(Textures.CROSSHAIR_RANGE,
-                    (scope.getScaledWindowWidth() - scaledWidth) / 2,
-                    (scope.getScaledWindowHeight() - scaledHeight) / 2, 0.0F, 0.0F, scaledWidth, scaledHeight);
-        }
-    }
-
-    @Override
-    public boolean isEnabled() {
-        return enabled.value;
-    }
-
-    @Override
-    public void onEnabled(boolean e) {
-        enabled.value = e;
-    }
-}
@@ -1,61 +0,0 @@
-package org.saturnclient.modules.mods;
-
-import org.saturnclient.modules.HudMod;
-import org.saturnclient.modules.ModDimensions;
-import org.saturnclient.modules.Module;
-import org.saturnclient.modules.ModuleDetails;
-import org.saturnclient.saturnclient.SaturnClient;
-import org.saturnclient.saturnclient.config.manager.Property;
-import org.saturnclient.ui2.RenderScope;
-import org.saturnclient.ui2.resources.Fonts;
-
-public class DayCounter extends Module implements HudMod {
-    private static Property<Boolean> enabled = Property.bool(false);
-    private static ModDimensions dimensions = new ModDimensions(40, 18);
-    long day = 0;
-
-    public DayCounter() {
-        super(new ModuleDetails("DayCounter", "day")
-            .description("Displays the number of days that have passed")
-            .version("v0.1.0")
-            .tags("Utility"),
-            enabled.named("Enabled"),
-            dimensions.prop()
-        );
-    }
-
-    @Override
-    public void renderDummy(RenderScope scope) {
-        renderDay(271, scope);
-    }
-
-    @Override
-    public void renderHud(RenderScope scope) {
-        day = (SaturnClient.client.world.getTimeOfDay() / 24000L);
-        renderDay(day, scope);
-    }
-
-    public void renderDay(long day, RenderScope scope) {
-        String text = "Day: " + day;
-        scope.drawText(text,
-            0, 0, dimensions.font.value, dimensions.fgColor.value);
-        dimensions.width = Fonts.getWidth(text, dimensions.font.value);
-        dimensions.height = 18 * text.split("\n").length;
-    }
-
-    @Override
-    public boolean isEnabled() {
-        return enabled.value;
-    }
-
-    @Override
-    public ModDimensions getDimensions() {
-        return dimensions;
-    }
-
-    @Override
-    public void onEnabled(boolean e) {
-        enabled.value = e;
-    }
-}
-
@@ -1,53 +0,0 @@
-package org.saturnclient.modules.mods;
-
-import org.saturnclient.modules.HudMod;
-import org.saturnclient.modules.ModDimensions;
-import org.saturnclient.modules.Module;
-import org.saturnclient.modules.ModuleDetails;
-import org.saturnclient.saturnclient.SaturnClient;
-import org.saturnclient.saturnclient.config.manager.Property;
-import org.saturnclient.ui2.RenderScope;
-import org.saturnclient.ui2.resources.Fonts;
-
-public class Fps extends Module implements HudMod {
-    private static Property<Boolean> enabled = Property.bool(false);
-    private static ModDimensions dimensions = new ModDimensions(60, Fonts.getHeight());
-    
-    public Fps() {
-        super(new ModuleDetails("FPS Display", "fps")
-            .description("Displays current FPS")
-            .version("v0.1.0")
-            .tags("Utility"),
-            enabled.named("Enabled"),
-            dimensions.prop());
-    }
-
-    @Override
-    public void renderHud(RenderScope scope) {
-        String text = String.valueOf(SaturnClient.client.getCurrentFps()) + " FPS";
-        scope.drawText(text, 0, 0, dimensions.font.value, dimensions.fgColor.value);
-        dimensions.width = Fonts.getWidth(text, dimensions.font.value);
-    }
-
-    @Override
-    public void renderDummy(RenderScope scope) {
-        String text = "369 FPS";
-        scope.drawText(text, 0, 0, dimensions.font.value, dimensions.fgColor.value);
-        dimensions.width = Fonts.getWidth(text, dimensions.font.value);
-    }
-
-    @Override
-    public boolean isEnabled() {
-        return enabled.value;
-    }
-
-    @Override
-    public void onEnabled(boolean e) {
-        enabled.value = e;
-    }
-
-    @Override
-    public ModDimensions getDimensions() {
-        return dimensions;
-    }
-}
@@ -1,71 +0,0 @@
-package org.saturnclient.modules.mods;
-
-import org.lwjgl.glfw.GLFW;
-import org.saturnclient.modules.Module;
-import org.saturnclient.modules.ModuleDetails;
-import org.saturnclient.saturnclient.SaturnClient;
-import org.saturnclient.saturnclient.config.manager.Property;
-
-import net.minecraft.client.option.Perspective;
-
-public class Freelook extends Module {
-    private static Property<Boolean> enabled = Property.bool(false);
-    private static Property<Boolean> toggle = Property.bool(true);
-    public static Property<Integer> freelookKey = Property.keybinding(GLFW.GLFW_KEY_H);
-    public static boolean isFreeLooking = false;
-    private static boolean was1stPerson = false;
-    
-    public Freelook() {
-        super(
-            new ModuleDetails("Freelook", "freelook")
-                .description("Allows you to look around freely without moving your character")
-                .tags("Movement", "Camera")
-                .version("0.1.0"),
-            enabled.named("Enabled"),
-            toggle.named("Toggle freelook"),
-            freelookKey.named("Freelook Keybinding")
-        );
-    }
-    
-    @Override
-    public void tick() {
-        if (toggle.value) {
-            if (freelookKey.wasKeyPressed()) {
-                if (isFreeLooking) {
-                    stopFreelook();
-                } else {
-                    startFreelook();
-                }
-            }
-        } else if (freelookKey.isKeyPressed()) {
-            if (!isFreeLooking) {
-                startFreelook();
-            }
-        } else if (isFreeLooking) {
-            stopFreelook();
-        }
-    }
-
-    private void startFreelook() {
-        isFreeLooking = true;
-        was1stPerson = SaturnClient.client.options.getPerspective() == Perspective.FIRST_PERSON;
-        SaturnClient.client.options.setPerspective(Perspective.THIRD_PERSON_BACK);
-    }
-
-    private void stopFreelook() {
-        if (was1stPerson) {
-            SaturnClient.client.options.setPerspective(Perspective.FIRST_PERSON);
-        }
-        isFreeLooking = false;
-    }
-
-    @Override
-    public void onEnabled(boolean e) {
-        enabled.value = e;
-    }
-
-    @Override
-    public boolean isEnabled() {
-        return enabled.value;
-    }
-}
@@ -1,39 +0,0 @@
-package org.saturnclient.modules.mods;
-
-import org.saturnclient.modules.Module;
-import org.saturnclient.modules.ModuleDetails;
-import org.saturnclient.saturnclient.config.manager.Property;
-
-public class Fullbright extends Module {
-    private static Property<Boolean> enabled = Property.bool(false);
-    private static Property<Integer> brightness = Property.integer(100);
-
-    public Fullbright() {
-        super(
-            new ModuleDetails("Fullbright", "fullbright")
-            .description("Allows you to see in the dark")
-            .tags("Camera")
-            .version("v0.1.0"),
-            enabled.named("Enabled"),
-            brightness.named("Brightness %"));
-    }
-
-    @Override
-    public boolean isEnabled() {
-        return enabled.value;
-    }
-
-    @Override
-    public void onEnabled(boolean e) {
-        enabled.value = e;
-    }
-    
-    public static boolean shouldOverrideBrightness() {
-        return enabled.value;
-    }
-    
-    public static float getBrightnessValue() {
-        return brightness.value / 10;
-    }
-
-}
@@ -1,85 +0,0 @@
-package org.saturnclient.modules.mods;
-
-import org.saturnclient.modules.HudMod;
-import org.saturnclient.modules.ModDimensions;
-import org.saturnclient.modules.Module;
-import org.saturnclient.modules.ModuleDetails;
-import org.saturnclient.saturnclient.SaturnClient;
-import org.saturnclient.saturnclient.config.manager.Property;
-import org.saturnclient.ui2.RenderScope;
-import org.saturnclient.ui2.resources.Fonts;
-
-import net.minecraft.util.math.Vec3d;
-
-public class HealthDisplay extends Module implements HudMod {
-    private static Property<Boolean> enabled = Property.bool(false);
-    private static Property<Integer> displayMode = Property.select(0, "Health", "Hearts");
-    private static Property<Integer> decimals = Property.select(0, "0", "1", "2");
-    private static ModDimensions dimensions = new ModDimensions(40, 18);
-    double speed = 0.;
-    Vec3d velocity;
-    double y = 0.;
-
-    public HealthDisplay() {
-        super(new ModuleDetails("Health display", "health")
-            .description("Displays your current health")
-            .version("v0.1.0")
-            .tags("Utility"),
-            enabled.named("Enabled"),
-            displayMode.named("Display mode"),
-            decimals.named("Decimals"),
-            dimensions.prop()
-        );
-    }
-
-    @Override
-    public void renderDummy(RenderScope scope) {
-        renderHealth(10, scope);
-    }
-
-    @Override
-    public void renderHud(RenderScope scope) {
-        float health = SaturnClient.client.player.getHealth();
-        switch (displayMode.value) {
-            case 1:
-                health = health / 2;
-        }
-        renderHealth(health, scope);
-    }
-
-    public void renderHealth(float health, RenderScope scope) {
-        String text = "";
-
-        switch (decimals.value) {
-            case 0: 
-                text = String.format("%.0f ", health);
-                break;
-            case 1: 
-                text = String.format("%.1f ", health);
-                break;
-            case 2: 
-                text = String.format("%.2f ", health);
-                break;
-        }
-
-        scope.drawText(text,
-            0, 0, dimensions.font.value, dimensions.fgColor.value);
-        dimensions.width = Fonts.getWidth(text, dimensions.font.value);
-        dimensions.height = 18 * text.split("\n").length;
-    }
-
-    @Override
-    public boolean isEnabled() {
-        return enabled.value;
-    }
-
-    @Override
-    public ModDimensions getDimensions() {
-        return dimensions;
-    }
-
-    @Override
-    public void onEnabled(boolean e) {
-        enabled.value = e;
-    }
-}
@@ -1,153 +0,0 @@
-package org.saturnclient.modules.mods;
-
-import org.saturnclient.modules.Module;
-import org.saturnclient.modules.HudMod;
-import org.saturnclient.modules.ModDimensions;
-import org.saturnclient.saturnclient.SaturnClient;
-import org.saturnclient.saturnclient.config.manager.Property;
-import org.saturnclient.ui2.RenderScope;
-import org.saturnclient.modules.ModuleDetails;
-
-public class Keystrokes extends Module implements HudMod {
-
-    private static final Property<Boolean> enabled = Property.bool(false);
-    private static final Property<Boolean> showMouse = Property.bool(true);
-    private static final Property<Boolean> showSpace = Property.bool(false);
-
-    private static final Property<Integer> clickBg = Property.color(0xFFCCCCCC);
-    private static final Property<Integer> clickFg = Property.color(0xFFFFFFFF);
-
-    private static final ModDimensions dimensions = new ModDimensions(78, 54);
-
-    // Key states
-    private boolean w, a, s, d, lmb, rmb, space;
-
-    // Layout constants
-    private static final int KEY_SIZE = 24;
-    private static final int KEY_SPACING = 3;
-    private static final int MOUSE_WIDTH = 38;
-    private static final int MOUSE_HEIGHT = 24;
-    private static final int SPACE_HEIGHT = 19;
-
-    public Keystrokes() {
-        super(new ModuleDetails("Keystrokes", "keystrokes")
-                .description("Displays movement keystrokes")
-                .version("v0.2.0")
-                .tags("Utility"),
-
-                enabled.named("Enabled"),
-                showMouse.named("Show mouse clicks"),
-                showSpace.named("Show space"),
-                dimensions.prop(),
-                clickFg.named("Clicked fg"),
-                clickBg.named("Clicked bg")
-        );
-
-        dimensions.renderBackground = false;
-    }
-
-    @Override
-    public void tick() {
-        w = SaturnClient.client.options.forwardKey.isPressed();
-        a = SaturnClient.client.options.leftKey.isPressed();
-        s = SaturnClient.client.options.backKey.isPressed();
-        d = SaturnClient.client.options.rightKey.isPressed();
-        lmb = SaturnClient.client.options.attackKey.isPressed();
-        rmb = SaturnClient.client.options.useKey.isPressed();
-        space = SaturnClient.client.options.jumpKey.isPressed();
-
-        updateHeight();
-    }
-
-    private void updateHeight() {
-        int height = KEY_SIZE * 2 + KEY_SPACING;
-
-        if (showSpace.value)
-            height += SPACE_HEIGHT + KEY_SPACING;
-
-        if (showMouse.value)
-            height += MOUSE_HEIGHT + KEY_SPACING;
-
-        dimensions.height = height;
-    }
-
-    @Override
-    public void renderDummy(RenderScope scope) {
-        render(scope, false);
-    }
-
-    @Override
-    public void renderHud(RenderScope scope) {
-        render(scope, true);
-    }
-
-    private void render(RenderScope scope, boolean live) {
-
-        int yOffset = 0;
-
-        // --- W ---
-        renderKey(scope, live && w, 'W', KEY_SIZE + KEY_SPACING, yOffset);
-
-        // --- A S D ---
-        yOffset += KEY_SIZE + KEY_SPACING;
-
-        renderKey(scope, live && a, 'A', 0, yOffset);
-        renderKey(scope, live && s, 'S', KEY_SIZE + KEY_SPACING, yOffset);
-        renderKey(scope, live && d, 'D', (KEY_SIZE + KEY_SPACING) * 2, yOffset);
-
-        yOffset += KEY_SIZE + KEY_SPACING;
-
-        // --- SPACE ---
-        if (showSpace.value) {
-            renderKeySpace(scope, live && space, 0, yOffset);
-            yOffset += SPACE_HEIGHT + KEY_SPACING;
-        }
-
-        // --- MOUSE ---
-        if (showMouse.value) {
-            renderKeyMouse(scope, live && lmb, "LMB", 0, yOffset);
-            renderKeyMouse(scope, live && rmb, "RMB", MOUSE_WIDTH + KEY_SPACING, yOffset);
-        }
-    }
-
-    private void renderKey(RenderScope scope, boolean pressed, char c, int x, int y) {
-        int bg = pressed ? clickBg.value : dimensions.bgColor.value;
-        int fg = pressed ? clickFg.value : dimensions.fgColor.value;
-
-        scope.drawRoundedRectangle(x, y, KEY_SIZE, KEY_SIZE, dimensions.radius.value, bg);
-        scope.drawText(0.6f, String.valueOf(c), x + 9, y + 7, dimensions.font.value, fg);
-    }
-
-    private void renderKeyMouse(RenderScope scope, boolean pressed, String text, int x, int y) {
-        int bg = pressed ? clickBg.value : dimensions.bgColor.value;
-        int fg = pressed ? clickFg.value : dimensions.fgColor.value;
-
-        scope.drawRoundedRectangle(x, y, MOUSE_WIDTH, MOUSE_HEIGHT, dimensions.radius.value, bg);
-        scope.drawText(0.6f, text, x + 9, y + 7, dimensions.font.value, fg);
-    }
-
-    private void renderKeySpace(RenderScope scope, boolean pressed, int x, int y) {
-        int bg = pressed ? clickBg.value : dimensions.bgColor.value;
-        int fg = pressed ? clickFg.value : dimensions.fgColor.value;
-
-        scope.drawRoundedRectangle(x, y, dimensions.width, SPACE_HEIGHT, dimensions.radius.value, bg);
-
-        int lineY = y + SPACE_HEIGHT / 2;
-        scope.drawRect(x + (dimensions.width - 30) / 2, lineY, 30, 1, fg);
-    }
-
-    @Override
-    public boolean isEnabled() {
-        return enabled.value;
-    }
-
-    @Override
-    public ModDimensions getDimensions() {
-        return dimensions;
-    }
-
-    @Override
-    public void onEnabled(boolean e) {
-        enabled.value = e;
-    }
-}
@@ -1,148 +0,0 @@
-package org.saturnclient.modules.mods;
-
-import org.saturnclient.modules.Module;
-import org.saturnclient.modules.ModuleDetails;
-import org.saturnclient.modules.mods.utils.HealthRenderState;
-import org.saturnclient.saturnclient.config.manager.Property;
-
-import net.minecraft.client.render.entity.state.LivingEntityRenderState;
-
-// todo: rendering modes, custom names
-
-public class Nametags extends Module {
-    private static Property<Boolean> enabled = Property.bool(false);
-    private static Property<Boolean> healthDisplay = Property.bool(false);
-    private static Property<Boolean> players = Property.bool(true);
-    private static Property<Boolean> hostile = Property.bool(false);
-    private static Property<Boolean> passive = Property.bool(false);
-    private static Property<Boolean> heartEmoji = Property.bool(true);
-    private static Property<Boolean> obfuscate = Property.bool(false);
-    private static Property<Integer> unit = Property.select(0, "Health", "Hearts");
-    private static Property<Integer> format = Property.select(0, "Value", "Value / Total", "%");
-    private static Property<Integer> nameColor = Property.select(15,
-        "Black",
-        "Dark Blue",
-        "Dark Green",
-        "Dark Aqua",
-        "Dark Red",
-        "Dark Purple",
-        "Gold",
-        "Gray",
-        "Dark Gray",
-        "Blue",
-        "Green",
-        "Aqua",
-        "Red",
-        "Light Purple",
-        "Yellow",
-        "White"
-    );
-    private static Property<Integer> healthColor = Property.select(12,
-        "Black",
-        "Dark Blue",
-        "Dark Green",
-        "Dark Aqua",
-        "Dark Red",
-        "Dark Purple",
-        "Gold",
-        "Gray",
-        "Dark Gray",
-        "Blue",
-        "Green",
-        "Aqua",
-        "Red",
-        "Light Purple",
-        "Yellow",
-        "White"
-    );
-
-    private static final String[] COLOR_CODES = {
-        "§0", "§1", "§2", "§3", "§4", "§5", "§6", "§7",
-        "§8", "§9", "§a", "§b", "§c", "§d", "§e", "§f"
-    };
-
-    public Nametags() {
-        super(
-            new ModuleDetails("Nametags", "nametags")
-                .description("Allows you to modify entity nametags")
-                .tags("Camera", "Utility")
-                .version("0.1.0"),
-            enabled.named("Enabled"),
-            healthDisplay.named("Display health"),
-            players.named("Players"),
-            hostile.named("Hostile"),
-            passive.named("Passive"),
-            heartEmoji.named("Heart emoji"),
-            obfuscate.named("Obfuscate enemy names"),
-            unit.named("Unit"),
-            format.named("Format"),
-            nameColor.named("Name color"),
-            healthColor.named("Health color")
-        );
-    }
-    
-    @Override
-    public void tick() {
-       
-    }
-    
-    public static String getHealthString(LivingEntityRenderState state, HealthRenderState hrs, float health, float maxHealth) {
-        String ret = "";
-
-        switch (format.value){
-            case 0: // value
-                ret = String.format("%.1f", health / (unit.value + 1));
-                break;
-            
-            case 1: // value / total
-                ret = String.format("%.1f", health / (unit.value + 1)) + " / " + String.format("%.1f", maxHealth / (unit.value + 1));
-                break;
-            
-            case 2: // %
-                ret = String.format("%.0f%%", (health / maxHealth) * 100);
-                break;
-        }
-        return ret;
-    }
-
-    public static String getNametagString(LivingEntityRenderState state) {
-        if (state.customName == null) return null;
-        if (!healthDisplay.value) return state.customName.getString(); // name only
-        if (!(state instanceof HealthRenderState hrs)) return null;
-        
-        float health = hrs.saturn$getHealth();
-        float maxHealth = hrs.saturn$getMaxHealth();
-
-        HealthRenderState.EntityType type = hrs.saturn$getEntityType();
-        if (type == HealthRenderState.EntityType.PASSIVE && !passive.value) return null;
-        if (type == HealthRenderState.EntityType.HOSTILE && !hostile.value) return null;
-        if (type == HealthRenderState.EntityType.PLAYER && !players.value) return null;
-        if (type == HealthRenderState.EntityType.OTHER) return null;
-
-        if (health < 0f || maxHealth < 0f || health > maxHealth) return null;
-
-        String hpColor = COLOR_CODES[healthColor.value];
-        String color = COLOR_CODES[nameColor.value];
-        String heart = heartEmoji.value ? " ❤" : "";
-        String obf = obfuscate.value ? "§k" : "";
-        String reset = "§r";
-
-        String ret = color + obf + state.customName.getString() + reset +  " " + hpColor + getHealthString(state, hrs, health, maxHealth) + heart;
-        
-        return ret;
-    }
-
-    public static boolean shouldReplaceName() { 
-        return enabled.value;
-    }
-
-    @Override
-    public void onEnabled(boolean e) {
-        enabled.value = e;
-    }
-
-    @Override
-    public boolean isEnabled() {
-        return enabled.value;
-    }
-}
@@ -1,39 +0,0 @@
-package org.saturnclient.modules.mods;
-
-import org.saturnclient.modules.Module;
-import org.saturnclient.modules.ModuleDetails;
-import org.saturnclient.saturnclient.config.manager.Property;
-
-public class NoFog extends Module {
-    private static Property<Boolean> enabled = Property.bool(false);
-    private static Property<Boolean> liquids = Property.bool(false);
-
-    public NoFog() {
-        super(
-            new ModuleDetails("No Fog", "nofog")
-            .description("Stops fog from rendering")
-            .tags("Camera")
-            .version("v0.1.0"),
-            enabled.named("Enabled"),
-            liquids.named("See through liquids"));
-    }
-
-    @Override
-    public boolean isEnabled() {
-        return enabled.value;
-    }
-
-    @Override
-    public void onEnabled(boolean e) {
-        enabled.value = e;
-    }
-
-    // static for the mixin
-    public static boolean isActive() {
-        return enabled.value;
-    }
-
-    public static boolean liquids() {
-        return liquids.value;
-    }
-}
@@ -1,60 +0,0 @@
-package org.saturnclient.modules.mods;
-
-import org.saturnclient.modules.HudMod;
-import org.saturnclient.modules.ModDimensions;
-import org.saturnclient.modules.Module;
-import org.saturnclient.modules.ModuleDetails;
-import org.saturnclient.saturnclient.config.manager.Property;
-import org.saturnclient.ui2.RenderScope;
-import org.saturnclient.ui2.resources.Fonts;
-
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.network.ClientPlayNetworkHandler;
-
-public class Ping extends Module implements HudMod {
-    private static Property<Boolean> enabled = Property.bool(false);
-    private static ModDimensions dimensions = new ModDimensions(60, Fonts.getHeight());
-    
-    public Ping() {
-        super(new ModuleDetails("Ping Display", "ping")
-            .description("Displays ping")
-            .version("v0.1.0")
-            .tags("Utility"),
-            enabled.named("Enabled"),
-            dimensions.prop());
-    }
-
-    @Override
-    public void renderHud(RenderScope scope) {
-        MinecraftClient client = MinecraftClient.getInstance();
-        ClientPlayNetworkHandler handler = client.getNetworkHandler();
-        String text = "0 ms";
-        if (handler != null) {
-            text = String.valueOf(handler.getPlayerListEntry(client.player.getUuid()).getLatency()) + " ms";
-        }
-        scope.drawText(text, 0, 0, dimensions.font.value, dimensions.fgColor.value);
-        dimensions.width = Fonts.getWidth(text, dimensions.font.value);
-    }
-
-    @Override
-    public void renderDummy(RenderScope scope) {
-        String text = "10 ms";
-        scope.drawText(text, 0, 0, dimensions.font.value, dimensions.fgColor.value);
-        dimensions.width = Fonts.getWidth(text, dimensions.font.value);
-    }
-
-    @Override
-    public boolean isEnabled() {
-        return enabled.value;
-    }
-
-    @Override
-    public void onEnabled(boolean e) {
-        enabled.value = e;
-    }
-
-    @Override
-    public ModDimensions getDimensions() {
-        return dimensions;
-    }
-}
@@ -1,114 +0,0 @@
-package org.saturnclient.modules.mods;
-
-import org.saturnclient.modules.HudMod;
-import org.saturnclient.modules.ModDimensions;
-import org.saturnclient.modules.Module;
-import org.saturnclient.modules.ModuleDetails;
-import org.saturnclient.saturnclient.SaturnClient;
-import org.saturnclient.saturnclient.config.manager.Property;
-import org.saturnclient.ui2.RenderScope;
-import org.saturnclient.ui2.resources.Fonts;
-
-import net.minecraft.util.math.Vec3d;
-import net.minecraft.entity.Entity;
-
-public class Speedometer extends Module implements HudMod {
-    private static Property<Boolean> enabled = Property.bool(false);
-    private static Property<Integer> axis = Property.select(1, "Absolute", "X axis", "Y axis");
-    private static Property<Integer> unitText = Property.select(0, "None", "Blocks/s", "blocks/s", "b/s");
-    private static Property<Boolean> speedText = Property.bool(true);
-    private static ModDimensions dimensions = new ModDimensions(40, 18);
-    double speed = 0.;
-    Vec3d velocity;
-    double y = 0.;
-
-    public Speedometer() {
-        super(new ModuleDetails("Speedometer", "speed")
-            .description("Displays your current speed")
-            .version("v0.1.0")
-            .tags("Utility"),
-            enabled.named("Enabled"),
-            axis.named("Speed type"),
-            unitText.named("Unit text"),
-            speedText.named("Show speed text"),
-            dimensions.prop()
-        );
-    }
-
-    @Override
-    public void renderDummy(RenderScope scope) {
-        renderSpeed(2.71, scope);
-    }
-
-    @Override
-    public void renderHud(RenderScope scope) {
-        Entity vehicle = SaturnClient.client.player.getVehicle();
-        Entity player = SaturnClient.client.player;
-
-        if (vehicle == null) {
-            velocity = player.getVelocity();
-            y = player.isOnGround() ? 0. : velocity.y;
-        } else {
-            velocity = vehicle.getVelocity();
-            y = vehicle.isOnGround() ? 0. : velocity.y;
-        }
-
-        switch (axis.value) {
-            case 0: // Absolute
-                speed = (Math.sqrt(Math.pow(velocity.x, 2) + Math.pow(y, 2) + Math.pow(velocity.z, 2)));
-                break;
-
-            case 1: // x axis
-                speed = (Math.sqrt(Math.pow(velocity.x, 2) + Math.pow(velocity.z, 2)));
-                break;
-            
-            case 2: // y axis
-                speed = (Math.abs(y));
-                break;
-        }
-        renderSpeed(speed * 20, scope); // blocks/tick to blocks/s
-    }
-
-    public void renderSpeed(double speed, RenderScope scope) {
-        String f = String.format("%.2f ", speed);
-
-        switch (unitText.value) {
-            case 1: 
-                f += "Blocks/s";
-                break;
-            
-            case 2: 
-                f += "blocks/s";
-                break;
-            case 3: 
-                f += "b/s";
-                break;
-        }
-
-        String text = f;
-
-        if (speedText.value) {
-            text = "Speed: " + text;
-        }
-
-        scope.drawText(text,
-            0, 0, dimensions.font.value, dimensions.fgColor.value);
-        dimensions.width = Fonts.getWidth(text, dimensions.font.value);
-        dimensions.height = 18 * text.split("\n").length;
-    }
-
-    @Override
-    public boolean isEnabled() {
-        return enabled.value;
-    }
-
-    @Override
-    public ModDimensions getDimensions() {
-        return dimensions;
-    }
-
-    @Override
-    public void onEnabled(boolean e) {
-        enabled.value = e;
-    }
-}
@@ -1,105 +0,0 @@
-package org.saturnclient.modules.mods;
-
-import java.util.Arrays;
-
-import org.saturnclient.modules.HudMod;
-import org.saturnclient.modules.ModDimensions;
-import org.saturnclient.modules.Module;
-import org.saturnclient.modules.ModuleDetails;
-import org.saturnclient.saturnclient.SaturnClient;
-import org.saturnclient.saturnclient.config.manager.Property;
-import org.saturnclient.ui2.RenderScope;
-
-import net.minecraft.client.resource.language.I18n;
-import net.minecraft.client.texture.Sprite;
-import net.minecraft.client.texture.StatusEffectSpriteManager;
-import net.minecraft.entity.effect.StatusEffect;
-import net.minecraft.entity.effect.StatusEffectInstance;
-import net.minecraft.registry.Registries;
-import net.minecraft.registry.entry.RegistryEntry;
-import net.minecraft.util.Identifier;
-import net.minecraft.util.math.MathHelper;
-
-public class StatusEffects extends Module implements HudMod {
-    public static Property<Boolean> enabled = Property.bool(false);
-    private static ModDimensions dimensions = new ModDimensions(60, 0);
-
-    private final StatusEffectInstance[] dummyEffects = {
-        new StatusEffectInstance(Registries.STATUS_EFFECT.getEntry(Identifier.ofVanilla("speed")).get(), 12000, 2),
-        new StatusEffectInstance(Registries.STATUS_EFFECT.getEntry(Identifier.ofVanilla("strength")).get(), 12000, 2),
-        new StatusEffectInstance(Registries.STATUS_EFFECT.getEntry(Identifier.ofVanilla("fire_resistance")).get(), 12000, 2),
-    };
-
-    public StatusEffects() {
-        super(new ModuleDetails("Status effects", "effect")
-            .description("Displays status effects")
-            .version("v0.1.0")
-            .tags("Utility"),
-        
-        enabled.named("Enabled"),
-        dimensions.prop());
-    }
-
-    private void renderEffects(RenderScope scope, Iterable<StatusEffectInstance> effects) {
-        int row = 0;
-
-        StatusEffectSpriteManager statusEffectSpriteManager = SaturnClient.client.getStatusEffectSpriteManager();
-
-        for (StatusEffectInstance effect : effects) {
-            if (effect.shouldShowIcon()) {
-                RegistryEntry<StatusEffect> registryEntry = effect.getEffectType();
-                Sprite sprite = statusEffectSpriteManager.getSprite(registryEntry);
-                scope.drawSpriteStretched(sprite, 0, 18 * row, 16, 16);
-                scope.drawText(0.5f, getDurationAsString(effect), 18, 18 * row + 3, dimensions.font.value, -1);
-                row++;
-            }
-        }
-
-        dimensions.height = 18 * row;
-    }
-
-    @Override
-    public void renderHud(RenderScope scope) {
-        renderEffects(scope, SaturnClient.client.player.getStatusEffects());
-    }
-
-    @Override
-    public void renderDummy(RenderScope scope) {
-        renderEffects(scope, Arrays.asList(dummyEffects));
-    }
-
-    // This code was from: https://github.com/magicus/statuseffecttimer/blob/master/src/main/java/se/icus/mag/statuseffecttimer/mixin/StatusEffectTimerMixin.java
-    private String getDurationAsString(StatusEffectInstance statusEffectInstance) {
-		if (statusEffectInstance.isInfinite()) {
-			return I18n.translate("effect.duration.infinite");
-		}
-
-		int ticks = MathHelper.floor((float) statusEffectInstance.getDuration());
-		int totalSeconds = ticks / 20;
-
-		if (totalSeconds >= 3600) {
-			return totalSeconds / 3600 + "h";
-		} else if (totalSeconds >= 60) {
-            int minutes = totalSeconds / 60;
-            int seconds = totalSeconds % 60;
-			return String.format("%d:%02d", minutes, seconds);
-		} else {
-			return String.valueOf(totalSeconds) + "s";
-		}
-	}
-
-    @Override
-    public ModDimensions getDimensions() {
-        return dimensions;
-    }
-
-    @Override
-    public boolean isEnabled() {
-        return enabled.value;
-    }
-
-    @Override
-    public void onEnabled(boolean e) {
-        enabled.value = e;
-    }
-}
@@ -1,99 +0,0 @@
-package org.saturnclient.modules.mods;
-
-import org.saturnclient.modules.HudMod;
-import org.saturnclient.modules.ModDimensions;
-import org.saturnclient.modules.Module;
-import org.saturnclient.modules.ModuleDetails;
-import org.saturnclient.saturnclient.config.manager.Property;
-import org.saturnclient.ui2.RenderScope;
-import org.saturnclient.ui2.resources.Fonts;
-
-public class Tps extends Module implements HudMod {
-    private static Property<Boolean> enabled = Property.bool(false);
-    private static ModDimensions dimensions = new ModDimensions(60, Fonts.getHeight());
-
-    private static long lastWorldAge = -1;
-    private static long lastRealTime = -1;
-    private static double currentTps = 20.0;
-
-    private static final int SAMPLE_COUNT = 2;
-    private static final double[] samples = new double[SAMPLE_COUNT];
-    static {
-        java.util.Arrays.fill(samples, 20.0);
-    }
-    private static int sampleIndex = 0;
-    private static int samplesFilled = 0;
-
-    public Tps() {
-        super(new ModuleDetails("TPS Display", "tps")
-            .description("Displays the TPS")
-            .version("v0.1.0")
-            .tags("Utility"),
-            enabled.named("Enabled"),
-            dimensions.prop()
-        );
-    }
-
-    public static void onTimePacket(long worldAge) {
-        long now = System.currentTimeMillis();
-
-        if (lastWorldAge != -1 && lastRealTime != -1) {
-            long tickDelta = worldAge - lastWorldAge;
-            long timeDelta = now - lastRealTime;
-
-            if (timeDelta > 0 && tickDelta > 0) {
-                double sample = (tickDelta / (double) timeDelta) * 1000.0;
-                sample = Math.min(sample, 20.0);
-
-                samples[sampleIndex % SAMPLE_COUNT] = sample;
-                sampleIndex++;
-                samplesFilled = Math.min(samplesFilled + 1, SAMPLE_COUNT);
-
-                double sum = 0;
-                for (int i = 0; i < samplesFilled; i++) sum += samples[i];
-                currentTps = sum / samplesFilled;
-            }
-        }
-
-        lastWorldAge = worldAge;
-        lastRealTime = now;
-    }
-
-    public static void reset() {
-        lastWorldAge = -1;
-        lastRealTime = -1;
-        currentTps = 20.0;
-        sampleIndex = 0;
-        samplesFilled = SAMPLE_COUNT; 
-        for (int i = 0; i < SAMPLE_COUNT; i++) samples[i] = 20.0;
-    }
-
-    @Override
-    public void renderHud(RenderScope scope) {
-        String text = String.format("%.1f TPS", currentTps);
-        scope.drawText(text, 0, 0, dimensions.font.value, dimensions.fgColor.value);
-        dimensions.width = Fonts.getWidth(text, dimensions.font.value);
-    }
-
-    @Override
-    public void renderDummy(RenderScope scope) {
-        String text = "20.0 TPS";
-        scope.drawText(text, 0, 0, dimensions.font.value, dimensions.fgColor.value);
-        dimensions.width = Fonts.getWidth(text, dimensions.font.value);
-    }
-
-    @Override
-    public boolean isEnabled() {
-        return enabled.value;
-    }
-
-    @Override
-    public void onEnabled(boolean e) { 
-        enabled.value = e; 
-    }
-
-    @Override
-    public ModDimensions getDimensions() { 
-        return dimensions; 
-    }
-}
@@ -1,60 +0,0 @@
-package org.saturnclient.modules.mods;
-
-import org.lwjgl.glfw.GLFW;
-import org.saturnclient.modules.Module;
-import org.saturnclient.modules.ModuleDetails;
-import org.saturnclient.saturnclient.config.manager.Property;
-
-public class Zoom extends Module {
-    private static Property<Boolean> enabled = Property.bool(false);
-    private static Property<Boolean> toggle = Property.bool(false);
-    public static Property<Integer> zoomKey = Property.keybinding(GLFW.GLFW_KEY_C);
-    public static Property<Float> zoomLevel = Property.floatProp(3.0f);
-    
-    public static boolean isZooming = false;
-    
-    public Zoom() {
-        super(
-            new ModuleDetails("Zoom", "zoom")
-                .description("Allows you to zoom in for a closer view")
-                .tags("Camera", "Utility")
-                .version("0.1.0"),
-            enabled.named("Enabled"),
-            toggle.named("Toggle zoom"),
-            zoomKey.named("Zoom Keybinding"),
-            zoomLevel.named("Zoom Level")
-        );
-    }
-    
-    @Override
-    public void tick() {
-        if (toggle.value) {
-            if (zoomKey.wasKeyPressed()) {
-                isZooming = !isZooming;
-            }
-        } else {
-            isZooming = zoomKey.isKeyPressed();
-        }
-    }
-
-    public static float getZoomLevel() {
-        return zoomLevel.value;
-    }
-
-    public static boolean shouldZoom() { 
-        return enabled.value;
-    }
-
-    @Override
-    public void onEnabled(boolean e) {
-        enabled.value = e;
-        if (!e) {
-            isZooming = false;
-        }
-    }
-
-    @Override
-    public boolean isEnabled() {
-        return enabled.value;
-    }
-}
@@ -1,33 +0,0 @@
-package org.saturnclient.modules.mods.mixins;
-
-import net.minecraft.client.render.BackgroundRenderer;
-
-import org.saturnclient.modules.mods.NoFog;
-import net.minecraft.entity.Entity;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.ModifyVariable;
-import org.spongepowered.asm.mixin.injection.Redirect;
-
-@Mixin(BackgroundRenderer.class)
-public class BackgroundRendererMixin {
-    
-    @ModifyVariable(method = "applyFog", at = @At("HEAD"), ordinal = 0, argsOnly = true)
-    private static float modifyFogStart(float viewDistance) {
-        if (NoFog.isActive()) {
-            return Float.MAX_VALUE; // this could be customised
-        }
-        return viewDistance;
-    }
-    // liquids
-    @Redirect(
-        method = "applyFog",
-        at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/Entity;isSpectator()Z")
-    )
-    private static boolean redirectIsSpectator(Entity entity) {
-        if (NoFog.isActive() && NoFog.liquids()) {
-            return true; // pretend to be spectator
-        }
-        return entity.isSpectator();
-    }
-}
@@ -1,62 +0,0 @@
-package org.saturnclient.modules.mods.mixins;
-
-
-import net.minecraft.client.network.ClientPlayerEntity;
-import net.minecraft.entity.Entity;
-import net.minecraft.util.math.MathHelper;
-
-import org.saturnclient.modules.mods.Freelook;
-import org.saturnclient.modules.mods.utils.CameraOverriddenEntity;
-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;
-	}
-}
@@ -1,22 +0,0 @@
-package org.saturnclient.modules.mods.mixins;
-
-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.CallbackInfoReturnable;
-import org.saturnclient.modules.mods.Zoom;
-
-import net.minecraft.client.render.GameRenderer;
-
-@Mixin(GameRenderer.class)
-public class GameRendererMixin {
-    
-    @Inject(method = "getFov", at = @At("RETURN"), cancellable = true)
-    private void onGetFov(CallbackInfoReturnable<Float> cir) {
-        if (Zoom.isZooming && Zoom.shouldZoom()) {
-            float originalFov = cir.getReturnValue();
-            float zoomedFov = originalFov / Zoom.getZoomLevel();
-            cir.setReturnValue(zoomedFov);
-        }
-    }
-}
@@ -1,23 +0,0 @@
-// code modified from Gamma utils: https://github.com/Sjouwer/gamma-utils
-package org.saturnclient.modules.mods.mixins;
-
-import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
-import net.minecraft.client.render.LightmapTextureManager;
-import org.saturnclient.modules.mods.Fullbright;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-
-@Mixin(LightmapTextureManager.class)
-public class LightmapTextureManagerMixin {
-    
-    @ModifyExpressionValue(
-        method = "update",
-        at = @At(value = "INVOKE", target = "Ljava/lang/Math;max(FF)F", ordinal = 0)
-    )
-    private float modifyGamma(float original) {
-        if (Fullbright.shouldOverrideBrightness()) {
-            return Fullbright.getBrightnessValue();
-        }
-        return original;
-    }
-}
@@ -1,26 +0,0 @@
-package org.saturnclient.modules.mods.mixins;
-
-import net.minecraft.client.render.entity.state.LivingEntityRenderState;
-
-import org.saturnclient.modules.mods.utils.HealthRenderState;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Unique;
-
-@Mixin(LivingEntityRenderState.class)
-public class LivingEntityRenderStateMixin implements org.saturnclient.modules.mods.utils.HealthRenderState {
-
-    @Unique private float saturn$health = 0f;
-    @Unique private float saturn$maxHealth = 1f;
-    @Unique private HealthRenderState.EntityType saturn$entityType = HealthRenderState.EntityType.OTHER;
-
-    public float saturn$getHealth() { return saturn$health; }
-    public float saturn$getMaxHealth() { return saturn$maxHealth; }
-    public void saturn$setHealth(float health, float maxHealth) {
-        this.saturn$health = health;
-        this.saturn$maxHealth = maxHealth;
-    }
-
-    public HealthRenderState.EntityType saturn$getEntityType() { return saturn$entityType; }
-    public void saturn$setEntityType(HealthRenderState.EntityType type) { this.saturn$entityType = type; }
-
-}
@@ -1,34 +0,0 @@
-package org.saturnclient.modules.mods.mixins;
-
-import net.minecraft.client.render.entity.LivingEntityRenderer;
-import net.minecraft.client.render.entity.state.LivingEntityRenderState;
-import org.saturnclient.modules.mods.utils.HealthRenderState;
-import net.minecraft.entity.LivingEntity;
-import net.minecraft.entity.mob.HostileEntity;
-import net.minecraft.entity.passive.PassiveEntity;
-import net.minecraft.entity.player.PlayerEntity;
-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(LivingEntityRenderer.class)
-public abstract class LivingEntityRendererMixin<T extends LivingEntity, S extends LivingEntityRenderState> {
-
-    @Inject(method = "updateRenderState", at = @At("TAIL"))
-    private void saturn$captureHealth(T entity, S state, float tickDelta, CallbackInfo ci) {
-        if (!(state instanceof HealthRenderState hrs)) return;
-
-        hrs.saturn$setHealth(entity.getHealth(), entity.getMaxHealth());
-
-        if (entity instanceof PlayerEntity) {
-            hrs.saturn$setEntityType(HealthRenderState.EntityType.PLAYER);
-        } else if (entity instanceof HostileEntity) {
-            hrs.saturn$setEntityType(HealthRenderState.EntityType.HOSTILE);
-        } else if (entity instanceof PassiveEntity) {
-            hrs.saturn$setEntityType(HealthRenderState.EntityType.PASSIVE);
-        } else {
-            hrs.saturn$setEntityType(HealthRenderState.EntityType.OTHER);
-        }
-    }
-}
@@ -1,48 +0,0 @@
-package org.saturnclient.modules.mods.mixins;
-
-import net.minecraft.client.render.VertexConsumerProvider;
-import net.minecraft.client.render.entity.EntityRenderer;
-import net.minecraft.client.render.entity.state.EntityRenderState;
-import net.minecraft.client.render.entity.state.LivingEntityRenderState;
-import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.text.Text;
-import org.saturnclient.modules.mods.Nametags;
-import org.spongepowered.asm.mixin.Mixin;
-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;
-
-@Mixin(EntityRenderer.class)
-public abstract class NametagsMixin {
-
-    @Unique
-    private static final ThreadLocal<Boolean> saturn$rendering = ThreadLocal.withInitial(() -> false);
-
-    @Shadow
-    protected abstract <S extends EntityRenderState> void renderLabelIfPresent(
-        S state, Text text, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light
-    );
-
-    @Inject(method = "renderLabelIfPresent", at = @At("HEAD"), cancellable = true)
-    private <S extends EntityRenderState> void saturn$replaceNametag(S state, Text text,
-            MatrixStack matrices, VertexConsumerProvider vertexConsumers,
-            int light, CallbackInfo ci) {
-
-        if (saturn$rendering.get()) return;
-        if (!Nametags.shouldReplaceName()) return;
-        if (!(state instanceof LivingEntityRenderState living)) return;
-
-        String replacement = Nametags.getNametagString(living);
-        if (replacement == null) return;
-
-        ci.cancel();
-        saturn$rendering.set(true);
-        try {
-            renderLabelIfPresent(state, Text.literal(replacement), matrices, vertexConsumers, light);
-        } finally {
-            saturn$rendering.set(false);
-        }
-    }
-}
@@ -1,58 +0,0 @@
-package org.saturnclient.modules.mods.mixins;
-
-import org.saturnclient.modules.HudMod;
-import org.saturnclient.modules.ModDimensions;
-import org.saturnclient.modules.ModManager;
-import org.saturnclient.saturnclient.SaturnClient;
-import org.saturnclient.saturnclient.menus.HudEditor;
-import org.saturnclient.saturnclient.mixin.DrawContextAccessor;
-import org.saturnclient.ui2.RenderScope;
-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;
-
-import net.minecraft.client.font.TextRenderer;
-import net.minecraft.client.gui.DrawContext;
-import net.minecraft.client.gui.hud.InGameHud;
-import net.minecraft.client.render.RenderLayer;
-import net.minecraft.client.render.RenderTickCounter;
-
-@Mixin(InGameHud.class)
-public class RenderMixin {
-    @Inject(method = "renderChat", at = @At("TAIL"))
-    public void renderMods(DrawContext context, RenderTickCounter tickCounter, CallbackInfo ci) {
-        TextRenderer textRenderer = SaturnClient.client.textRenderer;
-
-        if (textRenderer != null &&
-                !(SaturnClient.client.currentScreen instanceof HudEditor)) {
-            RenderScope renderScope = new RenderScope(context.getMatrices(),
-                    ((DrawContextAccessor) context).getVertexConsumers());
-
-            for (org.saturnclient.modules.Module m : ModManager.ENABLED_MODS) {
-                if (m instanceof HudMod && m.isEnabled()) {
-                    ModDimensions dim = ((HudMod) m).getDimensions();
-
-                    renderScope.matrices.push();
-
-                    renderScope.matrices.translate(dim.x.value, (float) dim.y.value, 0);
-
-                    renderScope.matrices.scale(dim.scale.value, dim.scale.value, 1.0f);
-
-                    if (dim.renderBackground) {
-                        renderScope.drawRoundedRectangle(0, 0, dim.width, dim.height, dim.radius.value,
-                                dim.bgColor.value);
-                    }
-
-                    renderScope.setRenderLayer(RenderLayer::getGuiTextured);
-
-                    ((HudMod) m).renderHud(renderScope);
-
-                    renderScope.matrices.pop();
-                } else {
-                    m.render(renderScope);
-                }
-            }
-        }
-    }
-}
@@ -1,18 +0,0 @@
-package org.saturnclient.modules.mods.mixins;
-
-import net.minecraft.client.network.ClientPlayNetworkHandler;
-import net.minecraft.network.packet.s2c.play.WorldTimeUpdateS2CPacket;
-import org.saturnclient.modules.mods.Tps;
-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(ClientPlayNetworkHandler.class)
-public class TpsMixin {
-
-    @Inject(method = "onWorldTimeUpdate", at = @At("HEAD"))
-    private void onWorldTimeUpdate(WorldTimeUpdateS2CPacket packet, CallbackInfo ci) {
-        Tps.onTimePacket(packet.time());
-    }
-}
@@ -1,9 +0,0 @@
-package org.saturnclient.modules.mods.utils;
-
-public interface CameraOverriddenEntity {
-	float freelook$getCameraPitch();
-	float freelook$getCameraYaw();
-
-	void freelook$setCameraPitch(float pitch);
-	void freelook$setCameraYaw(float yaw);
-}
@@ -1,14 +0,0 @@
-package org.saturnclient.modules.mods.utils;
-
-public interface HealthRenderState {
-    float saturn$getHealth();
-    float saturn$getMaxHealth();
-    void saturn$setHealth(float health, float maxHealth);
-
-    EntityType saturn$getEntityType();
-    void saturn$setEntityType(EntityType type);
-
-    enum EntityType {
-        PLAYER, HOSTILE, PASSIVE, OTHER
-    }
-}
@@ -1,91 +0,0 @@
-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.util.math.MatrixStack;
-
-import org.saturnclient.modules.ModManager;
-import org.saturnclient.saturnclient.client.ServiceClient;
-import org.saturnclient.saturnclient.config.Config;
-import org.saturnclient.saturnclient.config.manager.ConfigManager;
-import org.saturnclient.saturnclient.cosmetics.Emotes;
-import org.saturnclient.saturnclient.cosmetics.Hats;
-import org.saturnclient.saturnclient.cosmetics.cloaks.Cloaks;
-import org.saturnclient.saturnclient.event.KeyInputHandler;
-import org.saturnclient.saturnclient.mixin.DrawContextAccessor;
-import org.saturnclient.ui2.RenderScope;
-import org.saturnclient.ui2.SaturnScreen;
-import org.saturnclient.ui2.elements.ImageTexture;
-import org.saturnclient.ui2.resources.Textures;
-import org.saturnclient.ui2.screens.TitleMenu;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import dev.felnull.specialmodelloader.api.event.SpecialModelLoaderEvents;
-
-/**
- * Main class for the Saturn Client mod.
- */
-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();
-        Config.init();
-        ModManager.init();
-
-        client.execute(() -> {
-            SaturnScreen.preload(client);
-        });
-
-        ClientLifecycleEvents.CLIENT_STOPPING.register(_o -> ConfigManager.save());
-
-        SpecialModelLoaderEvents.LOAD_SCOPE.register(() -> {
-            return (resourceManager, location) -> MOD_ID.equals(location.getNamespace());
-        });
-
-        ScreenEvents.AFTER_INIT.register((client, screen, scaledWidth, scaledHeight) -> {
-            if (screen != null && !(screen instanceof TitleMenu)) {
-                if (screen instanceof SaturnScreen) {
-                    ((SaturnScreen) screen).draw(new ImageTexture(Textures.LOGO_TEXT_BIG).dimensions(180, 18)
-                            .position(screen.width - 180 - 20, screen.height - 18 - 20));
-                } else {
-                    ScreenEvents.afterRender(screen).register((screen1, context, mouseX, mouseY, tickDelta) -> {
-                        RenderScope renderScope = new RenderScope(context.getMatrices(),
-                                ((DrawContextAccessor) context).getVertexConsumers());
-
-                        int width = context.getScaledWindowWidth();
-                        int height = context.getScaledWindowHeight();
-
-                        float scaleX = (float) screen1.width / width;
-                        float scaleY = (float) screen1.height / height;
-
-                        MatrixStack matrixStack = context.getMatrices();
-                        matrixStack.push();
-                        matrixStack.translate(width - 95, height - 14, 0);
-                        matrixStack.scale(0.5f / scaleX, 0.5f / scaleY, 1.0f);
-                        renderScope.drawTexture(Textures.LOGO_TEXT_BIG, 0, 0, 0, 0, 180, 18);
-                        matrixStack.pop();
-                    });
-                }
-            }
-        });
-
-        KeyInputHandler.register();
-        Emotes.initialize();
-        if (ServiceClient.authenticate()) {
-            Cloaks.initialize();
-            Hats.initialize();
-            LOGGER.info(MOD_ID + " initialization complete");
-        } else {
-            LOGGER.error("Failed to authenticate with the server");
-        }
-    }
-}
@@ -1,205 +0,0 @@
-package org.saturnclient.saturnclient.client;
-
-import java.util.UUID;
-import java.util.concurrent.TimeUnit;
-
-import org.saturnclient.saturnclient.SaturnClient;
-import org.saturnclient.saturnclient.client.player.SaturnPlayer;
-import org.saturnclient.saturnclient.cosmetics.Hats;
-import org.saturnclient.saturnclient.cosmetics.cloaks.Cloaks;
-
-import dev.kosmx.playerAnim.api.layered.AnimationStack;
-import dev.kosmx.playerAnim.minecraftApi.PlayerAnimationAccess;
-import dev.kosmx.playerAnim.minecraftApi.PlayerAnimationRegistry;
-import dev.selimaj.session.Session;
-import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents;
-import net.minecraft.client.network.AbstractClientPlayerEntity;
-import net.minecraft.util.Identifier;
-
-public class ServiceClient {
-    private static Session session;
-    public static UUID uuid;
-
-    public static boolean connectTimeout() {
-        try {
-            session = Session.connect("wss://saturn-server.selimaj.dev", 10, TimeUnit.SECONDS);
-            return true;
-        } catch (Exception e) {
-            return false;
-        }
-    }
-
-    public static boolean authenticate() {
-        ClientLifecycleEvents.CLIENT_STOPPING.register(_o -> {
-            if (session != null)
-                try {
-                    session.close();
-                } catch (Exception e) {
-                    SaturnClient.LOGGER.error("Unable to close Saturn session");
-
-                }
-        });
-
-        try {
-            var mcSession = SaturnClient.client.getSession();
-            if (mcSession == null) {
-                SaturnClient.LOGGER.error("No active Minecraft session found");
-                return false;
-            }
-
-            String accessToken = mcSession.getAccessToken();
-            uuid = mcSession.getUuidOrNull();
-            String username = mcSession.getUsername();
-
-            SaturnClient.LOGGER.info("Authenticating with UUID: " + uuid);
-
-            if (!connectTimeout()) {
-                SaturnClient.LOGGER.error("Unable to authenticate: Session Server Timeout");
-                return false;
-            }
-
-            ServiceMethods.Types.Player response = session.request(ServiceMethods.Authenticate, accessToken)
-                    .get();
-
-            for (String availableCloak : response.cloaks()) {
-                Cloaks.availableCloaks.add(availableCloak);
-            }
-
-            for (String availableHat : response.hats()) {
-                Hats.availableHats.add(availableHat);
-            }
-
-            eventHandlers();
-
-            SaturnPlayer.set(new SaturnPlayer(uuid, username, response.cloak(), response.hat()));
-
-            Cloaks.loadCloak(uuid);
-
-            return true;
-        } catch (Exception e) {
-            SaturnClient.LOGGER.error("Authentication failed", e);
-            return false;
-        }
-    }
-
-    public static void setCloak(String itemId) {
-        try {
-            session.request(ServiceMethods.SetCloak, itemId).whenComplete((msg, throwable) -> {
-                if (throwable != null) {
-                    throwable.printStackTrace();
-                } else {
-                    try {
-                        session.request(ServiceMethods.SendPlayer,
-                                new ServiceMethods.Types.SendPlayerRequest(SaturnPlayer.getExternalUUIDAsString()));
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    }
-                }
-            });
-        } catch (Exception e) {
-            SaturnClient.LOGGER.error("Failed to set cloak (service): ", e);
-        }
-    }
-
-    public static void setHat(String itemId) {
-        try {
-            session.request(ServiceMethods.SetHat, itemId).whenComplete((msg, throwable) -> {
-                if (throwable != null) {
-                    throwable.printStackTrace();
-                } else {
-                    try {
-                        session.request(ServiceMethods.SendPlayer,
-                                new ServiceMethods.Types.SendPlayerRequest(SaturnPlayer.getExternalUUIDAsString()));
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    }
-                }
-            });
-        } catch (Exception e) {
-            SaturnClient.LOGGER.error("Failed to set hat (service): ", e);
-        }
-    }
-
-    public static void buyCloak(String itemId) {
-        try {
-            session.request(ServiceMethods.BuyCloak, itemId).whenComplete((msg, throwable) -> {
-                if (throwable != null) {
-                    throwable.printStackTrace();
-                } else {
-                    Cloaks.availableCloaks.add(itemId);
-                }
-            });
-        } catch (Exception e) {
-            SaturnClient.LOGGER.error("Failed to buy cloak (service): ", e);
-        }
-    }
-
-    public static void buyHat(String itemId) {
-        try {
-            session.request(ServiceMethods.BuyHat, itemId).whenComplete((msg, throwable) -> {
-                if (throwable != null) {
-                    throwable.printStackTrace();
-                } else {
-                    Hats.availableHats.add(itemId);
-                }
-            });
-        } catch (Exception e) {
-            SaturnClient.LOGGER.error("Failed to buy hat (service): ", e);
-        }
-    }
-
-    public static void emote(String emote) {
-        try {
-            session.request(ServiceMethods.Emote,
-                    new ServiceMethods.Types.EmoteRequest(emote, SaturnPlayer.getExternalUUIDAsString()))
-                    .whenComplete((msg, throwable) -> {
-                        if (throwable != null) {
-                            throwable.printStackTrace();
-                        }
-                    });
-        } catch (Exception e) {
-            SaturnClient.LOGGER.error("Failed to emote (service): ", e);
-        }
-    }
-
-    public static void eventHandlers() {
-        session.onNotification(ServiceMethods.EmoteEvent, (data) -> {
-            for (AbstractClientPlayerEntity player : SaturnClient.client.world.getPlayers()) {
-                if (player.getUuidAsString().equals(data.from())) {
-                    AnimationStack animationStack = PlayerAnimationAccess.getPlayerAnimLayer(player);
-                    if (data.emote() != null && !data.emote().isEmpty()) {
-                        if (animationStack.isActive() && animationStack.getPriority() == 1000) {
-                            animationStack.removeLayer(1000);
-                        }
-                        animationStack.addAnimLayer(1000,
-                                PlayerAnimationRegistry
-                                        .getAnimation(Identifier.of("saturnclient", data.emote()))
-                                        .playAnimation());
-                    } else {
-                        animationStack.removeLayer(1000);
-                    }
-                }
-            }
-        });
-
-        session.onNotification(ServiceMethods.Player, (player) -> {
-            System.out.println(player);
-            SaturnPlayer.set(player.toSaturnPlayer());
-        });
-    }
-
-    public static void player(UUID uuid, String name) {
-        try {
-            session.request(ServiceMethods.GetPlayer, uuid.toString())
-                    .whenComplete((user, throwable) -> {
-                        if (throwable != null) {
-                            throwable.printStackTrace();
-                        } else if (user != null) {
-                            SaturnPlayer.set(user.toSaturnPlayer(uuid, name));
-                        }
-                    });
-        } catch (Exception e) {
-            SaturnClient.LOGGER.error("Failed to get player", e);
-        }
-    }
-}
@@ -1,113 +0,0 @@
-package org.saturnclient.saturnclient.client;
-
-import java.util.UUID;
-
-import org.saturnclient.saturnclient.client.ServiceMethods.Types.SendPlayerRequest;
-import org.saturnclient.saturnclient.client.player.SaturnPlayer;
-
-import dev.selimaj.session.types.Method;
-
-public class ServiceMethods {
-
-    // =========================
-    // Types (Rust structs)
-    // =========================
-    public static class Types {
-
-        public record EmoteRequest(String emote, String[] targets) {
-        }
-
-        public record EmoteEvent(String emote, String from) {
-        }
-
-        public record Player(
-                String cloak,
-                String hat,
-                String[] cloaks,
-                String[] hats) {
-            public SaturnPlayer toSaturnPlayer(UUID uuid, String name) {
-                return new SaturnPlayer(uuid, name, cloak, hat);
-            }
-        }
-
-        public record PlayerStream(Player player, String name, String uuid) {
-            public SaturnPlayer toSaturnPlayer() {
-                return new SaturnPlayer(UUID.fromString(uuid), name, this.player.cloak, this.player.hat);
-            }
-        }
-
-        public record SendPlayerRequest(String[] targets) {
-        }
-    }
-
-    // =========================
-    // AUTH
-    // =========================
-    public static final Method<String, Types.Player, String> Authenticate = new Method<>("auth",
-            String.class,
-            Types.Player.class,
-            String.class);
-
-    // =========================
-    // EQUIP
-    // =========================
-    public static final Method<String, String, String> SetCloak = new Method<>("set_cloak",
-            String.class,
-            String.class,
-            String.class);
-
-    public static final Method<String, String, String> SetHat = new Method<>("set_hat",
-            String.class,
-            String.class,
-            String.class);
-
-    // =========================
-    // BUY
-    // =========================
-    public static final Method<String, String, String> BuyCloak = new Method<>("buy_cloak",
-            String.class,
-            String.class,
-            String.class);
-
-    public static final Method<String, String, String> BuyHat = new Method<>("buy_hat",
-            String.class,
-            String.class,
-            String.class);
-
-    // =========================
-    // EMOTE
-    // =========================
-    public static final Method<Types.EmoteRequest, Void, String> Emote = new Method<>("emote",
-            Types.EmoteRequest.class,
-            Void.class,
-            String.class);
-
-    public static final Method<Types.EmoteEvent, Void, Void> EmoteEvent = new Method<>("emote_event",
-            Types.EmoteEvent.class,
-            Void.class,
-            Void.class);
-
-    // =========================
-    // GET PLAYER
-    // =========================
-    public static final Method<String, Types.Player, String> GetPlayer = new Method<>("get_player",
-            String.class,
-            Types.Player.class,
-            String.class);
-
-    // =========================
-    // PLAYER (Server Notification)
-    // =========================
-    public static final Method<Types.PlayerStream, Void, Void> Player = new Method<>("player",
-            Types.PlayerStream.class,
-            Void.class,
-            Void.class);
-
-    // =========================
-    // SEND PLAYER
-    // =========================
-    public static final Method<SendPlayerRequest, Void, String> SendPlayer = new Method<>("send_player",
-            SendPlayerRequest.class,
-            Void.class,
-            String.class);
-}
@@ -1,52 +0,0 @@
-package org.saturnclient.saturnclient.client.player;
-
-import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents;
-import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
-import org.saturnclient.saturnclient.SaturnClient;
-import org.saturnclient.saturnclient.client.ServiceClient;
-
-import net.minecraft.client.network.PlayerListEntry;
-import net.minecraft.client.MinecraftClient;
-
-import java.util.HashSet;
-import java.util.Set;
-import java.util.UUID;
-
-import com.mojang.authlib.GameProfile;
-
-public class PlayerTracker {
-    private static Set<UUID> trackedPlayers = new HashSet<>();
-
-    public static void initialize() {
-        // When client joins a server, reset tracked players
-        ClientPlayConnectionEvents.JOIN.register((handler, sender, client) -> {
-            trackedPlayers.clear();
-            client.execute(() -> {
-                checkForNewPlayers(SaturnClient.client);
-            });
-        });
-
-        // Check for new players every tick
-        ClientTickEvents.END_CLIENT_TICK.register(client -> checkForNewPlayers(client));
-    }
-
-    private static void checkForNewPlayers(MinecraftClient client) {
-        if (client.getNetworkHandler() == null)
-            return;
-
-        for (PlayerListEntry player : client.getNetworkHandler().getPlayerList()) {
-            UUID playerUUID = player.getProfile().getId();
-
-            if (!trackedPlayers.contains(playerUUID)) {
-                // A new player has joined
-                onPlayerJoin(client, player);
-                trackedPlayers.add(playerUUID);
-            }
-        }
-    }
-
-    private static void onPlayerJoin(MinecraftClient client, PlayerListEntry player) {
-        GameProfile profile = player.getProfile();
-        ServiceClient.player(profile.getId(), profile.getName());
-    }
-}
@@ -1,61 +0,0 @@
-package org.saturnclient.saturnclient.client.player;
-
-import java.util.Map;
-import java.util.UUID;
-
-import org.saturnclient.saturnclient.config.Config;
-
-import net.minecraft.util.Formatting;
-
-public class Roles {
-    static enum Role {
-        OWNER,
-        ADMIN,
-        PARTNER,
-        CONTRIBUTOR
-    }
-
-    private static final Map<UUID, Role> ROLES = Map.of(
-            UUID.fromString("d362a042-28bd-49e1-a807-ae74dbe8aba9"),
-            Role.OWNER,
-            UUID.fromString("d8dc7023-179b-4460-bcf6-493fbf1289a6"),
-            Role.CONTRIBUTOR);
-
-    /*
-     * 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(UUID uuid) {
-        Role role = ROLES.get(uuid);
-
-        if (role == null) {
-            return Formatting.WHITE;
-        }
-
-        switch (role) {
-            case OWNER:
-                return Formatting.DARK_RED;
-
-            case ADMIN:
-                return Formatting.RED;
-
-            case PARTNER:
-                return Formatting.GOLD;
-
-            case CONTRIBUTOR:
-                return Formatting.AQUA;
-
-            default:
-                return Formatting.WHITE;
-        }
-    }
-
-    public static String getSaturnIndicator() {
-        return Config.realisticLogo.value ? "" : "";
-    }
-}
@@ -1,54 +0,0 @@
-package org.saturnclient.saturnclient.client.player;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-
-import org.jetbrains.annotations.Nullable;
-import org.saturnclient.saturnclient.client.ServiceClient;
-
-public class SaturnPlayer {
-    private static Map<UUID, SaturnPlayer> PLAYERS = new HashMap<>();
-    private static Map<String, UUID> PLAYER_NAMES = new HashMap<>();
-
-    public String cloak = "";
-    public String hat = "";
-    public final UUID uuid;
-    public final String name;
-
-    public SaturnPlayer(UUID uuid, String name, String cloak, String hat) {
-        this.cloak = cloak;
-        this.hat = hat;
-        this.uuid = uuid;
-        this.name = name;
-    }
-
-    @Nullable
-    public static SaturnPlayer get() {
-        return PLAYERS.get(ServiceClient.uuid);
-    }
-
-    @Nullable
-    public static SaturnPlayer get(UUID uuid) {
-        return PLAYERS.get(uuid);
-    }
-
-    @Nullable
-    public static SaturnPlayer get(String name) {
-        UUID uuid = PLAYER_NAMES.get(name);
-        if (uuid == null)
-            return null;
-        return PLAYERS.get(uuid);
-    }
-
-    public static void set(SaturnPlayer player) {
-        PLAYER_NAMES.put(player.name, player.uuid);
-        PLAYERS.put(player.uuid, player);
-    }
-
-    public static String[] getExternalUUIDAsString() {
-        return PLAYERS.keySet().stream().filter(id -> !id.equals(ServiceClient.uuid)).map(UUID::toString)
-                .toArray(String[]::new);
-    }
-
-}
@@ -1,55 +0,0 @@
-package org.saturnclient.saturnclient.config;
-
-import org.saturnclient.saturnclient.config.manager.ConfigManager;
-import org.saturnclient.saturnclient.config.manager.Property;
-
-public class AnimationConfig {
-    public static ConfigManager config;
-
-    // Logo
-    public static final AnimationConfig logo = new AnimationConfig(true, 700, 0);
-
-    // Main menu
-    public static final AnimationConfig mainMenu = new AnimationConfig(true, 700, 120);
-
-    // Mod menu
-    public static final AnimationConfig modMenu = new AnimationConfig(true, 100, 20);
-
-    // Shift menu
-    public static final AnimationConfig shiftMenu = new AnimationConfig(true, 100, 100);
-
-    // Cosmetics menu
-    public static final AnimationConfig cosmeticsMenu = new AnimationConfig(true, 700, 40);
-
-    // Emote wheel
-    public static final AnimationConfig emoteWheel = new AnimationConfig(true, 200, 40);
-
-    public static void init(ConfigManager parent) {
-        config = new ConfigManager(parent, "Animations");
-
-        logo.init("Logo");
-        mainMenu.init("Main Menu");
-        modMenu.init("Mod Menu");
-        shiftMenu.init("Shift Menu");
-        cosmeticsMenu.init("Cosmetics Menu");
-        emoteWheel.init("Emote Wheel");
-    }
-
-    // Animation properties
-    public final Property<Integer> duration;
-    public final Property<Integer> stagger;
-    public final Property<Integer> curve;
-
-    public AnimationConfig(boolean enabled, int delay, int stagger) {
-        this.duration = Property.integer(delay);
-        this.stagger = Property.integer(stagger);
-        this.curve = Property.select(1, "Ease In Out Cubic", "Ease Out Cubic", "Ease In Out Back");
-    }
-
-    public void init(String name) {
-        // config.property("Enable " + name + " Animations", this.enabled);
-        config.property(name + " Duration", this.duration);
-        config.property(name + " Stagger", this.stagger);
-        config.property(name + " Curve", this.curve);
-    }
-}
@@ -1,37 +0,0 @@
-package org.saturnclient.saturnclient.config;
-
-import org.lwjgl.glfw.GLFW;
-import org.saturnclient.saturnclient.config.manager.ConfigManager;
-import org.saturnclient.saturnclient.config.manager.Property;
-import org.saturnclient.ui2.resources.Textures;
-
-import net.minecraft.util.Identifier;
-
-public class Config {
-    public static ConfigManager config;
-
-    public static Property<Boolean> realisticLogo = Property.bool(false);
-    public static Property<Boolean> saturnTitleScreen = Property.bool(true);
-    public static Property<Boolean> cloakPhysics = Property.bool(true);
-    public static Property<Integer> openEmoteWheel = Property.keybinding(GLFW.GLFW_KEY_B);
-    public static Property<Boolean> stagger = Property.bool(true);
-
-    public static Identifier getLogo() {
-        return realisticLogo.value ? Textures.REALISTIC_LOGO : Textures.LOGO;
-    }
-
-    public static void init() {
-        config = new ConfigManager("Saturn Client");
-        config.property("Realistic logo", realisticLogo);
-        config.property("Saturn client title screen", saturnTitleScreen);
-        config.property("Open Emote Wheel", openEmoteWheel);
-        config.property("Cloak Physics", cloakPhysics);
-        config.property("Stagger Animations", stagger);
-
-        // Initialize a sub namespace for theme
-        Theme.init(config);
-
-        // Initialize a sub namespace for animations
-        AnimationConfig.init(config);
-    }
-}
@@ -1,91 +0,0 @@
-package org.saturnclient.saturnclient.config;
-
-import org.saturnclient.saturnclient.config.manager.ConfigManager;
-import org.saturnclient.saturnclient.config.manager.Property;
-
-public class Theme {
-    // Main UI background (slightly warm dark to match Saturn tone)
-    public static final Property<Integer> BACKGROUND = Property.color(0xFF12100D);
-
-    // Default text color
-    public static final Property<Integer> FOREGROUND = Property.color(0xFFF2E6D2);
-
-    // Widget default background (normal state)
-    public static final Property<Integer> PRIMARY = Property.color(0xFF1C1915);
-
-    // Widget text color
-    public static final Property<Integer> PRIMARY_FG = Property.color(0xFFEAD9B8);
-
-    // Saturn brand color (hovered / enabled / selected)
-    public static final Property<Integer> ACCENT = Property.color(0xFFE2BF7D);
-
-    // Text/icons shown on accent background
-    public static final Property<Integer> ACCENT_FG = Property.color(0xFF1A140A);
-
-    // Misc colors
-    public static final Property<Integer> SCROLL = Property.color(0xFFE2BF7D);
-
-    // UI metrics
-    public static final Property<Integer> BG_RADIUS = Property.integer(12);
-    public static final Property<Integer> WIDGET_RADIUS = Property.integer(10);
-
-    // Font
-    public static final Property<Integer> FONT = Property.font(2);
-
-    public static void init(ConfigManager parent) {
-        ConfigManager config = new ConfigManager(parent, "UI Style");
-        config.property("Background", BACKGROUND);
-        config.property("Foreground", FOREGROUND);
-        config.property("Primary", PRIMARY);
-        config.property("Primary Foreground", PRIMARY_FG);
-        config.property("Accent", ACCENT);
-        config.property("Accent Foreground", ACCENT_FG);
-        config.property("Scrollbar Color", SCROLL);
-
-        config.property("Background Radius", BG_RADIUS);
-        config.property("Widget Radius", WIDGET_RADIUS);
-
-        config.property("Font", FONT);
-    }
-
-    /**
-     * primary by default, accent if true
-     */
-    public static int getBg(boolean hover) {
-        return hover ? ACCENT.value : PRIMARY.value;
-    }
-
-    /**
-     * (Foreground) primary by default, accent if true
-     */
-    public static int getFg(boolean hover) {
-        return hover ? ACCENT_FG.value : PRIMARY_FG.value;
-    }
-
-    /**
-     * Multiplies existing alpha with 0–255 alpha.
-     */
-    public static int withAlpha(int alpha, int color) {
-        alpha = Math.max(0, Math.min(255, alpha));
-
-        int originalAlpha = (color >>> 24) & 0xFF;
-
-        // Merge (multiply) alphas
-        int merged = (originalAlpha * alpha) / 255;
-
-        return (color & 0x00FFFFFF) | (merged << 24);
-    }
-
-    /**
-     * Multiplies existing alpha with 0.0–1.0 alpha.
-     */
-    public static int withAlpha(float alpha, int color) {
-        alpha = Math.max(0f, Math.min(1f, alpha));
-
-        int originalAlpha = (color >>> 24) & 0xFF;
-
-        int merged = (int) (originalAlpha * alpha);
-
-        return (color & 0x00FFFFFF) | (merged << 24);
-    }
-}
@@ -1,181 +0,0 @@
-package org.saturnclient.saturnclient.config.manager;
-
-import com.google.gson.*;
-import org.saturnclient.saturnclient.SaturnClient;
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-public class ConfigManager {
-
-    private static final File configFile = new File(SaturnClient.client.runDirectory, "saturn.json");
-
-    // SINGLE ROOT TREE
-    private static final Map<String, Property<?>> ROOT = new LinkedHashMap<>();
-
-    private static JsonObject cachedJson = null;
-
-    private final Map<String, Property<?>> currentMap;
-
-    private final String[] path;
-
-    /**
-     * Creates a root namespace
-     */
-    public ConfigManager(String namespace) {
-        this.currentMap = new LinkedHashMap<>();
-        this.path = new String[] { namespace }; // Path is just ["namespace"]
-        ROOT.put(namespace, Property.namespace(currentMap));
-    }
-
-    /**
-     * Creates a sub-namespace inside a parent
-     */
-    public ConfigManager(ConfigManager parent, String namespace) {
-        this.currentMap = new LinkedHashMap<>();
-
-        // Build new path: parent path + current namespace
-        this.path = new String[parent.path.length + 1];
-        System.arraycopy(parent.path, 0, this.path, 0, parent.path.length);
-        this.path[this.path.length - 1] = namespace;
-
-        parent.property(namespace, Property.namespace(currentMap));
-    }
-
-    /**
-     * Add a property
-     */
-    public <T> Property<T> property(String name, Property<T> value) {
-        currentMap.put(name, value);
-        loadSingleProperty(name, value);
-        return value;
-    }
-
-    /**
-     * Add empty namespace
-     */
-    public ConfigManager sub(String name) {
-        return new ConfigManager(this, name);
-    }
-
-    /**
-     * Load entire config
-     */
-    public static void load() {
-        SaturnClient.LOGGER.info("Loading config...");
-
-        JsonObject json = loadAndCache();
-        if (json == null)
-            return;
-
-        loadRecursive(json, ROOT);
-    }
-
-    /**
-     * Save entire config
-     */
-    public static void save() {
-        SaturnClient.LOGGER.info("Saving config...");
-
-        JsonObject rootJson = new JsonObject();
-        saveRecursive(rootJson, ROOT);
-
-        try {
-            String formatted = new GsonBuilder()
-                    .setPrettyPrinting()
-                    .create()
-                    .toJson(rootJson);
-
-            Files.writeString(configFile.toPath(), formatted);
-            SaturnClient.LOGGER.info("Config saved successfully.");
-        } catch (IOException e) {
-            SaturnClient.LOGGER.error("Error saving config file", e);
-        }
-    }
-
-    /**
-     * Recursive save
-     */
-    private static void saveRecursive(JsonObject json, Map<String, Property<?>> map) {
-        map.forEach((name, prop) -> {
-            if (prop.isNamespace()) {
-                JsonObject child = new JsonObject();
-                saveRecursive(child, prop.getNamespaceMap());
-                json.add(name, child);
-            } else {
-                json.add(name, prop.toJson());
-            }
-        });
-    }
-
-    /**
-     * Recursive load
-     */
-    private static void loadRecursive(JsonObject json, Map<String, Property<?>> map) {
-        map.forEach((name, prop) -> {
-            JsonElement element = json.get(name);
-            if (element == null)
-                return;
-
-            if (prop.isNamespace() && element.isJsonObject()) {
-                loadRecursive(element.getAsJsonObject(), prop.getNamespaceMap());
-            } else {
-                prop.loadFromJson(element);
-            }
-        });
-    }
-
-    /**
-     * Load only a single property immediately after creation,
-     * traversing the JSON tree based on this manager's path.
-     */
-    private void loadSingleProperty(String name, Property<?> prop) {
-        JsonObject source = cachedJson != null ? cachedJson : loadAndCache();
-        if (source == null)
-            return;
-
-        // Traverse the tree to the correct namespace
-        JsonObject currentScope = source;
-        for (String segment : path) {
-            JsonElement next = currentScope.get(segment);
-            if (next != null && next.isJsonObject()) {
-                currentScope = next.getAsJsonObject();
-            } else {
-                return; // Path doesn't exist in config yet
-            }
-        }
-
-        // Now look for the property inside the correctly nested object
-        JsonElement element = currentScope.get(name);
-        if (element != null) {
-            prop.loadFromJson(element);
-        }
-    }
-
-    /**
-     * Reads file and caches json
-     */
-    private static JsonObject loadAndCache() {
-        try {
-            if (!configFile.exists()) {
-                Files.writeString(configFile.toPath(), "{}");
-                return new JsonObject();
-            }
-
-            String json = Files.readString(configFile.toPath());
-            cachedJson = JsonParser.parseString(json).getAsJsonObject();
-            return cachedJson;
-
-        } catch (IOException e) {
-            SaturnClient.LOGGER.error("Error reading config file", e);
-            return null;
-        }
-    }
-
-    public Map<String, Property<?>> getProperties() {
-        return currentMap;
-    }
-}
@@ -1,298 +0,0 @@
-package org.saturnclient.saturnclient.config.manager;
-
-import java.util.Map;
-
-import org.lwjgl.glfw.GLFW;
-import org.saturnclient.saturnclient.SaturnClient;
-
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonPrimitive;
-
-public class Property<T> {
-    public static class NamedProperty<T> {
-        public String name;
-        public Property<T> prop;
-
-        public NamedProperty(String name, Property<T> value) {
-            this.name = name;
-            this.prop = value;
-        }
-    }
-
-    public enum PropertyType {
-        BOOLEAN,
-        INTEGER,
-        FLOAT,
-        STRING,
-        HEX,
-        NAMESPACE,
-        SELECT,
-        KEYBINDING,
-    }
-
-    public T value;
-    public boolean isReset = false;
-    private T defaultValue;
-    private String[] availableValues;
-    private final PropertyType type;
-    private boolean wasPressedLastTick = false;
-
-    private Property(T value, PropertyType type) {
-        this.value = value;
-        this.defaultValue = value;
-        this.type = type;
-    }
-
-    // ---------- Factory Methods ----------
-    public static <T> Property<T> from(T value) {
-        if (value instanceof Boolean)
-            return new Property<>(value, PropertyType.BOOLEAN);
-        if (value instanceof Integer)
-            return new Property<>(value, PropertyType.INTEGER);
-        if (value instanceof Float)
-            return new Property<>(value, PropertyType.FLOAT);
-        if (value instanceof String)
-            return new Property<>(value, PropertyType.STRING);
-        if (valueIsNamespace(value))
-            return new Property<>(value, PropertyType.NAMESPACE);
-        return null;
-    }
-
-    public static Property<Integer> font(int value) {
-        return select(value, "Default", "Inter", "Inter bold");
-    }
-
-    public static Property<Integer> select(Integer value, String... availableValues) {
-        Property<Integer> property = new Property<>(value, PropertyType.SELECT);
-        property.availableValues = availableValues;
-        return property;
-    }
-
-    public static Property<Map<String, Property<?>>> namespace(Map<String, Property<?>> value) {
-        return new Property<>(value, PropertyType.NAMESPACE);
-    }
-
-    public static Property<Boolean> bool(boolean value) {
-        return new Property<>(value, PropertyType.BOOLEAN);
-    }
-
-    public static Property<Integer> integer(int value) {
-        return new Property<>(value, PropertyType.INTEGER);
-    }
-
-    public static Property<Float> floatProp(float value) {
-        return new Property<>(value, PropertyType.FLOAT);
-    }
-
-    public static Property<String> string(String value) {
-        return new Property<>(value, PropertyType.STRING);
-    }
-
-    public static Property<Integer> color(int value) {
-        return new Property<>(value, PropertyType.HEX);
-    }
-
-    public static Property<Integer> keybinding(int value) {
-        return new Property<>(value, PropertyType.KEYBINDING);
-    }
-
-    // ---------- Select Helpers ----------
-    public void next() {
-        if (type == PropertyType.SELECT) {
-            int i = (Integer) value;
-            setValue((i < availableValues.length - 1) ? i + 1 : 0);
-        }
-    }
-
-    public void prev() {
-        if (type == PropertyType.SELECT) {
-            int i = (Integer) value;
-            setValue((i > 0) ? i - 1 : availableValues.length - 1);
-        }
-    }
-
-    public void setSelection(int selection) {
-        if (type == PropertyType.SELECT && selection >= 0 && selection < availableValues.length) {
-            setValue(selection);
-        }
-    }
-
-    public String getSelection() {
-        return (type == PropertyType.SELECT) ? availableValues[(Integer) value] : null;
-    }
-
-    // ---------- Lifecycle ----------
-    public void reset() {
-        value = defaultValue;
-        isReset = true;
-    }
-
-    public PropertyType getType() {
-        return type;
-    }
-
-    @SuppressWarnings("unchecked")
-    public Map<String, Property<?>> getNamespaceValue() {
-        if (type == PropertyType.NAMESPACE && value instanceof Map) {
-            return (Map<String, Property<?>>) value;
-        }
-        throw new IllegalStateException("Property is not a namespace");
-    }
-
-    // ---------- JSON Serialization ----------
-    /*
-     * BOOLEAN,
-     * INTEGER,
-     * FLOAT,
-     * STRING,
-     * HEX,
-     * NAMESPACE,
-     * SELECT,
-     * KEYBINDING,
-     */
-    public JsonElement toJson() {
-        switch (type) {
-            case BOOLEAN:
-                return new JsonPrimitive((Boolean) value);
-            case INTEGER:
-                return new JsonPrimitive((Integer) value);
-            case FLOAT:
-                return new JsonPrimitive((Float) value);
-            case NAMESPACE:
-                JsonObject nested = new JsonObject();
-                getNamespaceValue().forEach((k, v) -> nested.add(k, v.toJson()));
-                return nested;
-            case HEX:
-                return new JsonPrimitive(String.format("#%08X", (Integer) value));
-            case KEYBINDING:
-                return new JsonPrimitive((Integer) value);
-            case SELECT:
-                return new JsonPrimitive((Integer) value);
-            default:
-                return new JsonPrimitive(String.valueOf(value));
-        }
-    }
-
-    public void loadFromJson(JsonElement element) {
-        if (element == null)
-            return;
-
-        switch (type) {
-            case BOOLEAN:
-                if (element.isJsonPrimitive() && element.getAsJsonPrimitive().isBoolean())
-                    setValue(element.getAsBoolean());
-                break;
-            case INTEGER:
-                if (element.isJsonPrimitive()) {
-                    JsonPrimitive p = element.getAsJsonPrimitive();
-                    if (p.isNumber())
-                        setValue(p.getAsInt());
-                    else if (p.isString())
-                        setValue(parseHexToInt(p.getAsString()));
-                }
-                break;
-            case FLOAT:
-                if (element.isJsonPrimitive() && element.getAsJsonPrimitive().isNumber())
-                    setValue(element.getAsFloat());
-                break;
-            case STRING:
-                if (element.isJsonPrimitive() && element.getAsJsonPrimitive().isString())
-                    setValue(element.getAsString());
-                break;
-            case HEX:
-                if (element.isJsonPrimitive() && element.getAsJsonPrimitive().isString())
-                    setValue(parseHexToInt(element.getAsString()));
-                break;
-            case NAMESPACE:
-                if (element.isJsonObject()) {
-                    JsonObject obj = element.getAsJsonObject();
-                    getNamespaceValue().forEach((k, v) -> v.loadFromJson(obj.get(k)));
-                }
-                break;
-            case SELECT:
-                if (element.isJsonPrimitive() && element.getAsJsonPrimitive().isNumber())
-                    setSelection(element.getAsInt());
-                break;
-            case KEYBINDING:
-                if (element.isJsonPrimitive() && element.getAsJsonPrimitive().isNumber())
-                    setValue(element.getAsInt());
-                break;
-        }
-    }
-
-    // ---------- Utility ----------
-    @Override
-    public String toString() {
-        return String.valueOf(value);
-    }
-
-    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);
-    }
-
-    // ---------- Keybindings ----------
-    public boolean isKeyPressed() {
-        return (Integer) value != -1 &&
-                GLFW.glfwGetKey(SaturnClient.client.getWindow().getHandle(), (Integer) value) == GLFW.GLFW_PRESS &&
-                SaturnClient.client.currentScreen == null;
-    }
-
-    public boolean wasKeyPressed() {
-        boolean pressed = isKeyPressed();
-        boolean result = pressed && !wasPressedLastTick;
-        wasPressedLastTick = pressed;
-        return result;
-    }
-
-    // ---------- HEX ----------
-    public static int parseHexToInt(String hex) {
-        hex = hex.replace("#", "");
-        if (hex.length() == 6)
-            hex = "FF" + hex;
-        if (hex.length() != 8)
-            throw new IllegalArgumentException("Hex must be 6 or 8 chars long, got \'" + hex + "\'");
-        return (int) Long.parseLong(hex, 16);
-    }
-
-    // Misc
-    public Property<T> copy() {
-        return new Property<>(this.value, this.type);
-    }
-
-    public void load(String name, JsonElement element) {
-        if (element != null && element.isJsonObject()) {
-            load(name, element.getAsJsonObject());
-        }
-    }
-
-    public void load(String name, JsonObject element) {
-        JsonElement value = element.get(name);
-        if (value != null)
-            this.loadFromJson(value);
-    }
-
-    public boolean isNamespace() {
-        return type == PropertyType.NAMESPACE;
-    }
-
-    @SuppressWarnings("unchecked")
-    public Map<String, Property<?>> getNamespaceMap() {
-        return isNamespace() ? (Map<String, Property<?>>) (Object) value : null;
-    }
-}
@@ -1,17 +0,0 @@
-package org.saturnclient.saturnclient.cosmetics;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class Emotes {
-    public static List<String> availableEmotes = new ArrayList<>();
-
-    public static void initialize() {
-        availableEmotes.add("tpose");
-        availableEmotes.add("back_flip");
-        availableEmotes.add("facepalm");
-        availableEmotes.add("cry");
-        availableEmotes.add("giga_chad");
-        availableEmotes.add("front_flip");
-    }
-}
@@ -1,62 +0,0 @@
-package org.saturnclient.saturnclient.cosmetics;
-
-import org.saturnclient.saturnclient.client.player.SaturnPlayer;
-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;
-import net.minecraft.client.render.entity.feature.FeatureRendererContext;
-import net.minecraft.client.render.entity.model.PlayerEntityModel;
-import net.minecraft.client.render.entity.state.PlayerEntityRenderState;
-import net.minecraft.client.render.item.ItemRenderer;
-import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.component.DataComponentTypes;
-import net.minecraft.component.type.EquippableComponent;
-import net.minecraft.entity.EquipmentSlot;
-import net.minecraft.item.ItemStack;
-import net.minecraft.item.Items;
-import net.minecraft.item.ModelTransformationMode;
-import net.minecraft.util.Identifier;
-
-public class HatFeatureRenderer extends FeatureRenderer<PlayerEntityRenderState, PlayerEntityModel> {
-    public HatFeatureRenderer(FeatureRendererContext<PlayerEntityRenderState, PlayerEntityModel> context) {
-        super(context);
-    }
-
-    @Override
-    public void render(MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light,
-            PlayerEntityRenderState state, float limbAngle, float limbDistance) {
-        ItemStack headItem = state.equippedHeadStack;
-        SaturnPlayer player = SaturnPlayer.get(state.name);
-
-        if (!headItem.isEmpty() || state.invisible || player == null || player.hat.isEmpty()) {
-            return;
-        }
-
-        matrices.push();
-
-        this.getContextModel().head.rotate(matrices);
-        matrices.multiply(net.minecraft.util.math.RotationAxis.POSITIVE_X.rotationDegrees(180.0f));
-        matrices.multiply(net.minecraft.util.math.RotationAxis.POSITIVE_Y.rotationDegrees(180.0f));
-
-        ItemStack customHat = new ItemStack(Items.STICK);
-        customHat.set(DataComponentTypes.ITEM_MODEL,
-                Identifier.of("saturnclient:hat_" + player.hat));
-        customHat.set(DataComponentTypes.EQUIPPABLE,
-                EquippableComponent.builder(EquipmentSlot.HEAD).build());
-
-        ItemRenderer itemRenderer = SaturnClient.client.getItemRenderer();
-
-        itemRenderer.renderItem(
-                customHat,
-                ModelTransformationMode.THIRD_PERSON_RIGHT_HAND,
-                light,
-                OverlayTexture.DEFAULT_UV,
-                matrices,
-                vertexConsumers,
-                null,
-                0);
-
-        matrices.pop();
-    }
-}
@@ -1,31 +0,0 @@
-package org.saturnclient.saturnclient.cosmetics;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
-
-import org.saturnclient.saturnclient.client.ServiceClient;
-import org.saturnclient.saturnclient.client.player.SaturnPlayer;
-
-public class Hats {
-    public static final String[] ALL_HATS = { "horns_black", "horns_white", "halo", "halo_black" };
-    public static List<String> availableHats = new ArrayList<>();
-
-    public static void initialize() {
-        availableHats.add(0, "");
-    }
-
-    public static void setHat(String hatName) {
-        if (availableHats.contains(hatName)) {
-            setHat(ServiceClient.uuid, hatName);
-            ServiceClient.setHat(hatName);
-        }
-    }
-
-    public static void setHat(UUID uuid, String hatName) {
-        SaturnPlayer player = SaturnPlayer.get(uuid);
-        if (player != null) {
-            player.hat = hatName;
-        }
-    }
-}
@@ -1,265 +0,0 @@
-package org.saturnclient.saturnclient.cosmetics.cloaks;
-
-import net.minecraft.util.Identifier;
-
-import org.saturnclient.saturnclient.client.ServiceClient;
-import org.saturnclient.saturnclient.client.player.SaturnPlayer;
-import org.saturnclient.saturnclient.cosmetics.cloaks.utils.AnimatedCloakData;
-import org.saturnclient.saturnclient.cosmetics.cloaks.utils.IdentifierUtils;
-
-import javax.imageio.ImageIO;
-import java.awt.image.BufferedImage;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.*;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-import org.saturnclient.saturnclient.SaturnClient;
-
-/**
- * Manages the cloak system for Saturn Client.
- * Handles loading and caching of player cloaks.
- * Originally created by IIpho3nix and modified for Saturn Client by leo.
- */
-public class Cloaks {
-    public static final String[] ALL_CLOAKS = { "glitch", "mercedes_flow", "crimson_mark", "bmw", "amg", "amg_petronas",
-            "ferrari", "redbull", "black_hole_amethyst", "black_hole_flame", "black_hole_white" };
-    private static final String[] ANIMATED_CLOAKS = { "glitch", "black_hole_amethyst", "black_hole_flame",
-            "black_hole_white" };
-
-    private static final String CLOAKS_RESOURCE_PATH = "assets/saturnclient/textures/cloaks/";
-    public static final List<String> availableCloaks = new ArrayList<>();
-    public static Identifier cloakCacheIdentifier = null;
-    public static final Map<UUID, List<AnimatedCloakData>> animatedCloaks = new ConcurrentHashMap<>();
-    private static final Map<UUID, Long> lastFrameTime = new ConcurrentHashMap<>();
-
-    private static final ExecutorService CLOAK_LOADER_EXECUTOR = Executors.newFixedThreadPool(
-            Math.min(4, Runtime.getRuntime().availableProcessors()),
-            r -> {
-                Thread t = new Thread(r, "cloak-loader");
-                t.setDaemon(true);
-                t.setPriority(Thread.NORM_PRIORITY - 1);
-                return t;
-            });
-
-    private static final ConcurrentHashMap<String, List<AnimatedCloakData>> CLOAK_CACHE = new ConcurrentHashMap<>();
-
-    /**
-     * Initializes the cloak system.
-     * Loads cloak textures from resources.
-     */
-    public static void initialize() {
-        availableCloaks.add(0, "");
-    }
-
-    /**
-     * Sets cloak of the current player
-     * 
-     * @param cloakName Name of the cloak file to load
-     */
-    public static void setCloak(String cloakName) {
-        if (availableCloaks.contains(cloakName)) {
-            setCloak(ServiceClient.uuid, cloakName);
-            ServiceClient.setCloak(cloakName);
-        }
-    }
-
-    /**
-     * Handles loading and caching of a new cloak texture, without connecting to the
-     * server.
-     * 
-     * @param cloakName Name of the cloak file to load
-     */
-    public static void setCloak(UUID uuid, String cloakName) {
-        SaturnPlayer player = SaturnPlayer.get(uuid);
-
-        if (player != null) {
-            player.cloak = cloakName;
-        }
-
-        loadCloak(uuid);
-    }
-
-    /**
-     * Handles loading and caching of a new cloak texture, without connecting to the
-     * server.
-     * 
-     * @param cloakName Name of the cloak file to load
-     */
-    public static void loadCloak(UUID uuid) {
-        SaturnPlayer player = SaturnPlayer.get(uuid);
-
-        if (player != null && player.cloak != null) {
-            if (!player.cloak.isEmpty()) {
-                if (Arrays.asList(ANIMATED_CLOAKS).contains(player.cloak)) {
-                    loadAnimatedCloakAsync(uuid, player.cloak)
-                            .exceptionally(throwable -> {
-                                SaturnClient.LOGGER.error("Failed to load animated cloak for player: " + player.cloak,
-                                        throwable);
-                                return null;
-                            });
-
-                } else {
-                    SaturnClient.client.execute(() -> loadStaticCloak(player.cloak + ".png"));
-                }
-            }
-        }
-    }
-
-    /**
-     * Loads and processes a static cloak from a PNG file in resources.
-     * 
-     * @param fileName Name of the PNG file to load
-     */
-    private static void loadStaticCloak(String fileName) {
-        try {
-            String resourcePath = CLOAKS_RESOURCE_PATH + fileName;
-            InputStream inputStream = Cloaks.class.getClassLoader().getResourceAsStream(resourcePath);
-
-            if (inputStream != null) {
-                BufferedImage image = ImageIO.read(inputStream);
-
-                // Add debug logging for static cloak
-                SaturnClient.LOGGER.info("Static cloak dimensions: " + image.getWidth() + "x" + image.getHeight());
-
-                String safeFileName = fileName.toLowerCase(Locale.ROOT)
-                        .replace(' ', '_')
-                        .replaceAll("[^a-z0-9/._-]", "");
-
-                cloakCacheIdentifier = Identifier.of(SaturnClient.MOD_ID, "cloaks_" + safeFileName);
-                IdentifierUtils.registerBufferedImageTexture(cloakCacheIdentifier, image);
-            }
-        } catch (IOException e) {
-            SaturnClient.LOGGER.error("Failed to load static cloak from resources: " + fileName, e);
-        }
-    }
-
-    public static CompletableFuture<Void> loadAnimatedCloakAsync(UUID uuid, String cloakName) {
-        return CompletableFuture.runAsync(() -> {
-            String fileName = cloakName + ".gif";
-
-            // Check cache first
-            List<AnimatedCloakData> cached = CLOAK_CACHE.get(fileName);
-            if (cached != null) {
-                animatedCloaks.put(uuid, cached);
-                lastFrameTime.put(uuid, System.currentTimeMillis());
-                return;
-            }
-
-            String resourcePath = CLOAKS_RESOURCE_PATH + fileName;
-
-            try (InputStream inputStream = Cloaks.class.getClassLoader().getResourceAsStream(resourcePath)) {
-                if (inputStream == null) {
-                    SaturnClient.LOGGER.warn("Cloak resource not found: " + resourcePath);
-                    return;
-                }
-
-                // Read all bytes at once - more efficient than multiple reads
-                byte[] data = inputStream.readAllBytes();
-                GifDecoder.GifImage gif = GifDecoder.read(data);
-
-                int frameCount = gif.getFrameCount();
-                if (frameCount == 0) {
-                    SaturnClient.LOGGER.warn("No frames found in animated cloak: " + fileName);
-                    return;
-                }
-
-                // Pre-allocate collections with known size
-                List<AnimatedCloakData> animatedFrames = new ArrayList<>(frameCount);
-                String baseFrameId = fileName.replace(".gif", "");
-
-                // Process frames in batch
-                for (int i = 0; i < frameCount; i++) {
-                    BufferedImage frame = gif.getFrame(i);
-                    int delay = Math.max(gif.getDelay(i) * 10, 50); // Minimum 50ms delay
-
-                    String frameId = baseFrameId + "_frame_" + i;
-                    Identifier frameIdentifier = Identifier.of(SaturnClient.MOD_ID, "cloaks_" + frameId);
-
-                    try {
-                        IdentifierUtils.registerBufferedImageTextureFast(frameIdentifier, frame);
-                        // Register texture on main thread if required by the graphics system
-                        if (SaturnClient.client.isOnThread()) {
-                            // IdentifierUtils.registerBufferedImageTexture(frameIdentifier, frame);
-                        } else {
-                            // Queue for main thread execution
-                            // SaturnClient.client.execute(
-                            // () -> IdentifierUtils.registerBufferedImageTexture(frameIdentifier, frame));
-                        }
-
-                        animatedFrames.add(new AnimatedCloakData(frameIdentifier, delay));
-                    } catch (Exception e) {
-                        SaturnClient.LOGGER.error("Failed to register frame " + i + " for cloak: " + fileName, e);
-                        // Continue with other frames instead of failing completely
-                    }
-                }
-
-                if (!animatedFrames.isEmpty()) {
-                    // Cache the result for future use
-                    CLOAK_CACHE.put(fileName, animatedFrames);
-                    animatedCloaks.put(uuid, animatedFrames);
-                    lastFrameTime.put(uuid, System.currentTimeMillis());
-
-                    SaturnClient.LOGGER.info("Loaded {} frames for animated cloak: {} (cached)",
-                            animatedFrames.size(), fileName);
-                } else {
-                    SaturnClient.LOGGER.error("No valid frames could be loaded for cloak: " + fileName);
-                }
-
-            } catch (IOException e) {
-                SaturnClient.LOGGER.error("Failed to load animated cloak from resources: " + fileName, e);
-            } catch (Exception e) {
-                SaturnClient.LOGGER.error("Unexpected error loading animated cloak: " + fileName, e);
-            }
-        }, CLOAK_LOADER_EXECUTOR);
-    }
-
-    public static Identifier getCurrentCloakTexture(UUID uuid) {
-        SaturnPlayer player = SaturnPlayer.get(uuid);
-
-        if (player == null || player.cloak.isEmpty()) {
-            return null;
-        }
-
-        String cloakName = player.cloak;
-
-        if (Arrays.asList(ANIMATED_CLOAKS).contains(cloakName)) {
-            List<AnimatedCloakData> frames = animatedCloaks.get(uuid);
-            if (frames == null || frames.isEmpty()) {
-                return null;
-            }
-
-            long currentTime = System.currentTimeMillis();
-            long lastTime = lastFrameTime.getOrDefault(uuid, currentTime);
-            int currentFrame = 0;
-
-            long elapsedTime = currentTime - lastTime;
-            long totalTime = 0;
-            for (int i = 0; i < frames.size(); i++) {
-                totalTime += frames.get(i).getDelayMs();
-                if (elapsedTime < totalTime) {
-                    currentFrame = i;
-                    break;
-                }
-            }
-
-            if (elapsedTime >= totalTime) {
-                lastFrameTime.put(uuid, currentTime);
-                currentFrame = 0;
-            }
-
-            Identifier identifier = frames.get(currentFrame).getTextureId();
-
-            if (identifier == null) {
-                return Identifier.of(SaturnClient.MOD_ID, "textures/cloaks/" + cloakName + ".png");
-            }
-
-            return identifier;
-        } else {
-            return Identifier.of(SaturnClient.MOD_ID, "textures/cloaks/" + cloakName + ".png");
-        }
-    }
-}
@@ -1,791 +0,0 @@
-package org.saturnclient.saturnclient.cosmetics.cloaks;
-
-import java.awt.*;
-import java.awt.image.BufferedImage;
-import java.awt.image.DataBufferInt;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.concurrent.locks.ReadWriteLock;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
-
-/*
- * Copyright 2014 Dhyan Blum
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * <p>
- * A thread-safe decoder capable of processing a GIF data stream to render the graphics
- * contained in it. This implementation follows the official
- * <A HREF="http://www.w3.org/Graphics/GIF/spec-gif89a.txt">GIF
- * specification</A>.
- * </p>
- *
- * <p>
- * Example usage:
- * </p>
- *
- * <p>
- *
- * <pre>
- * final GifImage gifImage = GifDecoder.read(int[] data);
- * final int width = gifImage.getWidth();
- * final int height = gifImage.getHeight();
- * final int frameCount = gifImage.getFrameCount();
- * for (int i = 0; i < frameCount; i++) {
- * 	final BufferedImage image = gifImage.getFrame(i);
- * 	final int delay = gif.getDelay(i);
- * }
- * </pre>
- *
- * </p>
- *
- * @author Dhyan Blum
- * @version 1.09 November 2017 (Thread-safe version)
- */
-public final class GifDecoder {
-    
-    // Thread-local storage for reusable objects to avoid synchronization overhead
-    private static final ThreadLocal<DecodingContext> DECODING_CONTEXT = 
-        ThreadLocal.withInitial(DecodingContext::new);
-    
-    /**
-     * Thread-local context containing reusable objects for decoding operations.
-     * This eliminates the need for synchronization while maintaining performance benefits
-     * of object reuse within each thread.
-     */
-    static final class DecodingContext {
-        final BitReader bitReader = new BitReader();
-        final CodeTable codeTable = new CodeTable();
-        int[] pixelBuffer;
-        int[] prevPixelBuffer;
-        int[] tempBuffer;
-        
-        // Get or create a pixel buffer of the specified size
-        int[] getPixelBuffer(int size) {
-            if (pixelBuffer == null || pixelBuffer.length < size) {
-                pixelBuffer = new int[Math.max(size, 1024)]; // Minimum size to reduce allocations
-            }
-            return pixelBuffer;
-        }
-        
-        // Get or create a previous pixel buffer of the specified size
-        int[] getPrevPixelBuffer(int size) {
-            if (prevPixelBuffer == null || prevPixelBuffer.length < size) {
-                prevPixelBuffer = new int[Math.max(size, 1024)];
-            }
-            return prevPixelBuffer;
-        }
-        
-        // Get or create a temporary buffer of the specified size
-        int[] getTempBuffer(int size) {
-            if (tempBuffer == null || tempBuffer.length < size) {
-                tempBuffer = new int[Math.max(size, 1024)];
-            }
-            return tempBuffer;
-        }
-    }
-
-    static final class BitReader {
-        private int nextBitToRead;
-        private int numberOfBitsToRead;
-        private int bitMask; // Used to kill unwanted higher bits
-        private byte[] bytes; // Data array
-
-        // To avoid costly bounds checks, 'in' needs 2 more 0-bytes at the end
-        private void init(final byte[] bytes) {
-            this.bytes = bytes;
-            nextBitToRead = 0;
-        }
-
-        private int read() {
-            // Byte indices: (bitPos / 8), (bitPos / 8) + 1, (bitPos / 8) + 2
-            final int byteIndex = nextBitToRead >>> 3; // Byte = bit / 8
-            final int bitsToShiftRight = nextBitToRead & 7; // & 7 is the same as MODULO 8
-            
-            // Use int operations to avoid repeated array access
-            final int byte0 = bytes[byteIndex] & 0xFF;
-            final int byte1 = bytes[byteIndex + 1] & 0xFF;
-            final int byte2 = bytes[byteIndex + 2] & 0xFF;
-            
-            // Optimized bit manipulation
-            final int buffer = ((byte2 << 16) | (byte1 << 8) | byte0) >>> bitsToShiftRight;
-            nextBitToRead += numberOfBitsToRead;
-            return buffer & bitMask; // Kill the unwanted higher bits
-        }
-
-        private void setNumberOfBitsToRead(final int numberOfBitsToRead) {
-            this.numberOfBitsToRead = numberOfBitsToRead;
-            bitMask = (1 << numberOfBitsToRead) - 1;
-        }
-    }
-
-    static final class CodeTable {
-        private final int[][] table; // Maps codes to lists of colors
-        private int initTableSize; // Number of colors +2 for CLEAR + EOI
-        private int initCodeSize; // Initial code size
-        private int initCodeLimit; // First code limit
-        private int codeSize; // Current code size, maximum is 12 bits
-        private int nextCode; // Next available code for a new entry
-        private int nextCodeLimit; // Increase codeSize when nextCode == limit
-        private BitReader bitReader; // Notify when code sizes increases
-
-        public CodeTable() {
-            table = new int[4096][];
-        }
-
-        private int add(final int[] indices) {
-            if (nextCode < 4096) {
-                if (nextCode == nextCodeLimit && codeSize < 12) {
-                    codeSize++; // Max code size is 12
-                    bitReader.setNumberOfBitsToRead(codeSize);
-                    nextCodeLimit = (1 << codeSize) - 1; // 2^codeSize - 1
-                }
-                table[nextCode++] = indices;
-            }
-            return codeSize;
-        }
-
-        private int clear() {
-            codeSize = initCodeSize;
-            bitReader.setNumberOfBitsToRead(codeSize);
-            nextCodeLimit = initCodeLimit;
-            nextCode = initTableSize; // Don't recreate table, reset pointer
-            return codeSize;
-        }
-
-        private void init(final GifFrame fr, final int[] activeColTbl, final BitReader br) {
-            this.bitReader = br;
-            final int numColors = activeColTbl.length;
-            initCodeSize = fr.firstCodeSize;
-            initCodeLimit = (1 << initCodeSize) - 1; // 2^initCodeSize - 1
-            initTableSize = fr.endOfInfoCode + 1;
-            nextCode = initTableSize;
-            
-            // Initialize single color entries
-            for (int c = 0; c < numColors; c++) {
-                table[c] = new int[]{activeColTbl[c]}; // Single element array
-            }
-            
-            table[fr.clearCode] = new int[] { fr.clearCode }; // CLEAR
-            table[fr.endOfInfoCode] = new int[] { fr.endOfInfoCode }; // EOI
-            
-            // Locate transparent color in code table and set to 0
-            if (fr.transpColFlag && fr.transpColIndex < numColors) {
-                table[fr.transpColIndex] = new int[]{0};
-            }
-        }
-    }
-
-    final class GifFrame {
-        // Graphic control extension (optional)
-        // Disposal: 0=NO_ACTION, 1=NO_DISPOSAL, 2=RESTORE_BG, 3=RESTORE_PREV
-        private volatile int disposalMethod; // 0-3 as above, 4-7 undefined
-        private volatile boolean transpColFlag; // 1 Bit
-        private volatile int delay; // Unsigned, LSByte first, n * 1/100 * s
-        private volatile int transpColIndex; // 1 Byte
-        // Image descriptor
-        private volatile int x; // Position on the canvas from the left
-        private volatile int y; // Position on the canvas from the top
-        private volatile int w; // May be smaller than the base image
-        private volatile int h; // May be smaller than the base image
-        private volatile int wh; // width * height
-        private volatile boolean hasLocColTbl; // Has local color table? 1 Bit
-        private volatile boolean interlaceFlag; // Is an interlace image? 1 Bit
-        @SuppressWarnings("unused")
-        private volatile boolean sortFlag; // True if local colors are sorted, 1 Bit
-        private volatile int sizeOfLocColTbl; // Size of the local color table, 3 Bits
-        private volatile int[] localColTbl; // Local color table (optional)
-        // Image data
-        private volatile int firstCodeSize; // LZW minimum code size + 1 for CLEAR & EOI
-        private volatile int clearCode;
-        private volatile int endOfInfoCode;
-        private volatile byte[] data; // Holds LZW encoded data
-        private volatile BufferedImage img; // Full drawn image, not just the frame area
-        
-        // Synchronization for frame image creation
-        private final Object imageLock = new Object();
-    }
-
-    public final class GifImage {
-        public volatile String header; // Bytes 0-5, GIF87a or GIF89a
-        private volatile int w; // Unsigned 16 Bit, the least significant byte first
-        private volatile int h; // Unsigned 16 Bit, the least significant byte first
-        private volatile int wh; // Image width * image height
-        public volatile boolean hasGlobColTbl; // 1 Bit
-        public volatile int colorResolution; // 3 Bits
-        public volatile boolean sortFlag; // True if global colors are sorted, 1 Bit
-        public volatile int sizeOfGlobColTbl; // 2^(val(3 Bits) + 1), see spec
-        public volatile int bgColIndex; // Background color index, 1 Byte
-        public volatile int pxAspectRatio; // Pixel aspect ratio, 1 Byte
-        public volatile int[] globalColTbl; // Global color table
-        private final List<GifFrame> frames = new ArrayList<>(64);
-        public volatile String appId = ""; // 8 Bytes at in[i+3], usually "NETSCAPE"
-        public volatile String appAuthCode = ""; // 3 Bytes at in[i+11], usually "2.0"
-        public volatile int repetitions = 0; // 0: infinite loop, N: number of loops
-        
-        // Thread-safe frame rendering state
-        private volatile BufferedImage img = null; // Currently, drawn frame
-        private volatile Graphics2D g;
-        private final ReadWriteLock renderLock = new ReentrantReadWriteLock();
-        
-        // Synchronization objects
-        private final Object initLock = new Object();
-
-        private int[] decode(final GifFrame fr, final int[] activeColTbl) {
-            final DecodingContext ctx = DECODING_CONTEXT.get();
-            ctx.codeTable.init(fr, activeColTbl, ctx.bitReader);
-            ctx.bitReader.init(fr.data); // Incoming codes
-            final int clearCode = fr.clearCode, endCode = fr.endOfInfoCode;
-            
-            // Use thread-local pixel buffer
-            final int[] out = ctx.getPixelBuffer(wh);
-            
-            final int[][] tbl = ctx.codeTable.table; // Code table
-            int outPos = 0; // Next pixel position in the output image array
-            ctx.codeTable.clear(); // Init code table
-            ctx.bitReader.read(); // Skip leading clear code
-            int code = ctx.bitReader.read(); // Read first code
-            int[] pixels = tbl[code]; // Output pixel for first code
-            
-            // Use System.arraycopy for better performance
-            System.arraycopy(pixels, 0, out, outPos, pixels.length);
-            outPos += pixels.length;
-            
-            try {
-                while (true) {
-                    final int prevCode = code;
-                    code = ctx.bitReader.read(); // Get next code in stream
-                    if (code == clearCode) { // After a CLEAR table, there is
-                        ctx.codeTable.clear(); // no previous code, we need to read
-                        code = ctx.bitReader.read(); // a new one
-                        pixels = tbl[code]; // Output pixels
-                        System.arraycopy(pixels, 0, out, outPos, pixels.length);
-                        outPos += pixels.length;
-                        continue; // Back to the loop with a valid previous code
-                    } else if (code == endCode) {
-                        break;
-                    }
-                    final int[] prevVals = tbl[prevCode];
-                    final int[] prevValsAndK = new int[prevVals.length + 1];
-                    System.arraycopy(prevVals, 0, prevValsAndK, 0, prevVals.length);
-                    if (code < ctx.codeTable.nextCode) { // Code table contains code
-                        pixels = tbl[code]; // Output pixels
-                        System.arraycopy(pixels, 0, out, outPos, pixels.length);
-                        outPos += pixels.length;
-                        prevValsAndK[prevVals.length] = tbl[code][0]; // K
-                    } else {
-                        prevValsAndK[prevVals.length] = prevVals[0]; // K
-                        System.arraycopy(prevValsAndK, 0, out, outPos, prevValsAndK.length);
-                        outPos += prevValsAndK.length;
-                    }
-                    ctx.codeTable.add(prevValsAndK); // Previous indices + K
-                }
-            } catch (final ArrayIndexOutOfBoundsException ignored) {
-            }
-            
-            // Return a properly sized array
-            return Arrays.copyOf(out, outPos);
-        }
-
-        private int[] deinterlace(final int[] src, final GifFrame fr) {
-            final int w = fr.w, h = fr.h, wh = fr.wh;
-            final DecodingContext ctx = DECODING_CONTEXT.get();
-            final int[] dest = ctx.getTempBuffer(src.length);
-            
-            // Interlaced images are organized in 4 sets of pixel lines
-            final int set2Y = (h + 7) >>> 3; // Line no. = ceil(h/8.0)
-            final int set3Y = set2Y + ((h + 3) >>> 3); // ceil(h-4/8.0)
-            final int set4Y = set3Y + ((h + 1) >>> 2); // ceil(h-2/4.0)
-            
-            // Sets' start indices in source array
-            final int set2 = w * set2Y, set3 = w * set3Y, set4 = w * set4Y;
-            
-            // Line skips in destination array - use bit shifts for multiplication
-            final int w2 = w << 1, w4 = w2 << 1, w8 = w4 << 1;
-            
-            // Group 1 contains every 8th line starting from 0
-            int from = 0, to = 0;
-            for (; from < set2; from += w, to += w8) {
-                System.arraycopy(src, from, dest, to, w);
-            } 
-            // Group 2 contains every 8th line starting from 4
-            for (to = w4; from < set3; from += w, to += w8) {
-                System.arraycopy(src, from, dest, to, w);
-            } 
-            // Group 3 contains every 4th line starting from 2
-            for (to = w2; from < set4; from += w, to += w4) {
-                System.arraycopy(src, from, dest, to, w);
-            } 
-            // Group 4 contains every 2nd line starting from 1 (biggest group)
-            for (to = w; from < wh; from += w, to += w2) {
-                System.arraycopy(src, from, dest, to, w);
-            }
-            return Arrays.copyOf(dest, src.length); // Return a copy, not the shared buffer
-        }
-
-        private void drawFrame(final GifFrame fr) {
-            renderLock.writeLock().lock();
-            try {
-                // Determine the color table that will be active for this frame
-                final int[] activeColTbl = fr.hasLocColTbl ? fr.localColTbl : globalColTbl;
-                
-                // Get pixels from data stream
-                int[] pixels = decode(fr, activeColTbl);
-                if (fr.interlaceFlag) {
-                    pixels = deinterlace(pixels, fr); // Rearrange pixel lines
-                }
-                
-                // Create image of type TYPE_INT_ARGB for frame area
-                final BufferedImage frame = new BufferedImage(fr.w, fr.h, BufferedImage.TYPE_INT_ARGB);
-                final int[] frameData = ((DataBufferInt) frame.getRaster().getDataBuffer()).getData();
-                System.arraycopy(pixels, 0, frameData, 0, Math.min(pixels.length, fr.wh));
-                
-                // Draw frame area on top of working image
-                g.drawImage(frame, fr.x, fr.y, null);
-
-                // Keep a copy of the previous frame's pixels
-                final DecodingContext ctx = DECODING_CONTEXT.get();
-                final int[] prevPixelBuffer = ctx.getPrevPixelBuffer(wh);
-                final int[] imgData = ((DataBufferInt) img.getRaster().getDataBuffer()).getData();
-                System.arraycopy(imgData, 0, prevPixelBuffer, 0, wh);
-
-                // Create another copy for the end user to not expose internal state
-                synchronized (fr.imageLock) {
-                    if (fr.img == null) { // Double-checked locking
-                        fr.img = new BufferedImage(w, h, BufferedImage.TYPE_INT_ARGB);
-                        final int[] frameImgData = ((DataBufferInt) fr.img.getRaster().getDataBuffer()).getData();
-                        System.arraycopy(prevPixelBuffer, 0, frameImgData, 0, wh);
-                    }
-                }
-
-                // Handle disposal of current frame
-                if (fr.disposalMethod == 2) {
-                    // Restore to background color (clear frame area only)
-                    g.clearRect(fr.x, fr.y, fr.w, fr.h);
-                } else if (fr.disposalMethod == 3) {
-                    // Restore previous frame
-                    System.arraycopy(prevPixelBuffer, 0, imgData, 0, wh);
-                }
-            } finally {
-                renderLock.writeLock().unlock();
-            }
-        }
-
-        /**
-         * Returns the background color of the first frame in this GIF image. If
-         * the frame has a local color table, the returned color will be from
-         * that table. If not, the color will be from the global color table.
-         * Returns 0 if there is neither a local nor a global color table.
-         *
-         * @return 32 bit ARGB color in the form 0xAARRGGBB
-         */
-        public final int getBackgroundColor() {
-            renderLock.readLock().lock();
-            try {
-                final GifFrame frame = frames.get(0);
-                if (frame.hasLocColTbl) {
-                    return frame.localColTbl[bgColIndex];
-                } else if (hasGlobColTbl) {
-                    return globalColTbl[bgColIndex];
-                }
-                return 0;
-            } finally {
-                renderLock.readLock().unlock();
-            }
-        }
-
-        /**
-         * If not 0, the delay specifies how many hundredths (1/100) of a second
-         * to wait before displaying the frame <i>after</i> the current frame.
-         *
-         * @param index Index of the current frame, 0 to N-1
-         * @return Delay as number of hundredths (1/100) of a second
-         */
-        public final int getDelay(final int index) {
-            renderLock.readLock().lock();
-            try {
-                return frames.get(index).delay;
-            } finally {
-                renderLock.readLock().unlock();
-            }
-        }
-
-        /**
-         * @param index Index of the frame to return as image, starting from 0.
-         *              For incremental calls such as [0, 1, 2, ...] the method's
-         *              run time is O(1) as only one frame is drawn per call. For
-         *              random access calls such as [7, 12, ...] the run time is
-         *              O(N+1) with N being the number of previous frames that
-         *              need to be drawn before N+1 can be drawn on top. Once a
-         *              frame has been drawn it is being cached and the run time
-         *              is more or less O(0) to retrieve it from the list.
-         * @return A BufferedImage for the specified frame.
-         */
-        public BufferedImage getFrame(final int index) {
-            // Initialize rendering context if needed
-            if (img == null) {
-                synchronized (initLock) {
-                    if (img == null) { // Double-checked locking
-                        img = new BufferedImage(w, h, BufferedImage.TYPE_INT_ARGB);
-                        g = img.createGraphics();
-                        g.setBackground(new Color(0, true)); // Transparent color
-                        // Set rendering hints for better performance
-                        g.setRenderingHint(RenderingHints.KEY_ALPHA_INTERPOLATION, RenderingHints.VALUE_ALPHA_INTERPOLATION_SPEED);
-                        g.setRenderingHint(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_SPEED);
-                    }
-                }
-            }
-            
-            GifFrame fr = frames.get(index);
-            
-            // Check if frame is already rendered using double-checked locking
-            if (fr.img == null) {
-                synchronized (fr.imageLock) {
-                    if (fr.img == null) {
-                        // Draw all frames until and including the requested frame
-                        for (int i = 0; i <= index; i++) {
-                            fr = frames.get(i);
-                            if (fr.img == null) {
-                                drawFrame(fr);
-                            }
-                        }
-                    }
-                }
-            }
-            
-            return fr.img;
-        }
-
-        /**
-         * @return The number of frames contained in this GIF image
-         */
-        public final int getFrameCount() {
-            return frames.size();
-        }
-
-        /**
-         * @return The height of the GIF image
-         */
-        public final int getHeight() {
-            return h;
-        }
-
-        /**
-         * @return The width of the GIF image
-         */
-        public final int getWidth() {
-            return w;
-        }
-    }
-
-    static final boolean DEBUG_MODE = false;
-
-    /**
-     * @param in Raw image data as a byte[] array
-     * @return A GifImage object exposing the properties of the GIF image.
-     * @throws IOException If the image violates the GIF specification or is
-     *                     truncated.
-     */
-    public static GifImage read(final byte[] in) throws IOException {
-        final GifDecoder decoder = new GifDecoder();
-        final GifImage img = decoder.new GifImage();
-        GifFrame frame = null; // Currently open frame
-        int pos = readHeader(in, img); // Read header, get next byte position
-        pos = readLogicalScreenDescriptor(img, in, pos);
-        if (img.hasGlobColTbl) {
-            img.globalColTbl = new int[img.sizeOfGlobColTbl];
-            pos = readColTbl(in, img.globalColTbl, pos);
-        }
-        
-        // Main parsing loop with bounds checking optimization
-        while (pos < in.length) {
-            final int block = in[pos] & 0xFF;
-            switch (block) {
-                case 0x21: // Extension introducer
-                    if (pos + 1 >= in.length) {
-                        throw new IOException("Unexpected end of file.");
-                    }
-                    switch (in[pos + 1] & 0xFF) {
-                        case 0xFE: // Comment extension
-                            pos = readTextExtension(in, pos);
-                            break;
-                        case 0xFF: // Application extension
-                            pos = readAppExt(img, in, pos);
-                            break;
-                        case 0x01: // Plain text extension
-                            frame = null; // End of current frame
-                            pos = readTextExtension(in, pos);
-                            break;
-                        case 0xF9: // Graphic control extension
-                            if (frame == null) {
-                                frame = decoder.new GifFrame();
-                                img.frames.add(frame);
-                            }
-                            pos = readGraphicControlExt(frame, in, pos);
-                            break;
-                        default:
-                            throw new IOException("Unknown extension at " + pos);
-                    }
-                    break;
-                case 0x2C: // Image descriptor
-                    if (frame == null) {
-                        frame = decoder.new GifFrame();
-                        img.frames.add(frame);
-                    }
-                    pos = readImgDescr(frame, in, pos);
-                    if (frame.hasLocColTbl) {
-                        frame.localColTbl = new int[frame.sizeOfLocColTbl];
-                        pos = readColTbl(in, frame.localColTbl, pos);
-                    }
-                    pos = readImgData(frame, in, pos);
-                    frame = null; // End of current frame
-                    break;
-                case 0x3B: // GIF Trailer
-                    return img; // Found trailer, finished reading.
-                default:
-                    // Unknown block. The image is corrupted. Strategies: a) Skip
-                    // and wait for a valid block. Experience: It'll get worse. b)
-                    // Throw exception. c) Return gracefully if we are almost done
-                    // processing. The frames we have so far should be error-free.
-                    final double progress = (double) pos / in.length;
-                    if (progress < 0.9) {
-                        throw new IOException("Unknown block at: " + pos);
-                    }
-                    pos = in.length; // Exit loop
-            }
-        }
-        return img;
-    }
-
-    /**
-     * @param is Image data as input stream. This method will read from the
-     *           input stream's current position. It will not reset the
-     *           position before reading and won't reset or close the stream
-     *           afterwards. Call these methods before and after calling this
-     *           method as needed.
-     * @return A GifImage object exposing the properties of the GIF image.
-     * @throws IOException If an I/O error occurs, the image violates the GIF
-     *                     specification or the GIF is truncated.
-     */
-    public static GifImage read(final InputStream is) throws IOException {
-        final byte[] data = new byte[is.available()];
-        is.read(data, 0, data.length);
-        return read(data);
-    }
-
-    /**
-     * @param img GIF image
-     * @param in  Raw data
-     * @param i   Index of the first byte of the application extension
-     * @return Index of the first byte after this extension
-     */
-    static int readAppExt(final GifImage img, final byte[] in, int i) {
-        // Use StandardCharsets for better performance if available, otherwise fallback
-        img.appId = new String(in, i + 3, 8); // should be "NETSCAPE"
-        img.appAuthCode = new String(in, i + 11, 3); // should be "2.0"
-        i += 14; // Go to sub-block size, it's value should be 3
-        final int subBlockSize = in[i] & 0xFF;
-        // The only app extension widely used is NETSCAPE, it's got 3 data bytes
-        if (subBlockSize == 3) {
-            // in[i+1] should have value 01, in[i+5] should be block terminator
-            img.repetitions = (in[i + 2] & 0xFF) | ((in[i + 3] & 0xFF) << 8); // Short
-            return i + 5;
-        } // Skip unknown application extensions
-        while ((in[i] & 0xFF) != 0) { // While sub-block size != 0
-            i += (in[i] & 0xFF) + 1; // Skip to next sub-block
-        }
-        return i + 1;
-    }
-
-    /**
-     * @param in     Raw data
-     * @param colors Pre-initialized target array to store ARGB colors
-     * @param i      Index of the color table's first byte
-     * @return Index of the first byte after the color table
-     */
-    static int readColTbl(final byte[] in, final int[] colors, int i) {
-        final int numColors = colors.length;
-        for (int c = 0; c < numColors; c++) {
-            final int r = in[i++] & 0xFF; // 1st byte is red
-            final int g = in[i++] & 0xFF; // 2nd byte is green
-            final int b = in[i++] & 0xFF; // 3rd byte is blue
-            // Optimized color packing - alpha is always 0xFF for opaque
-            colors[c] = 0xFF000000 | (r << 16) | (g << 8) | b;
-        }
-        return i;
-    }
-
-    /**
-     * @param fr GIF frame
-     * @param in Raw data
-     * @param i  Index of the extension introducer
-     * @return Index of the first byte after this block
-     */
-    static int readGraphicControlExt(final GifFrame fr, final byte[] in, final int i) {
-        final int packed = in[i + 3] & 0xFF;
-        fr.disposalMethod = (packed & 0b00011100) >>> 2; // Bits 4-2
-        fr.transpColFlag = (packed & 1) == 1; // Bit 0
-        fr.delay = (in[i + 4] & 0xFF) | ((in[i + 5] & 0xFF) << 8); // 16 bit LSB
-        fr.transpColIndex = in[i + 6] & 0xFF; // Byte 6
-        return i + 8; // Skipped byte 7 (blockTerminator), as it's always 0x00
-    }
-
-    /**
-     * @param in  Raw data
-     * @param img The GifImage object that is currently read
-     * @return Index of the first byte after this block
-     * @throws IOException If the GIF header/trailer is missing, incomplete or
-     *                     unknown
-     */
-    static int readHeader(final byte[] in, final GifImage img) throws IOException {
-        if (in.length < 6) { // Check first 6 bytes
-            throw new IOException("Image is truncated.");
-        }
-        // Use ASCII encoding for header - faster than default charset
-        img.header = new String(in, 0, 6);
-        if (!img.header.equals("GIF87a") && !img.header.equals("GIF89a")) {
-            throw new IOException("Invalid GIF header.");
-        }
-        return 6;
-    }
-
-    /**
-     * @param fr The GIF frame to whom this image descriptor belongs
-     * @param in Raw data
-     * @param i  Index of the first byte of this block, i.e. the minCodeSize
-     * @return Byte index
-     */
-    static int readImgData(final GifFrame fr, final byte[] in, int i) {
-        final int fileSize = in.length;
-        final int minCodeSize = in[i++] & 0xFF; // Read code size, go to block
-        final int clearCode = 1 << minCodeSize; // CLEAR = 2^minCodeSize
-        fr.firstCodeSize = minCodeSize + 1; // Add 1 bit for CLEAR and EOI
-        fr.clearCode = clearCode;
-        fr.endOfInfoCode = clearCode + 1;
-        
-        // Pre-calculate image data size for better memory allocation
-        final int imgDataSize = readImgDataSize(in, i);
-        final byte[] imgData = new byte[imgDataSize + 2];
-        int imgDataPos = 0;
-        int subBlockSize = in[i] & 0xFF;
-        
-        while (subBlockSize > 0) { // While block has data
-            try { // Next line may throw exception if sub-block size is fake
-                final int nextSubBlockSizePos = i + subBlockSize + 1;
-                final int nextSubBlockSize = in[nextSubBlockSizePos] & 0xFF;
-                System.arraycopy(in, i + 1, imgData, imgDataPos, subBlockSize);
-                imgDataPos += subBlockSize; // Move output data position
-                i = nextSubBlockSizePos; // Move to next sub-block size
-                subBlockSize = nextSubBlockSize;
-            } catch (final Exception e) {
-                // Sub-block exceeds file end, only use remaining bytes
-                subBlockSize = fileSize - i - 1; // Remaining bytes
-                if (subBlockSize > 0) {
-                    System.arraycopy(in, i + 1, imgData, imgDataPos, subBlockSize);
-                    imgDataPos += subBlockSize; // Move output data position
-                }
-                i += subBlockSize + 1; // Move to next sub-block size
-                break;
-            }
-        }
-        fr.data = imgData; // Holds LZW encoded data
-        i++; // Skip last sub-block size, should be 0
-        return i;
-    }
-
-    static int readImgDataSize(final byte[] in, int i) {
-        final int fileSize = in.length;
-        int imgDataPos = 0;
-        int subBlockSize = in[i] & 0xFF;
-        while (subBlockSize > 0) { // While block has data
-            try { // Next line may throw exception if sub-block size is fake
-                final int nextSubBlockSizePos = i + subBlockSize + 1;
-                final int nextSubBlockSize = in[nextSubBlockSizePos] & 0xFF;
-                imgDataPos += subBlockSize; // Move output data position
-                i = nextSubBlockSizePos; // Move to next sub-block size
-                subBlockSize = nextSubBlockSize;
-            } catch (final Exception e) {
-                // Sub-block exceeds file end, only use remaining bytes
-                subBlockSize = fileSize - i - 1; // Remaining bytes
-                if (subBlockSize > 0) {
-                    imgDataPos += subBlockSize; // Move output data position
-                }
-                break;
-            }
-        }
-        return imgDataPos;
-    }
-
-    /**
-     * @param fr The GIF frame to whom this image descriptor belongs
-     * @param in Raw data
-     * @param i  Index of the image separator, i.e. the first block byte
-     * @return Index of the first byte after this block
-     */
-    static int readImgDescr(final GifFrame fr, final byte[] in, int i) {
-        fr.x = (in[++i] & 0xFF) | ((in[++i] & 0xFF) << 8); // Byte 1-2: left
-        fr.y = (in[++i] & 0xFF) | ((in[++i] & 0xFF) << 8); // Byte 3-4: top
-        fr.w = (in[++i] & 0xFF) | ((in[++i] & 0xFF) << 8); // Byte 5-6: width
-        fr.h = (in[++i] & 0xFF) | ((in[++i] & 0xFF) << 8); // Byte 7-8: height
-        fr.wh = fr.w * fr.h;
-        final int packed = in[++i] & 0xFF; // Byte 9 is a packed byte
-        fr.hasLocColTbl = (packed & 0b10000000) != 0; // Bit 7
-        fr.interlaceFlag = (packed & 0b01000000) != 0; // Bit 6
-        fr.sortFlag = (packed & 0b00100000) != 0; // Bit 5
-        final int colTblSizePower = (packed & 7) + 1; // Bits 2-0
-        fr.sizeOfLocColTbl = 1 << colTblSizePower; // 2^(N+1), As per the spec
-        return ++i;
-    }
-
-    /**
-     * @param img GIF image
-     * @param i   Start index of this block.
-     * @return Index of the first byte after this block.
-     */
-    static int readLogicalScreenDescriptor(final GifImage img, final byte[] in, final int i) {
-        img.w = (in[i] & 0xFF) | ((in[i + 1] & 0xFF) << 8); // 16 bit, LSB 1st
-        img.h = (in[i + 2] & 0xFF) | ((in[i + 3] & 0xFF) << 8); // 16 bit
-        img.wh = img.w * img.h;
-        final int packed = in[i + 4] & 0xFF; // Byte 4 is a packed byte
-        img.hasGlobColTbl = (packed & 0b10000000) != 0; // Bit 7
-        final int colResPower = ((packed & 0b01110000) >>> 4) + 1; // Bits 6-4
-        img.colorResolution = 1 << colResPower; // 2^(N+1), As per the spec
-        img.sortFlag = (packed & 0b00001000) != 0; // Bit 3
-        final int globColTblSizePower = (packed & 7) + 1; // Bits 0-2
-        img.sizeOfGlobColTbl = 1 << globColTblSizePower; // 2^(N+1), see spec
-        img.bgColIndex = in[i + 5] & 0xFF; // 1 Byte
-        img.pxAspectRatio = in[i + 6] & 0xFF; // 1 Byte
-        return i + 7;
-    }
-
-    /**
-     * @param in  Raw data
-     * @param pos Index of the extension introducer
-     * @return Index of the first byte after this block
-     */
-    static int readTextExtension(final byte[] in, final int pos) {
-        int i = pos + 2; // Skip extension introducer and label
-        int subBlockSize = in[i++] & 0xFF;
-        while (subBlockSize != 0 && i < in.length) {
-            i += subBlockSize;
-            if (i >= in.length) break; // Safety check
-            subBlockSize = in[i++] & 0xFF;
-        }
-        return i;
-    }
-}
@@ -1,36 +0,0 @@
-package org.saturnclient.saturnclient.cosmetics.cloaks.utils;
-
-import net.minecraft.util.Identifier;
-
-/**
- * Represents a single frame of an animated cloak.
- */
-public class AnimatedCloakData {
-    private final Identifier textureId;
-    private final int delayMs;
-
-    /**
-     * Creates a new animated cloak frame.
-     *
-     * @param textureId The texture identifier for this frame
-     * @param delayMs   The delay in milliseconds before the next frame
-     */
-    public AnimatedCloakData(Identifier textureId, int delayMs) {
-        this.textureId = textureId;
-        this.delayMs = delayMs;
-    }
-
-    /**
-     * @return The texture identifier for this frame
-     */
-    public Identifier getTextureId() {
-        return textureId;
-    }
-
-    /**
-     * @return The delay in milliseconds before the next frame
-     */
-    public int getDelayMs() {
-        return delayMs;
-    }
-}
@@ -1,98 +0,0 @@
-package org.saturnclient.saturnclient.cosmetics.cloaks.utils;
-
-import org.saturnclient.saturnclient.SaturnClient;
-import net.minecraft.client.texture.NativeImage;
-import net.minecraft.client.texture.NativeImageBackedTexture;
-import net.minecraft.util.Identifier;
-
-import java.awt.image.BufferedImage;
-import java.awt.image.DataBufferInt;
-
-public class IdentifierUtils {
-
-    /**
-     * ORIGINAL METHOD - EXTREMELY SLOW - causes 10-20 second freezes
-     * This converts BufferedImage -> PNG bytes -> ByteBuffer -> NativeImage ->
-     * Texture
-     * This is completely unnecessary and wastes massive amounts of CPU time!
-     */
-    public static void registerBufferedImageTexture(Identifier i, BufferedImage bi) {
-        try {
-            // This is the performance killer:
-            // 1. Converts BufferedImage to PNG (expensive compression)
-            // 2. Creates ByteBuffer copy (memory allocation)
-            // 3. NativeImage.read() parses PNG back to raw pixels (expensive decompression)
-            // This is doing compression -> decompression for no reason!
-
-            java.io.ByteArrayOutputStream baos = new java.io.ByteArrayOutputStream();
-            javax.imageio.ImageIO.write(bi, "png", baos);
-            byte[] bytes = baos.toByteArray();
-            java.nio.ByteBuffer bb = org.lwjgl.BufferUtils.createByteBuffer(bytes.length).put(bytes);
-            bb.flip();
-            NativeImageBackedTexture nibt = new NativeImageBackedTexture(NativeImage.read(bb));
-            SaturnClient.client.getTextureManager().registerTexture(i, nibt);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    /**
-     * OPTIMIZED METHOD - Direct pixel conversion without unnecessary PNG
-     * encoding/decoding
-     * This should reduce loading time from 10-20 seconds to under 1 second
-     */
-    public static void registerBufferedImageTextureFast(Identifier identifier, BufferedImage bufferedImage) {
-        try {
-            int width = bufferedImage.getWidth();
-            int height = bufferedImage.getHeight();
-
-            // Create NativeImage directly with the correct format
-            NativeImage nativeImage = new NativeImage(NativeImage.Format.RGBA, width, height, false);
-
-            // Direct pixel copy - much faster than PNG conversion
-            if (bufferedImage.getType() == BufferedImage.TYPE_INT_ARGB) {
-                // Fast path for ARGB images - direct memory access
-                int[] pixels = ((DataBufferInt) bufferedImage.getRaster().getDataBuffer()).getData();
-                for (int y = 0; y < height; y++) {
-                    for (int x = 0; x < width; x++) {
-                        int pixel = pixels[y * width + x];
-                        nativeImage.setColorArgb(x, y, pixel);
-                    }
-                }
-            } else {
-                // Fallback for other image types - still faster than PNG conversion
-                for (int y = 0; y < height; y++) {
-                    for (int x = 0; x < width; x++) {
-                        int rgb = bufferedImage.getRGB(x, y);
-                        nativeImage.setColorArgb(x, y, rgb);
-                    }
-                }
-            }
-
-            // Register the texture
-            NativeImageBackedTexture texture = new NativeImageBackedTexture(nativeImage);
-            SaturnClient.client.execute(
-                    () -> SaturnClient.client.getTextureManager().registerTexture(identifier, texture));
-
-        } catch (Exception e) {
-            SaturnClient.LOGGER.error("Failed to register texture: " + identifier, e);
-            // Fallback to slow method if fast method fails
-            registerBufferedImageTexture(identifier, bufferedImage);
-        }
-    }
-
-    /**
-     * EVEN FASTER VERSION - Bulk texture registration
-     * Use this when registering many textures at once (like animated cloak frames)
-     */
-    public static void registerBufferedImageTexturesBulk(java.util.Map<Identifier, BufferedImage> textures) {
-        long startTime = System.currentTimeMillis();
-
-        for (java.util.Map.Entry<Identifier, BufferedImage> entry : textures.entrySet()) {
-            registerBufferedImageTextureFast(entry.getKey(), entry.getValue());
-        }
-
-        long endTime = System.currentTimeMillis();
-        SaturnClient.LOGGER.info("Registered {} textures in {}ms", textures.size(), (endTime - startTime));
-    }
-}
@@ -1,48 +0,0 @@
-package org.saturnclient.saturnclient.cosmetics.cloaks.utils;
-
-import java.util.Random;
-
-/**
- * Utility class for generating random strings and numbers.
- */
-public final class RandomUtils {
-    private static final String ALPHANUMERIC = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
-    private static final String ALPHANUMERIC_LOWERCASE = "0123456789abcdefghijklmnopqrstuvwxyz";
-    private static final Random RANDOM = new Random();
-
-    private RandomUtils() {
-        // Prevent instantiation
-    }
-
-    /**
-     * Generates a random string of specified length using given characters.
-     */
-    private static String random(final int length, final char[] chars) {
-        StringBuilder sb = new StringBuilder(length);
-        for (int i = 0; i < length; i++) {
-            sb.append(chars[RANDOM.nextInt(chars.length)]);
-        }
-        return sb.toString();
-    }
-
-    /**
-     * Generates a random string of specified length using alphanumeric characters.
-     */
-    public static String randomString(final int length) {
-        return random(length, ALPHANUMERIC.toCharArray());
-    }
-
-    /**
-     * Generates a random lowercase string of specified length.
-     */
-    public static String randomStringLowercase(final int length) {
-        return random(length, ALPHANUMERIC_LOWERCASE.toCharArray());
-    }
-
-    /**
-     * Generates a random integer between min and max (inclusive).
-     */
-    public static int randBetween(int min, int max) {
-        return RANDOM.nextInt(max - min + 1) + min;
-    }
-}
@@ -1,140 +0,0 @@
-package org.saturnclient.saturnclient.menus;
-
-import net.minecraft.client.gui.DrawContext;
-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.manager.ConfigManager;
-import org.saturnclient.saturnclient.mixin.DrawContextAccessor;
-import org.saturnclient.ui2.RenderScope;
-import org.saturnclient.ui2.SaturnScreen;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class HudEditor extends Screen {
-    private final List<HudMod> hudMods = new ArrayList<>();
-    private HudMod draggingMod = null;
-    private boolean resizing = false;
-    private int offsetX, offsetY;
-    private static final int RESIZE_MARGIN = 3;
-
-    public HudEditor() {
-        super(Text.literal("HUD Editor"));
-        for (Module m : ModManager.ENABLED_MODS) {
-            if (m.isEnabled() && m instanceof HudMod) {
-                hudMods.add((HudMod) m);
-            }
-        }
-    }
-
-    @Override
-    public boolean mouseClicked(double mouseX, double mouseY, int button) {
-        if (button == 0) {
-            for (int m = hudMods.size() - 1; m >= 0; m--) {
-                HudMod mod = hudMods.get(m);
-                ModDimensions dim = mod.getDimensions();
-
-                // Check if clicking the corner for resizing
-                if (isCorner(mouseX, mouseY, dim)) {
-                    draggingMod = mod;
-                    resizing = true;
-                    offsetX = (int) (mouseX - (dim.x.value + dim.width * dim.scale.value));
-                    offsetY = (int) (mouseY - (dim.y.value + dim.height * dim.scale.value));
-                    return true;
-                }
-
-                // Check if clicking inside the mod
-                if (isInside(mouseX, mouseY, dim)) {
-                    draggingMod = mod;
-                    resizing = false;
-                    offsetX = (int) (mouseX - dim.x.value);
-                    offsetY = (int) (mouseY - dim.y.value);
-                    return true;
-                }
-            }
-        }
-        return super.mouseClicked(mouseX, mouseY, button);
-    }
-
-    @Override
-    public boolean mouseReleased(double mouseX, double mouseY, int button) {
-        if (button == 0) {
-            draggingMod = null;
-            resizing = false;
-        }
-        return super.mouseReleased(mouseX, mouseY, button);
-    }
-
-    @Override
-    public boolean mouseDragged(double mouseX, double mouseY, int button, double deltaX, double deltaY) {
-        if (draggingMod != null) {
-            ModDimensions dim = draggingMod.getDimensions();
-
-            if (resizing) {
-                // Scale based on cursor movement
-                float newScale = Math.max(0.5f, ((float) (mouseX - dim.x.value) / dim.width));
-                dim.scale.value = newScale;
-            } else {
-                // Move the mod
-                dim.x.value = (int) mouseX - offsetX;
-                dim.y.value = (int) mouseY - offsetY;
-            }
-        }
-        return super.mouseDragged(mouseX, mouseY, button, deltaX, deltaY);
-    }
-
-    @Override
-    public void render(DrawContext context, int mouseX, int mouseY, float delta) {
-        if (client.world == null && client.getCurrentServerEntry() == null) {
-            SaturnScreen.ROTATING_PANORAMA_RENDERER.render(context, this.width, this.height, 1.0F, delta);
-        }
-
-        RenderScope scope = new RenderScope(context.getMatrices(), ((DrawContextAccessor) context).getVertexConsumers());
-
-        for (HudMod mod : hudMods) {
-            ModDimensions dim = mod.getDimensions();
-            MatrixStack matrices = context.getMatrices();
-            matrices.push();
-
-            matrices.translate(dim.x.value, dim.y.value, 0);
-            matrices.scale(dim.scale.value, dim.scale.value, 1.0f);
-
-            // Render the mod
-            mod.renderDummy(scope);
-
-            matrices.pop();
-
-            // Draw border around mod
-            int borderX = dim.x.value;
-            int borderY = dim.y.value;
-            int borderW = (int) (dim.width * dim.scale.value);
-            int borderH = (int) (dim.height * dim.scale.value);
-
-            context.drawBorder(borderX, borderY, borderW, borderH, 0xFFFFFFFF); // White border
-        }
-    }
-
-    private boolean isInside(double mouseX, double mouseY, ModDimensions dim) {
-        return mouseX >= dim.x.value && mouseX <= dim.x.value + (dim.width * dim.scale.value) &&
-                mouseY >= dim.y.value && mouseY <= dim.y.value + (dim.height * dim.scale.value);
-    }
-
-    private boolean isCorner(double mouseX, double mouseY, ModDimensions dim) {
-        float rightX = dim.x.value + dim.width * dim.scale.value;
-        float bottomY = dim.y.value + dim.height * dim.scale.value;
-
-        return Math.abs(mouseX - rightX) < RESIZE_MARGIN && Math.abs(mouseY - bottomY) < RESIZE_MARGIN;
-    }
-
-    @Override
-    public void close() {
-        ConfigManager.save();
-        super.close();
-    }
-}
@@ -1,89 +0,0 @@
-package org.saturnclient.ui2;
-
-import org.saturnclient.ui2.anim.Animation;
-
-public class Element {
-    public int x;
-    public int y;
-    public int width;
-    public int height;
-    public float opacity = 1.0f;
-    public boolean focused;
-    public Animation animation;
-    public float scale = 1.0f;
-    public Integer duration = null; // Element duration, will fade out if not null
-
-    public void render(RenderScope renderScope, ElementContext ctx) {
-    }
-
-    public void click(int mouseX, int mouseY) {
-    }
-
-    public void scroll(int mouseX, int mouseY, double horizontalAmount, double verticalAmount) {
-    }
-
-    public void keyPressed(int keyCode, int scanCode, int modifiers) {
-    }
-
-    public void charTyped(char typedChar) {
-    }
-
-    public void mouseClicked(double mouseX, double mouseY, int button) {
-    }
-
-    public void mouseDragged(double mouseX, double mouseY, int button, double deltaX, double deltaY) {
-    }
-
-    public void mouseReleased(double mouseX, double mouseY, int button) {
-    }
-
-    public void playAnimationFrame(long elapsed) {
-        if (this.animation != null && elapsed >= this.animation.delay) {
-            this.animation.tick(this.animation.curve
-                    .apply(Math.min(1.0, (double) (elapsed - this.animation.delay) / this.animation.duration)), this);
-        }
-    }
-
-    public Element dimensions(int width, int height) {
-        this.width = width;
-        this.height = height;
-
-        return this;
-    }
-
-    public Element position(int x, int y) {
-        this.x = x;
-        this.y = y;
-
-        return this;
-    }
-
-    public Element centerHorizontal(int w, int h, int offsetX, int offsetY) {
-        this.x = (w - (int) (width * scale)) / 2 + offsetX;
-        this.y = offsetY;
-
-        return this;
-    }
-
-    public Element center(int w, int h) {
-        this.centerOffset(w, h, 0, 0);
-        return this;
-    }
-
-    public Element centerOffset(int w, int h, int offsetX, int offsetY) {
-        this.x = (w - (int) (width * scale)) / 2 + offsetX;
-        this.y = (h - (int) (height * scale)) / 2 + offsetY;
-
-        return this;
-    }
-
-    public Element animation(Animation animation) {
-        this.animation = animation;
-        return this;
-    }
-
-    public Element scale(float scale) {
-        this.scale = scale;
-        return this;
-    }
-}
@@ -1,25 +0,0 @@
-package org.saturnclient.ui2;
-
-public class ElementContext {
-    public int mouseX, mouseY;
-    public int elementWidth, elementHeight;
-    public float elementScale;
-    public long elapsed;
-
-    public ElementContext(long elapsed, int mouseX, int mouseY, Element e) {
-        this.mouseX = mouseX - e.x;
-        this.mouseY = mouseY - e.y;
-        this.elementWidth = e.width;
-        this.elementHeight = e.height;
-        this.elementScale = e.scale;
-        this.elapsed = elapsed;
-    }
-
-    public boolean isHovering() {
-        return Utils.isHovering(mouseX, mouseY, elementWidth, elementHeight, elementScale);
-    }
-
-    public boolean isHovering(int x, int y, int width, int height) {
-        return Utils.isHovering(mouseX - x, mouseY - y, width, height, elementScale);
-    }
-}
@@ -1,450 +0,0 @@
-package org.saturnclient.ui2;
-
-import java.util.ArrayDeque;
-import java.util.Deque;
-import java.util.Objects;
-import java.util.function.Consumer;
-import java.util.function.Function;
-
-import org.jetbrains.annotations.Nullable;
-import org.joml.Matrix4f;
-import org.saturnclient.ui2.resources.Fonts;
-import org.saturnclient.ui2.resources.SvgTexture;
-
-import com.mojang.blaze3d.systems.RenderSystem;
-
-import org.saturnclient.saturnclient.SaturnClient;
-import org.saturnclient.saturnclient.mixin.DrawContextAccessor;
-
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.font.TextRenderer;
-import net.minecraft.client.font.TextRenderer.TextLayerType;
-import net.minecraft.client.gui.DrawContext;
-import net.minecraft.client.gui.ScreenRect;
-import net.minecraft.client.render.DiffuseLighting;
-import net.minecraft.client.render.OverlayTexture;
-import net.minecraft.client.render.RenderLayer;
-import net.minecraft.client.render.VertexConsumer;
-import net.minecraft.client.render.VertexConsumerProvider;
-import net.minecraft.client.render.item.ItemRenderState;
-import net.minecraft.client.texture.Sprite;
-import net.minecraft.client.util.Window;
-import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.entity.LivingEntity;
-import net.minecraft.item.ItemStack;
-import net.minecraft.item.ModelTransformationMode;
-import net.minecraft.util.Identifier;
-import net.minecraft.util.crash.CrashException;
-import net.minecraft.util.crash.CrashReport;
-import net.minecraft.util.crash.CrashReportSection;
-import net.minecraft.util.math.RotationAxis;
-import net.minecraft.world.World;
-
-public class RenderScope {
-    public MatrixStack matrices;
-    public VertexConsumerProvider.Immediate vertexConsumers;
-    // private Function<Identifier, RenderLayer> renderLayers;
-    private ScissorStack scissorStack = new ScissorStack();
-    private int opacity = 255 << 24;
-    private final ItemRenderState itemRenderState;
-
-    public RenderScope(DrawContext context) {
-        this(context.getMatrices(), ((DrawContextAccessor) context).getVertexConsumers());
-    }
-
-    public RenderScope(MatrixStack matrices, VertexConsumerProvider.Immediate vertexConsumers) {
-        this.matrices = matrices;
-        this.vertexConsumers = vertexConsumers;
-        this.scissorStack = new ScissorStack();
-        this.itemRenderState = new ItemRenderState();
-    }
-
-    public void setOpacity(float alpha) {
-        this.opacity = (int) (alpha * 255) << 24;
-    }
-
-    public int getColor(int color) {
-        int originalAlpha = (color >>> 24) & 0xFF;
-        int newAlpha = (opacity >>> 24) & 0xFF;
-        int mixedAlpha = (originalAlpha * newAlpha) / 255;
-        return (mixedAlpha << 24) | (color & 0x00FFFFFF);
-    }
-
-    public void setRenderLayer(Function<Identifier, RenderLayer> renderLayers) {
-        // this.renderLayers = renderLayers;
-    }
-
-    public void drawRect(int x, int y, int width, int height, int color) {
-        if (color == 0)
-            return;
-        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, int font, int color) {
-        drawText(1.0f, text, x, y, font, color);
-    }
-
-    public void drawText(float scale, String text, int x, int y, int font, int color) {
-        if (color == 0)
-            return;
-        if (font == 0) {
-            scale *= 2;
-        }
-        int i = 0;
-        for (String line : text.split("\n")) {
-            color = getColor(color);
-            matrices.push();
-            matrices.translate(x, y + (i * Fonts.getHeight()), 0);
-            matrices.scale(scale, scale, 1.0f);
-            TextRenderer textRenderer = SaturnClient.client.textRenderer;
-            textRenderer.draw(Fonts.setFont(line, Fonts.getFont(font)), 0, font == 0 ? 1 : 7, color, false,
-                    this.matrices.peek().getPositionMatrix(),
-                    this.vertexConsumers, TextLayerType.NORMAL, 0, 15728880);
-            matrices.pop();
-            i++;
-        }
-    }
-
-    private 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) {
-        if (color == 0)
-            return;
-        radius = Math.min(radius, Math.min(width, height));
-        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(Identifier sprite, int x, int y, float u, float v, int width, int height, int color) {
-        this.drawTexture(sprite, x, y, u, v, width, height, width, height, width, height, color);
-    }
-
-    public void drawTexture(Identifier sprite, int x, int y, float u, float v, int width, int height) {
-        this.drawTexture(sprite, x, y, u, v, width, height, width, height, width, height);
-    }
-
-    public void drawTexture(Identifier sprite, int x, int y, float u, float v, int width, int height, int regionWith,
-            int regionHeight, int textureWidth, int textureHeight) {
-        this.drawTexture(sprite, x, y, u, v, width, height, regionWith, regionHeight, textureWidth, textureHeight, -1);
-    }
-
-    public void drawTexture(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(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(Identifier sprite, int x1, int x2, int y1, int y2, float u1, float u2, float v1,
-            float v2, int color) {
-
-        if (sprite.toString().endsWith(".svg")) {
-            sprite = SvgTexture.getSvg(MinecraftClient.getInstance(), sprite, (x2 - x1) * 2, (y2 - y1) * 2);
-        }
-
-        if (color == 0)
-            return;
-        x1 *= 4;
-        x2 *= 4;
-        y1 *= 4;
-        y2 *= 4;
-        color = getColor(color);
-
-        matrices.push();
-        matrices.scale(0.25f, 0.25f, 1.0f);
-        RenderSystem.setShaderTexture(0, sprite);
-        RenderLayer renderLayer = (RenderLayer) RenderLayer.getGuiTextured(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);
-        matrices.pop();
-    }
-
-    public void enableScissor(int x1, int y1, int x2, int y2) {
-        ScreenRect screenRect = (new ScreenRect(x1, y1, x2 - x1, y2 - y1))
-                .transform(this.matrices.peek().getPositionMatrix());
-        this.setScissor(this.scissorStack.push(screenRect));
-    }
-
-    public void disableScissor() {
-        this.setScissor(this.scissorStack.pop());
-    }
-
-    public boolean scissorContains(int x, int y) {
-        return this.scissorStack.containsPoint(x, y);
-    }
-
-    private void setScissor(@Nullable ScreenRect rect) {
-        this.draw();
-        if (rect != null) {
-            Window window = SaturnClient.client.getWindow();
-            int i = window.getFramebufferHeight();
-            double d = window.getScaleFactor();
-            double e = (double) rect.getLeft() * d;
-            double f = (double) i - (double) rect.getBottom() * d;
-            double g = (double) rect.width() * d;
-            double h = (double) rect.height() * d;
-            RenderSystem.enableScissor((int) e, (int) f, Math.max(0, (int) g), Math.max(0, (int) h));
-        } else {
-            RenderSystem.disableScissor();
-        }
-
-    }
-
-    public void draw() {
-        this.vertexConsumers.draw();
-    }
-
-    public void draw(Consumer<VertexConsumerProvider> drawer) {
-        drawer.accept(this.vertexConsumers);
-        this.vertexConsumers.draw();
-    }
-
-    static class ScissorStack {
-        private final Deque<ScreenRect> stack = new ArrayDeque<>();
-
-        public ScreenRect push(ScreenRect p_281812_) {
-            ScreenRect screenrectangle = this.stack.peekLast();
-            if (screenrectangle != null) {
-                ScreenRect screenrectangle1 = Objects.requireNonNullElse(p_281812_.intersection(screenrectangle),
-                        ScreenRect.empty());
-                this.stack.addLast(screenrectangle1);
-                return screenrectangle1;
-            } else {
-                this.stack.addLast(p_281812_);
-                return p_281812_;
-            }
-        }
-
-        @Nullable
-        public ScreenRect pop() {
-            if (this.stack.isEmpty()) {
-                throw new IllegalStateException("Scissor stack underflow");
-            } else {
-                this.stack.removeLast();
-                return this.stack.peekLast();
-            }
-        }
-
-        public boolean containsPoint(int p_329411_, int p_333404_) {
-            return this.stack.isEmpty() ? true : this.stack.peek().contains(p_329411_, p_333404_);
-        }
-    }
-
-    public void drawItem(ItemStack item, int x, int y) {
-        this.drawItem(SaturnClient.client.player, SaturnClient.client.world, item, x, y, 0);
-    }
-
-    public void drawItem(ItemStack stack, int x, int y, int seed) {
-        this.drawItem(SaturnClient.client.player, SaturnClient.client.world, stack, x, y, seed);
-    }
-
-    public void drawItem(ItemStack stack, int x, int y, int seed, int z) {
-        this.drawItem(SaturnClient.client.player, SaturnClient.client.world, stack, x, y, seed, z);
-    }
-
-    public void drawItemWithoutEntity(ItemStack stack, int x, int y) {
-        this.drawItemWithoutEntity(stack, x, y, 0);
-    }
-
-    public void drawItemWithoutEntity(ItemStack stack, int x, int y, int seed) {
-        this.drawItem((LivingEntity) null, SaturnClient.client.world, stack, x, y, seed);
-    }
-
-    public void drawItem(LivingEntity entity, ItemStack stack, int x, int y, int seed) {
-        this.drawItem(entity, entity.getWorld(), stack, x, y, seed);
-    }
-
-    private void drawItem(@Nullable LivingEntity entity, @Nullable World world, ItemStack stack, int x, int y,
-            int seed) {
-        this.drawItem(entity, world, stack, x, y, seed, 0);
-    }
-
-    private void drawItem(@Nullable LivingEntity entity, @Nullable World world, ItemStack stack, int x, int y, int seed,
-            int z) {
-        if (!stack.isEmpty()) {
-            SaturnClient.client.getItemModelManager().update(this.itemRenderState, stack, ModelTransformationMode.GUI,
-                    false, world, entity, seed);
-            this.matrices.push();
-            this.matrices.translate((float) (x + 8), (float) (y + 8),
-                    (float) (150 + (this.itemRenderState.hasDepth() ? z : 0)));
-
-            try {
-                this.matrices.scale(16.0F, -16.0F, 16.0F);
-                boolean bl = !this.itemRenderState.isSideLit();
-                if (bl) {
-                    this.draw();
-                    DiffuseLighting.disableGuiDepthLighting();
-                }
-
-                this.itemRenderState.render(this.matrices, this.vertexConsumers, 15728880, OverlayTexture.DEFAULT_UV);
-                this.draw();
-                if (bl) {
-                    DiffuseLighting.enableGuiDepthLighting();
-                }
-            } catch (Throwable var11) {
-                CrashReport crashReport = CrashReport.create(var11, "Rendering item");
-                CrashReportSection crashReportSection = crashReport.addElement("Item being rendered");
-                crashReportSection.add("Item Type", () -> {
-                    return String.valueOf(stack.getItem());
-                });
-                crashReportSection.add("Item Components", () -> {
-                    return String.valueOf(stack.getComponents());
-                });
-                crashReportSection.add("Item Foil", () -> {
-                    return String.valueOf(stack.hasGlint());
-                });
-                throw new CrashException(crashReport);
-            }
-
-            this.matrices.pop();
-        }
-    }
-
-    public void drawSpriteStretched(Sprite sprite, int x, int y, int width, int height) {
-        this.drawSpriteStretched(sprite, x, y, width, height, -1);
-    }
-
-    public void drawSpriteStretched(Sprite sprite, int x, int y, int width, int height, int color) {
-        if (color == 0)
-            return;
-        if (width != 0 && height != 0) {
-            this.drawTexturedQuad(sprite.getAtlasId(), x, x + width, y, y + height, sprite.getMinU(), sprite.getMaxU(),
-                    sprite.getMinV(), sprite.getMaxV(), color);
-        }
-    }
-
-    public void fill(int x1, int y1, int x2, int y2, int color) {
-        this.fill(x1, y1, x2, y2, 0, color);
-    }
-
-    public void fill(int x1, int y1, int x2, int y2, int z, int color) {
-        this.fill(RenderLayer.getGui(), x1, y1, x2, y2, z, color);
-    }
-
-    public void fill(RenderLayer layer, int x1, int y1, int x2, int y2, int color) {
-        this.fill(layer, x1, y1, x2, y2, 0, color);
-    }
-
-    public void fill(RenderLayer layer, int x1, int y1, int x2, int y2, int z, int color) {
-        Matrix4f matrix4f = this.matrices.peek().getPositionMatrix();
-        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(layer);
-        vertexConsumer.vertex(matrix4f, (float) x1, (float) y1, (float) z).color(color);
-        vertexConsumer.vertex(matrix4f, (float) x1, (float) y2, (float) z).color(color);
-        vertexConsumer.vertex(matrix4f, (float) x2, (float) y2, (float) z).color(color);
-        vertexConsumer.vertex(matrix4f, (float) x2, (float) y1, (float) z).color(color);
-    }
-
-    public void drawBorder(int x, int y, int width, int height, int color) {
-        this.fill(x, y, x + width, y + 1, color);
-        this.fill(x, y + height - 1, x + width, y + height, color);
-        this.fill(x, y + 1, x + 1, y + height - 1, color);
-        this.fill(x + width - 1, y + 1, x + width, y + height - 1, color);
-    }
-}
@@ -1,65 +0,0 @@
-package org.saturnclient.ui2;
-
-import java.util.List;
-
-import org.lwjgl.glfw.GLFW;
-import org.saturnclient.saturnclient.SaturnClient;
-import org.saturnclient.ui2.elements.Notification;
-import org.saturnclient.ui2.elements.Notification.NotificationKind;
-
-public class Utils {
-    public static boolean isHovering(int mouseX, int mouseY, int elementWidth, int elementHeight, float elementScale) {
-        return mouseX >= 0 &&
-                mouseX <= (elementWidth * elementScale) &&
-                mouseY >= 0 &&
-                mouseY <= (elementHeight * elementScale);
-    }
-
-    public static char getCharFromKey(int keyCode, int modifiers) {
-        boolean shift = (modifiers & GLFW.GLFW_MOD_SHIFT) != 0;
-
-        // A-Z
-        if (keyCode >= GLFW.GLFW_KEY_A && keyCode <= GLFW.GLFW_KEY_Z) {
-            return (char) (shift
-                    ? 'A' + (keyCode - GLFW.GLFW_KEY_A)
-                    : 'a' + (keyCode - GLFW.GLFW_KEY_A));
-        }
-
-        // 0-9
-        if (keyCode >= GLFW.GLFW_KEY_0 && keyCode <= GLFW.GLFW_KEY_9) {
-            return shift
-                    ? ")!@#$%^&*(".charAt(keyCode - GLFW.GLFW_KEY_0)
-                    : (char) ('0' + (keyCode - GLFW.GLFW_KEY_0));
-        }
-
-        // Special characters
-        return switch (keyCode) {
-            case GLFW.GLFW_KEY_SPACE -> ' ';
-            case GLFW.GLFW_KEY_PERIOD -> shift ? '>' : '.';
-            case GLFW.GLFW_KEY_COMMA -> shift ? '<' : ',';
-            case GLFW.GLFW_KEY_MINUS -> shift ? '_' : '-';
-            case GLFW.GLFW_KEY_EQUAL -> shift ? '+' : '=';
-            case GLFW.GLFW_KEY_SEMICOLON -> shift ? ':' : ';';
-            case GLFW.GLFW_KEY_APOSTROPHE -> shift ? '"' : '\'';
-            case GLFW.GLFW_KEY_SLASH -> shift ? '?' : '/';
-            case GLFW.GLFW_KEY_BACKSLASH -> shift ? '|' : '\\';
-            case GLFW.GLFW_KEY_LEFT_BRACKET -> shift ? '{' : '[';
-            case GLFW.GLFW_KEY_RIGHT_BRACKET -> shift ? '}' : ']';
-            case GLFW.GLFW_KEY_GRAVE_ACCENT -> shift ? '~' : '`';
-            default -> '\0';
-        };
-    }
-
-    public static <T> T getOrNull(List<T> list, int index) {
-        return (index >= 0 && index < list.size()) ? list.get(index) : null;
-    }
-
-    public static void notify(NotificationKind kind, String title, String toast) {
-        if (SaturnClient.client.currentScreen instanceof SaturnScreen) {
-            ((SaturnScreen) SaturnClient.client.currentScreen)
-                    .draw(new Notification(SaturnClient.client.currentScreen.width,
-                            SaturnClient.client.currentScreen.height, kind,
-                            title, toast));
-        }
-    }
-}
@@ -1,37 +0,0 @@
-package org.saturnclient.ui2.anim;
-
-import java.util.function.Function;
-
-import org.saturnclient.saturnclient.config.AnimationConfig;
-import org.saturnclient.ui2.Element;
-
-public abstract class Animation {
-    public int duration;
-    public int delay = 0;
-    public Function<Double, Double> curve = Curve::easeInOutCubic;
-
-    Animation(AnimationConfig config) {
-        this.duration = config.duration.value;
-        switch (config.curve.value) {
-            case 0:
-                this.curve = Curve::easeInOutCubic;
-                break;
-            case 1:
-                this.curve = Curve::easeOutCubic;
-                break;
-            case 2:
-                this.curve = Curve::easeInOutBack;
-                break;
-            default:
-                break;
-        }
-    }
-
-    Animation(int duration) {
-        this.duration = duration;
-    }
-
-    public abstract void tick(double progress, Element element);
-
-    public abstract void init(Element element);
-}
@@ -1,22 +0,0 @@
-package org.saturnclient.ui2.anim;
-
-public class Curve {
-    public static double easeOutCubic(double x) {
-        return 1 - Math.pow(1 - x, 3);
-    }
-
-    public static double easeInOutCubic(double x) {
-        return (x < 0.5 ? 4 * x * x * x : 1 - Math.pow(-2 * x + 2, 3) / 2);
-    }
-
-    public static double easeInOutBack(double x) {
-        double c1 = 2.5;
-        double c2 = c1 * 1.525;
-
-        if (x < 0.5) {
-            return (Math.pow(2 * x, 2) * ((c2 + 1) * 2 * x - c2)) / 2;
-        } else {
-            return (Math.pow(2 * x - 2, 2) * ((c2 + 1) * (2 * x - 2) + c2) + 2) / 2;
-        }
-    }
-}
@@ -1,27 +0,0 @@
-package org.saturnclient.ui2.anim;
-
-import org.saturnclient.saturnclient.config.AnimationConfig;
-import org.saturnclient.ui2.Element;
-
-public class Fade extends Animation {
-    float targetOpacity;
-
-    public Fade(int duration) {
-        super(duration);
-    }
-
-    public Fade(AnimationConfig config) {
-        super(config);
-    }
-
-    @Override
-    public void tick(double progress, Element element) {
-        element.opacity = Math.max(0.1f, targetOpacity * (float) progress);
-    }
-
-    @Override
-    public void init(Element element) {
-        targetOpacity = element.opacity;
-        element.opacity = 0.1f;
-    }
-}
@@ -1,27 +0,0 @@
-package org.saturnclient.ui2.anim;
-
-import org.saturnclient.saturnclient.config.AnimationConfig;
-import org.saturnclient.ui2.Element;
-
-public class FadeOut extends Animation {
-    float targetOpacity;
-
-    public FadeOut(int duration) {
-        super(duration);
-    }
-
-    public FadeOut(AnimationConfig config) {
-        super(config);
-    }
-
-    @Override
-    public void tick(double progress, Element element) {
-        element.opacity = targetOpacity - (float) progress;
-    }
-
-    @Override
-    public void init(Element element) {
-        targetOpacity = element.opacity;
-        // element.opacity = 1.0f;
-    }
-}
@@ -1,39 +0,0 @@
-package org.saturnclient.ui2.anim;
-
-import org.saturnclient.saturnclient.config.AnimationConfig;
-import org.saturnclient.ui2.Element;
-
-public class SlideFade extends Animation {
-    public Fade fade;
-    public SlideY slideY;
-
-    public SlideFade(int duration, int offset) {
-        super(duration);
-        this.fade = new Fade(duration);
-        this.slideY = new SlideY(duration, offset);
-    }
-
-    public SlideFade(AnimationConfig config, int offset) {
-        super(config);
-        this.fade = new Fade(duration);
-        this.slideY = new SlideY(duration, offset);
-    }
-
-    @Override
-    public void tick(double progress, Element element) {
-        fade.delay = this.delay;
-        fade.duration = this.duration;
-
-        slideY.delay = this.delay;
-        slideY.duration = this.duration;
-
-        fade.tick(progress, element);
-        slideY.tick(progress, element);
-    }
-
-    @Override
-    public void init(Element element) {
-        fade.init(element);
-        slideY.init(element);
-    }
-}
@@ -1,39 +0,0 @@
-package org.saturnclient.ui2.anim;
-
-import org.saturnclient.saturnclient.config.AnimationConfig;
-import org.saturnclient.ui2.Element;
-
-public class SlideX extends Animation {
-    int offset = 20;
-    double startX;
-
-    public SlideX(AnimationConfig config) {
-        super(config);
-    }
-
-    public SlideX(AnimationConfig config, int offset) {
-        super(config);
-        this.offset = offset;
-    }
-
-    public SlideX(int duration) {
-        super(duration);
-    }
-
-    public SlideX(int duration, int offset) {
-        super(duration);
-        this.offset = offset;
-    }
-
-    @Override
-    public void init(Element element) {
-        startX = element.x - offset;
-        element.x = (int) startX;
-    }
-
-    @Override
-    public void tick(double progress, Element element) {
-        double currentX = startX + offset * progress;
-        element.x = (int) currentX;
-    }
-}
@@ -1,39 +0,0 @@
-package org.saturnclient.ui2.anim;
-
-import org.saturnclient.saturnclient.config.AnimationConfig;
-import org.saturnclient.ui2.Element;
-
-public class SlideY extends Animation {
-    int offset = 20;
-    double startY;
-
-    public SlideY(AnimationConfig config) {
-        super(config);
-    }
-
-    public SlideY(AnimationConfig config, int offset) {
-        super(config);
-        this.offset = offset;
-    }
-
-    public SlideY(int duration) {
-        super(duration);
-    }
-
-    public SlideY(int duration, int offset) {
-        super(duration);
-        this.offset = offset;
-    }
-
-    @Override
-    public void init(Element element) {
-        startY = element.y - offset;
-        element.y = (int) startY;
-    }
-
-    @Override
-    public void tick(double progress, Element element) {
-        double currentY = startY + offset * progress;
-        element.y = (int) currentY;
-    }
-}
@@ -1,47 +0,0 @@
-package org.saturnclient.ui2.components;
-
-import org.saturnclient.saturnclient.config.Theme;
-import org.saturnclient.ui2.Element;
-import org.saturnclient.ui2.ElementContext;
-import org.saturnclient.ui2.RenderScope;
-
-import net.minecraft.client.render.RenderLayer;
-import net.minecraft.util.Identifier;
-
-public class CosmeticPreview extends Element {
-    static int padding = 14;
-
-    Identifier sprite;
-    private Runnable onClick;
-    private boolean isSelected;
-
-    public CosmeticPreview(boolean isSelected, Identifier sprite, Runnable onClick) {
-        this.sprite = sprite;
-        this.onClick = onClick;
-        this.isSelected = isSelected;
-
-        this.width = 50;
-        this.height = 111;
-    }
-
-    @Override
-    public void render(RenderScope renderScope, ElementContext ctx) {
-        renderScope.drawRoundedRectangle(0, 0, width, height, Theme.WIDGET_RADIUS.value,
-                isSelected ? Theme.ACCENT.value : Theme.PRIMARY.value);
-
-        renderScope.setRenderLayer(RenderLayer::getGuiTextured);
-
-        int texWidth = width - padding;
-        int texHeight = height - padding;
-
-        renderScope.drawTexture(sprite, padding / 2, padding / 2, 0, 0, texWidth, texHeight,
-                Theme.FOREGROUND.value);
-    }
-
-    @Override
-    public void click(int mouseX, int mouseY) {
-        if (onClick != null) {
-            onClick.run();
-        }
-    }
-}
@@ -1,98 +0,0 @@
-package org.saturnclient.ui2.components;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.saturnclient.ui2.Element;
-import org.saturnclient.ui2.ElementContext;
-import org.saturnclient.ui2.RenderScope;
-import org.saturnclient.ui2.Utils;
-
-public class ElementRenderer {
-    public static void draw(List<Element> elements, Element element) {
-        synchronized (elements) {
-            elements.add(element);
-        }
-
-        if (element.animation != null) {
-            element.animation.init(element);
-        }
-    }
-
-    public static void render(List<Element> elements, long elapsed, RenderScope renderScope, int mouseX, int mouseY) {
-        for (Element element : elements) {
-            element.playAnimationFrame(elapsed);
-
-            renderScope.matrices.push();
-            renderScope.setOpacity(element.opacity);
-            renderScope.matrices.translate(element.x, element.y, 0);
-            renderScope.matrices.scale(element.scale, element.scale, 1.0f);
-            element.render(renderScope, new ElementContext(elapsed, mouseX, mouseY, element));
-            renderScope.matrices.pop();
-            renderScope.setRenderLayer(null);
-        }
-    }
-
-    public static void mouseClicked(List<Element> elements, 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;
-
-                element.mouseClicked(adjustedMouseX * element.scale, adjustedMouseY * element.scale, button);
-
-                if (element.opacity > 0 && Utils.isHovering(adjustedMouseX, adjustedMouseY, element.width,
-                        element.height, element.scale)) {
-                    element.focused = true;
-                    element.click((int) (adjustedMouseX * element.scale), (int) (adjustedMouseY * element.scale));
-                }
-            }
-        }
-    }
-
-    public static void mouseScrolled(
-            List<Element> elements,
-            double mouseX,
-            double mouseY,
-            double horizontalAmount,
-            double verticalAmount) {
-        for (Element element : new ArrayList<>(elements)) {
-            if (Utils.isHovering((int) mouseX - element.x, (int) mouseY - element.y, element.width, element.height,
-                    element.scale)) {
-                element.scroll(
-                        (int) mouseX - element.x,
-                        (int) mouseY - element.y,
-                        horizontalAmount,
-                        verticalAmount);
-            }
-        }
-    }
-
-    public static void keyPressed(List<Element> elements, int keyCode, int scanCode, int modifiers) {
-        for (Element element : new ArrayList<>(elements)) {
-            if (element.focused && element.opacity > 0) {
-                element.keyPressed(keyCode, scanCode, modifiers);
-
-                char typedChar = Utils.getCharFromKey(keyCode, modifiers);
-                if (typedChar != '\0') {
-                    element.charTyped(typedChar);
-                }
-            }
-        }
-    }
-
-    public static void mouseDragged(List<Element> elements, double mouseX, double mouseY, int button, double deltaX,
-            double deltaY) {
-        for (Element element : new ArrayList<>(elements)) {
-            element.mouseDragged(mouseX - element.x, mouseY - element.y, button, deltaX, deltaY);
-        }
-    }
-
-    public static void mouseReleased(List<Element> elements, double mouseX, double mouseY, int button) {
-        for (Element element : new ArrayList<>(elements)) {
-            element.mouseReleased(mouseX - element.x, mouseY - element.y, button);
-        }
-    }
-}
@@ -1,165 +0,0 @@
-package org.saturnclient.ui2.components;
-
-import org.saturnclient.modules.Module;
-import org.saturnclient.saturnclient.SaturnClient;
-import org.saturnclient.saturnclient.config.Theme;
-import org.saturnclient.ui2.resources.Fonts;
-import org.saturnclient.ui2.resources.Textures;
-import org.saturnclient.ui2.Element;
-import org.saturnclient.ui2.ElementContext;
-import org.saturnclient.ui2.RenderScope;
-import org.saturnclient.ui2.Utils;
-import org.saturnclient.ui2.screens.ConfigEditor;
-
-import net.minecraft.client.render.RenderLayer;
-
-public class SaturnModule extends Element {
-
-    private final Module mod;
-
-    static int p = 10; // padding
-    static int s = 14; // settings icon size
-    static int expand = 5; // settings icon click area
-
-    public SaturnModule(Module mod) {
-        this.mod = mod;
-        this.width = 160;
-        this.height = 50;
-    }
-
-    @Override
-    public void render(RenderScope renderScope, ElementContext ctx) {
-        boolean hovered = ctx.isHovering();
-        boolean enabled = mod.isEnabled();
-
-        int iconX = width - s - p;
-        int iconY = height - s - p;
-
-        boolean settingsHover = ctx.isHovering(
-                getSettingsX(),
-                getSettingsY(),
-                getSettingsHitBox(),
-                getSettingsHitBox());
-
-        renderScope.setRenderLayer(RenderLayer::getGuiTextured);
-
-        // Resolve theme colors
-        int bgColor = Theme.PRIMARY.value;
-        int fgColor = hovered && !settingsHover ? Theme.ACCENT.value : Theme.PRIMARY_FG.value;
-
-        int iconBg = enabled ? Theme.ACCENT.value : Theme.PRIMARY.value;
-        int iconFg = enabled ? Theme.ACCENT_FG.value : fgColor;
-
-        int settingsColor = settingsHover
-                ? Theme.ACCENT.value
-                : Theme.withAlpha(160, fgColor);
-
-        int h = height - (p * 2);
-
-        // Main background
-        renderScope.drawRoundedRectangle(
-                0, 0,
-                width, height,
-                Theme.WIDGET_RADIUS.value,
-                bgColor);
-
-        // Icon background
-        renderScope.drawRoundedRectangle(
-                p, p,
-                h, h,
-                Theme.WIDGET_RADIUS.value,
-                iconBg);
-
-        // Icon
-        renderScope.drawTexture(
-                mod.getIconTexture(),
-                p + (p / 2),
-                p + (p / 2),
-                0, 0,
-                h - p,
-                h - p,
-                iconFg);
-
-        // Module name
-        renderScope.drawText(
-                0.6f,
-                mod.getName(),
-                p + h + 4,
-                p + 1,
-                Theme.FONT.value,
-                fgColor);
-
-        // Version (right aligned)
-        String version = mod.getVersion();
-        int versionWidth = (int) (Fonts.getWidth(version, Theme.FONT.value) * 0.35f);
-
-        renderScope.drawText(
-                0.35f,
-                version,
-                width - p - versionWidth,
-                p + 1,
-                Theme.FONT.value,
-                fgColor);
-
-        // Tags
-        int xt = p + h + 4;
-        for (String tag : mod.getTags()) {
-            int tagWidth = (int) (Fonts.getWidth(tag, Theme.FONT.value) * 0.4f);
-
-            renderScope.drawRoundedRectangle(
-                    xt,
-                    p + (h / 2),
-                    tagWidth + 6,
-                    12,
-                    5,
-                    Theme.ACCENT.value);
-
-            renderScope.drawText(
-                    0.4f,
-                    tag,
-                    xt + 2,
-                    p + (h / 2) + 3,
-                    Theme.FONT.value,
-                    Theme.ACCENT_FG.value);
-
-            xt += tagWidth + 9;
-        }
-
-        // Settings icon
-        renderScope.drawTexture(
-                Textures.SETTINGS,
-                iconX,
-                iconY,
-                0, 0,
-                s, s,
-                settingsColor);
-    }
-
-    @Override
-    public void click(int mouseX, int mouseY) {
-        boolean settingsHover = Utils.isHovering(
-                mouseX - getSettingsX(),
-                mouseY - getSettingsY(),
-                getSettingsHitBox(),
-                getSettingsHitBox(),
-                1.0f);
-
-        if (settingsHover) {
-            SaturnClient.client.setScreen(new ConfigEditor(mod.getConfig()));
-        } else {
-            mod.setEnabled(!mod.isEnabled());
-        }
-    }
-
-    private int getSettingsX() {
-        return width - s - p - expand;
-    }
-
-    private int getSettingsY() {
-        return height - s - p - expand;
-    }
-
-    private int getSettingsHitBox() {
-        return s + expand * 2;
-    }
-}
@@ -1,125 +0,0 @@
-package org.saturnclient.ui2.components;
-
-import org.saturnclient.saturnclient.SaturnClient;
-import org.saturnclient.saturnclient.config.Config;
-import org.saturnclient.saturnclient.config.Theme;
-import org.saturnclient.ui2.resources.Textures;
-import org.saturnclient.ui2.Element;
-import org.saturnclient.ui2.ElementContext;
-import org.saturnclient.ui2.RenderScope;
-import org.saturnclient.ui2.Utils;
-import org.saturnclient.ui2.screens.ConfigEditor;
-import org.saturnclient.ui2.screens.ModMenu;
-import org.saturnclient.ui2.screens.cosmetics.CloakMenu;
-import org.saturnclient.ui2.screens.store.CloakStore;
-
-import net.minecraft.client.render.RenderLayer;
-import net.minecraft.util.Identifier;
-
-public class Sidebar extends Element {
-    public static class SidebarComponent {
-        Runnable onClick;
-        boolean end;
-        Identifier sprite;
-
-        public SidebarComponent(Identifier sprite, Runnable onClick, boolean end) {
-            this.onClick = onClick;
-            this.end = end;
-            this.sprite = sprite;
-        }
-    }
-
-    Runnable onClose;
-    SidebarComponent[] components = {
-            new Sidebar.SidebarComponent(Textures.MODS_TAB, () -> {
-                SaturnClient.client.setScreen(new ModMenu());
-            }, false),
-            new Sidebar.SidebarComponent(Textures.SETTINGS, () -> {
-                SaturnClient.client.setScreen(new ConfigEditor(Config.config));
-            }, false),
-
-            new Sidebar.SidebarComponent(Textures.SHIRT, () -> {
-                SaturnClient.client.setScreen(new CloakMenu());
-            }, false),
-
-            new Sidebar.SidebarComponent(Textures.CLOSE, () -> {
-                onClose.run();
-            }, true),
-
-            new Sidebar.SidebarComponent(Textures.STORE, () -> {
-                SaturnClient.client.setScreen(new CloakStore());
-            }, true),
-    };
-    int active = 0;
-
-    public Sidebar(int active, Runnable onClose) {
-        this.width = 30;
-        this.height = 350;
-        this.active = active;
-        this.onClose = onClose;
-    }
-
-    @Override
-    public void render(RenderScope renderScope, ElementContext ctx) {
-        int topRow = 0;
-        int bottomRow = 0;
-
-        int gap = 5; // 5px gap between icons
-        int padding = 10;
-        int sp = 30 - padding + gap;
-        int s = 30 - (padding * 2);
-        int s2 = s + padding;
-
-        renderScope.setRenderLayer(RenderLayer::getGuiTextured);
-
-        renderScope.drawRoundedRectangle(0, 0, width, height, Theme.BG_RADIUS.value, Theme.BACKGROUND.value);
-
-        int i = 0;
-
-        for (SidebarComponent component : components) {
-            int y = component.end ? ((height - (sp * bottomRow)) - (s * 2)) : (padding + (sp * topRow));
-            boolean selected = ctx.isHovering(0, y - (padding / 2), s2, s2) || active == i;
-
-            renderScope.drawRoundedRectangle(padding / 2, y - (padding / 2), s + padding,
-                    s + padding, Theme.WIDGET_RADIUS.value, Theme.getBg(selected));
-
-            renderScope.drawTexture(component.sprite, padding, y, 0, 0, s, s, Theme.getFg(selected));
-
-            if (component.end) {
-                bottomRow += 1;
-            } else {
-                topRow += 1;
-            }
-
-            i++;
-        }
-    }
-
-    @Override
-    public void click(int mouseX, int mouseY) {
-        int topRow = 0;
-        int bottomRow = 0;
-
-        int gap = 5;
-        int padding = 10;
-        int sp = 30 - padding + gap;
-        int s = 30 - (padding * 2);
-        int s2 = s + padding;
-
-        for (SidebarComponent component : components) {
-            int y = component.end ? ((height - (sp * bottomRow)) - (s * 2)) : (padding + (sp * topRow));
-            boolean hovering = Utils.isHovering(mouseX - (padding / 2), mouseY - (y - (padding / 2)), s2, s2, scale);
-
-            if (hovering) {
-                component.onClick.run();
-                break;
-            }
-
-            if (component.end) {
-                bottomRow += 1;
-            } else {
-                topRow += 1;
-            }
-        }
-    }
-}
@@ -1,59 +0,0 @@
-package org.saturnclient.ui2.components.inputs;
-
-import org.saturnclient.saturnclient.config.manager.ConfigManager;
-import org.saturnclient.saturnclient.config.manager.Property;
-import org.saturnclient.ui2.resources.Fonts;
-
-public class FloatInput extends Input {
-    public Property<Float> prop;
-
-    public FloatInput(Property<Float> prop) {
-        this.width = 120;
-        this.height = Fonts.getHeight();
-        this.prop = prop;
-        this.text = String.valueOf(prop.value);
-    }
-
-    @Override
-    public void charTyped(char chr) {
-        if ((Character.isDigit(chr) || chr == '.' || (chr == '-' && cursorPosition == 0)) && text.length() < 10) {
-            if (text.equals("0") && cursorPosition == 1) {
-                text = "" + chr;
-            } else {
-                text = text.substring(0, cursorPosition) +
-                        chr +
-                        text.substring(cursorPosition);
-
-                try {
-                    prop.value = text.isEmpty() ? 0 : Float.parseFloat(text);
-                    cursorPosition++;
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-    }
-
-    @Override
-    public void backspace() {
-        try {
-            if (text.length() == 0) {
-                text = "0";
-                cursorPosition = 1;
-            }
-            prop.value = Float.parseFloat(text);
-            ConfigManager.save();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    @Override
-    public void checkReset() {
-        if (prop.isReset) {
-            this.text = String.valueOf(prop.value);
-            this.cursorPosition = 0;
-            prop.isReset = false;
-        }
-    }
-}
@@ -1,183 +0,0 @@
-package org.saturnclient.ui2.components.inputs;
-
-import java.awt.Color;
-
-import org.saturnclient.saturnclient.config.manager.Property;
-import org.saturnclient.ui2.Element;
-import org.saturnclient.ui2.ElementContext;
-import org.saturnclient.ui2.RenderScope;
-
-public class HexInput extends Element {
-    public Property<Integer> prop;
-
-    // Picker state
-    private boolean open = false;
-    private float hue = 0f;
-    private float opacity = 1f;
-    private int selectedX = 0;
-    private int selectedY = 0;
-
-    private boolean draggingOpacity = false;
-
-    // Dimensions
-    private static final int PICKER_WIDTH = 100;
-    private static final int PICKER_HEIGHT = 100;
-    private static final int SLIDER_WIDTH = 100;
-    private static final int SLIDER_HEIGHT = 10;
-    private static final int HUE_SLIDER_HEIGHT = 10;
-
-    public HexInput(Property<Integer> prop) {
-        this.prop = prop;
-        this.width = 58;
-        this.height = 20;
-        syncFromColor();
-    }
-
-    @Override
-    public void click(int mouseX, int mouseY) {
-        open = !open;
-    }
-
-    @Override
-    public void mouseClicked(double mouseX, double mouseY, int button) {
-        if (open) {
-            handlePickerClick(mouseX - width - 8, mouseY);
-        }
-    }
-
-    @Override
-    public void mouseDragged(double mouseX, double mouseY, int button, double deltaX, double deltaY) {
-        if (open) {
-            handlePickerDrag(mouseX - width - 8, mouseY);
-        }
-    }
-
-    @Override
-    public void mouseReleased(double mouseX, double mouseY, int button) {
-        draggingOpacity = false;
-    }
-
-    @Override
-    public void render(RenderScope renderScope, ElementContext ctx) {
-        // Draw the main color rectangle
-        renderScope.drawRoundedRectangle(0, 0, width, height, 6, prop.value);
-
-        if (!open)
-            return;
-
-        // Draw the picker relative to (width + 8, 0)
-        int pickerX = width + 8;
-        int pickerY = 0;
-
-        renderColorSquare(renderScope, pickerX, pickerY);
-        renderOpacitySlider(renderScope, pickerX, pickerY - SLIDER_HEIGHT - 10);
-        renderHueSlider(renderScope, pickerX, pickerY + PICKER_HEIGHT + 10);
-    }
-
-    private void renderColorSquare(RenderScope renderScope, int xStart, int yStart) {
-        for (int x = 0; x < PICKER_WIDTH; x++) {
-            for (int y = 0; y < PICKER_HEIGHT; y++) {
-                float saturation = x / (float) PICKER_WIDTH;
-                float value = 1f - y / (float) PICKER_HEIGHT;
-                int color = Color.HSBtoRGB(hue, saturation, value);
-                int alpha = (int) (opacity * 255) & 0xFF;
-                color = (alpha << 24) | (color & 0xFFFFFF);
-                renderScope.fill(xStart + x, yStart + y, xStart + x + 1, yStart + y + 1, color);
-            }
-        }
-
-        // Draw selection square
-        int selX = xStart + selectedX - 4;
-        int selY = yStart + selectedY - 4;
-        renderScope.fill(selX, selY, selX + 8, selY + 8, 0xFF000000 | prop.value);
-        renderScope.drawBorder(selX, selY, 8, 8, 0xFFFFFFFF);
-    }
-
-    private void renderOpacitySlider(RenderScope renderScope, int xStart, int yStart) {
-        for (int x = 0; x < SLIDER_WIDTH; x++) {
-            float localOpacity = x / (float) SLIDER_WIDTH;
-            int alpha = (int) (localOpacity * 255) & 0xFF;
-            int color = (alpha << 24) | (prop.value & 0xFFFFFF);
-            renderScope.fill(xStart + x, yStart, xStart + x + 1, yStart + SLIDER_HEIGHT, color);
-        }
-
-        int knobX = xStart + (int) (opacity * SLIDER_WIDTH);
-        renderScope.fill(knobX - 1, yStart - 2, knobX + 1, yStart + SLIDER_HEIGHT + 2, 0xFF000000);
-    }
-
-    private void renderHueSlider(RenderScope renderScope, int xStart, int yStart) {
-        for (int x = 0; x < SLIDER_WIDTH; x++) {
-            float localHue = x / (float) SLIDER_WIDTH;
-            int color = Color.HSBtoRGB(localHue, 1f, 1f);
-            renderScope.fill(xStart + x, yStart, xStart + x + 1, yStart + HUE_SLIDER_HEIGHT, 0xFF000000 | color);
-        }
-
-        int knobX = xStart + (int) (hue * SLIDER_WIDTH);
-        renderScope.fill(knobX - 1, yStart - 2, knobX + 1, yStart + HUE_SLIDER_HEIGHT + 2, 0xFF000000);
-    }
-
-    private void handlePickerClick(double mouseX, double mouseY) {
-        // Color square
-        if (mouseX >= 0 && mouseX < PICKER_WIDTH && mouseY >= 0 && mouseY < PICKER_HEIGHT) {
-            selectedX = (int) mouseX;
-            selectedY = (int) mouseY;
-            updateColorFromSelection();
-        }
-
-        // Opacity slider
-        int opY = -SLIDER_HEIGHT - 10;
-        if (mouseX >= 0 && mouseX < SLIDER_WIDTH && mouseY >= opY && mouseY <= opY + SLIDER_HEIGHT) {
-            updateOpacity(mouseX);
-            draggingOpacity = true;
-        }
-
-        // Hue slider
-        int hueY = PICKER_HEIGHT + 10;
-        if (mouseX >= 0 && mouseX < SLIDER_WIDTH && mouseY >= hueY && mouseY <= hueY + HUE_SLIDER_HEIGHT) {
-            updateHue(mouseX);
-        }
-    }
-
-    private void handlePickerDrag(double mouseX, double mouseY) {
-        // Opacity
-        if (draggingOpacity)
-            updateOpacity(mouseX);
-
-        // Color square
-        if (mouseX >= 0 && mouseX < PICKER_WIDTH && mouseY >= 0 && mouseY < PICKER_HEIGHT) {
-            selectedX = (int) mouseX;
-            selectedY = (int) mouseY;
-            updateColorFromSelection();
-        }
-    }
-
-    private void updateColorFromSelection() {
-        float saturation = selectedX / (float) PICKER_WIDTH;
-        float value = 1f - selectedY / (float) PICKER_HEIGHT;
-        int color = Color.HSBtoRGB(hue, saturation, value);
-        int alpha = (int) (opacity * 255) & 0xFF;
-        prop.value = (alpha << 24) | (color & 0xFFFFFF);
-    }
-
-    private void updateHue(double mouseX) {
-        hue = (float) Math.max(0, Math.min(1, mouseX / SLIDER_WIDTH));
-        updateColorFromSelection();
-    }
-
-    private void updateOpacity(double mouseX) {
-        opacity = (float) Math.max(0, Math.min(1, mouseX / SLIDER_WIDTH));
-        updateColorFromSelection();
-    }
-
-    private void syncFromColor() {
-        int rgb = prop.value & 0xFFFFFF;
-        float[] hsb = Color.RGBtoHSB((rgb >> 16) & 0xFF, (rgb >> 8) & 0xFF, rgb & 0xFF, null);
-        hue = hsb[0];
-        selectedX = (int) (hsb[1] * PICKER_WIDTH);
-        selectedY = (int) ((1f - hsb[2]) * PICKER_HEIGHT);
-        int alpha = (prop.value >> 24) & 0xFF;
-        if (alpha == 0)
-            alpha = 255;
-        opacity = alpha / 255f;
-    }
-}
@@ -1,113 +0,0 @@
-package org.saturnclient.ui2.components.inputs;
-
-import org.lwjgl.glfw.GLFW;
-import org.saturnclient.saturnclient.SaturnClient;
-import org.saturnclient.saturnclient.config.Theme;
-import org.saturnclient.ui2.Element;
-import org.saturnclient.ui2.ElementContext;
-import org.saturnclient.ui2.RenderScope;
-import org.saturnclient.ui2.resources.Fonts;
-
-public abstract class Input extends Element {
-    String text = "";
-    public int cursorPosition = 0;
-
-    public abstract void checkReset();
-
-    public abstract void backspace();
-
-    public boolean validateBackspace() {
-        return true;
-    }
-
-    @Override
-    public void keyPressed(int keyCode, int scanCode, int modifiers) {
-        if (keyCode == GLFW.GLFW_KEY_BACKSPACE) {
-            if (cursorPosition > 0 && validateBackspace()) {
-                text = text.substring(0, cursorPosition - 1) +
-                        text.substring(cursorPosition);
-                cursorPosition--;
-                backspace();
-            }
-        } else if (keyCode == GLFW.GLFW_KEY_LEFT) {
-            if (cursorPosition > 0) {
-                cursorPosition--;
-            }
-        } else if (keyCode == GLFW.GLFW_KEY_RIGHT) {
-            if (cursorPosition < text.length()) {
-                cursorPosition++;
-            }
-        }
-    }
-
-    @Override
-    public void click(int mouseX, int mouseY) {
-        int scrollOffset = getScrollOffset();
-        String visibleText = text.substring(scrollOffset);
-
-        int newCursorPos = scrollOffset;
-        float textWidth = 0;
-
-        for (int i = 0; i < visibleText.length(); i++) {
-            textWidth = SaturnClient.client.textRenderer.getWidth(visibleText.substring(0, i + 1)) * 0.6f;
-
-            if (textWidth > mouseX) {
-                break;
-            }
-
-            newCursorPos++;
-        }
-
-        cursorPosition = newCursorPos;
-    }
-
-    @Override
-    public void render(RenderScope renderScope, ElementContext ctx) {
-        checkReset();
-
-        renderScope.drawRoundedRectangle(0, 0, width, height, 10, 0xFF000000);
-
-        int scrollOffset = getScrollOffset();
-        String visibleText = getVisibleText(scrollOffset);
-        int textColor = focused ? 0xFFFFFF : 0xAAAAAA;
-        renderScope.drawText(0.6f, visibleText, 4, 4, Theme.FONT.value, textColor);
-
-        if (focused) {
-            int cursorX = 4 +
-                    (int) (Fonts.getWidth(visibleText.substring(0, cursorPosition - scrollOffset), Theme.FONT.value)
-                            * 0.6f);
-
-            renderScope.drawRect(cursorX, 2, 1, height - 4, 0xFFFFFFFF);
-        }
-    }
-
-    protected int getScrollOffset() {
-        if (text.isEmpty()) {
-            return 0;
-        }
-
-        int offset = 0;
-        int maxWidth = width - 4; // Available width for text
-        while (offset < cursorPosition) { // Ensure cursor remains visible
-            String visibleText = text.substring(offset, cursorPosition);
-            if (Fonts.getWidth(visibleText, Theme.FONT.value) > maxWidth) {
-                offset++;
-            } else {
-                break;
-            }
-        }
-        return offset;
-    }
-
-    protected String getVisibleText(int scrollOffset) {
-        String visibleText = text.substring(scrollOffset);
-
-        // Ensure text does not overflow past the available width
-        for (int i = 1; i <= visibleText.length(); i++) {
-            if (Fonts.getWidth(visibleText.substring(0, i), Theme.FONT.value) > width - 4) {
-                return visibleText.substring(0, i - 1); // Trim overflow
-            }
-        }
-        return visibleText;
-    }
-}
@@ -1,59 +0,0 @@
-package org.saturnclient.ui2.components.inputs;
-
-import org.saturnclient.saturnclient.config.manager.ConfigManager;
-import org.saturnclient.saturnclient.config.manager.Property;
-import org.saturnclient.ui2.resources.Fonts;
-
-public class IntInput extends Input {
-    public Property<Integer> prop;
-
-    public IntInput(Property<Integer> prop) {
-        this.width = 120;
-        this.height = Fonts.getHeight();
-        this.prop = prop;
-        this.text = String.valueOf(prop.value);
-    }
-
-    @Override
-    public void charTyped(char chr) {
-        if ((Character.isDigit(chr) || chr == '.' || (chr == '-' && cursorPosition == 0)) && text.length() < 10) {
-            if (text.equals("0") && cursorPosition == 1) {
-                text = "" + chr;
-            } else {
-                text = text.substring(0, cursorPosition) +
-                        chr +
-                        text.substring(cursorPosition);
-
-                try {
-                    prop.value = text.isEmpty() ? 0 : Integer.parseInt(text);
-                    cursorPosition++;
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-    }
-
-    @Override
-    public void backspace() {
-        try {
-            if (text.length() == 0) {
-                text = "0";
-                cursorPosition = 1;
-            }
-            prop.value = Integer.parseInt(text);
-            ConfigManager.save();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    @Override
-    public void checkReset() {
-        if (prop.isReset) {
-            this.text = String.valueOf(prop.value);
-            this.cursorPosition = 0;
-            prop.isReset = false;
-        }
-    }
-}
@@ -1,41 +0,0 @@
-package org.saturnclient.ui2.components.inputs;
-
-import org.lwjgl.glfw.GLFW;
-import org.saturnclient.saturnclient.config.Theme;
-import org.saturnclient.saturnclient.config.manager.Property;
-import org.saturnclient.ui2.Element;
-import org.saturnclient.ui2.ElementContext;
-import org.saturnclient.ui2.RenderScope;
-import org.saturnclient.ui2.resources.Fonts;
-
-public class KeybindingSelector extends Element {
-    Property<Integer> prop;
-
-    public KeybindingSelector(Property<Integer> prop) {
-        this.prop = prop;
-        this.width = 120;
-        this.height = Fonts.getHeight();
-    }
-
-    @Override
-    public void render(RenderScope renderScope, ElementContext ctx) {
-        int textColor = focused ? 0xFFFFFF : 0xAAAAAA;
-        renderScope.drawRoundedRectangle(0, 0, width, height, 10, 0xFF000000);
-        String name = GLFW.glfwGetKeyName(prop.value, GLFW.glfwGetKeyScancode(prop.value));
-
-        renderScope.drawText(0.6f,
-                prop.value == -1 ? "<NONE>"
-                        : name != null ? name.toUpperCase() : "<Invalid-Key>",
-                4, 4, Theme.FONT.value, textColor);
-    }
-
-    @Override
-    public void keyPressed(int keyCode, int scanCode, int modifiers) {
-        if (keyCode == GLFW.GLFW_KEY_BACKSPACE) {
-            prop.value = -1;
-        } else {
-            prop.value = keyCode;
-        }
-        focused = false;
-    }
-}
@@ -1,43 +0,0 @@
-package org.saturnclient.ui2.components.inputs;
-
-import org.saturnclient.saturnclient.config.Theme;
-import org.saturnclient.saturnclient.config.manager.Property;
-import org.saturnclient.ui2.Element;
-import org.saturnclient.ui2.ElementContext;
-import org.saturnclient.ui2.RenderScope;
-import org.saturnclient.ui2.Utils;
-import org.saturnclient.ui2.resources.Fonts;
-import net.minecraft.client.render.RenderLayer;
-
-public class Select extends Element {
-    private Property<Integer> prop;
-
-    public Select(Property<Integer> prop) {
-        this.prop = prop;
-        this.width = 150;
-        this.height = 15;
-    }
-
-    @Override
-    public void render(RenderScope renderScope, ElementContext ctx) {
-        renderScope.setRenderLayer(RenderLayer::getGuiTextured);
-
-        renderScope.drawText(0.8f, "<", 0, 0, Theme.FONT.value, Theme.FOREGROUND.value);
-
-        String text = prop.getSelection();
-
-        renderScope.drawText(0.6f, text, (int) (width - ((float) Fonts.getWidth(text, Theme.FONT.value) * 0.6f)) / 2, 1,
-                Theme.FONT.value, Theme.FOREGROUND.value);
-
-        renderScope.drawText(0.8f, ">", width - 10, 0, Theme.FONT.value, Theme.FOREGROUND.value);
-    }
-
-    @Override
-    public void click(int mouseX, int mouseY) {
-        if (Utils.isHovering(mouseX - (width - 10), mouseY, 10, height, 1.0f)) {
-            prop.next();
-        } else if (Utils.isHovering(mouseX, mouseY, 10, height, 1.0f)) {
-            prop.prev();
-        }
-    }
-}
@@ -1,30 +0,0 @@
-package org.saturnclient.ui2.components.inputs;
-
-import org.saturnclient.saturnclient.config.Theme;
-import org.saturnclient.saturnclient.config.manager.Property;
-import org.saturnclient.ui2.Element;
-import org.saturnclient.ui2.ElementContext;
-import org.saturnclient.ui2.RenderScope;
-
-public class Toggle extends Element {
-    private Property<Boolean> prop;
-
-    public Toggle(Property<Boolean> prop) {
-        this.prop = prop;
-        this.width = 60;
-        this.height = 30;
-    }
-
-    @Override
-    public void render(RenderScope renderScope, ElementContext ctx) {
-        renderScope.drawRoundedRectangle(0, 0, width, height, height,
-                Theme.withAlpha(0.5f, prop.value ? Theme.ACCENT.value : Theme.PRIMARY.value));
-        renderScope.drawRoundedRectangle(prop.value ? 30 : 0, 0, 30, 30, 30,
-                prop.value ? Theme.ACCENT.value : Theme.PRIMARY.value);
-    }
-
-    @Override
-    public void click(int mouseX, int mouseY) {
-        prop.value = !prop.value;
-    }
-}
@@ -1,66 +0,0 @@
-package org.saturnclient.ui2.elements;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.saturnclient.saturnclient.config.AnimationConfig;
-import org.saturnclient.saturnclient.config.Config;
-import org.saturnclient.ui2.Element;
-import org.saturnclient.ui2.ElementContext;
-import org.saturnclient.ui2.RenderScope;
-import org.saturnclient.ui2.components.ElementRenderer;
-
-public class AnimationStagger extends Element {
-    protected List<Element> children = new ArrayList<>();
-    public int delay;
-
-    public AnimationStagger(int delay) {
-        this.delay = delay;
-    }
-
-    public AnimationStagger(AnimationConfig config) {
-        this.delay = config.stagger.value;
-    }
-
-    public void draw(Element element) {
-        if (!Config.stagger.value) {
-            element.animation = null;
-        }
-
-        if (element.animation != null) {
-            element.animation.delay = delay * children.size();
-        }
-
-        ElementRenderer.draw(children, element);
-
-        this.height = Math.max(this.height, element.y + element.height);
-        this.width = Math.max(this.width, element.x + element.width);
-    }
-
-    @Override
-    public void render(RenderScope renderScope, ElementContext ctx) {
-        ElementRenderer.render(children, ctx.elapsed, renderScope,
-                ctx.mouseX,
-                ctx.mouseY);
-    }
-
-    @Override
-    public void mouseClicked(double mouseX, double mouseY, int button) {
-        ElementRenderer.mouseClicked(children, mouseX, mouseY, button);
-    }
-
-    @Override
-    public void keyPressed(int keyCode, int scanCode, int modifiers) {
-        ElementRenderer.keyPressed(children, keyCode, scanCode, modifiers);
-    }
-
-    @Override
-    public void mouseDragged(double mouseX, double mouseY, int button, double deltaX, double deltaY) {
-        ElementRenderer.mouseDragged(children, mouseX, mouseY, button, deltaX, deltaY);
-    }
-
-    @Override
-    public void mouseReleased(double mouseX, double mouseY, int button) {
-        ElementRenderer.mouseReleased(children, mouseX, mouseY, button);
-    }
-}
@@ -1,35 +0,0 @@
-package org.saturnclient.ui2.elements;
-
-import org.saturnclient.saturnclient.config.Theme;
-import org.saturnclient.ui2.Element;
-import org.saturnclient.ui2.ElementContext;
-import org.saturnclient.ui2.RenderScope;
-import org.saturnclient.ui2.resources.Fonts;
-
-public class Button extends Element {
-    private String text;
-    private Runnable onClick;
-
-    public Button(String text, Runnable onClick) {
-        this.text = text;
-        this.onClick = onClick;
-        this.dimensions(Fonts.getWidth(text, Theme.FONT.value) + 50, 38);
-    }
-
-    @Override
-    public void render(RenderScope renderScope, ElementContext ctx) {
-        renderScope.drawRoundedRectangle(0, 0, width, height, Theme.WIDGET_RADIUS.value,
-                ctx.isHovering() ? Theme.ACCENT.value : Theme.PRIMARY.value);
-
-        renderScope.drawText(text, Fonts.centerX(width, text, Theme.FONT.value), Fonts.centerY(height),
-                Theme.FONT.value,
-                ctx.isHovering() ? Theme.ACCENT_FG.value : Theme.PRIMARY_FG.value);
-    }
-
-    @Override
-    public void click(int mouseX, int mouseY) {
-        if (onClick != null) {
-            onClick.run();
-        }
-    }
-}
@@ -1,33 +0,0 @@
-package org.saturnclient.ui2.elements;
-
-import org.saturnclient.saturnclient.config.Theme;
-import org.saturnclient.ui2.Element;
-import org.saturnclient.ui2.ElementContext;
-import org.saturnclient.ui2.RenderScope;
-
-import net.minecraft.client.render.RenderLayer;
-import net.minecraft.util.Identifier;
-
-public class ClickableTexture extends Element {
-    Identifier sprite;
-    private Runnable onClick;
-
-    public ClickableTexture(Identifier sprite, Runnable onClick) {
-        this.sprite = sprite;
-        this.onClick = onClick;
-    }
-
-    @Override
-    public void render(RenderScope renderScope, ElementContext ctx) {
-        renderScope.setRenderLayer(RenderLayer::getGuiTextured);
-        renderScope.drawTexture(sprite, 0, 0, 0, 0, width, height,
-                ctx.isHovering() ? Theme.ACCENT.value : Theme.PRIMARY.value);
-    }
-
-    @Override
-    public void click(int mouseX, int mouseY) {
-        if (onClick != null) {
-            onClick.run();
-        }
-    }
-}
@@ -1,32 +0,0 @@
-package org.saturnclient.ui2.elements;
-
-import org.saturnclient.ui2.Element;
-import org.saturnclient.ui2.ElementContext;
-import org.saturnclient.ui2.RenderScope;
-import org.saturnclient.ui2.resources.SvgTexture;
-
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.util.Identifier;
-
-public class ImageTexture extends Element {
-    Identifier sprite;
-
-    public ImageTexture(Identifier sprite) {
-        this.sprite = sprite;
-    }
-
-    @Override
-    public void render(RenderScope renderScope, ElementContext ctx) {
-        if (sprite.toString().endsWith(".svg")) {
-            MinecraftClient client = MinecraftClient.getInstance();
-
-            // Get the actual window pixel dimensions for the image
-            int renderWidth = (int) (width * client.getWindow().getFramebufferWidth() / client.getWindow().getWidth());
-            int renderHeight = (int) (height * client.getWindow().getFramebufferHeight() / client.getWindow().getHeight());
-
-            sprite = SvgTexture.getSvg(client, sprite, renderWidth * 2, renderHeight * 2);
-        }
-
-        renderScope.drawTexture(sprite, 0, 0, 0, 0, width, height);
-    }
-}
@@ -1,58 +0,0 @@
-package org.saturnclient.ui2.elements;
-
-import org.saturnclient.saturnclient.config.Theme;
-import org.saturnclient.saturnclient.config.manager.Property;
-import org.saturnclient.ui2.Element;
-import org.saturnclient.ui2.ElementContext;
-import org.saturnclient.ui2.RenderScope;
-import org.saturnclient.ui2.anim.SlideX;
-import org.saturnclient.ui2.resources.Fonts;
-import org.saturnclient.ui2.resources.Textures;
-
-public class Notification extends Element {
-    private static Property<Integer> error = Property.color(0xFFbf212f);
-    private static Property<Integer> info = Property.color(0xFF264b96);
-    private static Property<Integer> success = Property.color(0xFF27b376);
-
-    public static enum NotificationKind {
-        Error,
-        Info,
-        Success,
-    }
-
-    NotificationKind kind;
-    String text;
-    String title;
-
-    public Notification(int width, int height, NotificationKind kind, String title, String text) {
-        this.kind = kind;
-        this.text = text;
-        this.title = title;
-        this.width = (int) Math.max(Fonts.getWidth(text, 1) * 0.6f, Fonts.getWidth(title, 1)) + 20;
-        this.height = 50;
-        this.x = width - this.width - 15;
-        this.y = height - this.height - 15;
-        this.animation = new SlideX(700, -width);
-        this.duration = 3000;
-    }
-
-    @Override
-    public void render(RenderScope renderScope, ElementContext ctx) {
-        renderScope.drawRoundedRectangle(0, 0, width, height, 10, Theme.PRIMARY.value);
-        switch (kind) {
-            case Error:
-                renderScope.drawTexture(Textures.CIRCLE_X, 9, 9, 0, 0, 15, 15, error.value);
-                break;
-
-            case Info:
-                renderScope.drawTexture(Textures.INFO, 9, 9, 0, 0, 15, 15, info.value);
-                break;
-
-            case Success:
-                renderScope.drawTexture(Textures.CHECK, 9, 9, 0, 0, 15, 15, success.value);
-                break;
-        }
-        renderScope.drawText(0.7f, title, 32, 10, 1, -1);
-        renderScope.drawText(0.5f, text, 32, 28, 1, -1);
-    }
-}
@@ -1,130 +0,0 @@
-package org.saturnclient.ui2.elements;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.saturnclient.saturnclient.config.Theme;
-import org.saturnclient.saturnclient.config.manager.Property;
-import org.saturnclient.ui2.Element;
-import org.saturnclient.ui2.ElementContext;
-import org.saturnclient.ui2.RenderScope;
-import org.saturnclient.ui2.components.ElementRenderer;
-
-public class Scroll extends Element {
-    private static Property<Integer> scrollBarRadius = Property.integer(10);
-    private static Property<Integer> scrollBarWidth = Property.integer(5);
-    private static Property<Integer> scrollBarPadding = Property.integer(5);
-
-    int padding = 0;
-
-    protected List<Element> children = new ArrayList<>();
-    int scroll = 0;
-    int maxScroll = 0;
-
-    public Scroll(int padding) {
-        this.padding = padding;
-    }
-
-    public void draw(Element element) {
-        ElementRenderer.draw(children, element);
-    }
-
-    @Override
-    public void render(RenderScope renderScope, ElementContext ctx) {
-        calculateMaxScroll();
-
-        renderScope.drawRoundedRectangle(0, 0, width, height,
-                Theme.BG_RADIUS.value, Theme.BACKGROUND.value);
-
-        renderScope.enableScissor(padding, padding, width - padding, height - padding);
-        renderScope.matrices.push();
-        renderScope.matrices.translate(padding, -scroll + padding, 0);
-
-        ElementRenderer.render(children, ctx.elapsed, renderScope,
-                ctx.mouseX - padding,
-                ctx.mouseY - padding + scroll);
-
-        renderScope.matrices.pop();
-        renderScope.disableScissor();
-
-        if (maxScroll > 0) {
-            renderScope.drawRoundedRectangle(
-                    width - scrollBarWidth.value - scrollBarPadding.value,
-                    calculateScrollBarY(),
-                    scrollBarWidth.value,
-                    calculateScrollBarHeight(),
-                    scrollBarRadius.value,
-                    Theme.SCROLL.value);
-        }
-    }
-
-    @Override
-    public void scroll(int mouseX, int mouseY, double horizontalAmount, double verticalAmount) {
-        scroll -= verticalAmount;
-        if (scroll < 0) {
-            scroll = 0;
-        } else if (scroll > maxScroll) {
-            scroll = maxScroll;
-        }
-    }
-
-    @Override
-    public Element dimensions(int width, int height) {
-        super.dimensions(width, height);
-    
-        maxScroll = 0;
-        for (Element element : children) {
-            maxScroll = Math.max(maxScroll, (element.y + element.height + padding) - (height - padding * 2));
-        }
-        
-        return this;
-    }
-
-    int calculateScrollBarHeight() {
-        if (maxScroll <= 0)
-            return height - (scrollBarPadding.value * 2);
-        return Math.max(20, (height * height) / (height + maxScroll + 10)) - (scrollBarPadding.value * 2);
-    }
-
-    int calculateScrollBarY() {
-        int scrollBarHeight = calculateScrollBarHeight();
-        if (maxScroll <= 0) return scrollBarPadding.value;
-        int y = (scroll * (height - scrollBarHeight - scrollBarPadding.value * 2)) / maxScroll + scrollBarPadding.value;
-        return Math.min(y, height - scrollBarHeight - scrollBarPadding.value);
-    }
-
-    private void calculateMaxScroll() {
-        maxScroll = 0;
-
-        for (Element element : children) {
-            int bottom = element.y + element.height;
-            maxScroll = Math.max(maxScroll, bottom - height + padding);
-        }
-
-        if (maxScroll > 0) {
-            maxScroll = maxScroll + 10;
-        } else {
-            maxScroll = 0;
-        }
-    }
-
-    @Override
-    public void keyPressed(int keyCode, int scanCode, int modifiers) {
-        ElementRenderer.keyPressed(children, keyCode, scanCode, modifiers);
-    }
-
-    @Override
-    public void mouseClicked(double mouseX, double mouseY, int button) {
-        ElementRenderer.mouseClicked(children, mouseX - padding, mouseY - padding + scroll, button);
-    }
-
-    @Override
-    public void mouseDragged(double mouseX, double mouseY, int button, double deltaX, double deltaY) {
-        ElementRenderer.mouseDragged(children, mouseX - padding, mouseY - padding + scroll, button, deltaX, deltaY);
-    }
-
-    @Override
-    public void mouseReleased(double mouseX, double mouseY, int button) {
-        ElementRenderer.mouseReleased(children, mouseX - padding, mouseY - padding + scroll, button);
-    }
-}
@@ -1,64 +0,0 @@
-package org.saturnclient.ui2.elements;
-
-import org.saturnclient.saturnclient.config.Theme;
-import org.saturnclient.ui2.Element;
-import org.saturnclient.ui2.ElementContext;
-import org.saturnclient.ui2.RenderScope;
-import org.saturnclient.ui2.Utils;
-
-import net.minecraft.util.Identifier;
-
-public class TabMenu extends Element {
-    public static class TabMenuComponent {
-        Runnable onClick;
-        Identifier sprite;
-
-        public TabMenuComponent(Identifier sprite, Runnable onClick) {
-            this.onClick = onClick;
-            this.sprite = sprite;
-        }
-    }
-
-    TabMenuComponent[] components;
-    public int selectedScreen = 0;
-
-    public TabMenu(int active, TabMenuComponent... components) {
-        this.components = components;
-        width = 25 * components.length + 6;
-        height = 30;
-        this.selectedScreen = active;
-    }
-
-    @Override
-    public void render(RenderScope renderScope, ElementContext ctx) {
-        renderScope.drawRoundedRectangle(0, 0, width, height, Theme.WIDGET_RADIUS.value, Theme.PRIMARY.value);
-
-        int col = 0;
-        for (TabMenuComponent component : components) {
-            int x = 25 * col + 5;
-
-            boolean hovering = ctx.isHovering(x, 5, 20, 20) || selectedScreen == col;
-
-            if (hovering) {
-                renderScope.drawRoundedRectangle(x, 5, 20, 20, Theme.WIDGET_RADIUS.value, Theme.ACCENT.value);
-            }
-
-            renderScope.drawTexture(component.sprite, x + 5, 10, 0, 0, 10, 10,
-                    hovering ? Theme.ACCENT_FG.value : Theme.PRIMARY_FG.value);
-
-            col++;
-        }
-    }
-
-    @Override
-    public void click(int mouseX, int mouseY) {
-        int col = 0;
-        for (TabMenuComponent component : components) {
-            int x = 25 * col + 5;
-            if (Utils.isHovering(mouseX - x, mouseY - 5, 20, 20, 1.0f)) {
-                component.onClick.run();
-            }
-            col++;
-        }
-    }
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Kr4ight	b86a2775a1	Merge pull request #65 from saturnclientmc/improved-build-configs Improved build configs	2026-03-28 21:13:48 +01:00
selimaj-dev	2d16da9dd5	Shared versioning	2026-03-28 21:11:08 +01:00
selimaj-dev	9c0f9a1434	Expanded heap size just in case	2026-03-28 21:00:53 +01:00
selimaj-dev	d58b0c90fd	Small improvements with build	2026-03-28 20:56:40 +01:00
selimaj-dev	bf4cec4ea5	Build all	2026-03-28 20:54:05 +01:00
Kr4ight	2d75ee4ee8	Merge pull request #62 from saturnclientmc/zoom-and-freelok-animation Zoom and freelok animations	2026-03-26 23:57:35 +01:00
selimaj-dev	37569d069d	Working freelook	2026-03-26 17:59:33 +01:00
selimaj-dev	f44647ba52	Working freelook	2026-03-26 16:56:44 +01:00
selimaj-dev	518c1d9d57	Merge pull request #60 from saturnclientmc/refactor-renderscope Refactor RenderScope and improved support with 1.21.6	2026-03-26 02:28:33 +01:00
selimaj-dev	7caff20255	Fixed EntityDrawer	2026-03-26 02:27:04 +01:00
selimaj-dev	69698c16f7	Fixed EntityDrawer	2026-03-26 02:16:57 +01:00
selimaj-dev	3705afb593	Saturn Screen 1.21.6 small patches	2026-03-25 23:36:00 +01:00
selimaj-dev	ebe7200d65	Improved rounded rectangles #59	2026-03-25 23:26:33 +01:00
selimaj-dev	b457f070b9	Improved rounded rectangles #59	2026-03-25 22:18:26 +01:00
selimaj-dev	4f44274111	Fixed rounded corners on RenderScope 1.21.6 #59	2026-03-25 21:46:34 +01:00
selimaj-dev	51c6108e35	Fixed soem stuff on RenderScope 1.21.6 #59	2026-03-25 21:20:14 +01:00
selimaj-dev	3a71cd5b02	Fixed MatrixStack leak on RenderScope 1.21.6 #59	2026-03-25 21:04:53 +01:00
selimaj-dev	9424e2ec71	Refactored RenderScope 1.21.6 #59	2026-03-25 19:24:02 +01:00
selimaj-dev	d50d19b609	Refactored RenderScope and MatrixStack for 1.21.5 #59	2026-03-25 19:09:36 +01:00
selimaj-dev	bf280d945e	Improved #59	2026-03-25 19:00:21 +01:00
selimaj-dev	0b469e6a5a	Improved RenderScope for 1.21.4 #59	2026-03-25 18:23:31 +01:00
Kr4ight	57da2f1181	Merge pull request #58 from saturnclientmc/buggy-1.21.6 Buggy 1.21.6	2026-03-25 16:11:48 +01:00
selimaj-dev	c771764251	Fixed MatrixStackRef	2026-03-25 16:10:41 +01:00
selimaj-dev	a004585cba	Matrix3x2fStackRef	2026-03-25 15:51:14 +01:00
selimaj-dev	92a1f70eb1	Fixed DrawContextAccessor	2026-03-25 15:43:18 +01:00
selimaj-dev	1d0c582729	SaturnScreen temp fix	2026-03-25 15:40:56 +01:00
selimaj-dev	0f947b5115	Rendering for 1.21.6	2026-03-25 15:39:41 +01:00
selimaj-dev	8852856d45	Status effect mixin and ShaderUtils for 1.21.6	2026-03-25 14:49:56 +01:00
selimaj-dev	f7a882b0ab	Remvoed all player animator stuff	2026-03-25 14:35:37 +01:00
selimaj-dev	35b127def2	Copy pasted 1.21.6	2026-03-25 14:34:22 +01:00
selimaj-dev	13a5347412	Fix mixins #57	2026-03-24 14:36:24 +01:00
Kr4ight	ca235486bb	Merge pull request #56 from saturnclientmc/refactor-mod-system Refactor mod system #55	2026-03-24 13:10:43 +01:00
selimaj-dev	89f29d5d0e	Refactor feature / module system for 1.21.5 #55	2026-03-24 13:09:32 +01:00
selimaj-dev	99929c7d64	Refactor feature / module system for 1.21.5 #55	2026-03-24 13:06:50 +01:00
selimaj-dev	8836cc851b	Refactor feature / module system for 1.21.4 #55	2026-03-24 13:01:38 +01:00
selimaj-dev	7849e2e04c	Refactored feature / module system #55	2026-03-24 12:05:02 +01:00
Kr4ight	0bf5bf030f	Merge pull request #54 from saturnclientmc/mod-preview Mod Preview #52	2026-03-24 11:30:52 +01:00
selimaj-dev	21cc6936f7	Mod Preview #52	2026-03-24 11:27:13 +01:00
selimaj-dev	5f225953c2	Merge pull request #53 from saturnclientmc/refactor-gif Refactored gif system	2026-03-23 21:48:54 +01:00
selimaj-dev	9fbeac628c	Refactoed 1.21.5 to work with new gif api	2026-03-23 21:05:22 +01:00
selimaj-dev	df102fff84	Gif loading	2026-03-23 20:41:58 +01:00
selimaj-dev	d3cd883782	Gif loading	2026-03-23 20:33:10 +01:00
selimaj-dev	7ce54c8561	Fixed 1.21.5 end cosmetics shader	2026-03-23 19:31:11 +01:00
selimaj-dev	faa18c99ab	Fixed hat rotation in 1.21.5	2026-03-23 14:33:26 +01:00
Rudi	a73b139256	Merge pull request #50 from RudideC/master update common	2026-03-21 23:23:48 +01:00
RudideC	02066bf380	Merge branch 'master' of https://github.com/RudideC/saturnclient	2026-03-21 23:23:15 +01:00
RudideC	925cd6d062	Update common	2026-03-21 23:19:41 +01:00
selimaj-dev	f45aa843e5	Merge pull request #48 from saturnclientmc/improved-cloak-physics Improved cloak physics	2026-03-21 22:38:15 +01:00
selimaj-dev	9f4b2f015d	Common	2026-03-21 22:36:53 +01:00
selimaj-dev	16b3936649	Improved expressiveness in cloak physics	2026-03-21 22:08:08 +01:00
RudideC	8b8104412c	Update common	2026-03-21 21:51:59 +01:00
selimaj-dev	2bbabff979	Fixed the same thing for 1.21.5	2026-03-21 20:46:10 +01:00
selimaj-dev	39dc0963ce	Fixed saturn player tracking	2026-03-21 20:40:29 +01:00
Rudi	c37efa53b3	Merge pull request #47 from RudideC/master fixed compilation	2026-03-21 17:59:56 +01:00
RudideC	fe629b8bf5	finally works svg lib wasnt included	2026-03-21 17:59:22 +01:00
RudideC	a8e15b98dd	now it runs at least	2026-03-21 17:46:17 +01:00
RudideC	1a71f055ff	1.21.5 build changes same as 1.21.4	2026-03-21 17:36:53 +01:00
RudideC	fa68fcad50	1.21.4 build changes not quite working, close though	2026-03-21 17:36:41 +01:00
Rudi	66e58b31c2	Merge pull request #46 from RudideC/master 1.21.5 support [NOT PRODUCTION READY]	2026-03-21 17:08:13 +01:00
RudideC	938429dca7	idk	2026-03-21 17:06:50 +01:00
RudideC	b9eb77f9e1	different import	2026-03-21 17:06:44 +01:00
RudideC	a9b331044f	prev vs last	2026-03-21 17:06:36 +01:00
RudideC	db22e99b0f	armor change	2026-03-21 17:06:29 +01:00
RudideC	290da45cde	mixin change	2026-03-21 17:06:23 +01:00
RudideC	56e8cde0f9	major change here, hope nothing bad happens	2026-03-21 17:06:17 +01:00
RudideC	6df7aacb56	1.21.5	2026-03-21 17:05:20 +01:00
RudideC	c2f19ef3cf	updated for 1.21.5	2026-03-21 17:05:09 +01:00
RudideC	6ac91f10ab	player anim for 1.21.5	2026-03-21 17:04:58 +01:00
RudideC	52930df0a9	copy pasted 1.21.4 haha	2026-03-21 16:04:22 +01:00
Rudi	ac9f765cb6	Change submodule URL to use HTTPS this works	2026-03-21 15:42:52 +01:00
Kr4ight	4962e0e4c3	Merge pull request #44 from saturnclientmc/cosmetics Cosmetics	2026-03-21 14:47:33 +01:00
selimaj-dev	020636d293	Cosmetic update	2026-03-21 14:37:11 +01:00
selimaj-dev	0f172ccbab	Bucket hat	2026-03-21 13:12:26 +01:00
selimaj-dev	635219a556	bucket hat	2026-03-21 13:12:03 +01:00
selimaj-dev	5e53a2e188	End shader	2026-03-21 10:38:14 +01:00
selimaj-dev	39b4b616b0	Albania mark	2026-03-21 01:54:24 +01:00
selimaj-dev	0471a007ce	Improved cloak physics	2026-03-21 00:38:41 +01:00
selimaj-dev	b60f218e29	Cloak loading	2026-03-20 23:06:07 +01:00
Kr4ight	67fb65dcf5	Merge pull request #42 from saturnclientmc/feature-implementations Implemented features and refactored Property	2026-03-20 22:02:39 +01:00
selimaj-dev	a6f3fd79b3	Nofog	2026-03-20 21:55:38 +01:00
selimaj-dev	ab60119266	Refactored effect	2026-03-20 21:36:18 +01:00
selimaj-dev	6a40d6b6f1	Fixed Dummy for status effects	2026-03-20 21:17:34 +01:00
selimaj-dev	10a4868d8f	Fixed config stuff	2026-03-20 21:07:50 +01:00
selimaj-dev	01da8b8198	Improved module implementation structure	2026-03-20 19:42:41 +01:00
selimaj-dev	787ffd7bcb	Fixed freelook	2026-03-20 19:22:59 +01:00
selimaj-dev	462b6fc462	Merge pull request #39 from saturnclientmc/1.21-1.21.1-minor-support 1.21 1.21.1 minor support	2026-03-09 17:50:17 -07:00
selimaj-dev	97603f84ec	Fixed	2026-03-10 01:48:31 +01:00
selimaj-dev	fba84ebb9a	Fixed	2026-03-10 01:48:12 +01:00
selimaj-dev	edfe1d59c1	1.21.1 (crashing)	2026-03-09 12:27:13 +01:00
selimaj-dev	7b95f083e7	Fixed CloakFeatureRenderer	2026-03-09 12:23:14 +01:00
selimaj-dev	33c8945d42	Fixed CloakFeatureRenderer	2026-03-09 12:07:59 +01:00
selimaj-dev	4e029570d0	Fixed not booting and build.gradle	2026-03-09 11:44:27 +01:00
selimaj-dev	e5a418d7b2	Fixed saturn mixins	2026-03-09 11:32:43 +01:00
selimaj-dev	b38e247bff	Fixed KeyInputHandler	2026-03-09 11:26:27 +01:00
selimaj-dev	59248ee520	Temporarily fixed SaturnScreenFabric	2026-03-09 11:25:52 +01:00
selimaj-dev	1ec0b90f9b	RenderScopeImpl fix	2026-03-09 11:25:11 +01:00
selimaj-dev	4dca80b6b1	Temporarily fixed mixins	2026-03-09 11:17:56 +01:00
selimaj-dev	2317d981b1	Temporarily fixed cosmetics	2026-03-09 11:13:35 +01:00
selimaj-dev	dbd096dfbf	Added 1.21 (copied from 1.21.4)	2026-03-09 10:45:57 +01:00
selimaj-dev	edef4f4893	fix	2026-03-09 01:37:45 +01:00
selimaj-dev	9712bc0f47	Merge pull request #37 from saturnclientmc/final-architecture Final architecture	2026-03-08 17:34:50 -07:00
selimaj-dev	e0d0571078	Fix	2026-03-09 01:33:29 +01:00
selimaj-dev	c467eb3b95	Improved gradle	2026-03-09 00:31:20 +01:00
selimaj-dev	57f6ffa3d4	Fixed protected	2026-03-08 16:17:13 +01:00
selimaj-dev	2df38b2962	Moved implementations into impl	2026-03-08 16:16:06 +01:00
selimaj-dev	f947fa5f17	Fixed a few things	2026-03-08 16:11:00 +01:00
selimaj-dev	9a8c9670c6	Fixed a few things	2026-03-08 16:05:53 +01:00
selimaj-dev	301b75c003	Mixins	2026-03-08 16:00:36 +01:00
selimaj-dev	ceeb64282f	Modules implementation	2026-03-08 15:55:44 +01:00
selimaj-dev	d68e47d1cc	Removed old module logic	2026-03-08 13:48:06 +01:00
selimaj-dev	b04014a87f	Refactor mixins	2026-03-08 13:34:52 +01:00
selimaj-dev	8854726916	Refactor mixins	2026-03-08 13:34:45 +01:00
selimaj-dev	f182ac7e91	Refactor interface to feature	2026-03-08 12:50:46 +01:00
selimaj-dev	68a366a30b	ServiceClient cloak loading #36	2026-03-08 12:07:34 +01:00
selimaj-dev	dfb3c6e614	CloakStore and static loading	2026-03-08 11:58:11 +01:00
selimaj-dev	6af6ecefad	Cloaks in common	2026-03-08 11:45:19 +01:00
selimaj-dev	8039862142	Moving cloaks to common	2026-03-08 11:29:45 +01:00
selimaj-dev	b6f164b43b	ElementRenderer fix	2026-03-08 11:18:21 +01:00
selimaj-dev	962d2c0319	Fabric mod json small change for website	2026-03-08 11:11:09 +01:00
selimaj-dev	12b4a4fc5f	Improved separation	2026-03-08 11:05:46 +01:00
selimaj-dev	b99840a937	Provider	2026-03-08 02:59:03 +01:00
selimaj-dev	f9938a51e9	Fixed font	2026-03-08 02:47:31 +01:00
selimaj-dev	2fa04b079d	GLFW	2026-03-08 02:40:23 +01:00
selimaj-dev	c22a9ff5ae	Implemented text interface	2026-03-08 02:30:47 +01:00
selimaj-dev	66024ebfa2	Implemented all of the refrences	2026-03-08 01:53:22 +01:00
selimaj-dev	66e4a12819	Improved implementation of ref	2026-03-08 01:23:26 +01:00
selimaj-dev	216b1707ae	Architecture #35	2026-03-07 23:16:48 +01:00
selimaj-dev	bdc21920eb	Architecture #35	2026-03-07 23:14:02 +01:00
selimaj-dev	5d2a21dd69	Removed minecraft package bc it's unnecessary	2026-03-07 23:01:56 +01:00
selimaj-dev	7f5acb9daf	Updated readme	2026-03-07 21:30:04 +01:00
selimaj-dev	7728c6e818	Common submodule	2026-03-07 21:25:16 +01:00
selimaj-dev	ea6d2958e7	Removed common to replace it with a git submodule	2026-03-07 21:22:32 +01:00
selimaj-dev	04a4a1b226	Merge pull request #34 from saturnclientmc/rewritten-with-common-system Rewritten with common system (Multi version support)	2026-03-07 09:38:50 -08:00
selimaj-dev	b59c2ba705	Moved hats and emotes to common	2026-03-07 18:19:18 +01:00
selimaj-dev	4ddd650102	Fixed default font	2026-03-07 18:06:51 +01:00
selimaj-dev	5f63f8b37a	Cosmetics fade remove of sidebar	2026-03-07 17:54:19 +01:00
selimaj-dev	9110cbe722	Added all of the mods	2026-03-07 17:49:35 +01:00
selimaj-dev	c2144dcfc8	Fixed screen events	2026-03-07 17:43:01 +01:00
selimaj-dev	39d03c4ef6	Fixed skinpreview drawer	2026-03-07 17:30:47 +01:00
selimaj-dev	d4107df833	Fixed resize	2026-03-07 17:23:18 +01:00
selimaj-dev	196dd08943	Title menu stuff	2026-03-07 17:19:10 +01:00
selimaj-dev	199635be0b	Fixed screen rendering	2026-03-07 17:08:10 +01:00
selimaj-dev	d82921976b	It runs but..	2026-03-07 17:04:11 +01:00
selimaj-dev	8bfc3bc699	Refactored	2026-03-07 17:01:49 +01:00
selimaj-dev	e348b94720	Refactored	2026-03-07 16:57:31 +01:00
selimaj-dev	35df2b2b27	Client stuff	2026-03-07 16:55:29 +01:00
selimaj-dev	a577ee7796	testing	2026-03-07 16:37:59 +01:00
selimaj-dev	8d528387db	Screens	2026-03-07 16:13:11 +01:00
selimaj-dev	90db3d3915	fixed saturnclient package	2026-03-07 16:04:35 +01:00
selimaj-dev	4d7a79f517	HudEditor moved to common	2026-03-07 16:00:51 +01:00
selimaj-dev	5b8ce8f048	Idk	2026-03-07 15:49:29 +01:00
selimaj-dev	7fd5493995	Saturn Screen implementation	2026-03-07 15:37:37 +01:00
selimaj-dev	7af945486c	SaturnScreen	2026-03-07 02:33:57 +01:00
selimaj-dev	5bd0d249f9	SaturnScreen	2026-03-07 01:01:10 +01:00
selimaj-dev	0cd192107d	Working skin preview	2026-03-07 00:57:04 +01:00
selimaj-dev	3aa98d458d	Implementing components	2026-03-07 00:49:31 +01:00
selimaj-dev	eca1be7d81	Refacted modules in saturnclient	2026-03-07 00:40:58 +01:00
selimaj-dev	bdc22e87ae	ping, speedometer, and status effects	2026-03-07 00:37:55 +01:00
selimaj-dev	9b73e4d1c9	nofog and tps and zoom	2026-03-07 00:29:57 +01:00
selimaj-dev	439dc2653e	nametags fullbright and health display with keystrokes	2026-03-07 00:25:11 +01:00
selimaj-dev	9fee71154e	fps and freelook	2026-03-06 23:54:25 +01:00
selimaj-dev	afedec45ae	day counter crosshair and coordinates	2026-03-06 23:44:19 +01:00
selimaj-dev	5544946769	auto Sprint and Clock	2026-03-06 23:37:03 +01:00
selimaj-dev	debf9ce96d	Module provider	2026-03-06 23:27:26 +01:00
selimaj-dev	c93b0e049d	Armor display mod	2026-03-06 23:10:58 +01:00
selimaj-dev	6eb7fa4c8b	Transitioned mod helpers to common	2026-03-06 12:45:02 +01:00
selimaj-dev	a02653c5ab	Working UI	2026-03-06 12:39:49 +01:00
selimaj-dev	12bb846e50	Improved structure	2026-03-06 12:17:31 +01:00
selimaj-dev	58a38ad809	Fixed scroll	2026-03-06 11:58:14 +01:00
selimaj-dev	b9657d6f45	Working	2026-03-06 11:50:51 +01:00
selimaj-dev	da27d820f7	MatrixStack	2026-03-06 11:45:17 +01:00
selimaj-dev	e07ec5a54a	ElementRenderer	2026-03-06 11:41:14 +01:00
selimaj-dev	27c5bafb6b	Client mixin	2026-03-06 11:37:24 +01:00
selimaj-dev	3291dc1e6e	Temporarily fized 1.21.4	2026-03-06 11:28:48 +01:00
selimaj-dev	7ada7ea3c8	Adding more implementations and fixes	2026-03-06 11:10:28 +01:00
selimaj-dev	fc87506965	Adding more implementations	2026-03-06 10:59:07 +01:00
selimaj-dev	0084457008	Fixing svgTexture	2026-03-06 10:27:51 +01:00
selimaj-dev	d874d5a388	Elements	2026-03-06 10:16:43 +01:00
selimaj-dev	53332157e3	Small change	2026-03-06 01:15:47 +01:00
selimaj-dev	e70c1423a4	Fonts	2026-03-06 01:10:51 +01:00
selimaj-dev	9dbf431a55	Element and animations	2026-03-06 00:53:11 +01:00
selimaj-dev	0f41b2786c	Improved structure and added RenderScope	2026-03-06 00:29:11 +01:00
selimaj-dev	86d588ffc4	New textures	2026-03-06 00:09:02 +01:00
selimaj-dev	c19b92b242	modules with new resources	2026-03-06 00:08:41 +01:00
selimaj-dev	8027b627d8	UI with new resources	2026-03-06 00:08:07 +01:00
selimaj-dev	9c34198138	Fixed assets	2026-03-06 00:02:11 +01:00
selimaj-dev	6226604fa5	Saturn Client provider and jackson	2026-03-05 23:57:30 +01:00
selimaj-dev	98d5bf5ce5	Saturn Client provider	2026-03-05 23:51:28 +01:00
selimaj-dev	9bf04639b3	ImageTexture with abstracted Identifier	2026-03-05 23:46:32 +01:00
selimaj-dev	e8671640e3	Using updated config	2026-03-05 23:45:03 +01:00
selimaj-dev	daf71b0e8c	moved resources	2026-03-05 23:38:56 +01:00
selimaj-dev	d2b016ddc7	Resources	2026-03-05 23:37:09 +01:00
selimaj-dev	4bb6cf8489	Config theme and animation config	2026-03-05 23:34:42 +01:00
selimaj-dev	cd8a41524f	Config manager and property	2026-03-05 23:28:54 +01:00
selimaj-dev	68a43d55b9	Fixed circular dependency	2026-03-05 22:02:12 +01:00
selimaj-dev	8d3f283f4c	MinecraftProvider structure	2026-03-05 21:47:58 +01:00
selimaj-dev	2cd1e39ec5	Identifier	2026-03-05 19:44:52 +01:00
selimaj-dev	45ceaf8b39	renamed ui2 to ui	2026-03-05 18:56:57 +01:00
selimaj-dev	dc17e9aa44	Ignore build directory	2026-03-05 16:40:34 +01:00
selimaj-dev	bd9dc51578	Common sub project	2026-03-05 16:35:48 +01:00
selimaj-dev	1b3c23587d	Working 1.21.4 saturn client (but old structure still)	2026-03-05 16:14:18 +01:00
selimaj-dev	da24cc584b	Added saturnclient 1.21.4 code	2026-03-05 16:07:35 +01:00
selimaj-dev	55b1814c1e	Removed unnecessary client side	2026-03-05 16:01:11 +01:00
selimaj-dev	98976ea745	Working common	2026-03-05 15:52:52 +01:00
selimaj-dev	e9f0a49389	Working build	2026-03-05 15:41:24 +01:00
selimaj-dev	e414bc2097	Fixed gradle issue	2026-03-05 15:34:30 +01:00
selimaj-dev	6711753bec	gradle wrapper	2026-03-05 15:32:57 +01:00
selimaj-dev	076c3d67f8	mod Template	2026-03-05 15:31:31 +01:00
selimaj-dev	6af269da11	Common and versions	2026-03-05 15:25:56 +01:00
selimaj-dev	b98fe211f0	Starting fresh	2026-03-05 15:24:28 +01:00
selimaj-dev	c70ac16978	Merge pull request #31 from saturnclientmc/rewrote-3d-cosmetic-rendering Rewrote 3d cosmetic rendering #18	2026-03-03 02:39:12 -08:00
selimaj-dev	6ad563fd4a	Removed old obj library	2026-03-03 11:32:02 +01:00
selimaj-dev	8be1bab1b6	Rotation	2026-03-03 11:28:34 +01:00
selimaj-dev	a553360868	Refactored json	2026-03-03 10:00:58 +01:00
selimaj-dev	944bada2a2	Refactored structure	2026-03-03 09:53:12 +01:00
selimaj-dev	8ed855723b	Working cosmetic id mtl loader	2026-03-03 04:10:19 +01:00
selimaj-dev	5b9807c5d3	Mtl loader	2026-03-03 04:05:14 +01:00
selimaj-dev	d9e5153452	Halo json	2026-03-03 03:54:05 +01:00
selimaj-dev	92b310e5e2	Working json for model	2026-03-03 03:50:56 +01:00
selimaj-dev	02d973e4e4	Hat model caching	2026-03-03 03:40:44 +01:00
selimaj-dev	2f41fc080c	Working custom obj hat	2026-03-03 03:06:03 +01:00
selimaj-dev	80684f7e07	Working mtl obj rendering	2026-03-03 02:51:06 +01:00
selimaj-dev	e3ad918755	Working obj rendering	2026-03-03 02:37:53 +01:00
selimaj-dev	178fb1a484	Tesiting 3d obj rendering	2026-03-02 15:01:18 +01:00
selimaj-dev	2b0f1dcb48	Cosmetics refactor	2026-03-02 02:59:09 +01:00
selimaj-dev	154fbd774f	Cosmetics refactor to main	2026-03-02 02:56:17 +01:00
selimaj-dev	a497d2a14f	Cloak sneak and swim handling	2026-03-02 02:50:28 +01:00
selimaj-dev	00af8c4cd7	Improved cloak y velocity handling	2026-03-02 02:11:38 +01:00
selimaj-dev	3a922418ca	Fixed pivot	2026-03-02 02:00:30 +01:00
selimaj-dev	96d7f5065c	Fixed small waves	2026-03-01 22:17:16 +01:00
selimaj-dev	fb85702ee9	Fixed UI animation default settings	2026-02-25 23:55:16 +01:00
selimaj-dev	69cad4caab	Updated README	2026-02-25 23:47:37 +01:00