Point common at the opaque theme upgrade

Co-Authored-By: Claude Opus 5.5 <[email protected]>

.gitea/workflows/release.yml

@@ -57,7 +57,8 @@ jobs:
       - name: Build all versions
         run: |
           chmod +x gradlew
-          # buildAll remaps every versions/* project in parallel into build/allJars.
+          # buildAll remaps every Minecraft version (two at a time, to stay within the
+          # Gradle heap) into build/allJars.
           ./gradlew buildAll --no-daemon --stacktrace
 
       - name: Upload jars to the release

README.MD

@@ -47,7 +47,7 @@ git clone --recurse-submodules https://git.selimaj.dev/saturnclientmc/saturnclie
 cd saturnclient
 
 ./gradlew buildAll                    # every version → build/allJars/
-./gradlew :1.21.11:build              # a single version (versions not on Stonecutter yet: :mc-1.21.10)
+./gradlew :1.21.11:build              # a single version
 ./gradlew :1.21.11:runClient          # launch a development client
 ```
 
@@ -65,7 +65,7 @@ We welcome contributions of all kinds:
 
 If you're an artist or designer interested in helping with cosmetics or visual assets, we'd love to collaborate.
 
-Most features belong in `common`, which every Minecraft version shares. For code that differs between versions, see the [version guide](VERSION_GUIDE.md): it covers how the versions are laid out, porting a change to all of them with `scripts/port.sh`, and adding a new Minecraft version. Every pull request is compiled for all versions automatically.
+Most features belong in `common`, which every Minecraft version shares. For code that differs between versions, see the [version guide](VERSION_GUIDE.md): it covers how the versions share one copy of the code with Stonecutter, writing version-specific code, and adding a new Minecraft version. Every pull request is compiled for all versions automatically.
 
 ## Credits
 

VERSION_GUIDE.md

@@ -4,13 +4,13 @@ How Saturn Client supports several Minecraft versions, and how to change or add
 
 ## Layout
 
-Saturn is moving from one full copy of the version-specific code per Minecraft version to a single copy built with [Stonecutter](https://stonecutter.kikugie.dev/) (issue #8). During the move there are two kinds of version:
+Every supported Minecraft version (1.21.4 to 1.21.11) builds from one copy of the version-specific code with [Stonecutter](https://stonecutter.kikugie.dev/):
 
 - `common/`: all version-independent code (mods, UI, cosmetics, the server client). It has no Minecraft dependency and reaches the game only through the interfaces in `org.saturnclient.common`.
-- `src/`: the version-specific code (providers, refs, mixins and the three mixin configs) for the versions built by Stonecutter, currently **1.21.11**. It's one copy: where Minecraft's API differs between them, the code goes behind version comments (see below). Each of these versions is the Gradle project `:<mc>`, and `versions/<mc>/` holds only its `gradle.properties` (Minecraft, Yarn, Fabric Loader and Fabric API versions), `build/` and `run/`.
-- `versions/<mc>/src/`: the versions not moved yet (1.21.4 to 1.21.10), each a full copy, as the Gradle project `:mc-<mc>` with its own `build.gradle`.
+- `src/`: the version-specific code (providers, refs, mixins and the three mixin configs), one copy for every version. Where Minecraft's API differs between versions, the code goes behind version comments (see below).
+- `versions/<mc>/`: each version's `gradle.properties` (Minecraft, Yarn, Fabric Loader and Fabric API versions), plus its `build/` and `run/` folders. Each version is the Gradle project `:<mc>`.
 
-`settings.gradle.kts` lists the Stonecutter versions in `stonecutterVersions` and includes every other folder under `versions/` as `:mc-<mc>`. The root `build.gradle.kts` builds each Stonecutter version, and `stonecutter.gradle.kts` configures the root project (shared repositories, the `common` wiring and `buildAll`). Loom's version for the Stonecutter versions is `loom_version` in the root `gradle.properties`.
+`settings.gradle.kts` lists the versions in `stonecutterVersions`. The root `build.gradle.kts` builds each version, and `stonecutter.gradle.kts` configures the root project (shared repositories, the `common` wiring and `buildAll`). Loom's version is `loom_version` in the root `gradle.properties`.
 
 ## Version-specific code with Stonecutter
 
@@ -20,44 +20,48 @@ The code in `src/` is always plain Java for the **active** version (1.21.11, set
 //? if >=1.21.9 {
 public void render(MatrixStack matrices, OrderedRenderCommandQueue queue, int light, PlayerEntityRenderState state, float limbAngle, float limbDistance) {
 //?} else
-/*public void render(MatrixStack matrices, VertexConsumerProvider consumers, int light, PlayerEntityRenderState state, float limbAngle, float limbDistance) {*/
+//public void render(MatrixStack matrices, VertexConsumerProvider consumers, int light, PlayerEntityRenderState state, float limbAngle, float limbDistance) {
 ```
 
+A condition without braces covers the next line only. For several lines, use braces and wrap the inactive block in `/* … */`:
+
+```java
+//? if >=1.21.11 {
+import net.minecraft.client.render.RenderLayers;
+import net.minecraft.client.render.RenderSetup;
+//?} else {
+/*import net.minecraft.client.render.RenderPhase.Textures;
+*///?}
+```
+
+Stonecutter rewrites inactive code into its own layout when switching versions (a single inactive line becomes `//code`), so write it that way to begin with, or run a switch and a reset before committing.
+
+When a newer version leaves something out that an older one implements, keep the older version's code behind a condition and mark the newer branch with a `TODO`, rather than dropping it for every version. The panorama in `SaturnScreenFabric.render` is an example. Search for `TODO` to find what newer versions still lack (tracked in #30), and remove the condition once a version gap is fixed.
+
+A whole class that only exists for some versions (such as `MatrixStackMixin`, which only makes sense before 1.21.6's GUI rewrite) can keep an empty class body on the other versions. Before splitting a class like that, look for a hook that works on every version: nametags used to hook label rendering, which 1.21.9 changed, and now replace the name while the render state is built (`LivingEntityRendererMixin`), with no version condition at all. An empty mixin changes nothing, and it keeps the mixin configs the same for every version, since JSON can't hold version comments.
+
+Inactive code sits inside a `/* … */` comment, so it can't contain `/* … */` comments itself: use `//` comments in code that's only active for some versions. For the same reason, don't nest multi-line version blocks; use `//?} else if <condition> {` for more than two version ranges, as in `PlayerEntityRendererMixin` and `SaturnRenderState`.
+
 - `./gradlew "Set active project to <mc>"` (or the Stonecutter IntelliJ plugin) rewrites `src/` so that version's code is the uncommented one, for editing it in the IDE.
 - `./gradlew "Reset active project"` switches back to 1.21.11. **Run it before committing**, so `src/` is always committed with 1.21.11 active.
 - Each version's processed copy is compiled from `versions/<mc>/build/generated/stonecutter/`, which is also where to look when a non-active version fails to compile.
 
 The `emotes` repository uses the same setup, and its `BentCubeRenderer` and `PlayerModelMixin` are small examples of version comments.
 
-## Porting a change to the other versions
+## Checking a change on every version
 
-Make the change in one version, usually the newest, then run:
-
-```sh
-scripts/port.sh                        # port uncommitted changes to every other version
-scripts/port.sh --dry-run              # see what would apply cleanly first
-scripts/port.sh --to 1.21.9,1.21.10    # only some versions
-scripts/port.sh --commit <rev>         # port what a commit changed instead
-```
-
-The script applies the diff under one version's source to each other version with `git apply --3way`. The Stonecutter `src/` counts as one version (1.21.11), so changes port between it and the old copies in both directions:
-
-- **applied**: the files matched, and nothing else is needed.
-- **CONFLICTS**: that version's code really differs. The file gets normal conflict markers, with the version's own code in `ours` and the ported change in `theirs`. Adapt the change to that version's API and resolve.
-- **already has this change**: nothing to do, which is safe to see when re-running.
-
-Only source is ported. `build.gradle` and `gradle.properties` are version-specific on purpose. Then build everything:
+Since every version shares `src/`, a change applies to all of them at once. Code that uses the Minecraft API may still only compile on some, so build them all:
 
 ```sh
 ./gradlew compileJava
 ```
 
-The **Check** workflow runs the same compile on every pull request, so a version that was missed or mis-ported fails before merging.
+The **Check** workflow runs the same compile on every pull request, so a version a change doesn't compile on fails before merging. Mixins whose target changed fail at startup rather than at compile time, so launch the versions a change touches with `./gradlew :<mc>:runClient`.
+
+For bigger changes, `./gradlew buildAll` builds every version's jar into `build/allJars/`.
 
 ## Adding a Minecraft version
 
-Add new versions to Stonecutter rather than copying a folder:
-
 1. Create `versions/<new>/gradle.properties` with `minecraft_version`, `yarn_mappings`, `loader_version` and `fabric_api_version` (copy 1.21.11's and change the values; they're listed at <https://fabricmc.net/develop>). Loom's version is shared, in the root `gradle.properties`.
 2. Add `<new>` to `stonecutterVersions` in `settings.gradle.kts`.
 3. Build it with `./gradlew :<new>:compileJava` and put what Minecraft changed behind version comments. Check the mixin configs in `src/main/resources/*.mixins.json` as well: a mixin whose target changed fails at startup, not at compile time, so launch it with `./gradlew :<new>:runClient`.

gradle.properties

@@ -6,10 +6,10 @@ org.gradle.caching=true
 # 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.1.1-beta
+mod_version=0.1.3-beta
 
 # Saturn's emote library (git.selimaj.dev/saturnclientmc/emotes)
 emotes_version=0.1.0
 
-# Loom, for the Stonecutter versions (settings.gradle.kts). Old mc-<v> projects set their own.
+# Loom, for every Minecraft version (read in settings.gradle.kts).
 loom_version=1.17.21

scripts/port.sh

@@ -1,184 +0,0 @@
-#!/usr/bin/env bash
-# Port a change made in one Minecraft version's code to the other versions.
-#
-# Takes the diff under one version's source folder and applies it to the others
-# with `git apply --3way`: it applies cleanly where the files match, and leaves
-# normal merge conflicts only where a version really differs. Only source is
-# ported; build.gradle and gradle.properties are version-specific on purpose.
-#
-# Versions moved to Stonecutter (stonecutterVersions in settings.gradle.kts)
-# share the top-level src/, which counts as one version: the active one set in
-# stonecutter.gradle.kts. The others keep their own copy in versions/<v>/src.
-#
-# Usage:
-#   scripts/port.sh [--from VERSION] [--to V1,V2,...] [--commit REV] [--dry-run]
-#
-#   --from      version the change was made in. Default: the only version with
-#               uncommitted changes (or changed by --commit).
-#   --to        comma-separated versions to port to. Default: all others.
-#   --commit    port the changes a commit made instead of uncommitted changes.
-#   --dry-run   report what would happen without changing anything.
-#
-# Exit status: 0 if every version applied cleanly (or already had the change),
-# 1 if any version has conflicts or failed.
-
-set -euo pipefail
-
-cd "$(git rev-parse --show-toplevel)"
-
-from=""
-to=""
-commit=""
-dry_run=false
-
-while [ $# -gt 0 ]; do
-    case "$1" in
-        --from) from="$2"; shift 2 ;;
-        --to) to="$2"; shift 2 ;;
-        --commit) commit="$2"; shift 2 ;;
-        --dry-run) dry_run=true; shift ;;
-        -h|--help) sed -n '2,23p' "$0" | sed 's/^# \{0,1\}//'; exit 0 ;;
-        *) echo "Unknown option: $1 (see --help)" >&2; exit 2 ;;
-    esac
-done
-
-# Versions sharing the Stonecutter src/, and the one that stands for them.
-stonecutter_versions=$(sed -n 's/^val stonecutterVersions = listOf(\(.*\))/\1/p' settings.gradle.kts | tr -d '" ' | tr ',' ' ')
-stonecutter_active=$(sed -n 's/^stonecutter active "\(.*\)"/\1/p' stonecutter.gradle.kts 2>/dev/null || true)
-
-is_stonecutter() {
-    printf '%s\n' $stonecutter_versions | grep -qx "$1"
-}
-
-# Where a version's source lives.
-src_of() {
-    if is_stonecutter "$1"; then echo "src"; else echo "versions/$1/src"; fi
-}
-
-old_versions=$(for d in versions/*/; do [ -d "$d/src" ] && basename "$d"; done)
-all_versions=$(printf '%s\n' $old_versions $stonecutter_active | grep . | sort -t. -k1,1n -k2,2n -k3,3n)
-
-version_exists() {
-    [ -d "$(src_of "$1")" ]
-}
-
-# Versions with changes, from the working tree or from the given commit.
-changed_versions() {
-    if [ -n "$commit" ]; then
-        git show --name-only --format= "$commit" -- versions/ src/
-    else
-        git diff HEAD --name-only -- versions/ src/
-        git ls-files --others --exclude-standard -- versions/ src/
-    fi | sed -n -e 's#^versions/\([^/]*\)/src/.*#\1#p' -e "s#^src/.*#${stonecutter_active}#p" | sort -u
-}
-
-if [ -z "$from" ]; then
-    candidates=$(changed_versions)
-    count=$(printf '%s\n' "$candidates" | grep -c . || true)
-    if [ "$count" -ne 1 ]; then
-        echo "Changes found in ${count} versions (${candidates//$'\n'/, }); pass --from to choose one." >&2
-        exit 2
-    fi
-    from="$candidates"
-fi
-
-version_exists "$from" || { echo "No such version: $from" >&2; exit 2; }
-if is_stonecutter "$from"; then
-    from="$stonecutter_active"
-fi
-from_src=$(src_of "$from")
-
-if [ -z "$to" ]; then
-    to=$(printf '%s\n' $all_versions | grep -vx "$from" | paste -sd, -)
-fi
-
-# New files are only included in `git diff HEAD` once git knows about them.
-if [ -z "$commit" ]; then
-    untracked=$(git ls-files --others --exclude-standard -- "$from_src")
-    if [ -n "$untracked" ]; then
-        if $dry_run; then
-            echo "note: new files in $from_src are untracked and won't be ported in a dry run:" >&2
-            printf '  %s\n' $untracked >&2
-        else
-            printf '%s\n' "$untracked" | xargs git add --intent-to-add --
-        fi
-    fi
-fi
-
-# --full-index gives --3way the real blob ids to merge against.
-if [ -n "$commit" ]; then
-    patch=$(git show --full-index --binary --format= "$commit" -- "$from_src")
-else
-    patch=$(git diff HEAD --full-index --binary -- "$from_src")
-fi
-
-if [ -z "$patch" ]; then
-    echo "No changes under $from_src to port." >&2
-    exit 2
-fi
-
-files=$(printf '%s\n' "$patch" | grep -c '^diff --git' || true)
-echo "Porting $files file(s) from $from${commit:+ (commit $commit)}"
-
-from_re=$(printf '%s' "$from_src" | sed 's/\./\\./g')
-tmp=$(mktemp -d)
-trap 'rm -rf "$tmp"' EXIT
-
-status=0
-IFS=',' read -r -a targets <<< "$to"
-
-for target in "${targets[@]}"; do
-    if [ "$target" = "$from" ]; then
-        continue
-    fi
-    if is_stonecutter "$target" && [ "$target" != "$stonecutter_active" ]; then
-        printf '  %-8s  skipped: shares src/ with %s\n' "$target" "$stonecutter_active"
-        [ "$from" = "$stonecutter_active" ] || status=1
-        continue
-    fi
-    if ! version_exists "$target"; then
-        printf '  %-8s  skipped: no such version\n' "$target"
-        status=1
-        continue
-    fi
-
-    # Point the patch's file headers at the target version's source folder.
-    target_src=$(src_of "$target")
-    printf '%s\n' "$patch" | sed -E "/^(diff --git |--- |\+\+\+ |rename (from|to) |copy (from|to) )/ s#([ab]/|(from|to) )${from_re}/#\1${target_src}/#g" > "$tmp/$target.patch"
-
-    if git apply --check --reverse "$tmp/$target.patch" 2>/dev/null; then
-        printf '  %-8s  already has this change\n' "$target"
-        continue
-    fi
-
-    if $dry_run; then
-        if git apply --check "$tmp/$target.patch" 2>/dev/null; then
-            printf '  %-8s  would apply cleanly\n' "$target"
-        else
-            printf '  %-8s  would need a 3-way merge (possible conflicts)\n' "$target"
-        fi
-        continue
-    fi
-
-    if output=$(git apply --3way "$tmp/$target.patch" 2>&1); then
-        printf '  %-8s  applied\n' "$target"
-    else
-        conflicts=$(git diff --name-only --diff-filter=U -- "$target_src")
-        if [ -n "$conflicts" ]; then
-            printf '  %-8s  CONFLICTS in:\n' "$target"
-            printf '%s\n' "$conflicts" | sed 's/^/              /'
-        else
-            printf '  %-8s  FAILED:\n' "$target"
-            printf '%s\n' "$output" | sed 's/^/              /'
-        fi
-        status=1
-    fi
-done
-
-if ! $dry_run; then
-    echo
-    echo "Ported changes are staged in the target versions. Resolve any conflicts, then build"
-    echo "the affected versions, e.g. ./gradlew compileJava"
-fi
-
-exit $status

settings.gradle.kts

@@ -6,8 +6,7 @@ pluginManagement {
         mavenCentral()
     }
 
-    // Loom's version, for the Stonecutter versions' build.gradle.kts (the old mc-<v> projects set
-    // their own in versions/<v>/gradle.properties).
+    // Loom's version for build.gradle.kts, which can't read properties in its plugins block.
     val loom_version: String by settings
     plugins {
         id("net.fabricmc.fabric-loom-remap") version loom_version
@@ -24,7 +23,7 @@ include("common")
 
 // Versions built by Stonecutter from the shared src/ (see stonecutter.gradle.kts). Each one's
 // versions/<v>/gradle.properties holds its Minecraft, Yarn and Fabric API versions.
-val stonecutterVersions = listOf("1.21.11")
+val stonecutterVersions = listOf("1.21.4", "1.21.5", "1.21.6", "1.21.7", "1.21.8", "1.21.9", "1.21.10", "1.21.11")
 
 stonecutter {
     create(rootProject) {
@@ -32,12 +31,3 @@ stonecutter {
         vcsVersion = "1.21.11"
     }
 }
-
-// Versions not moved to Stonecutter yet still build from their own copy in versions/<v>/src,
-// as projects named mc-<v>.
-file("versions").listFiles { file -> file.isDirectory && file.name !in stonecutterVersions }!!
-    .sortedBy { it.name }
-    .forEach { dir ->
-        include("mc-${dir.name}")
-        project(":mc-${dir.name}").projectDir = dir
-    }

src/main/java/org/saturnclient/impl/cosmetics/CloakFeatureRenderer.java

@@ -4,18 +4,26 @@ import java.util.Arrays;
 
 import org.joml.Matrix3f;
 import org.joml.Matrix4f;
+import org.joml.Quaternionf;
 import org.joml.Vector3f;
 import org.joml.Vector4f;
 import org.saturnclient.client.player.SaturnPlayer;
 import org.saturnclient.common.ref.asset.IdentifierRef;
 import org.saturnclient.config.Config;
 import org.saturnclient.cosmetics.Cloaks;
+import org.saturnclient.emotes.core.bend.LimbBend;
+import org.saturnclient.emotes.core.bend.Vec3;
+import org.saturnclient.emotes.fabric.access.BendablePart;
 import org.saturnclient.impl.cosmetics.utils.ShaderUtils;
 import org.saturnclient.saturnclient.SaturnRenderState;
 
+import net.minecraft.client.model.ModelPart;
 import net.minecraft.client.render.OverlayTexture;
 import net.minecraft.client.render.VertexConsumer;
+//? if >=1.21.9 {
 import net.minecraft.client.render.command.OrderedRenderCommandQueue;
+//?} else
+//import net.minecraft.client.render.VertexConsumerProvider;
 import net.minecraft.client.render.entity.equipment.EquipmentModel;
 import net.minecraft.client.render.entity.equipment.EquipmentModelLoader;
 import net.minecraft.client.render.entity.equipment.EquipmentModel.LayerType;
@@ -30,7 +38,6 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.item.equipment.EquipmentAsset;
 import net.minecraft.registry.RegistryKey;
 import net.minecraft.util.math.MathHelper;
-import net.minecraft.util.math.RotationAxis;
 import net.minecraft.util.math.Vec3d;
 
 /**
@@ -380,6 +387,25 @@ public class CloakFeatureRenderer extends FeatureRenderer<PlayerEntityRenderStat
         }
     }
 
+    /**
+     * An emote that bends the torso leans the chest from the hips, so the cloak hangs from where the
+     * top of the back ends up, turned as much as the torso is there.
+     */
+    private static void followBend(MatrixStack matrices, ModelPart body) {
+        LimbBend bend = ((BendablePart) (Object) body).saturnEmotes$getBend();
+        if (bend == null || bend.isStraight()) {
+            return;
+        }
+
+        // The top of the torso, in the body's own pixels
+        float[] top = new float[3];
+        bend.bendPoint(0, 0, 0, top);
+        matrices.translate(top[0] / 16.0f, top[1] / 16.0f, top[2] / 16.0f);
+
+        Vec3 axis = bend.axis();
+        matrices.multiply(new Quaternionf().rotationAxis(bend.angleAt(0), axis.x(), axis.y(), axis.z()));
+    }
+
     // Shift array left and insert new value at the start
     private void updateSegmentValues(float value) {
         // Shift all elements one position to the right (from end to start)
@@ -394,14 +420,24 @@ public class CloakFeatureRenderer extends FeatureRenderer<PlayerEntityRenderStat
     private long lastUpdate = 0;
 
     @Override
-    public void render(MatrixStack matrices, OrderedRenderCommandQueue queue, int light, PlayerEntityRenderState state,
-            float limbAngle, float limbDistance) {
+    public void render(MatrixStack matrices,
+            //? if >=1.21.9 {
+            OrderedRenderCommandQueue output,
+            //?} else
+            //VertexConsumerProvider output,
+            int light, PlayerEntityRenderState state, float limbAngle, float limbDistance) {
         if (state.invisible || !state.capeVisible
+                //? if >=1.21.9 {
                 || state.skinTextures.cape() != null) {
+                //?} else
+                //|| state.skinTextures.capeTexture() != null) {
             return;
         }
 
+        //? if >=1.21.8 {
         SaturnPlayer player = state.getData(SaturnRenderState.saturnDataKey);
+        //?} else
+        //SaturnPlayer player = SaturnPlayer.get(state.name);
 
         if (player == null) {
             return;
@@ -423,17 +459,24 @@ public class CloakFeatureRenderer extends FeatureRenderer<PlayerEntityRenderStat
 
         matrices.push();
 
+        // On the back: the whole player (which emotes like the backflip turn), then the body's position
+        // and turn (which crouching and emotes move), then the chest's lean when an emote bends the torso
+        PlayerEntityModel model = this.getContextModel();
+        //? if >=1.21.5 {
+        model.getRootPart().applyTransform(matrices);
+        model.body.applyTransform(matrices);
+        //?} else {
+        /*model.getRootPart().rotate(matrices);
+        model.body.rotate(matrices);
+        *///?}
+        followBend(matrices, model.body);
+
         matrices.translate(0.0f, 0.0f, 0.12f);
 
         if (this.hasCustomModelForLayer(state.equippedChestStack, LayerType.HUMANOID)) {
             matrices.translate(0.0F, -0.053125F, 0.06875F);
         }
 
-        if (state.isInSneakingPose) {
-            matrices.translate(0, 0.16f, 0.0f);
-            matrices.multiply(RotationAxis.POSITIVE_X.rotationDegrees(29.0f));
-        }
-
         long now = System.currentTimeMillis();
         if (now - lastUpdate >= 20) {
             float velX = Math.min(0.8f, state.field_53537 / 108.0f);
@@ -454,9 +497,12 @@ public class CloakFeatureRenderer extends FeatureRenderer<PlayerEntityRenderStat
 
         horizontalCurve = MathHelper.clamp(state.field_53537 / 150.0f, -1.0f, 1.0f);
 
-        queue.submitCustom(matrices, ShaderUtils.getRenderLayer(customCape), (entry, vertexConsumer) -> {
+        //? if >=1.21.9 {
+        output.submitCustom(matrices, ShaderUtils.getRenderLayer(customCape), (entry, vertexConsumer) -> {
             renderCape(entry, vertexConsumer, state, l, OverlayTexture.DEFAULT_UV);
         });
+        //?} else
+        //renderCape(matrices.peek(), output.getBuffer(ShaderUtils.getRenderLayer(customCape)), state, l, OverlayTexture.DEFAULT_UV);
 
         matrices.pop();
     }

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

@@ -1,19 +1,20 @@
 package org.saturnclient.impl.cosmetics;
 
-import org.joml.Quaternionf;
 import org.saturnclient.client.player.SaturnPlayer;
 import org.saturnclient.impl.cosmetics.obj.MtlLoader;
 import org.saturnclient.impl.cosmetics.obj.ObjModel;
 import org.saturnclient.saturnclient.SaturnRenderState;
 
 import net.minecraft.client.render.OverlayTexture;
+//? if >=1.21.9 {
 import net.minecraft.client.render.command.OrderedRenderCommandQueue;
+//?} else
+//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.util.math.MatrixStack;
-import net.minecraft.client.model.ModelPart;
 
 public class HatFeatureRenderer extends FeatureRenderer<PlayerEntityRenderState, PlayerEntityModel> {
     public HatFeatureRenderer(FeatureRendererContext<PlayerEntityRenderState, PlayerEntityModel> context) {
@@ -21,9 +22,16 @@ public class HatFeatureRenderer extends FeatureRenderer<PlayerEntityRenderState,
     }
 
     @Override
-    public void render(MatrixStack matrices, OrderedRenderCommandQueue queue, int light, PlayerEntityRenderState state,
-            float limbAngle, float limbDistance) {
+    public void render(MatrixStack matrices,
+            //? if >=1.21.9 {
+            OrderedRenderCommandQueue output,
+            //?} else
+            //VertexConsumerProvider output,
+            int light, PlayerEntityRenderState state, float limbAngle, float limbDistance) {
+        //? if >=1.21.8 {
         SaturnPlayer player = state.getData(SaturnRenderState.saturnDataKey);
+        //?} else
+        //SaturnPlayer player = SaturnPlayer.get(state.name);
 
         if (state.invisible || player == null || player.hat.isEmpty()) {
             return;
@@ -31,11 +39,19 @@ public class HatFeatureRenderer extends FeatureRenderer<PlayerEntityRenderState,
 
         matrices.push();
 
-        ModelPart head = this.getContextModel().head;
-        matrices.multiply(new Quaternionf().rotationZYX(head.roll, head.yaw, head.pitch));
+        // On the head, as vanilla places head items: the whole player (which emotes like the backflip
+        // turn), then the head's position, turn and scale (which crouching and emotes move)
+        PlayerEntityModel model = this.getContextModel();
+        //? if >=1.21.5 {
+        model.getRootPart().applyTransform(matrices);
+        model.head.applyTransform(matrices);
+        //?} else {
+        /*model.getRootPart().rotate(matrices);
+        model.head.rotate(matrices);
+        *///?}
 
         ObjModel.cosmetic("hat", player.hat).render(MtlLoader.cosmetic(player.hat),
-                matrices, queue, light,
+                matrices, output, light,
                 OverlayTexture.DEFAULT_UV);
 
         matrices.pop();

src/main/java/org/saturnclient/impl/cosmetics/obj/ObjModel.java

@@ -13,7 +13,10 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import de.javagl.obj.Mtl;
 import de.javagl.obj.Obj;
 import net.minecraft.client.MinecraftClient;
+//? if >=1.21.9 {
 import net.minecraft.client.render.command.OrderedRenderCommandQueue;
+//?} else
+//import net.minecraft.client.render.VertexConsumerProvider;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.resource.Resource;
 import net.minecraft.resource.ResourceManager;
@@ -78,8 +81,12 @@ public class ObjModel {
         }
     }
 
-    public void render(Map<String, Mtl> mtlMap, MatrixStack matrices, OrderedRenderCommandQueue queue, int light,
-            int overlay) {
+    public void render(Map<String, Mtl> mtlMap, MatrixStack matrices,
+            //? if >=1.21.9 {
+            OrderedRenderCommandQueue output,
+            //?} else
+            //VertexConsumerProvider output,
+            int light, int overlay) {
         matrices.push();
 
         matrices.multiply(net.minecraft.util.math.RotationAxis.POSITIVE_X.rotationDegrees(180.0f));
@@ -95,7 +102,7 @@ public class ObjModel {
             matrices.multiply(net.minecraft.util.math.RotationAxis.POSITIVE_Z.rotationDegrees(config.rotation.z));
         }
 
-        ObjRenderer.renderObj(this.obj, mtlMap, matrices, queue, light, overlay);
+        ObjRenderer.renderObj(this.obj, mtlMap, matrices, output, light, overlay);
 
         matrices.pop();
     }

src/main/java/org/saturnclient/impl/cosmetics/obj/ObjRenderer.java

@@ -12,7 +12,10 @@ import de.javagl.obj.*;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.render.RenderLayer;
 import net.minecraft.client.render.VertexConsumer;
+//? if >=1.21.9 {
 import net.minecraft.client.render.command.OrderedRenderCommandQueue;
+//?} else
+//import net.minecraft.client.render.VertexConsumerProvider;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.util.Identifier;
 
@@ -28,7 +31,10 @@ public class ObjRenderer {
     public static void renderObj(Obj obj,
             Map<String, Mtl> mtlMap,
             MatrixStack matrices,
-            OrderedRenderCommandQueue queue,
+            //? if >=1.21.9 {
+            OrderedRenderCommandQueue output,
+            //?} else
+            //VertexConsumerProvider output,
             int light,
             int overlay) {
 
@@ -64,20 +70,26 @@ public class ObjRenderer {
             final float fr = r, fg = g, fb = b;
             final Obj finalObj = groupObj;
 
-            queue.submitCustom(matrices, layer, (e, vertexConsumer) -> {
+            //? if >=1.21.9 {
+            output.submitCustom(matrices, layer,
+                    (entry, consumer) -> drawGroup(finalObj, consumer, entry, light, overlay, fr, fg, fb));
+            //?} else
+            //drawGroup(finalObj, output.getBuffer(layer), matrices.peek(), light, overlay, fr, fg, fb);
+        }
+    }
 
-                int faces = finalObj.getNumFaces();
+    private static void drawGroup(Obj obj, VertexConsumer consumer, MatrixStack.Entry entry, int light, int overlay,
+            float r, float g, float b) {
+        int faces = obj.getNumFaces();
 
         for (int f = 0; f < faces; f++) {
-                    ObjFace face = finalObj.getFace(f);
+            ObjFace face = obj.getFace(f);
             int verts = face.getNumVertices();
 
             for (int i = verts - 1; i >= 0; i--) {
-                        writeVertex(finalObj, face, i, vertexConsumer, e, light, overlay, fr, fg, fb);
+                writeVertex(obj, face, i, consumer, entry, light, overlay, r, g, b);
             }
         }
-            });
-        }
     }
 
     private static void writeVertex(Obj obj, ObjFace face, int index, VertexConsumer consumer,

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

@@ -43,9 +43,12 @@ public class IdentifierUtils {
             }
 
             SaturnClient.client.execute(() -> {
+                //? if >=1.21.5 {
                 NativeImageBackedTexture texture = new NativeImageBackedTexture(
                         () -> identifier.toString(),
                         nativeImage);
+                //?} else
+                //NativeImageBackedTexture texture = new NativeImageBackedTexture(nativeImage);
 
                 SaturnClient.client.getTextureManager().registerTexture(identifier, texture);
             });

src/main/java/org/saturnclient/impl/cosmetics/utils/ShaderUtils.java

@@ -3,16 +3,30 @@ package org.saturnclient.impl.cosmetics.utils;
 import org.saturnclient.common.ref.asset.IdentifierRef;
 import org.saturnclient.cosmetics.utils.GifUtils;
 
+//? if >=1.21.5
 import com.mojang.blaze3d.pipeline.RenderPipeline;
 
+//? if >=1.21.5
 import net.minecraft.client.gl.RenderPipelines;
 import net.minecraft.client.render.RenderLayer;
+//? if <1.21.5 {
+/*import net.minecraft.client.render.RenderPhase;
+import net.minecraft.client.render.VertexFormat.DrawMode;
+import net.minecraft.client.render.VertexFormats;
+*///?}
+//? if >=1.21.11 {
 import net.minecraft.client.render.RenderLayers;
 import net.minecraft.client.render.RenderSetup;
 import net.minecraft.client.render.block.entity.AbstractEndPortalBlockEntityRenderer;
+//?} else {
+/*import net.minecraft.client.render.RenderPhase.Textures;
+import net.minecraft.client.render.block.entity.EndPortalBlockEntityRenderer;
+*///?}
 import net.minecraft.util.Identifier;
 
 public class ShaderUtils {
+    // Render pipelines exist from 1.21.5; before that the layer names a shader program directly.
+    //? if >=1.21.5 {
     public static final RenderPipeline END_GATEWAY_PIPELINE = RenderPipelines.register(
             RenderPipeline.builder(new RenderPipeline.Snippet[] {
                     RenderPipelines.RENDERTYPE_END_PORTAL_SNIPPET })
@@ -20,20 +34,60 @@ public class ShaderUtils {
                     .withShaderDefine("PORTAL_LAYERS", 16)
                     .withCull(false)
                     .build());
+    //?}
 
+    //? if >=1.21.11 {
     public static final RenderLayer END_GATEWAY = RenderLayer.of("end_gateway",
             RenderSetup.builder(END_GATEWAY_PIPELINE)
                     .texture("Sampler0", AbstractEndPortalBlockEntityRenderer.SKY_TEXTURE)
                     .texture("Sampler1", AbstractEndPortalBlockEntityRenderer.PORTAL_TEXTURE).build());
+    //?} else if >=1.21.6 {
+    /*public static final RenderLayer END_GATEWAY = RenderLayer.of("end_gateway", 1536, false, false,
+            END_GATEWAY_PIPELINE,
+            RenderLayer.MultiPhaseParameters.builder()
+                    .texture(Textures.create().add(EndPortalBlockEntityRenderer.SKY_TEXTURE, false)
+                            .add(EndPortalBlockEntityRenderer.PORTAL_TEXTURE, false).build())
+                    .build(false));
+    *///?} else if >=1.21.5 {
+    /*public static final RenderLayer END_GATEWAY = RenderLayer.of("end_gateway", 1536, false, false,
+            END_GATEWAY_PIPELINE,
+            RenderLayer.MultiPhaseParameters.builder()
+                    .texture(Textures.create().add(EndPortalBlockEntityRenderer.SKY_TEXTURE, false, false)
+                            .add(EndPortalBlockEntityRenderer.PORTAL_TEXTURE, false, false).build())
+                    .build(false));
+    *///?} else {
+    /*public static final RenderLayer END_GATEWAY = RenderLayer.of(
+            "end_gateway",
+            VertexFormats.POSITION,
+            DrawMode.QUADS,
+            1536,
+            false,
+            false,
+            RenderLayer.MultiPhaseParameters.builder()
+                    .program(RenderLayer.END_GATEWAY_PROGRAM)
+                    .texture(Textures.create()
+                            .add(EndPortalBlockEntityRenderer.SKY_TEXTURE, false, false)
+                            .add(EndPortalBlockEntityRenderer.PORTAL_TEXTURE, false, false)
+                            .build())
+                    .cull(RenderPhase.DISABLE_CULLING)
+                    .build(false));
+    *///?}
 
     public static RenderLayer getRenderLayer(IdentifierRef texture) {
         String path = texture.toString();
         if (path.endsWith(".gif")) {
-            return RenderLayers.entityAlpha((Identifier) (Object) GifUtils.get(texture));
+            return entityAlpha((Identifier) (Object) GifUtils.get(texture));
         } else if (path.endsWith("end.png")) {
             return END_GATEWAY;
         } else {
-            return RenderLayers.entityAlpha((Identifier) (Object) texture);
+            return entityAlpha((Identifier) (Object) texture);
         }
     }
+
+    private static RenderLayer entityAlpha(Identifier texture) {
+        //? if >=1.21.11 {
+        return RenderLayers.entityAlpha(texture);
+        //?} else
+        //return RenderLayer.getEntityAlpha(texture);
+    }
 }

src/main/java/org/saturnclient/impl/features/entity/EntityFeatureImpl.java

@@ -12,10 +12,9 @@ import net.minecraft.entity.LivingEntity;
  * Fabric implementation of {@link EntityFeature}.
  *
  * Crosshair targeting is resolved via {@link MinecraftClient#crosshairTarget}.
- * Entity state for nametag rendering is supplied at render time by
- * {@link org.saturnclient.modules.mixins.LivingEntityRendererMixin} which
- * writes into the render state; {@link NametagsMixin} then constructs
- * a {@link RenderStateEntityState} from the already-extracted snapshot.
+ * Entity state for nametags is built by LivingEntityRendererMixin, which
+ * writes health into the render state and then constructs a
+ * {@link RenderStateEntityState} from that snapshot for NametagsMod.
  */
 public class EntityFeatureImpl implements EntityFeature {
 
@@ -43,7 +42,7 @@ public class EntityFeatureImpl implements EntityFeature {
      * Minecraft render-state object) as a platform-neutral
      * {@link EntityState} for use by {@link NametagsFeature}.
      *
-     * This is constructed inside {@link NametagsMixin} where both the
+     * This is constructed in LivingEntityRendererMixin, where both the
      * render-state mixin interface and the entity name are available.
      */
     public static final class RenderStateEntityState implements EntityState {

src/main/java/org/saturnclient/impl/features/entity/HealthRenderState.java

@@ -7,8 +7,8 @@ import org.saturnclient.common.feature.EntityFeature;
  * {@link net.minecraft.client.render.entity.state.LivingEntityRenderState}.
  *
  * Carries the entity's health snapshot and classification into the render
- * pipeline so that {@link NametagsMixin} can read them without touching
- * the live entity again.
+ * render state, so NametagsMod's replacement nametag (applied in
+ * LivingEntityRendererMixin) can use them without touching the live entity again.
  */
 public interface HealthRenderState {
 

src/main/java/org/saturnclient/impl/features/mixins/entity/CameraMixin.java

@@ -13,7 +13,10 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import net.minecraft.client.network.ClientPlayerEntity;
 import net.minecraft.client.render.Camera;
 import net.minecraft.entity.Entity;
+//? if >=1.21.11 {
 import net.minecraft.world.World;
+//?} else
+//import net.minecraft.world.BlockView;
 
 @Mixin(Camera.class)
 public abstract class CameraMixin {
@@ -25,7 +28,10 @@ public abstract class CameraMixin {
 
     @Inject(method = "update", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/Camera;setRotation(FF)V", ordinal = 1, shift = At.Shift.AFTER))
     public void lockRotation(
+            //? if >=1.21.11 {
             World focusedBlock,
+            //?} else
+            //BlockView focusedBlock,
             Entity cameraEntity,
             boolean isThirdPerson,
             boolean isFrontFacing,

src/main/java/org/saturnclient/impl/features/mixins/render/BackgroundRendererMixin.java

@@ -1,13 +1,19 @@
 package org.saturnclient.impl.features.mixins.render;
 
+//? if >=1.21.6 {
 import net.minecraft.client.render.fog.FogRenderer;
+//?} else
+//import net.minecraft.client.render.BackgroundRenderer;
 
 import org.saturnclient.mod.mods.NoFogMod;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.ModifyVariable;
 
+//? if >=1.21.6 {
 @Mixin(FogRenderer.class)
+//?} else
+//@Mixin(BackgroundRenderer.class)
 public class BackgroundRendererMixin {
     // fog
     @ModifyVariable(method = "applyFog", at = @At("HEAD"), ordinal = 0, argsOnly = true)

src/main/java/org/saturnclient/impl/features/mixins/render/GameRendererMixin.java

@@ -1,11 +1,20 @@
 package org.saturnclient.impl.features.mixins.render;
 
+//? if >=1.21.6
+import net.minecraft.client.MinecraftClient;
+//? if >=1.21.6
+import net.minecraft.client.option.GameOptions;
 import net.minecraft.client.render.GameRenderer;
 
+//? if >=1.21.6
+import org.saturnclient.impl.ui.SaturnScreenFabric;
+import org.saturnclient.mod.mods.FreelookMod;
 import org.saturnclient.mod.mods.ZoomMod;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
+//? if >=1.21.6
+import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 /**
@@ -32,6 +41,23 @@ public class GameRendererMixin {
         if (ZoomMod.shouldZoom()) {
             float zoomedFov = cir.getReturnValue() / ZoomMod.getZoomLevel();
             cir.setReturnValue(zoomedFov);
+        } else if (FreelookMod.shouldZoomOut()) {
+            float zoomedFov = cir.getReturnValue() / FreelookMod.getZoomLevel();
+            cir.setReturnValue(zoomedFov);
         }
     }
+
+    //? if >=1.21.6 {
+    // From 1.21.6 the menu blur's strength is the vanilla setting, read here every frame. While a
+    // Saturn screen is open, it's Saturn's background blur instead, faded in with the screen.
+    @Redirect(method = "render", at = @At(value = "INVOKE",
+            target = "Lnet/minecraft/client/option/GameOptions;getMenuBackgroundBlurrinessValue()I"))
+    private int useSaturnBlur(GameOptions options) {
+        if (MinecraftClient.getInstance().currentScreen instanceof SaturnScreenFabric saturnScreen) {
+            return saturnScreen.screen.getBackgroundBlur();
+        }
+
+        return options.getMenuBackgroundBlurrinessValue();
+    }
+    //?}
 }

src/main/java/org/saturnclient/impl/features/mixins/render/LivingEntityRenderStateMixin.java

@@ -18,8 +18,8 @@ import org.spongepowered.asm.mixin.Unique;
  *
  * The stored values are written by
  * {@link LivingEntityRendererMixin#saturn$captureHealth} each time a
- * render state is extracted from a live entity, and read by
- * {@link NametagsMixin} at render time.
+ * render state is extracted from a live entity, and read there right away for
+ * NametagsMod's replacement nametag.
  */
 @Mixin(LivingEntityRenderState.class)
 public class LivingEntityRenderStateMixin implements HealthRenderState {

src/main/java/org/saturnclient/impl/features/mixins/render/LivingEntityRendererMixin.java

@@ -6,24 +6,25 @@ import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.mob.HostileEntity;
 import net.minecraft.entity.passive.PassiveEntity;
 import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.text.Text;
 
 import org.saturnclient.common.feature.EntityFeature;
+import org.saturnclient.impl.features.entity.EntityFeatureImpl;
 import org.saturnclient.impl.features.entity.HealthRenderState;
+import org.saturnclient.mod.mods.NametagsMod;
 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;
 
 /**
- * Captures each living entity's health and type into the render state
- * during {@code updateRenderState}, so that nametag rendering can read
- * them without touching the live entity again.
+ * Captures each living entity's health and type into the render state during
+ * {@code updateRenderState}, and applies {@link NametagsMod}'s replacement nametag to the state's
+ * display name.
  *
- * Previously imported {@code NametagsInterface.EntityType}; now uses
- * {@link EntityFeature.EntityType} — the canonical enum shared across
- * the whole module system.
- *
- * The injection target and strategy are unchanged from the original.
+ * Replacing the name here, while the render state is built, works the same on every version. Hooking
+ * label rendering instead doesn't: 1.21.9 moved it to the render command queue. Player role icons are
+ * added after this, in PlayerEntityRendererMixin.
  */
 @Mixin(LivingEntityRenderer.class)
 public abstract class LivingEntityRendererMixin<T extends LivingEntity, S extends LivingEntityRenderState> {
@@ -47,5 +48,15 @@ public abstract class LivingEntityRendererMixin<T extends LivingEntity, S extend
             type = EntityFeature.EntityType.OTHER;
 
         hrs.saturn$setEntityType(type);
+
+        // Only entities that already show a label get a replacement one, as when this hooked label
+        // rendering.
+        if (NametagsMod.shouldReplaceName() && state.displayName != null) {
+            String replacement = NametagsMod.getNametagString(
+                    new EntityFeatureImpl.RenderStateEntityState(state.displayName.getString(), hrs));
+            if (replacement != null) {
+                state.displayName = Text.literal(replacement);
+            }
+        }
     }
 }

src/main/java/org/saturnclient/impl/features/player/PlayerFeatureImpl.java

@@ -169,22 +169,34 @@ public class PlayerFeatureImpl implements PlayerFeature {
 
     @Override
     public ItemStackRef getHelmet() {
+        //? if >=1.21.5 {
         return wrap(hasPlayer() ? player().getEquippedStack(EquipmentSlot.HEAD) : ItemStack.EMPTY);
+        //?} else
+        //return wrap(hasPlayer() ? player().getInventory().armor.get(3) : ItemStack.EMPTY);
     }
 
     @Override
     public ItemStackRef getChestplate() {
+        //? if >=1.21.5 {
         return wrap(hasPlayer() ? player().getEquippedStack(EquipmentSlot.CHEST) : ItemStack.EMPTY);
+        //?} else
+        //return wrap(hasPlayer() ? player().getInventory().armor.get(2) : ItemStack.EMPTY);
     }
 
     @Override
     public ItemStackRef getLeggings() {
+        //? if >=1.21.5 {
         return wrap(hasPlayer() ? player().getEquippedStack(EquipmentSlot.LEGS) : ItemStack.EMPTY);
+        //?} else
+        //return wrap(hasPlayer() ? player().getInventory().armor.get(1) : ItemStack.EMPTY);
     }
 
     @Override
     public ItemStackRef getBoots() {
+        //? if >=1.21.5 {
         return wrap(hasPlayer() ? player().getEquippedStack(EquipmentSlot.FEET) : ItemStack.EMPTY);
+        //?} else
+        //return wrap(hasPlayer() ? player().getInventory().armor.get(0) : ItemStack.EMPTY);
     }
 
     // ---------------------------------------------------------------

src/main/java/org/saturnclient/impl/features/world/WorldFeatureImpl.java

@@ -31,7 +31,7 @@ public class WorldFeatureImpl implements WorldFeature {
      */
     @Override
     public long getWorldAge() {
-        // return hasWorld() ? mc.world.getTime() : 0L;
-        return 0L;
+        // World.getTime() was a shortcut for this, and 1.21.11 removed it.
+        return hasWorld() ? mc.world.getLevelProperties().getTime() : 0L;
     }
 }

src/main/java/org/saturnclient/impl/mixins/MatrixStackMixin.java

@@ -1,14 +1,25 @@
 package org.saturnclient.impl.mixins;
 
-import org.joml.Quaternionfc;
-import org.saturnclient.common.ref.render.MatrixStackRef;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
 import net.minecraft.client.util.math.MatrixStack;
+import org.spongepowered.asm.mixin.Mixin;
+//? if <1.21.6 {
+/*import org.saturnclient.common.ref.render.MatrixStackRef;
+//? if >=1.21.5
+import org.joml.Quaternionfc;
+//? if <1.21.5
+//import org.joml.Quaternionf;
+import org.spongepowered.asm.mixin.Shadow;
 import net.minecraft.util.math.RotationAxis;
+*///?}
 
+/**
+ * Makes MatrixStack a MatrixStackRef, for GUI drawing before 1.21.6. From 1.21.6 the GUI uses a 2D
+ * Matrix3x2fStack (Matrix3x2fStackRef) instead, so this mixin is empty but stays registered, keeping
+ * impl.mixins.json the same for every version.
+ */
 @Mixin(MatrixStack.class)
-public abstract class MatrixStackMixin implements MatrixStackRef {
+//? if <1.21.6 {
+/*public abstract class MatrixStackMixin implements MatrixStackRef {
     @Shadow
     public abstract void push();
 
@@ -22,10 +33,16 @@ public abstract class MatrixStackMixin implements MatrixStackRef {
     public abstract void scale(float x, float y, float z);
 
     @Shadow
+    //? if >=1.21.5
     public abstract void multiply(Quaternionfc quaternion);
+    //? if <1.21.5
+    //public abstract void multiply(Quaternionf quaternion);
 
     @Shadow
+    //? if >=1.21.5
     public abstract void multiply(Quaternionfc quaternion, float originX, float originY, float originZ);
+    //? if <1.21.5
+    //public abstract void multiply(Quaternionf quaternion, float originX, float originY, float originZ);
 
     @Override
     public void translate(float x, float y) {
@@ -47,3 +64,5 @@ public abstract class MatrixStackMixin implements MatrixStackRef {
         multiply(RotationAxis.NEGATIVE_Z.rotationDegrees(angle));
     }
 }
+*///?} else
+public abstract class MatrixStackMixin {}

src/main/java/org/saturnclient/impl/mixins/MinecraftClientMixin.java

@@ -141,7 +141,10 @@ public abstract class MinecraftClientMixin implements MinecraftClientRef {
         if (entry == null)
             return null;
 
+        //? if >=1.21.9 {
         return entry.getProfile().name();
+        //?} else
+        //return entry.getProfile().getName();
     }
 
     @Override
@@ -157,6 +160,9 @@ public abstract class MinecraftClientMixin implements MinecraftClientRef {
         if (entry == null)
             return null;
 
+        //? if >=1.21.9 {
         return entry.getProfile().id();
+        //?} else
+        //return entry.getProfile().getId();
     }
 }

src/main/java/org/saturnclient/impl/mixins/StatusEffectMixin.java

@@ -3,6 +3,8 @@ package org.saturnclient.impl.mixins;
 import org.saturnclient.common.ref.asset.IdentifierRef;
 import org.saturnclient.common.ref.asset.SpriteRef;
 import org.saturnclient.common.ref.game.EffectRef;
+//? if <1.21.9
+//import org.saturnclient.saturnclient.SaturnClient;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 
@@ -29,15 +31,24 @@ public abstract class StatusEffectMixin implements EffectRef {
 
     @Override
     public SpriteRef getIcon() {
+        // 1.21.9 changed the GUI atlas, so newer versions draw the effect's texture (getIconId) instead.
+        //? if >=1.21.9 {
         return null;
+        //?} else if >=1.21.6 {
+        //return (SpriteRef) SaturnClient.client.getGuiAtlasManager().getSprite((InGameHud.getEffectTexture(getEffectType())));
+        //?} else
+        //return (SpriteRef) SaturnClient.client.getStatusEffectSpriteManager().getSprite(getEffectType());
     }
 
+    // Before 1.21.6 there's no InGameHud.getEffectTexture; getIcon's sprite is used there instead.
+    //? if >=1.21.6 {
     @Override
     public IdentifierRef getIconId() {
         Identifier id = InGameHud.getEffectTexture(getEffectType());
 
         return IdentifierRef.of(id.getNamespace(), "textures/" + id.getPath() + ".png");
     }
+    //?}
 
     @Override
     public String getInfiniteText() {

src/main/java/org/saturnclient/impl/mixins/TextMixin.java

@@ -7,6 +7,7 @@ import org.spongepowered.asm.mixin.Mixin;
 
 import net.minecraft.text.Style;
 import net.minecraft.text.Text;
+//? if >=1.21.9
 import net.minecraft.text.StyleSpriteSource.Font;
 import net.minecraft.util.Identifier;
 
@@ -15,7 +16,10 @@ public interface TextMixin extends TextRef {
 
     @Override
     public default TextRef withFont(IdentifierRef font) {
+        //? if >=1.21.9 {
         return (TextRef) (Text) (((Text) this).copy().setStyle(Style.EMPTY.withFont(new Font((Identifier) (Object) font))));
+        //?} else
+        //return (TextRef) (((Text) this).copy().setStyle(Style.EMPTY.withFont((Identifier) (Object) font)));
     }
 
     @Override

src/main/java/org/saturnclient/impl/provider/SaturnProviderImpl.java

@@ -2,11 +2,17 @@ package org.saturnclient.impl.provider;
 
 import java.awt.image.BufferedImage;
 import java.util.UUID;
+import java.util.function.Supplier;
 
 import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.toast.SystemToast;
+//? if >=1.21.9 {
+import net.minecraft.entity.player.SkinTextures;
+//?} else
+//import net.minecraft.client.util.SkinTextures;
 import net.minecraft.text.Text;
+import net.minecraft.util.Identifier;
 
 import org.saturnclient.common.provider.SaturnProvider;
 import org.saturnclient.common.ref.asset.IdentifierRef;
@@ -16,6 +22,9 @@ import org.saturnclient.impl.cosmetics.utils.IdentifierUtils;
 import org.saturnclient.saturnclient.SaturnClient;
 
 public class SaturnProviderImpl implements SaturnProvider {
+    /** Looks up the signed-in player's skin; made once, since the skin provider caches it */
+    private Supplier<Identifier> playerSkin;
+
     @Override
     public MinecraftClientRef getClient() {
         return (MinecraftClientRef) SaturnClient.client;
@@ -50,6 +59,23 @@ public class SaturnProviderImpl implements SaturnProvider {
     /** Shown longer than the vanilla default, since these ask the player to act. */
     private static final SystemToast.Type WARNING_TOAST = new SystemToast.Type(15_000L);
 
+    @Override
+    public IdentifierRef getPlayerSkin() {
+        if (playerSkin == null) {
+            MinecraftClient client = MinecraftClient.getInstance();
+            // 1.21.9 moved SkinTextures and renamed the skin provider's lookup.
+            //? if >=1.21.9 {
+            Supplier<SkinTextures> textures = client.getSkinProvider().supplySkinTextures(client.getGameProfile(), false);
+            playerSkin = () -> textures.get().body().texturePath();
+            //?} else {
+            /*Supplier<SkinTextures> textures = client.getSkinProvider().getSkinTexturesSupplier(client.getGameProfile());
+            playerSkin = () -> textures.get().texture();
+            *///?}
+        }
+
+        return (IdentifierRef) (Object) playerSkin.get();
+    }
+
     @Override
     public String getModVersion() {
         return FabricLoader.getInstance().getModContainer(SaturnClient.MOD_ID)

src/main/java/org/saturnclient/impl/ui/EntityDrawerImpl.java

@@ -1,47 +1,51 @@
 package org.saturnclient.impl.ui;
 
+// Entities in the UI are drawn through the GUI render state from 1.21.6, and straight into vertex
+// consumers before. This file has one implementation for each side.
+//? if >=1.21.6 {
 import org.jetbrains.annotations.Nullable;
 import org.joml.Quaternionf;
 import org.joml.Vector3f;
 import org.saturnclient.saturnclient.SaturnClient;
-import org.saturnclient.ui.ElementContext;
 import org.saturnclient.ui.RenderScope;
 import org.saturnclient.ui.components.SkinPreview.EntityDrawer;
 
+//? if >=1.21.9 {
 import net.minecraft.client.render.entity.EntityRenderManager;
+//?} else
+//import net.minecraft.client.render.entity.EntityRenderDispatcher;
 import net.minecraft.client.render.entity.EntityRenderer;
 import net.minecraft.client.render.entity.state.EntityRenderState;
 import net.minecraft.entity.LivingEntity;
 
 public class EntityDrawerImpl implements EntityDrawer {
     @Override
-    public void render(RenderScope renderScope, boolean negativeAngle, float angle, float scale, ElementContext ctx) {
+    public boolean render(RenderScope renderScope, int width, int height, float yaw) {
         LivingEntity entity = SaturnClient.client.player;
 
-        if (entity != null) {
-            drawEntity(renderScope, 0, 0, 75, 78, 30, 0.0625F, ctx.mouseX / scale, ctx.mouseY / scale,
-                    SaturnClient.client.player);
-        }
+        if (entity == null) {
+            return false;
         }
 
+        // The player is about 1.8 blocks tall; leave some room above and below.
+        drawEntity(renderScope, 0, 0, width, height, (int) (height / 2.2F), 0.0625F, yaw, entity);
+        return true;
+    }
+
+    // Draws the entity in the box, turned by yaw degrees (0 faces the viewer) with its head straight.
     public static void drawEntity(RenderScope renderScope, int x1, int y1, int x2, int y2, int size, float scale,
-            float mouseX, float mouseY, LivingEntity entity) {
-        float f = (float) (x1 + x2) / 2.0F;
-        float g = (float) (y1 + y2) / 2.0F;
+            float yaw, LivingEntity entity) {
         renderScope.enableScissor(x1, y1, x2, y2);
-        float h = (float) Math.atan((double) ((f - mouseX) / 40.0F));
-        float i = (float) Math.atan((double) ((g - mouseY) / 40.0F));
         Quaternionf quaternionf = (new Quaternionf()).rotateZ((float) Math.PI);
-        Quaternionf quaternionf2 = (new Quaternionf()).rotateX(i * 20.0F * ((float) Math.PI / 180F));
-        quaternionf.mul(quaternionf2);
+        Quaternionf quaternionf2 = new Quaternionf();
         float j = entity.bodyYaw;
         float k = entity.getYaw();
         float l = entity.getPitch();
         float m = entity.lastHeadYaw;
         float n = entity.headYaw;
-        entity.bodyYaw = 180.0F + h * 20.0F;
-        entity.setYaw(180.0F + h * 40.0F);
-        entity.setPitch(-i * 20.0F);
+        entity.bodyYaw = 180.0F + yaw;
+        entity.setYaw(180.0F + yaw);
+        entity.setPitch(0.0F);
         entity.headYaw = entity.getYaw();
         entity.lastHeadYaw = entity.getYaw();
         float o = entity.getScale();
@@ -59,12 +63,113 @@ public class EntityDrawerImpl implements EntityDrawer {
     public static void drawEntity(RenderScope renderScope, int x1, int y1, int x2, int y2, float scale,
             Vector3f translation, Quaternionf rotation, @Nullable Quaternionf overrideCameraAngle,
             LivingEntity entity) {
+        //? if >=1.21.9 {
         EntityRenderManager entityRenderDispatcher = SaturnClient.client.getEntityRenderDispatcher();
+        //?} else
+        //EntityRenderDispatcher entityRenderDispatcher = SaturnClient.client.getEntityRenderDispatcher();
         EntityRenderer<? super LivingEntity, ?> entityRenderer = entityRenderDispatcher.getRenderer(entity);
         EntityRenderState entityRenderState = entityRenderer.getAndUpdateRenderState(entity, 1.0F);
-        // entityRenderState.hitbox = null;
+        //? if <1.21.11
+        //entityRenderState.hitbox = null;
 
         if (renderScope instanceof RenderScopeImpl i)
             i.addEntity(entityRenderState, scale, translation, rotation, overrideCameraAngle, x1, y1, x2, y2);
     }
 }
+//?} else {
+/*import org.jetbrains.annotations.Nullable;
+import org.joml.Quaternionf;
+import org.joml.Vector3f;
+import org.saturnclient.saturnclient.SaturnClient;
+import org.saturnclient.ui.RenderScope;
+import org.saturnclient.ui.components.SkinPreview.EntityDrawer;
+
+import net.minecraft.client.render.DiffuseLighting;
+import net.minecraft.client.render.entity.EntityRenderDispatcher;
+import net.minecraft.entity.LivingEntity;
+
+public class EntityDrawerImpl implements EntityDrawer {
+    // Draws the entity in the box, turned by yaw degrees (0 faces the viewer) with its head straight.
+    public static void drawEntity(RenderScope renderScope, int x1, int y1, int x2, int y2, int size, float f,
+            float yaw, LivingEntity entity) {
+        float g = (float) (x1 + x2) / 2.0F;
+        float h = (float) (y1 + y2) / 2.0F;
+        renderScope.enableScissor(x1, y1, x2, y2);
+        Quaternionf quaternionf = (new Quaternionf()).rotateZ(3.1415927F);
+        float k = entity.bodyYaw;
+        float l = entity.getYaw();
+        float m = entity.getPitch();
+        //? if >=1.21.5
+        float n = entity.lastHeadYaw;
+        //? if <1.21.5
+        //float n = entity.prevHeadYaw;
+        float o = entity.headYaw;
+        entity.setYaw(180.0F + yaw);
+        entity.bodyYaw = 180.0F + yaw;
+        entity.setPitch(0.0F);
+        entity.headYaw = entity.getYaw();
+        //? if >=1.21.5
+        entity.lastHeadYaw = entity.getHeadYaw();
+        //? if <1.21.5
+        //entity.prevHeadYaw = entity.getHeadYaw();
+        entity.setCustomNameVisible(false);
+
+        float p = entity.getScale();
+        Vector3f vector3f = new Vector3f(0.0F, entity.getHeight() / 2.0F + f * p, 0.0F);
+        float q = (float) size / p;
+        drawEntity(renderScope, g, h, q, vector3f, quaternionf, null, entity);
+
+        entity.setCustomNameVisible(true);
+        entity.bodyYaw = k;
+        entity.setYaw(l);
+        entity.setPitch(m);
+        //? if >=1.21.5
+        entity.lastHeadYaw = n;
+        //? if <1.21.5
+        //entity.prevHeadYaw = n;
+        entity.headYaw = o;
+        renderScope.disableScissor();
+    }
+
+    public static void drawEntity(RenderScope renderScope, float x, float y, float size, Vector3f vector3f,
+            Quaternionf quaternionf, @Nullable Quaternionf quaternionf2, LivingEntity entity) {
+        if (renderScope instanceof RenderScopeImpl scopeImpl) {
+            scopeImpl.matrices.push();
+            scopeImpl.matrices.translate((double) x, (double) y, 0);
+            scopeImpl.matrices.scale(size, size, -size);
+            scopeImpl.matrices.translate(vector3f.x, vector3f.y, vector3f.z);
+            scopeImpl.matrices.multiply(quaternionf);
+            scopeImpl.draw();
+            //? if >=1.21.5
+            DiffuseLighting.disableGuiDepthLighting();
+            //? if <1.21.5
+            //DiffuseLighting.method_34742();
+            EntityRenderDispatcher entityRenderDispatcher = SaturnClient.client.getEntityRenderDispatcher();
+
+            entityRenderDispatcher.setRenderShadows(false);
+            scopeImpl.draw((vertexConsumers) -> {
+                entityRenderDispatcher.render(entity, 0.0, 0.0, 0.0, 1.0F,
+                        scopeImpl.matrices, vertexConsumers, 15728880);
+            });
+
+            scopeImpl.draw();
+            entityRenderDispatcher.setRenderShadows(true);
+            scopeImpl.getMatrixStack().pop();
+            DiffuseLighting.enableGuiDepthLighting();
+        }
+
+    }
+
+    @Override
+    public boolean render(RenderScope renderScope, int width, int height, float yaw) {
+        LivingEntity entity = SaturnClient.client.player;
+        if (entity == null) {
+            return false;
+        }
+
+        // The player is about 1.8 blocks tall; leave some room above and below.
+        drawEntity(renderScope, 0, 0, width, height, (int) (height / 2.2F), 0.0625F, yaw, entity);
+        return true;
+    }
+}
+*///?}

src/main/java/org/saturnclient/impl/ui/GlassRenderer.java

@@ -0,0 +1,380 @@
+package org.saturnclient.impl.ui;
+
+// Glass: a copy of the game behind the screen, blurred, drawn through each panel's rounded rectangle
+// texture as a mask. There's a copy for each blur strength in use (menus and widgets have their own),
+// blurred with vanilla's blur at that radius, so it holds the world or panorama without the screen's
+// own animated background blur.
+//
+// The GUI rewrites split this into three implementations:
+// - 1.21.6+: the GUI is drawn after the screen builds it, so the copy is taken from the main
+//   framebuffer while the screen builds its GUI, and glass is a GUI element with its own pipeline
+//   (shaders/core/glass.fsh). The blur is vanilla's effect rebuilt with the radius set.
+// - 1.21.5: the screen draws straight into the framebuffer, blurring it first, so the game is saved
+//   before the blur (saveBackground). Glass is a render layer with its own pipeline
+//   (shaders/core/glass_pre_1_21_6.fsh), and the blur takes the radius as it runs.
+// - 1.21.4: as 1.21.5, with GL framebuffers copied by blitting, and a shader program
+//   (shaders/core/glass.json) instead of a pipeline.
+//? if >=1.21.6 {
+import java.io.Reader;
+import java.util.HashMap;
+import java.util.Map;
+
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import com.mojang.blaze3d.pipeline.RenderPipeline;
+import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.blaze3d.textures.FilterMode;
+import com.mojang.blaze3d.textures.GpuTextureView;
+import com.mojang.serialization.JsonOps;
+
+import org.saturnclient.config.Config;
+import org.saturnclient.saturnclient.SaturnClient;
+
+import net.minecraft.client.gl.Framebuffer;
+import net.minecraft.client.gl.PostEffectPipeline;
+import net.minecraft.client.gl.PostEffectProcessor;
+import net.minecraft.client.gl.RenderPipelines;
+import net.minecraft.client.gl.SimpleFramebuffer;
+import net.minecraft.client.render.DefaultFramebufferSet;
+import net.minecraft.client.render.ProjectionMatrix2;
+import net.minecraft.client.texture.AbstractTexture;
+import net.minecraft.client.texture.TextureSetup;
+import net.minecraft.client.util.Pool;
+import net.minecraft.util.Identifier;
+
+public final class GlassRenderer {
+    public static final RenderPipeline PIPELINE = RenderPipeline.builder(RenderPipelines.POSITION_TEX_COLOR_SNIPPET)
+            .withLocation(Identifier.of("saturnclient", "pipeline/glass"))
+            .withFragmentShader(Identifier.of("saturnclient", "core/glass"))
+            .withSampler("Sampler1")
+            // The transforms block ends with LineWidth before 1.21.11 (see glass.fsh).
+            //? if <1.21.11
+            //.withShaderDefine("HAS_LINE_WIDTH")
+            .build();
+
+    private static final Identifier BLUR = Identifier.ofVanilla("post_effect/blur.json");
+    private static final ProjectionMatrix2 PROJECTION = new ProjectionMatrix2("saturn glass", 0.1f, 1000f, false);
+    // For the blurs' intermediate targets, freed once unused for a few frames
+    private static final Pool POOL = new Pool(3);
+
+    // By blur strength. A blur that failed to load is kept as null, so it isn't retried every frame.
+    private static final Map<Integer, PostEffectProcessor> BLURS = new HashMap<>();
+    private static final Map<Integer, SimpleFramebuffer> BACKDROPS = new HashMap<>();
+
+    private GlassRenderer() {
+    }
+
+    // Copies the main framebuffer and blurs the copy by blur. Call once a frame for each blur, while
+    // the screen builds its GUI, before drawing glass with it.
+    public static void captureBackdrop(int blur) {
+        Framebuffer main = SaturnClient.client.getFramebuffer();
+        int width = main.textureWidth;
+        int height = main.textureHeight;
+
+        SimpleFramebuffer backdrop = BACKDROPS.get(blur);
+        if (backdrop == null) {
+            backdrop = new SimpleFramebuffer("Saturn glass " + blur, width, height, false);
+            BACKDROPS.put(blur, backdrop);
+        } else if (backdrop.textureWidth != width || backdrop.textureHeight != height) {
+            backdrop.resize(width, height);
+        }
+        //? if <1.21.11
+        //backdrop.getColorAttachment().setTextureFilter(FilterMode.LINEAR, false);
+
+        RenderSystem.getDevice().createCommandEncoder().copyTextureToTexture(
+                main.getColorAttachment(), backdrop.getColorAttachment(), 0, 0, 0, 0, 0, width, height);
+
+        PostEffectProcessor processor = getBlur(blur);
+        if (processor != null) {
+            processor.render(backdrop, POOL);
+        }
+        POOL.decrementLifespan();
+        release(blur);
+    }
+
+    // The mask, then the copy blurred by blur, as the glass pipeline samples them
+    public static TextureSetup textures(AbstractTexture mask, int blur) {
+        GpuTextureView backdrop = BACKDROPS.get(blur).getColorAttachmentView();
+        //? if >=1.21.11
+        return TextureSetup.of(mask.getGlTextureView(), mask.getSampler(), backdrop, RenderSystem.getSamplerCache().get(FilterMode.LINEAR));
+        //? if <1.21.11
+        //return TextureSetup.of(mask.getGlTextureView(), backdrop);
+    }
+
+    // Frees the copies and blurs of strengths that are no longer set, besides kept
+    private static void release(int kept) {
+        BACKDROPS.entrySet().removeIf(entry -> {
+            boolean unused = entry.getKey() != kept && !isSet(entry.getKey());
+            if (unused) {
+                entry.getValue().delete();
+            }
+            return unused;
+        });
+        BLURS.entrySet().removeIf(entry -> {
+            boolean unused = entry.getKey() != kept && !isSet(entry.getKey());
+            if (unused && entry.getValue() != null) {
+                entry.getValue().close();
+            }
+            return unused;
+        });
+    }
+
+    private static boolean isSet(int blur) {
+        return blur == Config.menuBlur.value || blur == Config.widgetBlur.value;
+    }
+
+    private static PostEffectProcessor getBlur(int blur) {
+        if (!BLURS.containsKey(blur)) {
+            BLURS.put(blur, loadBlur(blur));
+        }
+        return BLURS.get(blur);
+    }
+
+    // Vanilla's blur, with its radius set to blur. Vanilla's own leaves it at 0, which makes the shader
+    // read the menu blur setting (Saturn's animated background blur while a Saturn screen is open).
+    private static PostEffectProcessor loadBlur(int blur) {
+        try (Reader reader = SaturnClient.client.getResourceManager().getResourceOrThrow(BLUR).getReader()) {
+            JsonElement json = JsonParser.parseReader(reader);
+            setRadius(json, blur);
+
+            PostEffectPipeline pipeline = PostEffectPipeline.CODEC.parse(JsonOps.INSTANCE, json).getOrThrow();
+            return PostEffectProcessor.parseEffect(pipeline, SaturnClient.client.getTextureManager(),
+                    DefaultFramebufferSet.MAIN_ONLY, Identifier.of("saturnclient", "glass_blur_" + blur), PROJECTION);
+        } catch (Exception e) {
+            SaturnClient.LOGGER.error("Couldn't load the glass blur", e);
+            return null;
+        }
+    }
+
+    // Sets every "Radius" uniform in the effect
+    private static void setRadius(JsonElement json, int radius) {
+        if (json.isJsonArray()) {
+            json.getAsJsonArray().forEach(element -> setRadius(element, radius));
+        } else if (json.isJsonObject()) {
+            JsonObject object = json.getAsJsonObject();
+            if (object.has("name") && object.get("name").getAsString().equals("Radius")) {
+                object.addProperty("value", (float) radius);
+            }
+            object.entrySet().forEach(entry -> setRadius(entry.getValue(), radius));
+        }
+    }
+}
+//?} else if >=1.21.5 {
+/*import java.util.HashMap;
+import java.util.Map;
+
+import com.mojang.blaze3d.pipeline.RenderPipeline;
+import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.blaze3d.textures.FilterMode;
+
+import org.saturnclient.config.Config;
+import org.saturnclient.saturnclient.SaturnClient;
+
+import net.minecraft.client.gl.Framebuffer;
+import net.minecraft.client.gl.PostEffectProcessor;
+import net.minecraft.client.gl.RenderPipelines;
+import net.minecraft.client.gl.SimpleFramebuffer;
+import net.minecraft.client.render.DefaultFramebufferSet;
+import net.minecraft.client.render.RenderLayer;
+import net.minecraft.client.render.RenderPhase;
+import net.minecraft.client.util.Pool;
+import net.minecraft.util.Identifier;
+
+public final class GlassRenderer {
+    private static final RenderPipeline PIPELINE = RenderPipeline.builder(RenderPipelines.POSITION_TEX_COLOR_SNIPPET)
+            .withLocation(Identifier.of("saturnclient", "pipeline/glass"))
+            .withFragmentShader(Identifier.of("saturnclient", "core/glass_pre_1_21_6"))
+            .withSampler("Sampler1")
+            .build();
+
+    private static final Identifier BLUR = Identifier.ofVanilla("blur");
+    // For the blur's intermediate target, freed once unused for a few frames
+    private static final Pool POOL = new Pool(3);
+
+    private static final Map<Integer, SimpleFramebuffer> BACKDROPS = new HashMap<>();
+    // By mask and blur
+    private static final Map<String, RenderLayer> LAYERS = new HashMap<>();
+    // The game behind the screen before the screen blurs it, which glass is blurred from
+    private static SimpleFramebuffer background;
+
+    private GlassRenderer() {
+    }
+
+    // Saves the main framebuffer for glass. Call each frame before the screen blurs its background.
+    public static void saveBackground() {
+        background = copy(SaturnClient.client.getFramebuffer(), background, "Saturn glass background");
+    }
+
+    // Copies the saved background and blurs the copy by blur. Call once a frame for each blur, before
+    // drawing glass with it.
+    public static void captureBackdrop(int blur) {
+        Framebuffer from = background != null ? background : SaturnClient.client.getFramebuffer();
+        SimpleFramebuffer backdrop = copy(from, BACKDROPS.get(blur), "Saturn glass " + blur);
+        BACKDROPS.put(blur, backdrop);
+
+        PostEffectProcessor processor = SaturnClient.client.getShaderLoader().loadPostEffect(BLUR,
+                DefaultFramebufferSet.MAIN_ONLY);
+        if (processor != null) {
+            processor.render(backdrop, POOL, pass -> pass.setUniform("Radius", (float) blur));
+        }
+        POOL.decrementLifespan();
+        release(blur);
+    }
+
+    // Draws glass through mask with the copy blurred by blur
+    public static RenderLayer getLayer(Identifier mask, int blur) {
+        return LAYERS.computeIfAbsent(mask + " " + blur, key -> RenderLayer.of("saturn_glass", 786432, PIPELINE,
+                RenderLayer.MultiPhaseParameters.builder()
+                        .texture(new RenderPhase.TextureBase(() -> {
+                            RenderSystem.setShaderTexture(0,
+                                    SaturnClient.client.getTextureManager().getTexture(mask).getGlTexture());
+                            RenderSystem.setShaderTexture(1, BACKDROPS.get(blur).getColorAttachment());
+                        }, () -> {
+                        }))
+                        .build(false)));
+    }
+
+    // Frees the copies of strengths that are no longer set, besides kept
+    private static void release(int kept) {
+        BACKDROPS.entrySet().removeIf(entry -> {
+            boolean unused = entry.getKey() != kept && entry.getKey() != Config.menuBlur.value
+                    && entry.getKey() != Config.widgetBlur.value;
+            if (unused) {
+                entry.getValue().delete();
+            }
+            return unused;
+        });
+    }
+
+    // Copies from into to, made or resized to match
+    private static SimpleFramebuffer copy(Framebuffer from, SimpleFramebuffer to, String name) {
+        int width = from.textureWidth;
+        int height = from.textureHeight;
+
+        if (to == null) {
+            to = new SimpleFramebuffer(name, width, height, false);
+        } else if (to.textureWidth != width || to.textureHeight != height) {
+            to.resize(width, height);
+        }
+        to.getColorAttachment().setTextureFilter(FilterMode.LINEAR, false);
+
+        RenderSystem.getDevice().createCommandEncoder().copyTextureToTexture(
+                from.getColorAttachment(), to.getColorAttachment(), 0, 0, 0, 0, 0, width, height);
+        return to;
+    }
+}
+*///?} else {
+/*import java.util.HashMap;
+import java.util.Map;
+
+import org.lwjgl.opengl.GL11;
+import org.lwjgl.opengl.GL30;
+
+import com.mojang.blaze3d.platform.GlStateManager;
+import com.mojang.blaze3d.systems.RenderSystem;
+
+import org.saturnclient.config.Config;
+import org.saturnclient.saturnclient.SaturnClient;
+
+import net.minecraft.client.gl.Defines;
+import net.minecraft.client.gl.Framebuffer;
+import net.minecraft.client.gl.PostEffectProcessor;
+import net.minecraft.client.gl.ShaderProgramKey;
+import net.minecraft.client.gl.SimpleFramebuffer;
+import net.minecraft.client.render.DefaultFramebufferSet;
+import net.minecraft.client.render.RenderLayer;
+import net.minecraft.client.render.RenderPhase;
+import net.minecraft.client.render.VertexFormat;
+import net.minecraft.client.render.VertexFormats;
+import net.minecraft.client.util.Pool;
+import net.minecraft.util.Identifier;
+
+public final class GlassRenderer {
+    private static final ShaderProgramKey PROGRAM = new ShaderProgramKey(Identifier.of("saturnclient", "core/glass"),
+            VertexFormats.POSITION_TEXTURE_COLOR, Defines.EMPTY);
+
+    private static final Identifier BLUR = Identifier.ofVanilla("blur");
+    // For the blur's intermediate target, freed once unused for a few frames
+    private static final Pool POOL = new Pool(3);
+
+    private static final Map<Integer, SimpleFramebuffer> BACKDROPS = new HashMap<>();
+    // By mask and blur
+    private static final Map<String, RenderLayer> LAYERS = new HashMap<>();
+    // The game behind the screen before the screen blurs it, which glass is blurred from
+    private static SimpleFramebuffer background;
+
+    private GlassRenderer() {
+    }
+
+    // Saves the main framebuffer for glass. Call each frame before the screen blurs its background.
+    public static void saveBackground() {
+        background = copy(SaturnClient.client.getFramebuffer(), background);
+    }
+
+    // Copies the saved background and blurs the copy by blur. Call once a frame for each blur, before
+    // drawing glass with it.
+    public static void captureBackdrop(int blur) {
+        Framebuffer from = background != null ? background : SaturnClient.client.getFramebuffer();
+        SimpleFramebuffer backdrop = copy(from, BACKDROPS.get(blur));
+        BACKDROPS.put(blur, backdrop);
+
+        PostEffectProcessor processor = SaturnClient.client.getShaderLoader().loadPostEffect(BLUR,
+                DefaultFramebufferSet.MAIN_ONLY);
+        if (processor != null) {
+            processor.setUniforms("Radius", blur);
+            processor.render(backdrop, POOL);
+        }
+        POOL.decrementLifespan();
+        release(blur);
+        SaturnClient.client.getFramebuffer().beginWrite(false);
+    }
+
+    // Draws glass through mask with the copy blurred by blur
+    public static RenderLayer getLayer(Identifier mask, int blur) {
+        return LAYERS.computeIfAbsent(mask + " " + blur, key -> RenderLayer.of("saturn_glass",
+                VertexFormats.POSITION_TEXTURE_COLOR, VertexFormat.DrawMode.QUADS, 786432,
+                RenderLayer.MultiPhaseParameters.builder()
+                        .texture(new RenderPhase.TextureBase(() -> {
+                            RenderSystem.setShaderTexture(0, mask);
+                            RenderSystem.setShaderTexture(1, BACKDROPS.get(blur).getColorAttachment());
+                        }, () -> {
+                        }))
+                        .program(new RenderPhase.ShaderProgram(PROGRAM))
+                        .transparency(RenderPhase.TRANSLUCENT_TRANSPARENCY)
+                        .build(false)));
+    }
+
+    // Frees the copies of strengths that are no longer set, besides kept
+    private static void release(int kept) {
+        BACKDROPS.entrySet().removeIf(entry -> {
+            boolean unused = entry.getKey() != kept && entry.getKey() != Config.menuBlur.value
+                    && entry.getKey() != Config.widgetBlur.value;
+            if (unused) {
+                entry.getValue().delete();
+            }
+            return unused;
+        });
+    }
+
+    // Copies from into to, made or resized to match
+    private static SimpleFramebuffer copy(Framebuffer from, SimpleFramebuffer to) {
+        int width = from.textureWidth;
+        int height = from.textureHeight;
+
+        if (to == null) {
+            to = new SimpleFramebuffer(width, height, false);
+        } else if (to.textureWidth != width || to.textureHeight != height) {
+            to.resize(width, height);
+        }
+        to.setTexFilter(GL11.GL_LINEAR);
+
+        GlStateManager._glBindFramebuffer(GL30.GL_READ_FRAMEBUFFER, from.fbo);
+        GlStateManager._glBindFramebuffer(GL30.GL_DRAW_FRAMEBUFFER, to.fbo);
+        GlStateManager._glBlitFrameBuffer(0, 0, width, height, 0, 0, width, height, GL11.GL_COLOR_BUFFER_BIT,
+                GL11.GL_NEAREST);
+        SaturnClient.client.getFramebuffer().beginWrite(false);
+        return to;
+    }
+}
+*///?}

src/main/java/org/saturnclient/impl/ui/RenderScopeImpl.java

@@ -1,8 +1,13 @@
 package org.saturnclient.impl.ui;
 
+// 1.21.6 rewrote GUI rendering: render states and a 2D matrix stack (Matrix3x2fStack) instead of
+// drawing into vertex consumers with a MatrixStack. This file has one implementation for each side.
+//? if >=1.21.6 {
 import java.util.ArrayDeque;
 import java.util.Deque;
+import java.util.HashSet;
 import java.util.Objects;
+import java.util.Set;
 
 import org.jetbrains.annotations.Nullable;
 import org.joml.Matrix3x2f;
@@ -33,7 +38,10 @@ import net.minecraft.client.gui.render.state.TextGuiElementRenderState;
 import net.minecraft.client.gui.render.state.TexturedQuadGuiElementRenderState;
 import net.minecraft.client.gui.render.state.special.EntityGuiElementRenderState;
 import net.minecraft.client.render.entity.state.EntityRenderState;
+//? if >=1.21.7 {
 import net.minecraft.client.render.item.KeyedItemRenderState;
+//?} else
+//import net.minecraft.client.render.item.ItemRenderState;
 import net.minecraft.client.texture.AbstractTexture;
 import net.minecraft.client.texture.Sprite;
 import net.minecraft.client.texture.TextureSetup;
@@ -54,6 +62,8 @@ public class RenderScopeImpl implements RenderScope {
 
     private ScissorStack scissorStack;
     private int opacity = 0xFF << 24;
+    // The glass blurs made for this scope's frame
+    private final Set<Integer> capturedBlurs = new HashSet<>();
 
     public RenderScopeImpl(DrawContext context) {
         this(context.getMatrices(), ((DrawContextAccessor) (Object) context).getState());
@@ -145,7 +155,10 @@ public class RenderScopeImpl implements RenderScope {
                             ((Text) Fonts.setFont(line, font)).asOrderedText(),
                             new Matrix3x2f(this.matrices.stack),
                             0, font == 0 ? 1 : 8,
+                            //? if >=1.21.11 {
                             finalColor, 0, false, false, this.scissorStack.peekLast()));
+                            //?} else
+                            //finalColor, 0, false, this.scissorStack.peekLast()));
 
             matrices.pop();
 
@@ -206,16 +219,39 @@ public class RenderScopeImpl implements RenderScope {
         GpuTextureView gpuTextureView = SaturnClient.client.getTextureManager()
                 .getTexture(sprite).getGlTextureView();
 
+        //? if >=1.21.11
         AbstractTexture abstractTexture = SaturnClient.client.getTextureManager().getTexture(sprite);
 
         this.state.addSimpleElement(new TexturedQuadGuiElementRenderState(
                 RenderPipelines.GUI_TEXTURED,
+                //? if >=1.21.11 {
                 TextureSetup.of(gpuTextureView, abstractTexture.getSampler()),
+                //?} else
+                //TextureSetup.withoutGlTexture(gpuTextureView),
                 new Matrix3x2f(this.matrices.stack),
                 x1, y1, x2, y2, u1, u2, v1, v2, color,
                 this.scissorStack.peekLast()));
     }
 
+    @Override
+    public void drawGlass(IdentifierRef mask, int x, int y, int width, int height, int blur) {
+        int color = getColor(0xFFFFFFFF);
+        if (mask == null || color >>> 24 == 0)
+            return;
+
+        if (capturedBlurs.add(blur)) {
+            GlassRenderer.captureBackdrop(blur);
+        }
+
+        AbstractTexture maskTexture = SaturnClient.client.getTextureManager().getTexture((Identifier) (Object) mask);
+        this.state.addSimpleElement(new TexturedQuadGuiElementRenderState(
+                GlassRenderer.PIPELINE,
+                GlassRenderer.textures(maskTexture, blur),
+                new Matrix3x2f(this.matrices.stack),
+                x, y, x + width, y + height, 0, 1, 0, 1, color,
+                this.scissorStack.peekLast()));
+    }
+
     // Scissor management
     @Override
     public void enableScissor(int x1, int y1, int x2, int y2) {
@@ -280,7 +316,10 @@ public class RenderScopeImpl implements RenderScope {
     private void drawItem(@Nullable LivingEntity entity, @Nullable World world, ItemStack stack, int x, int y, int seed,
             int z) {
         if (!stack.isEmpty()) {
+            //? if >=1.21.7 {
             KeyedItemRenderState keyedItemRenderState = new KeyedItemRenderState();
+            //?} else
+            //ItemRenderState keyedItemRenderState = new ItemRenderState();
             SaturnClient.client.getItemModelManager().clearAndUpdate(keyedItemRenderState, stack,
                     ItemDisplayContext.GUI, world,
                     entity, seed);
@@ -348,3 +387,453 @@ public class RenderScopeImpl implements RenderScope {
                 this.scissorStack.peekLast()));
     }
 }
+//?} else {
+/*import java.util.ArrayDeque;
+import java.util.Deque;
+import java.util.HashSet;
+import java.util.Objects;
+import java.util.Set;
+import java.util.function.Consumer;
+
+import org.jetbrains.annotations.Nullable;
+import org.joml.Matrix4f;
+
+import com.mojang.blaze3d.systems.RenderSystem;
+
+import org.saturnclient.common.ref.asset.IdentifierRef;
+import org.saturnclient.common.ref.asset.SpriteRef;
+import org.saturnclient.common.ref.game.ItemStackRef;
+import org.saturnclient.common.ref.render.MatrixStackRef;
+import org.saturnclient.saturnclient.SaturnClient;
+import org.saturnclient.saturnclient.mixin.DrawContextAccessor;
+import org.saturnclient.ui.RenderScope;
+import org.saturnclient.ui.resources.Fonts;
+import org.saturnclient.ui.resources.SvgTexture;
+
+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;
+//? if >=1.21.5
+import net.minecraft.item.ItemDisplayContext;
+//? if <1.21.5
+//import net.minecraft.item.ModelTransformationMode;
+import net.minecraft.item.ItemStack;
+
+import net.minecraft.text.Text;
+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.world.World;
+
+public class RenderScopeImpl implements RenderScope {
+    // ----------------------------
+    // Fields
+    // ----------------------------
+    public MatrixStack matrices;
+    public VertexConsumerProvider.Immediate vertexConsumers;
+    private ScissorStack scissorStack = new ScissorStack();
+    private int opacity = 255 << 24;
+    // The glass blurs made for this scope's frame
+    private final Set<Integer> capturedBlurs = new HashSet<>();
+    private final ItemRenderState itemRenderState;
+
+    // ----------------------------
+    // Constructors
+    // ----------------------------
+    public RenderScopeImpl(DrawContext context) {
+        this(context.getMatrices(), ((DrawContextAccessor) context).getVertexConsumers());
+    }
+
+    public RenderScopeImpl(MatrixStack matrices, VertexConsumerProvider.Immediate vertexConsumers) {
+        this.matrices = matrices;
+        this.vertexConsumers = vertexConsumers;
+        this.scissorStack = new ScissorStack();
+        this.itemRenderState = new ItemRenderState();
+    }
+
+    // ----------------------------
+    // Matrix & Transform
+    // ----------------------------
+    @Override
+    public MatrixStackRef getMatrixStack() {
+        return (MatrixStackRef) matrices;
+    }
+
+    // ----------------------------
+    // Color & Opacity
+    // ----------------------------
+    @Override
+    public void setOpacity(float alpha) {
+        this.opacity = (int) (alpha * 255) << 24;
+    }
+
+    @Override
+    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);
+    }
+
+    // ----------------------------
+    // Draw / Window Info
+    // ----------------------------
+    @Override
+    public void draw() {
+        this.vertexConsumers.draw();
+    }
+
+    @Override
+    public int getScaledWindowWidth() {
+        return SaturnClient.client.getWindow().getScaledWidth();
+    }
+
+    @Override
+    public int getScaledWindowHeight() {
+        return SaturnClient.client.getWindow().getScaledHeight();
+    }
+
+    public void draw(Consumer<VertexConsumerProvider> drawer) {
+        drawer.accept(this.vertexConsumers);
+        this.vertexConsumers.draw();
+    }
+
+    // ----------------------------
+    // Shapes
+    // ----------------------------
+    @Override
+    public void drawRectangle(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;
+
+        if (x1 < x2) {
+            int tmp = x1;
+            x1 = x2;
+            x2 = tmp;
+        }
+        if (y1 < y2) {
+            int tmp = y1;
+            y1 = y2;
+            y2 = tmp;
+        }
+
+        VertexConsumer vertexConsumer = this.vertexConsumers.getBuffer(RenderLayer.getGui());
+        vertexConsumer.vertex(matrix4f, x1, y1, 0).color(color);
+        vertexConsumer.vertex(matrix4f, x1, y2, 0).color(color);
+        vertexConsumer.vertex(matrix4f, x2, y2, 0).color(color);
+        vertexConsumer.vertex(matrix4f, x2, y1, 0).color(color);
+    }
+
+    @Override
+    public void fill(int x1, int y1, int x2, int y2, int color) {
+        fill(x1, y1, x2, y2, 0, color);
+    }
+
+    public void fill(int x1, int y1, int x2, int y2, int z, int color) {
+        fill(RenderLayer.getGui(), x1, y1, x2, y2, z, color);
+    }
+
+    public void fill(RenderLayer layer, int x1, int y1, int x2, int y2, int color) {
+        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();
+        if (x1 < x2) {
+            int tmp = x1;
+            x1 = x2;
+            x2 = tmp;
+        }
+        if (y1 < y2) {
+            int tmp = y1;
+            y1 = y2;
+            y2 = tmp;
+        }
+
+        VertexConsumer vertexConsumer = this.vertexConsumers.getBuffer(layer);
+        vertexConsumer.vertex(matrix4f, x1, y1, z).color(color);
+        vertexConsumer.vertex(matrix4f, x1, y2, z).color(color);
+        vertexConsumer.vertex(matrix4f, x2, y2, z).color(color);
+        vertexConsumer.vertex(matrix4f, x2, y1, z).color(color);
+    }
+
+    @Override
+    public void drawBorder(int x, int y, int width, int height, int color) {
+        fill(x, y, x + width, y + 1, color);
+        fill(x, y + height - 1, x + width, y + height, color);
+        fill(x, y + 1, x + 1, y + height - 1, color);
+        fill(x + width - 1, y + 1, x + width, y + height - 1, color);
+    }
+
+    // ----------------------------
+    // Text
+    // ----------------------------
+    @Override
+    public void drawText(String text, int x, int y, int font, int color) {
+        drawText(1.0f, text, x, y, font, color);
+    }
+
+    @Override
+    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((Text) Fonts.setFont(line, font), 0, font == 0 ? 1 : 7, color, false,
+                    matrices.peek().getPositionMatrix(), vertexConsumers, TextLayerType.NORMAL, 0, 15728880);
+            matrices.pop();
+            i++;
+        }
+    }
+
+    // ----------------------------
+    // Textures & Sprites
+    // ----------------------------
+    @Override
+    public void drawTexture(IdentifierRef sprite, int x, int y, float u, float v, int width, int height) {
+        drawTexture(sprite, x, y, u, v, width, height, width, height, width, height);
+    }
+
+    @Override
+    public void drawTexture(IdentifierRef sprite, int x, int y, float u, float v, int width, int height, int color) {
+        drawTexture(sprite, x, y, u, v, width, height, width, height, width, height, color);
+    }
+
+    @Override
+    public void drawTexture(IdentifierRef sprite, int x, int y, float u, float v, int width, int height,
+            int regionWidth, int regionHeight, int textureWidth, int textureHeight) {
+        drawTexture(sprite, x, y, u, v, width, height, regionWidth, regionHeight, textureWidth, textureHeight, -1);
+    }
+
+    @Override
+    public void drawTexture(IdentifierRef sprite, int x, int y, float u, float v, int width, int height,
+            int regionWidth, int regionHeight, int textureWidth, int textureHeight, int color) {
+        drawTexturedQuad((Identifier) (Object) sprite, x, x + width, y, y + height,
+                (u + 0.0f) / textureWidth, (u + regionWidth) / textureWidth,
+                (v + 0.0f) / textureHeight, (v + regionHeight) / textureHeight, color);
+    }
+
+    @Override
+    public void drawSpriteStretched(SpriteRef sprite, int x, int y, int width, int height) {
+        drawSpriteStretched(sprite, x, y, width, height, -1);
+    }
+
+    @Override
+    public void drawSpriteStretched(SpriteRef saturnSprite, int x, int y, int width, int height, int color) {
+        Sprite sprite = (Sprite) saturnSprite;
+        if (color == 0)
+            return;
+        if (width != 0 && height != 0) {
+            drawTexturedQuad(sprite.getAtlasId(), x, x + width, y, y + height,
+                    sprite.getMinU(), sprite.getMaxU(), sprite.getMinV(), sprite.getMaxV(), 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 = (Identifier) (Object) SvgTexture.getSvg((IdentifierRef) (Object) 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);
+        //? if <1.21.5
+        //RenderSystem.setShaderTexture(0, sprite);
+        RenderLayer renderLayer = RenderLayer.getGuiTextured(sprite);
+        Matrix4f matrix4f = matrices.peek().getPositionMatrix();
+        VertexConsumer vertexConsumer = vertexConsumers.getBuffer(renderLayer);
+        vertexConsumer.vertex(matrix4f, x1, y1, 0).texture(u1, v1).color(color);
+        vertexConsumer.vertex(matrix4f, x1, y2, 0).texture(u1, v2).color(color);
+        vertexConsumer.vertex(matrix4f, x2, y2, 0).texture(u2, v2).color(color);
+        vertexConsumer.vertex(matrix4f, x2, y1, 0).texture(u2, v1).color(color);
+        matrices.pop();
+    }
+
+    @Override
+    public void drawGlass(IdentifierRef mask, int x, int y, int width, int height, int blur) {
+        int color = getColor(0xFFFFFFFF);
+        if (mask == null || color >>> 24 == 0)
+            return;
+
+        if (capturedBlurs.add(blur)) {
+            GlassRenderer.captureBackdrop(blur);
+        }
+
+        // In quarter units, as drawTexturedQuad draws
+        int x1 = x * 4;
+        int x2 = (x + width) * 4;
+        int y1 = y * 4;
+        int y2 = (y + height) * 4;
+
+        matrices.push();
+        matrices.scale(0.25f, 0.25f, 1.0f);
+        Matrix4f matrix4f = matrices.peek().getPositionMatrix();
+        VertexConsumer vertexConsumer = vertexConsumers.getBuffer(GlassRenderer.getLayer((Identifier) (Object) mask, blur));
+        vertexConsumer.vertex(matrix4f, x1, y1, 0).texture(0, 0).color(color);
+        vertexConsumer.vertex(matrix4f, x1, y2, 0).texture(0, 1).color(color);
+        vertexConsumer.vertex(matrix4f, x2, y2, 0).texture(1, 1).color(color);
+        vertexConsumer.vertex(matrix4f, x2, y1, 0).texture(1, 0).color(color);
+        matrices.pop();
+    }
+
+    // ----------------------------
+    // Items
+    // ----------------------------
+    @Override
+    public void drawItem(ItemStackRef item, int x, int y) {
+        drawItem(SaturnClient.client.player, SaturnClient.client.world, item, x, y, 0);
+    }
+
+    private void drawItem(@Nullable LivingEntity entity, @Nullable World world, ItemStackRef stack, int x, int y,
+            int seed) {
+        drawItem(entity, world, (ItemStack) (Object) 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())
+            return;
+
+        //? if >=1.21.5
+        SaturnClient.client.getItemModelManager().update(itemRenderState, stack, ItemDisplayContext.GUI, world, entity, seed);
+        //? if >=1.21.5
+        SaturnClient.client.getItemModelManager().clearAndUpdate(this.itemRenderState, stack, ItemDisplayContext.GUI, world, entity, seed);
+        //? if <1.21.5
+        //SaturnClient.client.getItemModelManager().update(itemRenderState, stack, ModelTransformationMode.GUI, false, world, entity, seed);
+
+        this.matrices.push();
+        //? if >=1.21.5
+        this.matrices.translate((float) (x + 8), (float) (y + 8), (float) (150 + z));
+        //? if <1.21.5
+        //this.matrices.translate(x + 8, y + 8, 150 + (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 throwable) {
+            CrashReport crashReport = CrashReport.create(throwable, "Rendering item");
+            CrashReportSection crashReportSection = crashReport.addElement("Item being rendered");
+            crashReportSection.add("Item Type", () -> String.valueOf(stack.getItem()));
+            crashReportSection.add("Item Components", () -> String.valueOf(stack.getComponents()));
+            crashReportSection.add("Item Foil", () -> String.valueOf(stack.hasGlint()));
+            throw new CrashException(crashReport);
+        }
+
+        this.matrices.pop();
+    }
+
+    // ----------------------------
+    // Scissor / Clipping
+    // ----------------------------
+    @Override
+    public void enableScissor(int x1, int y1, int x2, int y2) {
+        ScreenRect screenRect = new ScreenRect(x1, y1, x2 - x1, y2 - y1)
+                .transform(matrices.peek().getPositionMatrix());
+        setScissor(scissorStack.push(screenRect));
+    }
+
+    @Override
+    public void disableScissor() {
+        setScissor(scissorStack.pop());
+    }
+
+    @Override
+    public boolean scissorContains(int x, int y) {
+        return scissorStack.containsPoint(x, y);
+    }
+
+    private void setScissor(@Nullable ScreenRect rect) {
+        draw();
+        if (rect != null) {
+            Window window = SaturnClient.client.getWindow();
+            int framebufferHeight = window.getFramebufferHeight();
+            double scaleFactor = window.getScaleFactor();
+            RenderSystem.enableScissor(
+                    (int) (rect.getLeft() * scaleFactor),
+                    (int) (framebufferHeight - rect.getBottom() * scaleFactor),
+                    Math.max(0, (int) (rect.width() * scaleFactor)),
+                    Math.max(0, (int) (rect.height() * scaleFactor)));
+        } else {
+            RenderSystem.disableScissor();
+        }
+    }
+
+    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_);
+        }
+    }
+}
+*///?}

src/main/java/org/saturnclient/impl/ui/SaturnScreenFabric.java

@@ -3,19 +3,31 @@ package org.saturnclient.impl.ui;
 import java.time.Duration;
 import java.time.Instant;
 
+import org.saturnclient.config.Config;
 import org.saturnclient.ui.RenderScope;
 import org.saturnclient.ui.SaturnScreen;
 import org.saturnclient.ui.SaturnScreen.ScreenProvider;
 
 import net.minecraft.client.MinecraftClient;
+//? if >=1.21.9
 import net.minecraft.client.gui.Click;
 import net.minecraft.client.gui.CubeMapRenderer;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.RotatingCubeMapRenderer;
 import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.input.KeyInput;
-import net.minecraft.client.texture.ResourceTexture;
+//? if >=1.21.6 {
+import net.minecraft.client.texture.CubemapTexture;
+//?} else {
+/*import net.minecraft.client.texture.ResourceTexture;
 import net.minecraft.client.texture.TextureManager;
+*///?}
+//? if >=1.21.9
+import net.minecraft.client.input.KeyInput;
+//? if <1.21.6 {
+/*import net.minecraft.client.gl.PostEffectProcessor;
+import net.minecraft.client.render.DefaultFramebufferSet;
+import net.minecraft.client.util.Pool;
+*///?}
 import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;
 
@@ -30,16 +42,29 @@ public class SaturnScreenFabric extends Screen implements ScreenProvider {
         ROTATING_PANORAMA_RENDERER = new RotatingCubeMapRenderer(PANORAMA_RENDERER);
     }
 
+    //? if <1.21.6
+    //private final Pool pool = new Pool(3);
     public final SaturnScreen screen;
 
+    /** Whether the panorama's textures are loaded; it isn't drawn before (e.g. under the splash). */
+    private static volatile boolean panoramaReady = false;
+
     public static void preload(MinecraftClient client) {
-        TextureManager textureManager = client.getTextureManager();
+        //? if >=1.21.6 {
+        // From 1.21.6 CubeMapRenderer draws from one cube map texture made of panorama_0..5.png.
+        // CubeMapRenderer.registerTextures only stores it for the next resource reload, which has
+        // already happened by now, so register it through the overload that loads it right away.
+        client.getTextureManager().registerTexture(PANORAMA, new CubemapTexture(PANORAMA));
+        //?} else {
+        /*TextureManager textureManager = client.getTextureManager();
         for (int i = 0; i < 6; i++) {
             String var10001 = PANORAMA.getPath();
             Identifier tex = PANORAMA.withPath(var10001 + "_" + i + ".png");
             ResourceTexture resourceTexture = new ResourceTexture(tex);
             textureManager.registerTexture(tex, resourceTexture);
         }
+        *///?}
+        panoramaReady = true;
     }
 
     public SaturnScreenFabric(SaturnScreen screen) {
@@ -53,6 +78,8 @@ public class SaturnScreenFabric extends Screen implements ScreenProvider {
         screen.init();
     }
 
+    //? if <1.21.6
+    //@SuppressWarnings("deprecation")
     @Override
     public void render(DrawContext context, int mouseX, int mouseY, float delta) {
         if (screen.start == null) {
@@ -60,18 +87,71 @@ public class SaturnScreenFabric extends Screen implements ScreenProvider {
         }
         long elapsed = Duration.between(screen.start, Instant.now()).toMillis();
 
-        mouseX *= 2;
-        mouseY *= 2;
+        screen.updateScale();
 
-        if (client.world == null && client.getCurrentServerEntry() == null) {
-            // ROTATING_PANORAMA_RENDERER.render(context, this.width, this.height, true);
+        mouseX = (int) (mouseX / screen.scale);
+        mouseY = (int) (mouseY / screen.scale);
+
+        // From 1.21.6 the background, blur included, is drawn in renderBackground.
+        //? if <1.21.6 {
+        /*if (isShowingPanorama()) {
+            ROTATING_PANORAMA_RENDERER.render(context, this.width, this.height, screen.backgroundOpacity, delta);
         }
 
+        // Glass is blurred from the game as it is before this screen blurs it.
+        if (Config.usesGlass()) {
+            context.draw();
+            GlassRenderer.saveBackground();
+        }
+
+        float radius = screen.getBackgroundBlur();
+        PostEffectProcessor postEffectProcessor = radius < 1 ? null : this.client.getShaderLoader().loadPostEffect(
+                Identifier.ofVanilla("blur"),
+                DefaultFramebufferSet.MAIN_ONLY);
+
+        if (postEffectProcessor != null) {
+            //? if >=1.21.5
+            postEffectProcessor.render(this.client.getFramebuffer(), this.pool, pass -> pass.setUniform("Radius", radius));
+            //? if <1.21.5
+            //postEffectProcessor.setUniforms("Radius", radius);
+            //? if <1.21.5
+            //postEffectProcessor.render(this.client.getFramebuffer(), this.pool);
+        }
+        *///?}
+
         RenderScope renderScope = new RenderScopeImpl(context);
 
         screen.render(renderScope, mouseX, mouseY, delta, elapsed);
     }
 
+    //? if >=1.21.6 {
+    // Vanilla's background would cover Saturn's panorama, and blurs by the vanilla setting. The
+    // strength of this blur comes from GameRendererMixin, which gives Saturn's setting instead.
+    @Override
+    public void renderBackground(DrawContext context, int mouseX, int mouseY, float delta) {
+        // The panorama renderer has no opacity (and takes no delta) from 1.21.6, so it's drawn fully
+        // opaque.
+        if (isShowingPanorama()) {
+            ROTATING_PANORAMA_RENDERER.render(context, this.width, this.height, true);
+        }
+
+        if (screen.getBackgroundBlur() >= 1) {
+            context.applyBlur();
+        }
+
+        if (client.world != null) {
+            renderDarkening(context);
+        }
+    }
+    //?}
+
+    /** Whether Saturn's panorama is behind the screen: outside a world, once it's loaded. */
+    private boolean isShowingPanorama() {
+        return panoramaReady && client.world == null && client.getCurrentServerEntry() == null;
+    }
+
+    // 1.21.9 moved mouse and key events to Click and KeyInput.
+    //? if >=1.21.9 {
     @Override
     public boolean mouseClicked(Click click, boolean doubled) {
         if (screen.mouseClicked(click.x(), click.y(), click.button())) {
@@ -83,7 +163,8 @@ public class SaturnScreenFabric extends Screen implements ScreenProvider {
 
     @Override
     public boolean mouseDragged(Click click, double offsetX, double offsetY) {
-        if (screen.mouseDragged(click.x(), click.y(), click.button(), 0.0, 0.0)) {
+        // offsetX and offsetY are the drag deltas, as mouseDragged's deltaX and deltaY were before 1.21.9.
+        if (screen.mouseDragged(click.x(), click.y(), click.button(), offsetX, offsetY)) {
             return true;
         }
 
@@ -98,6 +179,31 @@ public class SaturnScreenFabric extends Screen implements ScreenProvider {
 
         return super.mouseReleased(click);
     }
+    //?} else {
+    /*@Override
+    public boolean mouseClicked(double mouseX, double mouseY, int button) {
+        if (screen.mouseClicked(mouseX, mouseY, button)) {
+            return true;
+        }
+        return super.mouseClicked(mouseX, mouseY, button);
+    }
+
+    @Override
+    public boolean mouseDragged(double mouseX, double mouseY, int button, double deltaX, double deltaY) {
+        if (screen.mouseDragged(mouseX, mouseY, button, deltaX, deltaY)) {
+            return true;
+        }
+        return super.mouseDragged(mouseX, mouseY, button, deltaX, deltaY);
+    }
+
+    @Override
+    public boolean mouseReleased(double mouseX, double mouseY, int button) {
+        if (screen.mouseReleased(mouseX, mouseY, button)) {
+            return true;
+        }
+        return super.mouseReleased(mouseX, mouseY, button);
+    }
+    *///?}
 
     @Override
     public boolean mouseScrolled(double mouseX, double mouseY, double horizontalAmount, double verticalAmount) {
@@ -107,6 +213,7 @@ public class SaturnScreenFabric extends Screen implements ScreenProvider {
         return super.mouseScrolled(mouseX, mouseY, horizontalAmount, verticalAmount);
     }
 
+    //? if >=1.21.9 {
     @Override
     public boolean keyPressed(KeyInput input) {
         if (screen.keyPressed(input.getKeycode(), input.scancode(), input.modifiers())) {
@@ -115,12 +222,29 @@ public class SaturnScreenFabric extends Screen implements ScreenProvider {
 
         return super.keyPressed(input);
     }
+    //?} else {
+    /*@Override
+    public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
+        if (screen.keyPressed(keyCode, scanCode, modifiers)) {
+            return true;
+        }
+        return super.keyPressed(keyCode, scanCode, modifiers);
+    }
+    *///?}
 
-    // @Override
-    // public void resize(MinecraftClient client, int width, int height) {
-    //     screen.resize(width, height);
-    //     super.resize(client, width, height);
-    // }
+    //? if >=1.21.11 {
+    @Override
+    public void resize(int width, int height) {
+        screen.resize(width, height);
+        super.resize(width, height);
+    }
+    //?} else {
+    /*@Override
+    public void resize(MinecraftClient client, int width, int height) {
+        screen.resize(width, height);
+        super.resize(client, width, height);
+    }
+    *///?}
 
     @Override
     public void close() {
@@ -130,11 +254,11 @@ public class SaturnScreenFabric extends Screen implements ScreenProvider {
 
     @Override
     public int getWidth() {
-        return width * 2;
+        return width;
     }
 
     @Override
     public int getHeight() {
-        return height * 2;
+        return height;
     }
 }

src/main/java/org/saturnclient/saturnclient/SaturnRenderState.java

@@ -1,12 +1,24 @@
 package org.saturnclient.saturnclient;
 
+//? if >=1.21.11
 import org.jspecify.annotations.NonNull;
+//? if >=1.21.8 {
 import org.saturnclient.client.player.SaturnPlayer;
 
 import net.fabricmc.fabric.api.client.rendering.v1.RenderStateDataKey;
+//?}
 
+/**
+ * The key PlayerEntityRendererMixin stores each player's SaturnPlayer under in their render state.
+ * Fabric API's render state data only exists from 1.21.8, so older versions look players up by name.
+ */
 public class SaturnRenderState {
+    //? if >=1.21.11 {
     @NonNull
     public static RenderStateDataKey<SaturnPlayer> saturnDataKey = RenderStateDataKey
             .create(() -> "saturn-client-player");
+    //?} else if >=1.21.8 {
+    /*public static RenderStateDataKey<SaturnPlayer> saturnDataKey = RenderStateDataKey
+            .create(() -> "saturn-client-player");
+    *///?}
 }

src/main/java/org/saturnclient/saturnclient/event/KeyInputHandler.java

@@ -4,6 +4,7 @@ import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
 import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
 import net.minecraft.client.option.KeyBinding;
 import net.minecraft.client.util.InputUtil;
+//? if >=1.21.9
 import net.minecraft.util.Identifier;
 
 import org.saturnclient.config.Config;
@@ -11,6 +12,7 @@ import org.saturnclient.saturnclient.SaturnClient;
 import org.saturnclient.common.provider.Providers;
 import org.saturnclient.client.ServiceClient;
 import org.saturnclient.emotes.fabric.Emotes;
+import org.saturnclient.impl.ui.SaturnScreenFabric;
 import org.saturnclient.ui.screens.EmoteWheel;
 import org.saturnclient.ui.screens.ShiftMenu;
 
@@ -21,17 +23,28 @@ import org.lwjgl.glfw.GLFW;
  * Manages keybindings and their associated actions.
  */
 public class KeyInputHandler {
+    //? if >=1.21.9 {
     private static final Identifier KEY_CATEGORY = Identifier.of("saturnclient", "key.category.saturnclient");
+    //?} else
+    //private static final String KEY_CATEGORY = "key.category.saturnclient";
     private static final String MAIN_MENU_KEY_ID = "key.saturnclient.main_menu";
     private static final int DEFAULT_MENU_KEY = GLFW.GLFW_KEY_RIGHT_SHIFT;
     private static KeyBinding mainMenuKeyBinding;
 
     public static void register() {
+        //? if >=1.21.9 {
         mainMenuKeyBinding = KeyBindingHelper.registerKeyBinding(
                 new KeyBinding(
                         MAIN_MENU_KEY_ID,
                         DEFAULT_MENU_KEY,
                         KeyBinding.Category.create(KEY_CATEGORY)));
+        //?} else {
+        /*mainMenuKeyBinding = KeyBindingHelper.registerKeyBinding(new KeyBinding(
+                MAIN_MENU_KEY_ID,
+                InputUtil.Type.KEYSYM,
+                DEFAULT_MENU_KEY,
+                KEY_CATEGORY));
+        *///?}
 
         // Register the event handler for the main menu key
         ClientTickEvents.END_CLIENT_TICK.register(client -> {
@@ -39,9 +52,20 @@ public class KeyInputHandler {
                 Providers.saturn.getClient().setScreen(new ShiftMenu());
             }
 
-            if (Config.openEmoteWheel.wasKeyPressed() && client.currentScreen == null
+            // The emote wheel key opens the wheel, and closes it again while it's open. Closing it
+            // from the screen's own key handling would reopen it on the next tick, since the key is
+            // still down and no screen is open by then.
+            if (Config.openEmoteWheel.wasKeyPressed()
+                    //? if >=1.21.9 {
                     && !InputUtil.isKeyPressed(client.getWindow(), GLFW.GLFW_KEY_F3)) {
+                    //?} else
+                    //&& !InputUtil.isKeyPressed(client.getWindow().getHandle(), GLFW.GLFW_KEY_F3)) {
+                if (client.currentScreen == null) {
                     Providers.saturn.getClient().setScreen(new EmoteWheel());
+                } else if (client.currentScreen instanceof SaturnScreenFabric saturnScreen
+                        && saturnScreen.screen instanceof EmoteWheel) {
+                    saturnScreen.close();
+                }
             }
 
             // Sneaking cancels your own emote, for everyone.

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

@@ -1,12 +1,20 @@
 package org.saturnclient.saturnclient.mixin;
 
 import net.minecraft.client.gui.DrawContext;
+//? if >=1.21.6 {
 import net.minecraft.client.gui.render.state.GuiRenderState;
+//?} else
+//import net.minecraft.client.render.VertexConsumerProvider;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 
 @Mixin(DrawContext.class)
 public interface DrawContextAccessor {
+    //? if >=1.21.6 {
     @Accessor("state")
     GuiRenderState getState();
+    //?} else {
+    /*@Accessor("vertexConsumers")
+    VertexConsumerProvider.Immediate getVertexConsumers();
+    *///?}
 }

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

@@ -1,12 +1,16 @@
 package org.saturnclient.saturnclient.mixin;
 
+//? if >=1.21.9 {
 import net.minecraft.client.network.ClientPlayerLikeEntity;
+import net.minecraft.entity.PlayerLikeEntity;
+//?} else
+//import net.minecraft.client.network.AbstractClientPlayerEntity;
 import net.minecraft.client.render.entity.EntityRendererFactory;
 import net.minecraft.client.render.entity.LivingEntityRenderer;
 import net.minecraft.client.render.entity.PlayerEntityRenderer;
 import net.minecraft.client.render.entity.model.PlayerEntityModel;
 import net.minecraft.client.render.entity.state.PlayerEntityRenderState;
-import net.minecraft.entity.PlayerLikeEntity;
+import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.text.MutableText;
 import net.minecraft.text.Text;
@@ -36,16 +40,30 @@ public abstract class PlayerEntityRendererMixin
         this.addFeature(new CloakFeatureRenderer(this, ctx.getEquipmentModelLoader()));
     }
 
+    // Adds the role icon to the player's name, and stores the SaturnPlayer in the render state for the
+    // cloak and hat (Fabric API only has render state data from 1.21.8).
+    //? if >=1.21.9 {
     @Inject(method = "updateRenderState", at = @At("TAIL"))
     public <A extends PlayerLikeEntity & ClientPlayerLikeEntity> void updateRenderState(
-            A entity, PlayerEntityRenderState state,
-            float f, CallbackInfo ci) {
+            A entity, PlayerEntityRenderState state, float f, CallbackInfo ci) {
+        saturn$applyPlayer(entity, state);
+    }
+    //?} else {
+    /*@Inject(method = "updateRenderState", at = @At("TAIL"))
+    public void updateRenderState(
+            AbstractClientPlayerEntity entity, PlayerEntityRenderState state, float f, CallbackInfo ci) {
+        saturn$applyPlayer(entity, state);
+    }
+    *///?}
+
+    private void saturn$applyPlayer(Entity entity, PlayerEntityRenderState state) {
         if (entity == null) {
             return;
         }
 
         SaturnPlayer player = SaturnPlayer.get(entity.getUuid());
 
+        //? if >=1.21.8
         state.setData(SaturnRenderState.saturnDataKey, player);
 
         if (player != null && state.displayName != null) {

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

@@ -15,6 +15,7 @@ import org.spongepowered.asm.mixin.Final;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.SplashOverlay;
+//? if >=1.21.11
 import net.minecraft.client.util.Window;
 import net.minecraft.resource.ResourceReload;
 import net.minecraft.util.Util;
@@ -125,8 +126,10 @@ public abstract class SplashOverlayMixin {
     private void renderProgressBar(RenderScope scope, DrawContext context, int screenWidth, int screenHeight,
             int alpha) {
         int progressY = ((screenHeight - 5) / 2) + 25;
-        // context.drawBorder((screenWidth - 120) / 2, progressY, 120, 5,
-        // Theme.withAlpha(alpha, 0xFFFFFFFF));
+        //? if >=1.21.9 {
+        context.drawStrokedRectangle((screenWidth - 120) / 2, progressY, 120, 5, Theme.withAlpha(alpha, 0xFFFFFFFF));
+        //?} else
+        //context.drawBorder((screenWidth - 120) / 2, progressY, 120, 5, Theme.withAlpha(alpha, 0xFFFFFFFF));
 
         int progressWidth = Math.min((int) (progress * 120), 120);
         int progressX = (screenWidth - 120) / 2;
@@ -155,9 +158,13 @@ public abstract class SplashOverlayMixin {
 
             reloadCompleteTime = Util.getMeasuringTimeMs();
 
+            //? if >=1.21.11
             Window window = client.getWindow();
             if (client.currentScreen != null) {
+                //? if >=1.21.11 {
                 client.currentScreen.init(window.getScaledWidth(), window.getScaledHeight());
+                //?} else
+                //client.currentScreen.init(client, context.getScaledWindowWidth(), context.getScaledWindowHeight());
             }
         }
     }

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

@@ -27,8 +27,13 @@ public abstract class TabListMixin {
     private void saturn$addSaturnIcon(CallbackInfoReturnable<Text> cir) {
         PlayerListEntry entry = (PlayerListEntry) (Object) this;
         GameProfile profile = entry.getProfile();
+        //? if >=1.21.9 {
         String name = profile.name();
         UUID uuid = profile.id();
+        //?} else {
+        /*String name = profile.getName();
+        UUID uuid = profile.getId();
+        *///?}
 
         if (SaturnPlayer.get(name, uuid) == null) {
             return;

src/main/resources/assets/saturnclient/shaders/core/glass.fsh

@@ -0,0 +1,38 @@
+#version 330
+
+// Saturn's glass: the blurred game behind the screen, cut to a panel's shape. For 1.21.6 and
+// later; glass_pre_1_21_6.fsh (with glass.json, the program 1.21.4 loads) is for older versions.
+
+// Vanilla's transforms, laid out as the version has them: 1.21.6 to 1.21.10 end with LineWidth, which
+// 1.21.11 dropped (GlassRenderer defines HAS_LINE_WIDTH there). Not imported: the include only exists
+// from 1.21.6, and 1.21.4 and 1.21.5 still read every shader's imports while loading resources.
+layout(std140) uniform DynamicTransforms {
+    mat4 ModelViewMat;
+    vec4 ColorModulator;
+    vec3 ModelOffset;
+    mat4 TextureMat;
+#ifdef HAS_LINE_WIDTH
+    float LineWidth;
+#endif
+};
+
+// The panel's rounded rectangle, the same texture its background is drawn with
+uniform sampler2D Sampler0;
+// The game behind the screen, blurred, the size of the framebuffer
+uniform sampler2D Sampler1;
+
+in vec2 texCoord0;
+in vec4 vertexColor;
+
+out vec4 fragColor;
+
+void main() {
+    float mask = texture(Sampler0, texCoord0).a * vertexColor.a;
+    if (mask == 0.0) {
+        discard;
+    }
+
+    // The blurred copy lines up with the framebuffer being drawn to.
+    vec2 screenUv = gl_FragCoord.xy / vec2(textureSize(Sampler1, 0));
+    fragColor = vec4(texture(Sampler1, screenUv).rgb, mask) * ColorModulator;
+}

src/main/resources/assets/saturnclient/shaders/core/glass.json

@@ -0,0 +1,13 @@
+{
+    "vertex": "minecraft:core/position_tex_color",
+    "fragment": "saturnclient:core/glass_pre_1_21_6",
+    "samplers": [
+        { "name": "Sampler0" },
+        { "name": "Sampler1" }
+    ],
+    "uniforms": [
+        { "name": "ModelViewMat", "type": "matrix4x4", "count": 16, "values": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0 ] },
+        { "name": "ProjMat", "type": "matrix4x4", "count": 16, "values": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0 ] },
+        { "name": "ColorModulator", "type": "float", "count": 4, "values": [ 1.0, 1.0, 1.0, 1.0 ] }
+    ]
+}

src/main/resources/assets/saturnclient/shaders/core/glass_pre_1_21_6.fsh

@@ -0,0 +1,27 @@
+#version 150
+
+// Saturn's glass (see glass.fsh), for 1.21.4 and 1.21.5, which set uniforms one by one instead of in
+// blocks.
+
+uniform vec4 ColorModulator;
+
+// The panel's rounded rectangle, the same texture its background is drawn with
+uniform sampler2D Sampler0;
+// The game behind the screen, blurred, the size of the framebuffer
+uniform sampler2D Sampler1;
+
+in vec2 texCoord0;
+in vec4 vertexColor;
+
+out vec4 fragColor;
+
+void main() {
+    float mask = texture(Sampler0, texCoord0).a * vertexColor.a;
+    if (mask == 0.0) {
+        discard;
+    }
+
+    // The blurred copy lines up with the framebuffer being drawn to.
+    vec2 screenUv = gl_FragCoord.xy / vec2(textureSize(Sampler1, 0));
+    fragColor = vec4(texture(Sampler1, screenUv).rgb, mask) * ColorModulator;
+}

src/main/resources/impl.mixins.json

@@ -6,6 +6,7 @@
   "client": [
     "IdentifierMixin",
     "ItemStackMixin",
+    "MatrixStackMixin",
     "MinecraftClientMixin",
     "QuaternionfMixin",
     "WindowMixin",

versions/1.21.10/build.gradle

@@ -1,101 +0,0 @@
-plugins {
-	id 'net.fabricmc.fabric-loom-remap' version "${loom_version}"
-	id 'maven-publish'
-}
-
-version = "${project.mod_version}+${project.minecraft_version}"
-group = project.maven_group
-
-base {
-	archivesName = project.archives_base_name
-}
-
-repositories {
-	maven { name = "Selimaj"; url = 'https://git.selimaj.dev/api/packages/selimaj-dev/maven' }
-}
-
-dependencies {
-	// To change the versions see the gradle.properties file
-	minecraft "com.mojang:minecraft:${project.minecraft_version}"
-	mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
-	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
-
-	// Fabric API. This is technically optional, but you probably want it anyway.
-	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}"
-	
-	// Saturn's emote library (limb bending, Emotecraft emotes)
-	include modImplementation("org.saturnclient:emotes-fabric:${project.emotes_version}+${project.minecraft_version}")
-
-	implementation project(":common")
-
-	include implementation("dev.selimaj:session-java:0.2.0")
-    include implementation("de.javagl:obj:0.4.0")
-    include implementation("com.formdev:svgSalamander:1.1.4")
-    include implementation("com.fasterxml.jackson.core:jackson-databind:2.17.0")
-    include implementation("com.fasterxml.jackson.core:jackson-annotations:2.17.0")
-    include implementation("com.fasterxml.jackson.core:jackson-core:2.17.0")
-}
-
-/*
- * ================================================================
- * 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
-        )
-    }
-}
-
-tasks.withType(JavaCompile).configureEach {
-	it.options.release = 21
-}
-
-java {
-	// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
-	// if it is present.
-	// If you remove this line, sources will not be generated.
-	withSourcesJar()
-
-	sourceCompatibility = JavaVersion.VERSION_21
-	targetCompatibility = JavaVersion.VERSION_21
-}
-
-jar {
-	inputs.property "archivesName", project.base.archivesName
-
-	from("LICENSE") {
-		rename { "${it}_${inputs.properties.archivesName}"}
-	}
-
-	from project(":common").sourceSets.main.output
-	duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-}
-
-// configure the maven publication
-publishing {
-	publications {
-		create("mavenJava", MavenPublication) {
-			artifactId = project.archives_base_name
-			from components.java
-		}
-	}
-
-	// See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
-	repositories {
-		// Add repositories to publish to here.
-		// Notice: This block does NOT have the same function as the block in the top level.
-		// The repositories here will be used for publishing your artifact, not for
-		// retrieving dependencies.
-	}
-}

versions/1.21.10/gradle.properties

@@ -9,8 +9,7 @@ org.gradle.configuration-cache=false
 # check these on https://fabricmc.net/develop
 minecraft_version=1.21.10
 yarn_mappings=1.21.10+build.3
-loader_version=0.19.0
-loom_version=1.17.21
+loader_version=0.19.5
 
 fabric_api_version=0.138.4+1.21.10
 

versions/1.21.10/settings.gradle

@@ -1,10 +0,0 @@
-pluginManagement {
-	repositories {
-		maven {
-			name = 'Fabric'
-			url = 'https://maven.fabricmc.net/'
-		}
-		mavenCentral()
-		gradlePluginPortal()
-	}
-}

versions/1.21.10/src/main/java/org/saturnclient/impl/cosmetics/CloakFeatureRenderer.java

@@ -1,462 +0,0 @@
-package org.saturnclient.impl.cosmetics;
-
-import java.util.Arrays;
-
-import org.joml.Matrix3f;
-import org.joml.Matrix4f;
-import org.joml.Vector3f;
-import org.joml.Vector4f;
-import org.saturnclient.client.player.SaturnPlayer;
-import org.saturnclient.common.ref.asset.IdentifierRef;
-import org.saturnclient.config.Config;
-import org.saturnclient.cosmetics.Cloaks;
-import org.saturnclient.impl.cosmetics.utils.ShaderUtils;
-import org.saturnclient.saturnclient.SaturnRenderState;
-
-import net.minecraft.client.render.OverlayTexture;
-import net.minecraft.client.render.VertexConsumer;
-import net.minecraft.client.render.command.OrderedRenderCommandQueue;
-import net.minecraft.client.render.entity.equipment.EquipmentModel;
-import net.minecraft.client.render.entity.equipment.EquipmentModelLoader;
-import net.minecraft.client.render.entity.equipment.EquipmentModel.LayerType;
-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.util.math.MatrixStack;
-import net.minecraft.component.DataComponentTypes;
-import net.minecraft.component.type.EquippableComponent;
-import net.minecraft.item.ItemStack;
-import net.minecraft.item.equipment.EquipmentAsset;
-import net.minecraft.registry.RegistryKey;
-import net.minecraft.util.math.MathHelper;
-import net.minecraft.util.math.RotationAxis;
-import net.minecraft.util.math.Vec3d;
-
-/**
- * The cloak renderer
- * - **Efficient**: uses a image only consisting of the cloak texture, 16x8
- * whitespace.
- * - **Curving**: Curves when player velocity increases.
- * - **Wavey**: Makes the cloak feel like wind, when jump sprinting.
- */
-public class CloakFeatureRenderer extends FeatureRenderer<PlayerEntityRenderState, PlayerEntityModel> {
-    private final EquipmentModelLoader equipmentModelLoader;
-    private static final int PARTS = 24;
-    private final float[] segmentValues = new float[PARTS];
-    private static final int H_PARTS = 6;
-    private float horizontalCurve = 0.0f;
-
-    private static final float TEX_W = 176f;
-    private static final float TEX_H = 138f;
-
-    private static final class PxRect {
-        final int x, y, w, h;
-
-        PxRect(int x, int y, int w, int h) {
-            this.x = x;
-            this.y = y;
-            this.w = w;
-            this.h = h;
-        }
-
-        float u1() {
-            return x / TEX_W;
-        }
-
-        float v1() {
-            return y / TEX_H;
-        }
-
-        float u2() {
-            return (x + w) / TEX_W;
-        }
-
-        float v2() {
-            return (y + h) / TEX_H;
-        }
-    }
-
-    private static final PxRect FRONT_RECT = new PxRect(8, 8, 80, 128);
-    private static final PxRect BACK_RECT = new PxRect(96, 8, 80, 128);
-    private static final PxRect LEFT_EDGE_RECT = new PxRect(0, 8, 8, 128);
-    private static final PxRect RIGHT_EDGE_RECT = new PxRect(88, 8, 8, 128);
-    private static final PxRect TOP_RECT = new PxRect(8, 0, 80, 8);
-    private static final PxRect BOTTOM_RECT = new PxRect(88, 0, 80, 8);
-
-    public CloakFeatureRenderer(FeatureRendererContext<PlayerEntityRenderState, PlayerEntityModel> context,
-            EquipmentModelLoader equipmentModelLoader) {
-        super(context);
-        this.equipmentModelLoader = equipmentModelLoader;
-        Arrays.fill(segmentValues, 0.0f);
-    }
-
-    private boolean hasCustomModelForLayer(ItemStack stack, EquipmentModel.LayerType layerType) {
-        EquippableComponent equippableComponent = (EquippableComponent) stack
-                .get(DataComponentTypes.EQUIPPABLE);
-        if (equippableComponent != null && !equippableComponent.assetId().isEmpty()) {
-            EquipmentModel equipmentModel = this.equipmentModelLoader
-                    .get((RegistryKey<EquipmentAsset>) equippableComponent.assetId().get());
-            return !equipmentModel.getLayers(layerType).isEmpty();
-        } else {
-            return false;
-        }
-    }
-
-    private void vertex(VertexConsumer vc, Matrix4f posMat, Matrix3f normalMat,
-            Vec3d pos, int color,
-            float u, float v, int overlay, int light,
-            float nx, float ny, float nz) {
-
-        Vector4f p = new Vector4f((float) pos.x, (float) pos.y, (float) pos.z, 1.0f);
-        p.mul(posMat);
-
-        Vector3f n = new Vector3f(nx, ny, nz);
-        n.mul(normalMat);
-
-        vc.vertex(
-                p.x(), p.y(), p.z(),
-                color,
-                u, v,
-                overlay, light,
-                n.x(), n.y(), n.z());
-    }
-
-    private void renderCapeQuad(VertexConsumer vertexConsumer, MatrixStack.Entry entry,
-            Vec3d bottomLeft, Vec3d bottomRight, Vec3d topRight, Vec3d topLeft,
-            float u1, float v1, float u2, float v2, int light, int overlay,
-            float normalX, float normalY, float normalZ, boolean flipWinding) {
-        // Extract matrix (you must transform positions manually now)
-        Matrix4f pos = entry.getPositionMatrix();
-        Matrix3f normalMat = entry.getNormalMatrix();
-
-        int color = 0xFFFFFFFF; // white RGBA
-
-        if (!flipWinding) {
-            // CCW
-            vertex(vertexConsumer, pos, normalMat, bottomLeft, color, u1, v2, overlay, light, normalX, normalY,
-                    normalZ);
-            vertex(vertexConsumer, pos, normalMat, bottomRight, color, u2, v2, overlay, light, normalX, normalY,
-                    normalZ);
-            vertex(vertexConsumer, pos, normalMat, topRight, color, u2, v1, overlay, light, normalX, normalY, normalZ);
-            vertex(vertexConsumer, pos, normalMat, topLeft, color, u1, v1, overlay, light, normalX, normalY, normalZ);
-        } else {
-            // CW
-            vertex(vertexConsumer, pos, normalMat, topLeft, color, u1, v1, overlay, light, normalX, normalY, normalZ);
-            vertex(vertexConsumer, pos, normalMat, topRight, color, u2, v1, overlay, light, normalX, normalY, normalZ);
-            vertex(vertexConsumer, pos, normalMat, bottomRight, color, u2, v2, overlay, light, normalX, normalY,
-                    normalZ);
-            vertex(vertexConsumer, pos, normalMat, bottomLeft, color, u1, v2, overlay, light, normalX, normalY,
-                    normalZ);
-        }
-    }
-
-    private void renderCape(MatrixStack.Entry entry, VertexConsumer vertexConsumer,
-            PlayerEntityRenderState playerState, int light, int overlay) {
-
-        float capeWidth = 10.0f / 16.0f;
-        float capeHeight = 16.0f / 16.0f;
-        float capeDepth = 1.0f / 16.0f;
-
-        final float frontU1 = FRONT_RECT.u1();
-        final float frontU2 = FRONT_RECT.u2();
-        final float frontV1 = FRONT_RECT.v1();
-        final float frontV2 = FRONT_RECT.v2();
-        final float frontPartV = (frontV2 - frontV1) / PARTS;
-
-        final float backU1 = BACK_RECT.u1();
-        final float backU2 = BACK_RECT.u2();
-        final float backV1 = BACK_RECT.v1();
-        final float backV2 = BACK_RECT.v2();
-        final float backPartV = (backV2 - backV1) / PARTS;
-
-        final float leftU1 = LEFT_EDGE_RECT.u1();
-        final float leftU2 = LEFT_EDGE_RECT.u2();
-        final float leftV1 = LEFT_EDGE_RECT.v1();
-        final float leftV2 = LEFT_EDGE_RECT.v2();
-        final float leftPartV = (leftV2 - leftV1) / PARTS;
-
-        final float rightU1 = RIGHT_EDGE_RECT.u1();
-        final float rightU2 = RIGHT_EDGE_RECT.u2();
-        final float rightV1 = RIGHT_EDGE_RECT.v1();
-        final float rightV2 = RIGHT_EDGE_RECT.v2();
-        final float rightPartV = (rightV2 - rightV1) / PARTS;
-
-        final float topU1 = TOP_RECT.u1();
-        final float topU2 = TOP_RECT.u2();
-        final float topV1 = TOP_RECT.v1();
-        final float topV2 = TOP_RECT.v2();
-
-        final float bottomU1 = BOTTOM_RECT.u1();
-        final float bottomU2 = BOTTOM_RECT.u2();
-        final float bottomV1 = BOTTOM_RECT.v1();
-        final float bottomV2 = BOTTOM_RECT.v2();
-
-        // =============================
-        // 1. Spine
-        // =============================
-
-        float[] spineY = new float[PARTS + 1];
-        float[] spineZ = new float[PARTS + 1];
-
-        float partHeight = capeHeight / PARTS;
-
-        for (int i = 0; i < PARTS; i++) {
-            float angle = (2.0f - segmentValues[i]) * ((float) Math.PI / 2f);
-            float dirY = -(float) Math.cos(angle);
-            float dirZ = (float) Math.sin(angle);
-
-            spineY[i + 1] = spineY[i] + dirY * partHeight;
-            spineZ[i + 1] = spineZ[i] + dirZ * partHeight;
-        }
-
-        // =============================
-        // 2. Grid
-        // =============================
-
-        Vec3d[][] inner = new Vec3d[H_PARTS + 1][PARTS + 1];
-        Vec3d[][] outer = new Vec3d[H_PARTS + 1][PARTS + 1];
-
-        for (int x = 0; x <= H_PARTS; x++) {
-
-            float t = (float) x / H_PARTS;
-            float xPos = -capeWidth / 2.0f + capeWidth * t;
-
-            float centered = t - 0.5f;
-            float curve = (centered * centered) * 0.3f;
-            float zCurve = (curve * horizontalCurve) / PARTS;
-
-            for (int i = 0; i <= PARTS; i++) {
-                float y = spineY[i];
-                float z = spineZ[i];
-
-                int idx = Math.min(i, PARTS - 1);
-                // angle: 0 is horizontal (y-flat), PI/2 is vertical (z-flat)
-                float angle = (2.0f - segmentValues[idx]) * ((float) Math.PI / 2f);
-
-                float cosA = (float) Math.cos(angle);
-                float sinA = (float) Math.sin(angle);
-
-                // Calculate how much the horizontal curve shifts the vertex
-                float currentCurve = zCurve * i;
-
-                // Rotate the curve offset so it aligns with the cape's tilt
-                float curveY = sinA * currentCurve;
-                float curveZ = cosA * currentCurve;
-
-                float thickY = sinA * capeDepth;
-                float thickZ = cosA * capeDepth;
-
-                inner[x][i] = new Vec3d(xPos, y - curveY, z - curveZ);
-                outer[x][i] = new Vec3d(xPos, (y - curveY) - thickY, (z - curveZ) - thickZ);
-            }
-
-        }
-
-        // =============================
-        // 3. Front + Back
-        // =============================
-
-        for (int x = 0; x < H_PARTS; x++) {
-
-            float uStart = frontU1 + (frontU2 - frontU1) * (1.0f - ((float) x / H_PARTS));
-            float uEnd = frontU1 + (frontU2 - frontU1) * (1.0f - ((float) (x + 1) / H_PARTS));
-
-            float buStart = backU1 + (backU2 - backU1) * ((float) x / H_PARTS);
-            float buEnd = backU1 + (backU2 - backU1) * ((float) (x + 1) / H_PARTS);
-
-            for (int i = 0; i < PARTS; i++) {
-
-                float vStart = frontV1 + frontPartV * i;
-                float vEnd = frontV1 + frontPartV * (i + 1);
-
-                float bvStart = backV1 + backPartV * i;
-                float bvEnd = backV1 + backPartV * (i + 1);
-
-                Vec3d innerTL = inner[x + 1][i];
-                Vec3d innerTR = inner[x][i];
-                Vec3d innerBL = inner[x + 1][i + 1];
-                Vec3d innerBR = inner[x][i + 1];
-
-                Vec3d outerTL = outer[x + 1][i];
-                Vec3d outerTR = outer[x][i];
-                Vec3d outerBL = outer[x + 1][i + 1];
-                Vec3d outerBR = outer[x][i + 1];
-
-                // FRONT
-                renderCapeQuad(vertexConsumer, entry,
-                        outerBR, outerBL, outerTL, outerTR,
-                        uStart, vStart, uEnd, vEnd,
-                        light, overlay, 0, 0, 1, false);
-
-                // BACK
-                renderCapeQuad(vertexConsumer, entry,
-                        innerBL, innerBR, innerTR, innerTL,
-                        buEnd, bvStart, buStart, bvEnd,
-                        light, overlay, 0, 0, -1, false);
-            }
-        }
-
-        // =============================
-        // 4. LEFT SIDE (x = H_PARTS)
-        // =============================
-
-        for (int i = 0; i < PARTS; i++) {
-
-            Vec3d innerTop = inner[H_PARTS][i];
-            Vec3d innerBot = inner[H_PARTS][i + 1];
-            Vec3d outerTop = outer[H_PARTS][i];
-            Vec3d outerBot = outer[H_PARTS][i + 1];
-
-            float vStart = leftV1 + leftPartV * i;
-            float vEnd = leftV1 + leftPartV * (i + 1);
-
-            renderCapeQuad(vertexConsumer, entry,
-                    innerTop, outerTop, outerBot, innerBot,
-                    leftU1, vEnd,
-                    leftU2, vStart,
-                    light, overlay, -1, 0, 0, false);
-        }
-
-        // =============================
-        // 5. RIGHT SIDE (x = 0)
-        // =============================
-
-        for (int i = 0; i < PARTS; i++) {
-
-            Vec3d innerTop = inner[0][i];
-            Vec3d innerBot = inner[0][i + 1];
-            Vec3d outerTop = outer[0][i];
-            Vec3d outerBot = outer[0][i + 1];
-
-            float vStart = rightV1 + rightPartV * i;
-            float vEnd = rightV1 + rightPartV * (i + 1);
-
-            renderCapeQuad(vertexConsumer, entry,
-                    outerTop, innerTop, innerBot, outerBot,
-                    rightU1, vEnd,
-                    rightU2, vStart,
-                    light, overlay, 1, 0, 0, false);
-        }
-
-        // =============================
-        // 6. TOP (i = 0)
-        // =============================
-
-        for (int x = 0; x < H_PARTS; x++) {
-
-            Vec3d outerL = outer[x][0];
-            Vec3d outerR = outer[x + 1][0];
-            Vec3d innerR = inner[x + 1][0];
-            Vec3d innerL = inner[x][0];
-
-            float uStart = topU1 + (topU2 - topU1) * ((float) x / H_PARTS);
-            float uEnd = topU1 + (topU2 - topU1) * ((float) (x + 1) / H_PARTS);
-
-            renderCapeQuad(vertexConsumer, entry,
-                    outerL, outerR, innerR, innerL,
-                    uStart, topV1, uEnd, topV2,
-                    light, overlay, 0, 1, 0, false);
-        }
-
-        // =============================
-        // 7. BOTTOM (i = PARTS)
-        // =============================
-
-        for (int x = 0; x < H_PARTS; x++) {
-
-            Vec3d innerL = inner[x][PARTS];
-            Vec3d innerR = inner[x + 1][PARTS];
-            Vec3d outerR = outer[x + 1][PARTS];
-            Vec3d outerL = outer[x][PARTS];
-
-            float uStart = bottomU1 + (bottomU2 - bottomU1) * ((float) x / H_PARTS);
-            float uEnd = bottomU1 + (bottomU2 - bottomU1) * ((float) (x + 1) / H_PARTS);
-
-            renderCapeQuad(vertexConsumer, entry,
-                    innerL, innerR, outerR, outerL,
-                    uStart, bottomV1, uEnd, bottomV2,
-                    light, overlay, 0, -1, 0, false);
-        }
-    }
-
-    // Shift array left and insert new value at the start
-    private void updateSegmentValues(float value) {
-        // Shift all elements one position to the right (from end to start)
-        for (int i = segmentValues.length - 1; i > 0; i--) {
-            segmentValues[i] = segmentValues[i - 1];
-        }
-
-        // Insert the new value at index 0
-        segmentValues[0] = value;
-    }
-
-    private long lastUpdate = 0;
-
-    @Override
-    public void render(MatrixStack matrices, OrderedRenderCommandQueue queue, int light, PlayerEntityRenderState state,
-            float limbAngle, float limbDistance) {
-        if (state.invisible || !state.capeVisible
-                || state.skinTextures.cape() != null) {
-            return;
-        }
-
-        SaturnPlayer player = state.getData(SaturnRenderState.saturnDataKey);
-
-        if (player == null) {
-            return;
-        }
-
-        IdentifierRef customCape = Cloaks.getCurrentCloakTexture(player.cloak);
-        if (customCape == null
-                || this.hasCustomModelForLayer(state.equippedChestStack, LayerType.WINGS)) {
-            return;
-        }
-
-        int minBrightness = 7;
-        int blockLight = (light >> 4) & 0xF;
-        int skyLight = (light >> 20) & 0xF;
-        blockLight = Math.max(blockLight, minBrightness);
-        skyLight = Math.max(skyLight, minBrightness);
-        light = (skyLight << 20) | (blockLight << 4);
-
-        matrices.push();
-
-        matrices.translate(0.0f, 0.0f, 0.12f);
-
-        if (this.hasCustomModelForLayer(state.equippedChestStack, LayerType.HUMANOID)) {
-            matrices.translate(0.0F, -0.053125F, 0.06875F);
-        }
-
-        if (state.isInSneakingPose) {
-            matrices.translate(0, 0.16f, 0.0f);
-            matrices.multiply(RotationAxis.POSITIVE_X.rotationDegrees(29.0f));
-        }
-
-        long now = System.currentTimeMillis();
-        if (now - lastUpdate >= 20) {
-            float velX = Math.min(0.8f, state.field_53537 / 108.0f);
-            float rawVelY = state.field_53536;
-            float velY = (rawVelY > 3.4f ? rawVelY : rawVelY < -3.4f ? rawVelY : 0.0f) / 16;
-
-            float value = Math.max(0.0f, Math.min(2.0f, state.isSwimming ? 0.0f : velX + velY));
-
-            if (Config.cloakPhysics.value) {
-                updateSegmentValues(segmentValues[0] + (value - segmentValues[0]) * 0.3f);
-            } else {
-                Arrays.fill(segmentValues, segmentValues[0] + (value - segmentValues[0]) * 0.05f);
-            }
-            lastUpdate = now;
-        }
-
-        final int l = light;
-
-        horizontalCurve = MathHelper.clamp(state.field_53537 / 150.0f, -1.0f, 1.0f);
-
-        queue.submitCustom(matrices, ShaderUtils.getRenderLayer(customCape), (entry, vertexConsumer) -> {
-            renderCape(entry, vertexConsumer, state, l, OverlayTexture.DEFAULT_UV);
-        });
-
-        matrices.pop();
-    }
-}

versions/1.21.10/src/main/java/org/saturnclient/impl/cosmetics/HatFeatureRenderer.java

@@ -1,51 +0,0 @@
-package org.saturnclient.impl.cosmetics;
-
-import org.joml.Quaternionf;
-import org.saturnclient.client.player.SaturnPlayer;
-import org.saturnclient.impl.cosmetics.obj.MtlLoader;
-import org.saturnclient.impl.cosmetics.obj.ObjModel;
-
-import net.minecraft.client.render.OverlayTexture;
-import net.minecraft.client.render.VertexConsumerProvider;
-import net.minecraft.client.render.command.OrderedRenderCommandQueue;
-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.util.math.MatrixStack;
-import net.minecraft.client.model.ModelPart;
-
-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) {
-        if (state.displayName == null)
-            return;
-
-        SaturnPlayer player = SaturnPlayer.get(state.displayName.getString());
-
-        if (state.invisible || player == null || player.hat.isEmpty()) {
-            return;
-        }
-
-        matrices.push();
-
-        ModelPart head = this.getContextModel().head;
-        matrices.multiply(new Quaternionf().rotationZYX(head.roll, head.yaw, head.pitch));
-
-        ObjModel.cosmetic("hat", player.hat).render(MtlLoader.cosmetic(player.hat),
-                matrices, vertexConsumers, light,
-                OverlayTexture.DEFAULT_UV);
-
-        matrices.pop();
-    }
-
-    @Override
-    public void render(MatrixStack matrices, OrderedRenderCommandQueue queue, int light, PlayerEntityRenderState state,
-            float limbAngle, float limbDistance) {
-    }
-}

versions/1.21.10/src/main/java/org/saturnclient/impl/cosmetics/obj/MtlLoader.java

@@ -1,56 +0,0 @@
-package org.saturnclient.impl.cosmetics.obj;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import de.javagl.obj.*;
-
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.util.Identifier;
-
-public class MtlLoader {
-    static Map<Identifier, Map<String, Mtl>> loadedMtls = new HashMap<>();
-
-    static Map<String, Mtl> loadMtl(Identifier mtlId) throws IOException {
-        try (InputStream is = MinecraftClient.getInstance().getResourceManager()
-                .getResource(mtlId).get().getInputStream()) {
-            List<Mtl> mtlList = MtlReader.read(is);
-            Map<String, Mtl> mtlMap = new java.util.LinkedHashMap<>();
-            for (Mtl mtl : mtlList) {
-                mtlMap.put(mtl.getName(), mtl);
-            }
-            return mtlMap;
-        }
-    }
-
-    public static Map<String, Mtl> of(Identifier mtlId) {
-        if (loadedMtls.containsKey(mtlId))
-            return loadedMtls.get(mtlId);
-
-        try {
-            Map<String, Mtl> mtl = loadMtl(mtlId);
-            loadedMtls.put(mtlId, mtl);
-
-            return mtl;
-        } catch (IOException e) {
-            e.printStackTrace();
-
-            return null;
-        }
-
-    }
-
-    public static Map<String, Mtl> cosmetic(String cosmeticId) {
-        int index = cosmeticId.indexOf('_');
-
-        String mtlId = (index == -1) ? "" : cosmeticId.substring(index + 1);
-
-        if (mtlId.isEmpty())
-            mtlId = "white";
-
-        return of(Identifier.of("saturnclient", "models/cosmetic/materials/" + mtlId + ".mtl"));
-    }
-}

versions/1.21.10/src/main/java/org/saturnclient/impl/cosmetics/obj/ObjModel.java

@@ -1,102 +0,0 @@
-package org.saturnclient.impl.cosmetics.obj;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Optional;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-import de.javagl.obj.Mtl;
-import de.javagl.obj.Obj;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.render.VertexConsumerProvider;
-import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.resource.Resource;
-import net.minecraft.resource.ResourceManager;
-import net.minecraft.util.Identifier;
-
-public class ObjModel {
-    private static final ObjectMapper MAPPER = new ObjectMapper();
-    public static final Map<Identifier, ObjModel> loadedObjModels = new HashMap<>();
-
-    public record Config(
-            @JsonProperty("translate") Vec3d transform,
-            @JsonProperty("scale") Vec3d scale,
-            @JsonProperty("rotation") Vec3d rotation) {
-
-        public Config {
-            transform = transform == null ? new Vec3d(0, 0, 0) : transform;
-            scale = scale == null ? new Vec3d(1, 1, 1) : scale;
-            rotation = rotation == null ? new Vec3d(0, 0, 0) : rotation;
-        }
-
-        @JsonFormat(shape = JsonFormat.Shape.ARRAY)
-        public record Vec3d(float x, float y, float z) {
-        }
-    }
-
-    Obj obj;
-    Config config;
-
-    public static ObjModel cosmetic(String cosmeticKind, String id) {
-        return of(Identifier.of("saturnclient", "models/cosmetic/" + cosmeticKind + "/" + id.split("_")[0] + "/model"));
-    }
-
-    public static ObjModel of(Identifier obj) {
-        if (loadedObjModels.containsKey(obj))
-            return loadedObjModels.get(obj);
-
-        ObjModel o = new ObjModel(obj);
-        loadedObjModels.put(obj, o);
-        return o;
-    }
-
-    ObjModel(Identifier identifier) {
-        Identifier objId = Identifier.of(identifier.getNamespace(), identifier.getPath() + ".obj");
-        Identifier jsonId = Identifier.of(identifier.getNamespace(), identifier.getPath() + ".json");
-
-        try {
-            this.obj = ObjRenderer.loadObj(objId);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-
-        // Try loading JSON config if it exists
-        ResourceManager resourceManager = MinecraftClient.getInstance().getResourceManager();
-        Optional<Resource> resource = resourceManager.getResource(jsonId);
-
-        if (resource.isPresent()) {
-            try (InputStream stream = resource.get().getInputStream()) {
-                this.config = MAPPER.readValue(stream, Config.class);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-    }
-
-    public void render(Map<String, Mtl> mtlMap, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light,
-            int overlay) {
-        matrices.push();
-
-        matrices.multiply(net.minecraft.util.math.RotationAxis.POSITIVE_X.rotationDegrees(180.0f));
-        matrices.multiply(net.minecraft.util.math.RotationAxis.POSITIVE_Y.rotationDegrees(180.0f));
-
-        if (this.config != null) {
-            matrices.translate(config.transform.x, config.transform.y, config.transform.z);
-
-            matrices.scale(config.scale.x, config.scale.y, config.scale.z);
-
-            matrices.multiply(net.minecraft.util.math.RotationAxis.POSITIVE_X.rotationDegrees(config.rotation.x));
-            matrices.multiply(net.minecraft.util.math.RotationAxis.POSITIVE_Y.rotationDegrees(config.rotation.y));
-            matrices.multiply(net.minecraft.util.math.RotationAxis.POSITIVE_Z.rotationDegrees(config.rotation.z));
-        }
-
-        ObjRenderer.renderObj(this.obj, mtlMap, matrices, vertexConsumers, light, overlay);
-
-        matrices.pop();
-    }
-}

versions/1.21.10/src/main/java/org/saturnclient/impl/cosmetics/obj/ObjRenderer.java

@@ -1,112 +0,0 @@
-package org.saturnclient.impl.cosmetics.obj;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Map;
-
-import org.saturnclient.common.ref.asset.IdentifierRef;
-import org.saturnclient.impl.cosmetics.utils.ShaderUtils;
-
-import de.javagl.obj.*;
-
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.render.VertexConsumer;
-import net.minecraft.client.render.VertexConsumerProvider;
-import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.util.Identifier;
-
-public class ObjRenderer {
-
-    public static Obj loadObj(Identifier objId) throws IOException {
-        try (InputStream is = MinecraftClient.getInstance().getResourceManager()
-                .getResource(objId).get().getInputStream()) {
-            return ObjReader.read(is);
-        }
-    }
-
-    public static void renderObj(Obj obj, Map<String, Mtl> mtlMap, MatrixStack matrices,
-            VertexConsumerProvider vertexConsumers, int light, int overlay) {
-        MatrixStack.Entry entry = matrices.peek();
-
-        Map<String, Obj> materialGroups = ObjSplitting.splitByMaterialGroups(obj);
-
-        for (Map.Entry<String, Obj> group : materialGroups.entrySet()) {
-            String materialName = group.getKey();
-            Obj groupObj = group.getValue();
-
-            Mtl mtl = mtlMap != null ? mtlMap.get(materialName) : null;
-
-            // Resolve texture identifier using same logic as ObjUnbakedModelModel
-            IdentifierRef texture = IdentifierRef.ofVanilla("textures/misc/white.png");
-
-            if (mtl != null) {
-                String mapKd = mtl.getMapKd();
-                if (mapKd != null) {
-                    if (!mapKd.startsWith("#")) {
-                        texture = IdentifierRef.of(mapKd);
-                    }
-                }
-            }
-
-            // Diffuse color (Kd)
-            float r = 1f, g = 1f, b = 1f;
-            if (mtl != null) {
-                FloatTuple kd = mtl.getKd();
-                if (kd != null) {
-                    r = kd.getX();
-                    g = kd.getY();
-                    b = kd.getZ();
-                }
-            }
-
-            VertexConsumer consumer = vertexConsumers.getBuffer(ShaderUtils.getRenderLayer(texture));
-
-            int faces = groupObj.getNumFaces();
-            final float fr = r, fg = g, fb = b;
-
-            for (int f = 0; f < faces; f++) {
-                ObjFace face = groupObj.getFace(f);
-                int verts = face.getNumVertices();
-
-                // Your original winding order logic, untouched
-                for (int i = verts - 1; i >= 0; i--) {
-                    writeVertex(groupObj, face, i, consumer, entry, light, overlay, fr, fg, fb);
-                }
-            }
-        }
-    }
-
-    private static void writeVertex(Obj obj, ObjFace face, int index, VertexConsumer consumer,
-            MatrixStack.Entry matrix, int light, int overlay,
-            float r, float g, float b) {
-
-        FloatTuple pos = obj.getVertex(face.getVertexIndex(index));
-        float x = pos.getX();
-        float y = pos.getY();
-        float z = pos.getZ();
-
-        float nx = 0f, ny = 1f, nz = 0f;
-        int normalIndex = face.getNormalIndex(index);
-        if (normalIndex >= 0) {
-            FloatTuple n = obj.getNormal(normalIndex);
-            nx = n.getX();
-            ny = n.getY();
-            nz = n.getZ();
-        }
-
-        float u = 0f, v = 0f;
-        int texIndex = face.getTexCoordIndex(index);
-        if (texIndex >= 0) {
-            FloatTuple tc = obj.getTexCoord(texIndex);
-            u = tc.getX();
-            v = 1f - tc.getY(); // Flip V: OBJ bottom-left origin -> Minecraft top-left
-        }
-
-        consumer.vertex(matrix, x, y, z)
-                .color(r, g, b, 1f)
-                .texture(u, v)
-                .overlay(overlay)
-                .light(light)
-                .normal(matrix, nx, ny, nz);
-    }
-}

versions/1.21.10/src/main/java/org/saturnclient/impl/cosmetics/utils/IdentifierUtils.java

@@ -1,71 +0,0 @@
-package org.saturnclient.impl.cosmetics.utils;
-
-import org.saturnclient.common.ref.asset.IdentifierRef;
-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;
-import java.util.Map;
-
-public class IdentifierUtils {
-
-    public static void registerBufferedImageTextureFast(IdentifierRef identifierRef, BufferedImage bufferedImage) {
-        try {
-            Identifier identifier = (Identifier) (Object) identifierRef;
-
-            int width = bufferedImage.getWidth();
-            int height = bufferedImage.getHeight();
-
-            NativeImage nativeImage = new NativeImage(NativeImage.Format.RGBA, width, height, false);
-
-            if (bufferedImage.getType() == BufferedImage.TYPE_INT_ARGB) {
-                int[] pixels = ((DataBufferInt) bufferedImage.getRaster().getDataBuffer()).getData();
-
-                int index = 0;
-                for (int y = 0; y < height; y++) {
-                    for (int x = 0; x < width; x++) {
-                        nativeImage.setColorArgb(x, y, pixels[index++]);
-                    }
-                }
-
-            } else {
-
-                for (int y = 0; y < height; y++) {
-                    for (int x = 0; x < width; x++) {
-                        nativeImage.setColorArgb(x, y, bufferedImage.getRGB(x, y));
-                    }
-                }
-
-            }
-
-            SaturnClient.client.execute(() -> {
-                NativeImageBackedTexture texture = new NativeImageBackedTexture(
-                        () -> identifier.toString(),
-                        nativeImage);
-
-                SaturnClient.client.getTextureManager().registerTexture(identifier, texture);
-            });
-
-        } catch (Exception e) {
-            SaturnClient.LOGGER.error("Failed to register texture: {}", identifierRef, e);
-        }
-    }
-
-    public static void registerBufferedImageTexturesBulk(Map<IdentifierRef, BufferedImage> textures) {
-
-        long start = System.currentTimeMillis();
-
-        textures.forEach(IdentifierUtils::registerBufferedImageTextureFast);
-
-        long end = System.currentTimeMillis();
-
-        SaturnClient.LOGGER.info(
-                "Registered {} textures in {}ms",
-                textures.size(),
-                (end - start));
-    }
-}

versions/1.21.10/src/main/java/org/saturnclient/impl/cosmetics/utils/ShaderUtils.java

@@ -1,39 +0,0 @@
-package org.saturnclient.impl.cosmetics.utils;
-
-import org.saturnclient.common.ref.asset.IdentifierRef;
-import org.saturnclient.cosmetics.utils.GifUtils;
-
-import com.mojang.blaze3d.pipeline.RenderPipeline;
-
-import net.minecraft.client.gl.RenderPipelines;
-import net.minecraft.client.render.RenderLayer;
-import net.minecraft.client.render.RenderPhase.Textures;
-import net.minecraft.client.render.block.entity.EndPortalBlockEntityRenderer;
-import net.minecraft.util.Identifier;
-
-public class ShaderUtils {
-    public static final RenderPipeline END_GATEWAY_PIPELINE = RenderPipelines.register(
-            RenderPipeline.builder(new RenderPipeline.Snippet[] { RenderPipelines.RENDERTYPE_END_PORTAL_SNIPPET })
-                    .withLocation("pipeline/end_gateway")
-                    .withShaderDefine("PORTAL_LAYERS", 16)
-                    .withCull(false)
-                    .build());
-
-    public static final RenderLayer END_GATEWAY = RenderLayer.of("end_gateway", 1536, false, false,
-            END_GATEWAY_PIPELINE,
-            RenderLayer.MultiPhaseParameters.builder()
-                    .texture(Textures.create().add(EndPortalBlockEntityRenderer.SKY_TEXTURE, false)
-                            .add(EndPortalBlockEntityRenderer.PORTAL_TEXTURE, false).build())
-                    .build(false));
-
-    public static RenderLayer getRenderLayer(IdentifierRef texture) {
-        String path = texture.toString();
-        if (path.endsWith(".gif")) {
-            return RenderLayer.getEntityAlpha((Identifier) (Object) GifUtils.get(texture));
-        } else if (path.endsWith("end.png")) {
-            return END_GATEWAY;
-        } else {
-            return RenderLayer.getEntityAlpha((Identifier) (Object) texture);
-        }
-    }
-}

versions/1.21.10/src/main/java/org/saturnclient/impl/features/entity/CameraOverriddenEntity.java

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

versions/1.21.10/src/main/java/org/saturnclient/impl/features/entity/EntityFeatureImpl.java

@@ -1,79 +0,0 @@
-package org.saturnclient.impl.features.entity;
-
-import org.saturnclient.common.feature.EntityFeature;
-
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.entity.Entity;
-import net.minecraft.util.hit.EntityHitResult;
-import net.minecraft.util.hit.HitResult;
-import net.minecraft.entity.LivingEntity;
-
-/**
- * Fabric implementation of {@link EntityFeature}.
- *
- * Crosshair targeting is resolved via {@link MinecraftClient#crosshairTarget}.
- * Entity state for nametag rendering is supplied at render time by
- * {@link org.saturnclient.modules.mixins.LivingEntityRendererMixin} which
- * writes into the render state; {@link NametagsMixin} then constructs
- * a {@link RenderStateEntityState} from the already-extracted snapshot.
- */
-public class EntityFeatureImpl implements EntityFeature {
-
-    private final MinecraftClient mc;
-
-    public EntityFeatureImpl(MinecraftClient mc) {
-        this.mc = mc;
-    }
-
-    @Override
-    public boolean isTargetingLivingEntity() {
-        HitResult target = mc.crosshairTarget;
-        if (target == null || target.getType() != HitResult.Type.ENTITY)
-            return false;
-        Entity hit = ((EntityHitResult) target).getEntity();
-        return hit instanceof LivingEntity;
-    }
-
-    // ---------------------------------------------------------------
-    // Render-state adapter
-    // ---------------------------------------------------------------
-
-    /**
-     * Wraps a {@link HealthRenderState} (already injected into the
-     * Minecraft render-state object) as a platform-neutral
-     * {@link EntityState} for use by {@link NametagsFeature}.
-     *
-     * This is constructed inside {@link NametagsMixin} where both the
-     * render-state mixin interface and the entity name are available.
-     */
-    public static final class RenderStateEntityState implements EntityState {
-
-        private final String customName;
-        private final HealthRenderState hrs;
-
-        public RenderStateEntityState(String customName, HealthRenderState hrs) {
-            this.customName = customName;
-            this.hrs = hrs;
-        }
-
-        @Override
-        public String getCustomName() {
-            return customName;
-        }
-
-        @Override
-        public float getHealth() {
-            return hrs.saturn$getHealth();
-        }
-
-        @Override
-        public float getMaxHealth() {
-            return hrs.saturn$getMaxHealth();
-        }
-
-        @Override
-        public EntityType getEntityType() {
-            return hrs.saturn$getEntityType();
-        }
-    }
-}

versions/1.21.10/src/main/java/org/saturnclient/impl/features/entity/HealthRenderState.java

@@ -1,24 +0,0 @@
-package org.saturnclient.impl.features.entity;
-
-import org.saturnclient.common.feature.EntityFeature;
-
-/**
- * Injected interface on
- * {@link net.minecraft.client.render.entity.state.LivingEntityRenderState}.
- *
- * Carries the entity's health snapshot and classification into the render
- * pipeline so that {@link NametagsMixin} can read them without touching
- * the live entity again.
- */
-public interface HealthRenderState {
-
-    float saturn$getHealth();
-
-    float saturn$getMaxHealth();
-
-    void saturn$setHealth(float health, float maxHealth);
-
-    EntityFeature.EntityType saturn$getEntityType();
-
-    void saturn$setEntityType(EntityFeature.EntityType type);
-}

versions/1.21.10/src/main/java/org/saturnclient/impl/features/mixins/entity/CameraMixin.java

@@ -1,46 +0,0 @@
-package org.saturnclient.impl.features.mixins.entity;
-
-import org.saturnclient.impl.features.entity.CameraOverriddenEntity;
-import org.saturnclient.mod.mods.FreelookMod;
-import org.saturnclient.saturnclient.SaturnClient;
-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;
-
-import net.minecraft.client.network.ClientPlayerEntity;
-import net.minecraft.client.render.Camera;
-import net.minecraft.entity.Entity;
-import net.minecraft.world.BlockView;
-
-@Mixin(Camera.class)
-public abstract class CameraMixin {
-    @Unique
-    boolean firstTime = true;
-
-    @Shadow
-    protected abstract void setRotation(float yaw, float pitch);
-
-    @Inject(method = "update", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/Camera;setRotation(FF)V", ordinal = 1, shift = At.Shift.AFTER))
-    public void lockRotation(BlockView focusedBlock, Entity cameraEntity, boolean isThirdPerson, boolean isFrontFacing,
-            float tickDelta, CallbackInfo ci) {
-        if (FreelookMod.isFreeLooking() && cameraEntity instanceof ClientPlayerEntity) {
-            CameraOverriddenEntity cameraOverriddenEntity = (CameraOverriddenEntity) cameraEntity;
-
-            if (firstTime && SaturnClient.client.player != null) {
-                cameraOverriddenEntity.freelook$setCameraPitch(SaturnClient.client.player.getPitch());
-                cameraOverriddenEntity.freelook$setCameraYaw(SaturnClient.client.player.getYaw());
-                firstTime = false;
-            }
-            this.setRotation(cameraOverriddenEntity.freelook$getCameraYaw(),
-                    cameraOverriddenEntity.freelook$getCameraPitch());
-
-        }
-        if (!FreelookMod.isFreeLooking() && cameraEntity instanceof ClientPlayerEntity) {
-            firstTime = true;
-        }
-    }
-
-}

versions/1.21.10/src/main/java/org/saturnclient/impl/features/mixins/entity/EntityMixin.java

@@ -1,62 +0,0 @@
-package org.saturnclient.impl.features.mixins.entity;
-
-import org.saturnclient.impl.features.entity.CameraOverriddenEntity;
-import org.saturnclient.mod.mods.FreelookMod;
-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;
-
-import net.minecraft.client.network.ClientPlayerEntity;
-import net.minecraft.entity.Entity;
-import net.minecraft.util.math.MathHelper;
-
-@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 (FreelookMod.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;
-    }
-}

versions/1.21.10/src/main/java/org/saturnclient/impl/features/mixins/render/BackgroundRendererMixin.java

@@ -1,21 +0,0 @@
-package org.saturnclient.impl.features.mixins.render;
-
-import net.minecraft.client.render.fog.FogRenderer;
-
-import org.saturnclient.mod.mods.NoFogMod;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.ModifyVariable;
-
-@Mixin(FogRenderer.class)
-public class BackgroundRendererMixin {
-    // fog
-    @ModifyVariable(method = "applyFog", at = @At("HEAD"), ordinal = 0, argsOnly = true)
-    private static float modifyFogStart(float viewDistance) {
-        if (NoFogMod.isActive()) {
-            return viewDistance * 2.0f;
-        }
-
-        return viewDistance;
-    }
-}

versions/1.21.10/src/main/java/org/saturnclient/impl/features/mixins/render/GameRendererMixin.java

@@ -1,37 +0,0 @@
-package org.saturnclient.impl.features.mixins.render;
-
-import net.minecraft.client.render.GameRenderer;
-
-import org.saturnclient.mod.mods.ZoomMod;
-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;
-
-/**
- * Overrides the game's field-of-view when {@link ZoomMod} is active.
- *
- * The old code checked both {@code Zoom.isZooming} and
- * {@code Zoom.shouldZoom()} separately. The refactored
- * {@link ZoomMod#shouldZoom()} already ORs both conditions
- * ({@code enabled.value && isZooming}), so only one check is needed.
- *
- * No {@link org.saturnclient.common.module.ModProvider} is required
- * here because zooming is a pure render-time override with no per-tick
- * engine queries.
- */
-@Mixin(GameRenderer.class)
-public class GameRendererMixin {
-
-    /**
-     * After the vanilla FOV has been computed, divide it by the zoom
-     * level to produce the narrowed field-of-view.
-     */
-    @Inject(method = "getFov", at = @At("RETURN"), cancellable = true)
-    private void onGetFov(CallbackInfoReturnable<Float> cir) {
-        if (ZoomMod.shouldZoom()) {
-            float zoomedFov = cir.getReturnValue() / ZoomMod.getZoomLevel();
-            cir.setReturnValue(zoomedFov);
-        }
-    }
-}

versions/1.21.10/src/main/java/org/saturnclient/impl/features/mixins/render/LightmapTextureManagerMixin.java

@@ -1,35 +0,0 @@
-package org.saturnclient.impl.features.mixins.render;
-
-// Code approach adapted from Gamma Utils: https://github.com/Sjouwer/gamma-utils
-
-import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
-import net.minecraft.client.render.LightmapTextureManager;
-
-import org.saturnclient.mod.mods.FullbrightMod;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-
-/**
- * Overrides the lightmap's gamma computation when
- * {@link FullbrightMod} is active, replacing the vanilla
- * brightness with a user-configured value.
- *
- * The old import was {@code org.saturnclient.feature.features.Fullbright};
- * it is now {@link FullbrightMod}. The injection target and
- * strategy are unchanged.
- */
-@Mixin(LightmapTextureManager.class)
-public class LightmapTextureManagerMixin {
-
-    /**
-     * If fullbright is active, substitute the feature's brightness
-     * value for whatever vanilla calculated.
-     */
-    @ModifyExpressionValue(method = "update", at = @At(value = "INVOKE", target = "Ljava/lang/Math;max(FF)F", ordinal = 0))
-    private float modifyGamma(float original) {
-        if (FullbrightMod.shouldOverrideBrightness()) {
-            return FullbrightMod.getBrightnessValue();
-        }
-        return original;
-    }
-}

versions/1.21.10/src/main/java/org/saturnclient/impl/features/mixins/render/LivingEntityRenderStateMixin.java

@@ -1,59 +0,0 @@
-package org.saturnclient.impl.features.mixins.render;
-
-import net.minecraft.client.render.entity.state.LivingEntityRenderState;
-
-import org.saturnclient.common.feature.EntityFeature;
-import org.saturnclient.impl.features.entity.HealthRenderState;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Unique;
-
-/**
- * Implements {@link HealthRenderState} on
- * {@link LivingEntityRenderState}, injecting health and entity-type
- * storage into every living entity's render-state snapshot.
- *
- * Previously imported {@code NametagsInterface.EntityType}; the enum
- * now lives in {@link EntityFeature.EntityType} which is the single
- * canonical definition shared by the mixin layer and the feature layer.
- *
- * The stored values are written by
- * {@link LivingEntityRendererMixin#saturn$captureHealth} each time a
- * render state is extracted from a live entity, and read by
- * {@link NametagsMixin} at render time.
- */
-@Mixin(LivingEntityRenderState.class)
-public class LivingEntityRenderStateMixin implements HealthRenderState {
-
-    @Unique
-    private float saturn$health = 0f;
-    @Unique
-    private float saturn$maxHealth = 1f;
-    @Unique
-    private EntityFeature.EntityType saturn$entityType = EntityFeature.EntityType.OTHER;
-
-    @Override
-    public float saturn$getHealth() {
-        return saturn$health;
-    }
-
-    @Override
-    public float saturn$getMaxHealth() {
-        return saturn$maxHealth;
-    }
-
-    @Override
-    public void saturn$setHealth(float health, float maxHealth) {
-        this.saturn$health = health;
-        this.saturn$maxHealth = maxHealth;
-    }
-
-    @Override
-    public EntityFeature.EntityType saturn$getEntityType() {
-        return saturn$entityType;
-    }
-
-    @Override
-    public void saturn$setEntityType(EntityFeature.EntityType type) {
-        saturn$entityType = type;
-    }
-}

versions/1.21.10/src/main/java/org/saturnclient/impl/features/mixins/render/LivingEntityRendererMixin.java

@@ -1,51 +0,0 @@
-package org.saturnclient.impl.features.mixins.render;
-
-import net.minecraft.client.render.entity.LivingEntityRenderer;
-import net.minecraft.client.render.entity.state.LivingEntityRenderState;
-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.saturnclient.common.feature.EntityFeature;
-import org.saturnclient.impl.features.entity.HealthRenderState;
-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;
-
-/**
- * Captures each living entity's health and type into the render state
- * during {@code updateRenderState}, so that nametag rendering can read
- * them without touching the live entity again.
- *
- * Previously imported {@code NametagsInterface.EntityType}; now uses
- * {@link EntityFeature.EntityType} — the canonical enum shared across
- * the whole module system.
- *
- * The injection target and strategy are unchanged from the original.
- */
-@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());
-
-        // Classify entity type for the nametag feature's filtering logic
-        EntityFeature.EntityType type;
-        if (entity instanceof PlayerEntity)
-            type = EntityFeature.EntityType.PLAYER;
-        else if (entity instanceof HostileEntity)
-            type = EntityFeature.EntityType.HOSTILE;
-        else if (entity instanceof PassiveEntity)
-            type = EntityFeature.EntityType.PASSIVE;
-        else
-            type = EntityFeature.EntityType.OTHER;
-
-        hrs.saturn$setEntityType(type);
-    }
-}

versions/1.21.10/src/main/java/org/saturnclient/impl/features/mixins/render/RenderMixin.java

@@ -1,82 +0,0 @@
-package org.saturnclient.impl.features.mixins.render;
-
-import net.minecraft.client.font.TextRenderer;
-import net.minecraft.client.gui.DrawContext;
-import net.minecraft.client.gui.hud.InGameHud;
-import net.minecraft.client.render.RenderTickCounter;
-
-import org.saturnclient.impl.ui.RenderScopeImpl;
-import org.saturnclient.impl.ui.SaturnScreenFabric;
-import org.saturnclient.mod.HudMod;
-import org.saturnclient.mod.Mod;
-import org.saturnclient.mod.ModLayout;
-import org.saturnclient.mod.ModManager;
-import org.saturnclient.saturnclient.SaturnClient;
-import org.saturnclient.ui.RenderScope;
-import org.saturnclient.ui.screens.HudEditor;
-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;
-
-/**
- * Drives per-frame rendering for all registered features.
- *
- * This mixin is intentionally kept thin: it creates a {@link RenderScope},
- * iterates the enabled feature list from {@link ModManager}, and
- * dispatches either {@link HudMod#renderHud} (for HUD elements) or
- * {@link Mod#render} (for world-overlay features like Crosshair).
- *
- * No feature-specific logic lives here — all decisions about what to
- * draw are made inside each feature class.
- *
- * Changes from the original:
- * - Package imports updated to the refactored feature names (no
- * more {@code feature.features.*}).
- * - The HUD-editor screen check still uses the existing
- * {@link SaturnScreenFabric} / {@link HudEditor} pair; that is
- * unchanged infrastructure.
- */
-@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;
-
-        // Skip rendering while the HUD editor is open so the editor
-        // can draw its own preview layout without double-drawing.
-        if (textRenderer == null)
-            return;
-        if (SaturnClient.client.currentScreen instanceof SaturnScreenFabric f
-                && f.screen instanceof HudEditor)
-            return;
-
-        RenderScope scope = new RenderScopeImpl(context);
-
-        for (Mod feature : ModManager.ENABLED_MODS) {
-            if (!feature.isEnabled())
-                continue;
-
-            if (feature instanceof HudMod hud) {
-                ModLayout dim = hud.getDimensions();
-
-                scope.getMatrixStack().push();
-                scope.getMatrixStack().translate(dim.x.value, (float) dim.y.value);
-                scope.getMatrixStack().scale(dim.scale.value, dim.scale.value);
-
-                if (dim.renderBackground) {
-                    scope.drawRoundedRectangle(0, 0, dim.width, dim.height,
-                            dim.radius.value, dim.bgColor.value);
-                }
-
-                hud.renderHud(scope);
-                scope.getMatrixStack().pop();
-
-            } else {
-                // Non-HUD features (e.g. CrosshairFeature) use the plain render hook.
-                feature.render(scope);
-            }
-        }
-    }
-}

versions/1.21.10/src/main/java/org/saturnclient/impl/features/mixins/world/TpsMixin.java

@@ -1,30 +0,0 @@
-package org.saturnclient.impl.features.mixins.world;
-
-import net.minecraft.client.network.ClientPlayNetworkHandler;
-import net.minecraft.network.packet.s2c.play.WorldTimeUpdateS2CPacket;
-
-import org.saturnclient.mod.mods.TpsMod;
-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;
-
-/**
- * Feeds world-time packets into {@link TpsMod}'s TPS estimator.
- *
- * This is the only place in the entire codebase that reads a network
- * packet and passes data to a feature. The feature's
- * {@link TpsMod#onTimePacket(long)} method handles all averaging
- * logic; the mixin is intentionally reduced to a single forwarding call.
- *
- * The only change from the original is renaming the import from
- * {@code feature.features.Tps} to {@link TpsMod}.
- */
-@Mixin(ClientPlayNetworkHandler.class)
-public class TpsMixin {
-
-    @Inject(method = "onWorldTimeUpdate", at = @At("HEAD"))
-    private void onWorldTimeUpdate(WorldTimeUpdateS2CPacket packet, CallbackInfo ci) {
-        TpsMod.onTimePacket(packet.time());
-    }
-}

versions/1.21.10/src/main/java/org/saturnclient/impl/features/network/NetworkFeatureImpl.java

@@ -1,37 +0,0 @@
-package org.saturnclient.impl.features.network;
-
-import org.saturnclient.common.feature.NetworkFeature;
-
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.network.PlayerListEntry;
-
-/**
- * Fabric implementation of {@link NetworkFeature}.
- *
- * Connection presence is checked via the network handler.
- * Ping is read from the player's {@link PlayerListEntry} which the
- * server populates; returns {@code -1} when unavailable.
- */
-public class NetworkFeatureImpl implements NetworkFeature {
-
-    private final MinecraftClient mc;
-
-    public NetworkFeatureImpl(MinecraftClient mc) {
-        this.mc = mc;
-    }
-
-    @Override
-    public boolean hasNetwork() {
-        return mc.getNetworkHandler() != null;
-    }
-
-    @Override
-    public int getPing() {
-        if (mc.player == null || mc.getNetworkHandler() == null)
-            return -1;
-
-        PlayerListEntry entry = mc.getNetworkHandler().getPlayerListEntry(mc.player.getUuid());
-
-        return entry != null ? entry.getLatency() : -1;
-    }
-}

versions/1.21.10/src/main/java/org/saturnclient/impl/features/player/PlayerFeatureImpl.java

@@ -1,254 +0,0 @@
-package org.saturnclient.impl.features.player;
-
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.network.ClientPlayerEntity;
-import net.minecraft.entity.EquipmentSlot;
-import net.minecraft.entity.effect.StatusEffectInstance;
-import net.minecraft.item.ItemStack;
-import net.minecraft.item.Items;
-import net.minecraft.registry.Registries;
-import net.minecraft.util.Identifier;
-
-import org.saturnclient.common.feature.PlayerFeature;
-import org.saturnclient.common.ref.game.EffectRef;
-import org.saturnclient.common.ref.game.ItemStackRef;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * Fabric implementation of {@link PlayerFeature}.
- *
- * All access to {@link MinecraftClient} and {@link ClientPlayerEntity}
- * is encapsulated here. Features only ever see the {@link PlayerFeature}
- * interface; they never import Minecraft classes directly.
- *
- * Every method guards against a missing player and returns a safe
- * default so features are free of null checks.
- */
-public class PlayerFeatureImpl implements PlayerFeature {
-
-    private final MinecraftClient mc;
-
-    public PlayerFeatureImpl(MinecraftClient mc) {
-        this.mc = mc;
-    }
-
-    // ---------------------------------------------------------------
-    // Internal helper — never returns null
-    // ---------------------------------------------------------------
-
-    /** Returns the local player, or {@code null} if one is not loaded. */
-    private ClientPlayerEntity player() {
-        return mc.player;
-    }
-
-    // ---------------------------------------------------------------
-    // Presence
-    // ---------------------------------------------------------------
-
-    @Override
-    public boolean hasPlayer() {
-        return mc.player != null;
-    }
-
-    // ---------------------------------------------------------------
-    // Position
-    // ---------------------------------------------------------------
-
-    @Override
-    public int getX() {
-        return hasPlayer() ? (int) player().getX() : 0;
-    }
-
-    @Override
-    public int getY() {
-        return hasPlayer() ? (int) player().getY() : 0;
-    }
-
-    @Override
-    public int getZ() {
-        return hasPlayer() ? (int) player().getZ() : 0;
-    }
-
-    // ---------------------------------------------------------------
-    // Input / movement
-    // ---------------------------------------------------------------
-
-    @Override
-    public boolean isForwardPressed() {
-        return mc.options.forwardKey.isPressed();
-    }
-
-    @Override
-    public boolean isBackPressed() {
-        return mc.options.backKey.isPressed();
-    }
-
-    @Override
-    public boolean isLeftPressed() {
-        return mc.options.leftKey.isPressed();
-    }
-
-    @Override
-    public boolean isRightPressed() {
-        return mc.options.rightKey.isPressed();
-    }
-
-    @Override
-    public boolean isJumpPressed() {
-        return mc.options.jumpKey.isPressed();
-    }
-
-    @Override
-    public boolean isAttackPressed() {
-        return mc.options.attackKey.isPressed();
-    }
-
-    @Override
-    public boolean isUsePressed() {
-        return mc.options.useKey.isPressed();
-    }
-
-    @Override
-    public boolean isSneaking() {
-        return hasPlayer() && player().isSneaking();
-    }
-
-    @Override
-    public boolean isUsingItem() {
-        return hasPlayer() && player().isUsingItem();
-    }
-
-    @Override
-    public boolean hasHorizontalCollision() {
-        return hasPlayer() && player().horizontalCollision;
-    }
-
-    @Override
-    public boolean isOnGround() {
-        return hasPlayer() && player().isOnGround();
-    }
-
-    @Override
-    public void setSprinting(boolean sprinting) {
-        if (hasPlayer())
-            player().setSprinting(sprinting);
-    }
-
-    // ---------------------------------------------------------------
-    // Velocity
-    // ---------------------------------------------------------------
-
-    @Override
-    public Velocity getVelocity() {
-        if (!hasPlayer())
-            return Velocity.ZERO;
-        var v = player().getVelocity();
-        return new Velocity(v.x, v.y, v.z);
-    }
-
-    // ---------------------------------------------------------------
-    // Stats
-    // ---------------------------------------------------------------
-
-    @Override
-    public float getHealth() {
-        return hasPlayer() ? player().getHealth() : 0f;
-    }
-
-    // ---------------------------------------------------------------
-    // Equipment
-    // ---------------------------------------------------------------
-
-    @Override
-    public ItemStackRef getMainHand() {
-        return wrap(hasPlayer() ? player().getMainHandStack() : ItemStack.EMPTY);
-    }
-
-    @Override
-    public ItemStackRef getHelmet() {
-        return wrap(hasPlayer() ? player().getEquippedStack(EquipmentSlot.HEAD) : ItemStack.EMPTY);
-    }
-
-    @Override
-    public ItemStackRef getChestplate() {
-        return wrap(hasPlayer() ? player().getEquippedStack(EquipmentSlot.CHEST) : ItemStack.EMPTY);
-    }
-
-    @Override
-    public ItemStackRef getLeggings() {
-        return wrap(hasPlayer() ? player().getEquippedStack(EquipmentSlot.LEGS) : ItemStack.EMPTY);
-    }
-
-    @Override
-    public ItemStackRef getBoots() {
-        return wrap(hasPlayer() ? player().getEquippedStack(EquipmentSlot.FEET) : ItemStack.EMPTY);
-    }
-
-    // ---------------------------------------------------------------
-    // Dummy equipment
-    // ---------------------------------------------------------------
-
-    @Override
-    public ItemStackRef getDummyMainHand() {
-        return wrap(new ItemStack(Items.DIAMOND_SWORD));
-    }
-
-    @Override
-    public ItemStackRef getDummyHelmet() {
-        return wrap(new ItemStack(Items.DIAMOND_HELMET));
-    }
-
-    @Override
-    public ItemStackRef getDummyChestplate() {
-        return wrap(new ItemStack(Items.DIAMOND_CHESTPLATE));
-    }
-
-    @Override
-    public ItemStackRef getDummyLeggings() {
-        return wrap(new ItemStack(Items.DIAMOND_LEGGINGS));
-    }
-
-    @Override
-    public ItemStackRef getDummyBoots() {
-        return wrap(new ItemStack(Items.DIAMOND_BOOTS));
-    }
-
-    // ---------------------------------------------------------------
-    // Status effects
-    // ---------------------------------------------------------------
-
-    @Override
-    public List<? extends EffectRef> getActiveEffects() {
-        if (!hasPlayer())
-            return Collections.emptyList();
-
-        var effects = player().getActiveStatusEffects().values();
-        List<EffectRef> result = new ArrayList<>(effects.size());
-        for (StatusEffectInstance instance : effects) {
-            result.add((EffectRef) instance);
-        }
-        return result;
-    }
-
-    @Override
-    public List<? extends EffectRef> getDummyEffects() {
-        return List.of(
-                (EffectRef) new StatusEffectInstance(
-                        Registries.STATUS_EFFECT.getEntry(Identifier.ofVanilla("speed")).get(), 12000, 2),
-                (EffectRef) new StatusEffectInstance(
-                        Registries.STATUS_EFFECT.getEntry(Identifier.ofVanilla("strength")).get(), 12000, 2),
-                (EffectRef) new StatusEffectInstance(
-                        Registries.STATUS_EFFECT.getEntry(Identifier.ofVanilla("fire_resistance")).get(), 12000, 2));
-    }
-
-    // ---------------------------------------------------------------
-    // Helpers
-    // ---------------------------------------------------------------
-
-    private static ItemStackRef wrap(ItemStack stack) {
-        return (ItemStackRef) (Object) stack;
-    }
-}

versions/1.21.10/src/main/java/org/saturnclient/impl/features/render/RenderFeatureImpl.java

@@ -1,64 +0,0 @@
-package org.saturnclient.impl.features.render;
-
-import org.saturnclient.common.feature.RenderFeature;
-
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.option.Perspective;
-
-/**
- * Fabric implementation of {@link RenderFeature}.
- *
- * Window dimensions and FPS are read directly from
- * {@link MinecraftClient}. Camera perspective control delegates to
- * {@link net.minecraft.client.option.GameOptions}.
- */
-public class RenderFeatureImpl implements RenderFeature {
-
-    private final MinecraftClient mc;
-
-    public RenderFeatureImpl(MinecraftClient mc) {
-        this.mc = mc;
-    }
-
-    // ---------------------------------------------------------------
-    // Window
-    // ---------------------------------------------------------------
-
-    @Override
-    public int getScaledWindowWidth() {
-        return mc.getWindow().getScaledWidth();
-    }
-
-    @Override
-    public int getScaledWindowHeight() {
-        return mc.getWindow().getScaledHeight();
-    }
-
-    // ---------------------------------------------------------------
-    // Performance
-    // ---------------------------------------------------------------
-
-    @Override
-    public int getFps() {
-        return mc.getCurrentFps();
-    }
-
-    // ---------------------------------------------------------------
-    // Camera perspective
-    // ---------------------------------------------------------------
-
-    @Override
-    public boolean isFirstPerson() {
-        return mc.options.getPerspective() == Perspective.FIRST_PERSON;
-    }
-
-    @Override
-    public void setFirstPerson() {
-        mc.options.setPerspective(Perspective.FIRST_PERSON);
-    }
-
-    @Override
-    public void setThirdPersonBack() {
-        mc.options.setPerspective(Perspective.THIRD_PERSON_BACK);
-    }
-}

versions/1.21.10/src/main/java/org/saturnclient/impl/features/world/WorldFeatureImpl.java

@@ -1,36 +0,0 @@
-package org.saturnclient.impl.features.world;
-
-import org.saturnclient.common.feature.WorldFeature;
-
-import net.minecraft.client.MinecraftClient;
-
-/**
- * Fabric implementation of {@link WorldFeature}.
- *
- * Reads the client world's time directly from {@link MinecraftClient}.
- * Returns safe defaults when no world is loaded.
- */
-public class WorldFeatureImpl implements WorldFeature {
-
-    private final MinecraftClient mc;
-
-    public WorldFeatureImpl(MinecraftClient mc) {
-        this.mc = mc;
-    }
-
-    @Override
-    public boolean hasWorld() {
-        return mc.world != null;
-    }
-
-    /**
-     * Returns the total world age in ticks, or {@code 0} when no world
-     * is loaded. Used by {@link TpsFeature#onTimePacket} (which is
-     * called from the mixin and stores its own copy) and by
-     * {@link DayCounterFeature} for the day count.
-     */
-    @Override
-    public long getWorldAge() {
-        return hasWorld() ? mc.world.getTime() : 0L;
-    }
-}

versions/1.21.10/src/main/java/org/saturnclient/impl/mixins/IdentifierMixin.java

@@ -1,13 +0,0 @@
-package org.saturnclient.impl.mixins;
-
-import org.saturnclient.common.ref.asset.IdentifierRef;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-
-import net.minecraft.util.Identifier;
-
-@Mixin(Identifier.class)
-public abstract class IdentifierMixin implements IdentifierRef {
-    @Shadow
-    public abstract String toString();
-}

versions/1.21.10/src/main/java/org/saturnclient/impl/mixins/ItemStackMixin.java

@@ -1,19 +0,0 @@
-package org.saturnclient.impl.mixins;
-
-import org.saturnclient.common.ref.game.ItemStackRef;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-
-import net.minecraft.item.ItemStack;
-
-@Mixin(ItemStack.class)
-public abstract class ItemStackMixin implements ItemStackRef {
-    @Shadow
-    public abstract boolean isEmpty();
-
-    @Shadow
-    public abstract int getMaxDamage();
-
-    @Shadow
-    public abstract int getDamage();
-}

versions/1.21.10/src/main/java/org/saturnclient/impl/mixins/MinecraftClientMixin.java

@@ -1,162 +0,0 @@
-package org.saturnclient.impl.mixins;
-
-import java.io.File;
-import java.io.InputStream;
-import java.util.UUID;
-
-import org.jetbrains.annotations.Nullable;
-import org.saturnclient.common.ref.asset.IdentifierRef;
-import org.saturnclient.common.ref.game.MinecraftClientRef;
-import org.saturnclient.common.ref.render.WindowRef;
-import org.saturnclient.impl.ui.SaturnScreenFabric;
-import org.saturnclient.ui.SaturnScreen;
-import org.saturnclient.ui.screens.TitleMenu;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-
-import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.gui.screen.multiplayer.MultiplayerScreen;
-import net.minecraft.client.gui.screen.option.OptionsScreen;
-import net.minecraft.client.gui.screen.world.SelectWorldScreen;
-import net.minecraft.client.option.GameOptions;
-import net.minecraft.client.session.Session;
-import net.minecraft.client.util.Window;
-import net.minecraft.resource.ReloadableResourceManagerImpl;
-import net.minecraft.util.Identifier;
-
-@Mixin(MinecraftClient.class)
-public abstract class MinecraftClientMixin implements MinecraftClientRef {
-    @Shadow
-    public File runDirectory;
-
-    @Shadow
-    private Window window;
-
-    @Shadow
-    private ReloadableResourceManagerImpl resourceManager;
-
-    @Shadow
-    public GameOptions options;
-
-    @Shadow
-    private Session session;
-
-    @Shadow
-    public abstract void setScreen(@Nullable Screen screen);
-
-    @Shadow
-    @Override
-    public abstract void scheduleStop();
-
-    @Override
-    public File getRunDirectory() {
-        return runDirectory;
-    }
-
-    @Override
-    public InputStream getResource(IdentifierRef identifier) {
-        try {
-            return resourceManager.getResource((Identifier) (Object) identifier).get().getInputStream();
-        } catch (Exception e) {
-            return null;
-        }
-    }
-
-    @Override
-    public WindowRef getWindow() {
-        return (WindowRef) (Object) this.window;
-    }
-
-    @Override
-    public void setScreen(SaturnScreen screen) {
-        this.setScreen(new SaturnScreenFabric(screen));
-    }
-
-    @Override
-    public void setScreen(MinecraftScreen screen) {
-        SaturnScreenFabric exitTarget = new SaturnScreenFabric(new TitleMenu());
-
-        switch (screen) {
-            case SelectWorld:
-                this.setScreen(new SelectWorldScreen(exitTarget));
-                break;
-
-            case Multiplayer:
-                this.setScreen(new MultiplayerScreen(exitTarget));
-                break;
-
-            case Options:
-                this.setScreen(new OptionsScreen(exitTarget, this.options));
-                break;
-        }
-    }
-
-    @Override
-    public String getAccessToken() {
-        if (session == null) {
-            return null;
-        }
-
-        return this.session.getAccessToken();
-    }
-
-    @Override
-    public UUID getUuid() {
-        if (session == null) {
-            return null;
-        }
-        return this.session.getUuidOrNull();
-    }
-
-    @Override
-    public String getUsername() {
-        if (session == null) {
-            return null;
-        }
-        return this.session.getUsername();
-    }
-
-    @Override
-    public void onClientStopping(Runnable handler) {
-        ClientLifecycleEvents.CLIENT_STOPPING.register(_o -> handler.run());
-    }
-
-    @Override
-    public void executeOnThread(Runnable runnable) {
-        ((java.util.concurrent.Executor) (Object) this).execute(runnable);
-    }
-
-    @Override
-    @SuppressWarnings("resource")
-    public String getPlayerListEntry(UUID uuid) {
-        var client = (MinecraftClient) (Object) this;
-        var handler = client.getNetworkHandler();
-
-        if (handler == null)
-            return null;
-
-        var entry = handler.getPlayerListEntry(uuid);
-        if (entry == null)
-            return null;
-
-        return entry.getProfile().name();
-    }
-
-    @Override
-    @SuppressWarnings("resource")
-    public UUID getPlayerListEntryUUID(String name) {
-        var client = (MinecraftClient) (Object) this;
-        var handler = client.getNetworkHandler();
-
-        if (handler == null)
-            return null;
-
-        var entry = handler.getPlayerListEntry(name);
-        if (entry == null)
-            return null;
-
-        return entry.getProfile().id();
-    }
-}

versions/1.21.10/src/main/java/org/saturnclient/impl/mixins/QuaternionfMixin.java

@@ -1,9 +0,0 @@
-package org.saturnclient.impl.mixins;
-
-import org.joml.Quaternionf;
-import org.saturnclient.common.ref.render.QuaternionfRef;
-import org.spongepowered.asm.mixin.Mixin;
-
-@Mixin(Quaternionf.class)
-public abstract class QuaternionfMixin implements QuaternionfRef {
-}

versions/1.21.10/src/main/java/org/saturnclient/impl/mixins/SpriteMixin.java

@@ -1,9 +0,0 @@
-package org.saturnclient.impl.mixins;
-
-import net.minecraft.client.texture.Sprite;
-import org.saturnclient.common.ref.asset.SpriteRef;
-import org.spongepowered.asm.mixin.Mixin;
-
-@Mixin(Sprite.class)
-public abstract class SpriteMixin implements SpriteRef {
-}

versions/1.21.10/src/main/java/org/saturnclient/impl/mixins/StatusEffectMixin.java

@@ -1,51 +0,0 @@
-package org.saturnclient.impl.mixins;
-
-import org.saturnclient.common.ref.asset.IdentifierRef;
-import org.saturnclient.common.ref.asset.SpriteRef;
-import org.saturnclient.common.ref.game.EffectRef;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-
-import net.minecraft.client.gui.hud.InGameHud;
-import net.minecraft.entity.effect.StatusEffect;
-import net.minecraft.entity.effect.StatusEffectInstance;
-import net.minecraft.registry.entry.RegistryEntry;
-import net.minecraft.util.Identifier;
-
-@Mixin(StatusEffectInstance.class)
-public abstract class StatusEffectMixin implements EffectRef {
-
-    @Shadow
-    public abstract boolean shouldShowIcon();
-
-    @Shadow
-    public abstract boolean isInfinite();
-
-    @Shadow
-    public abstract int getDuration();
-
-    @Shadow
-    public abstract RegistryEntry<StatusEffect> getEffectType();
-
-    @Override
-    public SpriteRef getIcon() {
-        return null;
-    }
-
-    @Override
-    public IdentifierRef getIconId() {
-        Identifier id = InGameHud.getEffectTexture(getEffectType());
-
-        return IdentifierRef.of(id.getNamespace(), "textures/" + id.getPath() + ".png");
-    }
-
-    @Override
-    public String getInfiniteText() {
-        return "∞";
-    }
-
-    @Override
-    public int getDurationSeconds() {
-        return getDuration() / 20; // ticks → seconds
-    }
-}

versions/1.21.10/src/main/java/org/saturnclient/impl/mixins/TextMixin.java

@@ -1,25 +0,0 @@
-package org.saturnclient.impl.mixins;
-
-import org.saturnclient.common.ref.asset.IdentifierRef;
-import org.saturnclient.common.ref.render.TextRef;
-import org.saturnclient.saturnclient.SaturnClient;
-import org.spongepowered.asm.mixin.Mixin;
-
-import net.minecraft.text.Style;
-import net.minecraft.text.Text;
-import net.minecraft.text.StyleSpriteSource.Font;
-import net.minecraft.util.Identifier;
-
-@Mixin(Text.class)
-public interface TextMixin extends TextRef {
-
-    @Override
-    public default TextRef withFont(IdentifierRef font) {
-        return (TextRef) (((Text) this).copy().setStyle(Style.EMPTY.withFont(new Font((Identifier) (Object) font))));
-    }
-
-    @Override
-    public default int getWidth() {
-        return SaturnClient.client.textRenderer.getWidth((Text) this);
-    }
-}

versions/1.21.10/src/main/java/org/saturnclient/impl/mixins/WindowMixin.java

@@ -1,22 +0,0 @@
-package org.saturnclient.impl.mixins;
-
-import org.saturnclient.common.ref.render.WindowRef;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-
-import net.minecraft.client.util.Window;
-
-@Mixin(Window.class)
-public abstract class WindowMixin implements WindowRef {
-    @Shadow
-    public abstract int getWidth();
-
-    @Shadow
-    public abstract int getHeight();
-
-    @Shadow
-    public abstract int getFramebufferWidth();
-
-    @Shadow
-    public abstract int getFramebufferHeight();
-}

versions/1.21.10/src/main/java/org/saturnclient/impl/provider/FeatureProviderFabric.java

@@ -1,68 +0,0 @@
-package org.saturnclient.impl.provider;
-
-import net.minecraft.client.MinecraftClient;
-
-import org.saturnclient.common.feature.*;
-import org.saturnclient.common.provider.FeatureProvider;
-import org.saturnclient.impl.features.entity.EntityFeatureImpl;
-import org.saturnclient.impl.features.network.NetworkFeatureImpl;
-import org.saturnclient.impl.features.player.PlayerFeatureImpl;
-import org.saturnclient.impl.features.render.RenderFeatureImpl;
-import org.saturnclient.impl.features.world.WorldFeatureImpl;
-
-/**
- * Fabric implementation of {@link FeatureProvider}.
- *
- * Instantiated once during client startup (e.g. in the mod initialiser)
- * and passed to every feature constructor. All five sub-modules share
- * the same {@link MinecraftClient} reference so there is no
- * inconsistency between modules reading state within the same tick.
- *
- * <pre>{@code
- * FeatureProvider provider = new FeatureProviderFabric(MinecraftClient.getInstance());
- * FeatureManager.register(new AutoSprintFeature(provider));
- * FeatureManager.register(new CoordinatesFeature(provider));
- * // …
- * }</pre>
- */
-public class FeatureProviderFabric implements FeatureProvider {
-
-    private final PlayerFeature player;
-    private final WorldFeature world;
-    private final EntityFeature entity;
-    private final RenderFeature render;
-    private final NetworkFeature network;
-
-    public FeatureProviderFabric(MinecraftClient mc) {
-        this.player = new PlayerFeatureImpl(mc);
-        this.world = new WorldFeatureImpl(mc);
-        this.entity = new EntityFeatureImpl(mc);
-        this.render = new RenderFeatureImpl(mc);
-        this.network = new NetworkFeatureImpl(mc);
-    }
-
-    @Override
-    public PlayerFeature player() {
-        return player;
-    }
-
-    @Override
-    public WorldFeature world() {
-        return world;
-    }
-
-    @Override
-    public EntityFeature entity() {
-        return entity;
-    }
-
-    @Override
-    public RenderFeature render() {
-        return render;
-    }
-
-    @Override
-    public NetworkFeature network() {
-        return network;
-    }
-}

versions/1.21.10/src/main/java/org/saturnclient/impl/provider/GLFWProviderImpl.java

@@ -1,18 +0,0 @@
-package org.saturnclient.impl.provider;
-
-import org.lwjgl.glfw.GLFW;
-import org.saturnclient.common.provider.GLFWProvider;
-import org.saturnclient.saturnclient.SaturnClient;
-
-public class GLFWProviderImpl implements GLFWProvider {
-    @Override
-    public boolean isKeyPressed(int key) {
-        return GLFW.glfwGetKey(SaturnClient.client.getWindow().getHandle(), key) == GLFW.GLFW_PRESS
-                && SaturnClient.client.currentScreen == null;
-    }
-
-    @Override
-    public String getKeyName(int key) {
-        return GLFW.glfwGetKeyName(key, GLFW.glfwGetKeyScancode(key));
-    }
-}

versions/1.21.10/src/main/java/org/saturnclient/impl/provider/RefConstructorImpl.java

@@ -1,25 +0,0 @@
-package org.saturnclient.impl.provider;
-
-import org.saturnclient.common.provider.RefConstructorProvider;
-import org.saturnclient.common.ref.asset.IdentifierRef;
-import org.saturnclient.common.ref.render.TextRef;
-
-import net.minecraft.text.Text;
-import net.minecraft.util.Identifier;
-
-public class RefConstructorImpl implements RefConstructorProvider {
-    @Override
-    public IdentifierRef identifier(String fullPath) {
-        return (IdentifierRef) (Object) Identifier.of(fullPath);
-    }
-
-    @Override
-    public IdentifierRef identifier(String namespace, String path) {
-        return (IdentifierRef) (Object) Identifier.of(namespace, path);
-    }
-
-    @Override
-    public TextRef text(String text) {
-        return (TextRef) Text.literal(text);
-    }
-}

versions/1.21.10/src/main/java/org/saturnclient/impl/provider/SaturnProviderImpl.java

@@ -1,71 +0,0 @@
-package org.saturnclient.impl.provider;
-
-import java.awt.image.BufferedImage;
-import java.util.UUID;
-
-import net.fabricmc.loader.api.FabricLoader;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.toast.SystemToast;
-import net.minecraft.text.Text;
-
-import org.saturnclient.common.provider.SaturnProvider;
-import org.saturnclient.common.ref.asset.IdentifierRef;
-import org.saturnclient.common.ref.game.MinecraftClientRef;
-import org.saturnclient.cosmetics.Emotes;
-import org.saturnclient.impl.cosmetics.utils.IdentifierUtils;
-import org.saturnclient.saturnclient.SaturnClient;
-
-public class SaturnProviderImpl implements SaturnProvider {
-    @Override
-    public MinecraftClientRef getClient() {
-        return (MinecraftClientRef) SaturnClient.client;
-    }
-
-    @Override
-    public void playEmote(UUID fromPlayerUuid, String emoteIdOrNull) {
-        if (fromPlayerUuid == null) {
-            return;
-        }
-        // An empty or unknown ID stops whatever the player is playing.
-        Emotes.get(emoteIdOrNull == null ? "" : emoteIdOrNull).ifPresentOrElse(
-                emote -> org.saturnclient.emotes.fabric.Emotes.play(fromPlayerUuid, emote.animation()),
-                () -> org.saturnclient.emotes.fabric.Emotes.stop(fromPlayerUuid));
-    }
-
-    @Override
-    public void logInfo(String message) {
-        SaturnClient.LOGGER.info(message);
-    }
-
-    @Override
-    public void logError(String message) {
-        SaturnClient.LOGGER.error(message);
-    }
-
-    @Override
-    public void logError(String message, Throwable throwable) {
-        SaturnClient.LOGGER.error(message, throwable);
-    }
-
-    /** Shown longer than the vanilla default, since these ask the player to act. */
-    private static final SystemToast.Type WARNING_TOAST = new SystemToast.Type(15_000L);
-
-    @Override
-    public String getModVersion() {
-        return FabricLoader.getInstance().getModContainer(SaturnClient.MOD_ID)
-                .map(mod -> mod.getMetadata().getVersion().getFriendlyString())
-                .orElse("unknown");
-    }
-
-    @Override
-    public void showWarning(String title, String message) {
-        MinecraftClient client = MinecraftClient.getInstance();
-        client.execute(() -> client.getToastManager().add(
-                SystemToast.create(client, WARNING_TOAST, Text.literal(title), Text.literal(message))));
-    }
-
-    @Override
-    public void registerBufferedImageTexture(IdentifierRef i, BufferedImage bi) {
-        IdentifierUtils.registerBufferedImageTextureFast(i, bi);
-    }
-}

versions/1.21.10/src/main/java/org/saturnclient/impl/ref/Matrix3x2fStackRef.java

@@ -1,44 +0,0 @@
-package org.saturnclient.impl.ref;
-
-import org.joml.Matrix3x2fStack;
-import org.saturnclient.common.ref.render.MatrixStackRef;
-
-public class Matrix3x2fStackRef implements MatrixStackRef {
-    public final Matrix3x2fStack stack;
-
-    public Matrix3x2fStackRef(Matrix3x2fStack stack) {
-        this.stack = stack;
-    }
-
-    @Override
-    public void push() {
-        stack.pushMatrix();
-    }
-
-    @Override
-    public void pop() {
-        stack.popMatrix();
-    }
-
-    @Override
-    public void scale(float x, float y) {
-        stack.scale(x, y);
-    }
-
-    @Override
-    public void translate(float x, float y) {
-        stack.translate(x, y);
-    }
-
-    @Override
-    public void rotate(float angle) {
-        stack.rotate((float) Math.toRadians(angle));
-    }
-
-    @Override
-    public void rotate(float angle, float originX, float originY, float originZ) {
-        translate(originX, originY);
-        rotate(angle);
-        translate(-originX, -originY);
-    }
-}

versions/1.21.10/src/main/java/org/saturnclient/impl/ui/EntityDrawerImpl.java

@@ -1,70 +0,0 @@
-package org.saturnclient.impl.ui;
-
-import org.jetbrains.annotations.Nullable;
-import org.joml.Quaternionf;
-import org.joml.Vector3f;
-import org.saturnclient.saturnclient.SaturnClient;
-import org.saturnclient.ui.ElementContext;
-import org.saturnclient.ui.RenderScope;
-import org.saturnclient.ui.components.SkinPreview.EntityDrawer;
-
-import net.minecraft.client.render.entity.EntityRenderManager;
-import net.minecraft.client.render.entity.EntityRenderer;
-import net.minecraft.client.render.entity.state.EntityRenderState;
-import net.minecraft.entity.LivingEntity;
-
-public class EntityDrawerImpl implements EntityDrawer {
-    @Override
-    public void render(RenderScope renderScope, boolean negativeAngle, float angle, float scale, ElementContext ctx) {
-        LivingEntity entity = SaturnClient.client.player;
-
-        if (entity != null) {
-            drawEntity(renderScope, 0, 0, 75, 78, 30, 0.0625F, ctx.mouseX / scale, ctx.mouseY / scale,
-                    SaturnClient.client.player);
-        }
-    }
-
-    public static void drawEntity(RenderScope renderScope, int x1, int y1, int x2, int y2, int size, float scale,
-            float mouseX, float mouseY, LivingEntity entity) {
-        float f = (float) (x1 + x2) / 2.0F;
-        float g = (float) (y1 + y2) / 2.0F;
-        renderScope.enableScissor(x1, y1, x2, y2);
-        float h = (float) Math.atan((double) ((f - mouseX) / 40.0F));
-        float i = (float) Math.atan((double) ((g - mouseY) / 40.0F));
-        Quaternionf quaternionf = (new Quaternionf()).rotateZ((float) Math.PI);
-        Quaternionf quaternionf2 = (new Quaternionf()).rotateX(i * 20.0F * ((float) Math.PI / 180F));
-        quaternionf.mul(quaternionf2);
-        float j = entity.bodyYaw;
-        float k = entity.getYaw();
-        float l = entity.getPitch();
-        float m = entity.lastHeadYaw;
-        float n = entity.headYaw;
-        entity.bodyYaw = 180.0F + h * 20.0F;
-        entity.setYaw(180.0F + h * 40.0F);
-        entity.setPitch(-i * 20.0F);
-        entity.headYaw = entity.getYaw();
-        entity.lastHeadYaw = entity.getYaw();
-        float o = entity.getScale();
-        Vector3f vector3f = new Vector3f(0.0F, entity.getHeight() / 2.0F + scale * o, 0.0F);
-        float p = (float) size / o;
-        drawEntity(renderScope, x1, y1, x2, y2, p, vector3f, quaternionf, quaternionf2, entity);
-        entity.bodyYaw = j;
-        entity.setYaw(k);
-        entity.setPitch(l);
-        entity.lastHeadYaw = m;
-        entity.headYaw = n;
-        renderScope.disableScissor();
-    }
-
-    public static void drawEntity(RenderScope renderScope, int x1, int y1, int x2, int y2, float scale,
-            Vector3f translation, Quaternionf rotation, @Nullable Quaternionf overrideCameraAngle,
-            LivingEntity entity) {
-        EntityRenderManager entityRenderDispatcher = SaturnClient.client.getEntityRenderDispatcher();
-        EntityRenderer<? super LivingEntity, ?> entityRenderer = entityRenderDispatcher.getRenderer(entity);
-        EntityRenderState entityRenderState = entityRenderer.getAndUpdateRenderState(entity, 1.0F);
-        entityRenderState.hitbox = null;
-
-        if (renderScope instanceof RenderScopeImpl i)
-            i.addEntity(entityRenderState, scale, translation, rotation, overrideCameraAngle, x1, y1, x2, y2);
-    }
-}

versions/1.21.10/src/main/java/org/saturnclient/impl/ui/RenderScopeImpl.java

@@ -1,347 +0,0 @@
-package org.saturnclient.impl.ui;
-
-import java.util.ArrayDeque;
-import java.util.Deque;
-import java.util.Objects;
-
-import org.jetbrains.annotations.Nullable;
-import org.joml.Matrix3x2f;
-import org.joml.Matrix3x2fStack;
-import org.joml.Quaternionf;
-import org.joml.Vector3f;
-
-import com.mojang.blaze3d.textures.GpuTextureView;
-
-import org.saturnclient.common.ref.asset.IdentifierRef;
-import org.saturnclient.common.ref.asset.SpriteRef;
-import org.saturnclient.common.ref.game.ItemStackRef;
-import org.saturnclient.common.ref.render.MatrixStackRef;
-import org.saturnclient.impl.ref.Matrix3x2fStackRef;
-import org.saturnclient.saturnclient.SaturnClient;
-import org.saturnclient.saturnclient.mixin.DrawContextAccessor;
-import org.saturnclient.ui.RenderScope;
-import org.saturnclient.ui.resources.Fonts;
-import org.saturnclient.ui.resources.SvgTexture;
-
-import net.minecraft.client.gl.RenderPipelines;
-import net.minecraft.client.gui.DrawContext;
-import net.minecraft.client.gui.ScreenRect;
-import net.minecraft.client.gui.render.state.ColoredQuadGuiElementRenderState;
-import net.minecraft.client.gui.render.state.GuiRenderState;
-import net.minecraft.client.gui.render.state.ItemGuiElementRenderState;
-import net.minecraft.client.gui.render.state.TextGuiElementRenderState;
-import net.minecraft.client.gui.render.state.TexturedQuadGuiElementRenderState;
-import net.minecraft.client.gui.render.state.special.EntityGuiElementRenderState;
-import net.minecraft.client.render.entity.state.EntityRenderState;
-import net.minecraft.client.render.item.KeyedItemRenderState;
-import net.minecraft.client.texture.Sprite;
-import net.minecraft.client.texture.TextureSetup;
-import net.minecraft.entity.LivingEntity;
-import net.minecraft.item.ItemDisplayContext;
-import net.minecraft.item.ItemStack;
-import net.minecraft.text.Text;
-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.world.World;
-
-public class RenderScopeImpl implements RenderScope {
-
-    public final Matrix3x2fStackRef matrices;
-    public final GuiRenderState state;
-
-    private ScissorStack scissorStack;
-    private int opacity = 0xFF << 24;
-
-    public RenderScopeImpl(DrawContext context) {
-        this(context.getMatrices(), ((DrawContextAccessor) (Object) context).getState());
-    }
-
-    public RenderScopeImpl(Matrix3x2fStack matrices, GuiRenderState state) {
-        this.matrices = new Matrix3x2fStackRef(matrices);
-        this.state = state;
-        this.scissorStack = new ScissorStack();
-    }
-
-    @Override
-    public MatrixStackRef getMatrixStack() {
-        return matrices;
-    }
-
-    @Override
-    public void setOpacity(float alpha) {
-        this.opacity = ((int) (alpha * 255)) << 24;
-    }
-
-    @Override
-    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);
-    }
-
-    @Override
-    public void fill(int x1, int y1, int x2, int y2, int color) {
-        this.state.addSimpleElement(
-                new ColoredQuadGuiElementRenderState(
-                        RenderPipelines.GUI,
-                        TextureSetup.empty(),
-                        new Matrix3x2f(this.matrices.stack),
-                        x1, y1, x2, y2, color, color,
-                        this.scissorStack.peekLast()));
-    }
-
-    @Override
-    public void drawRectangle(int x, int y, int width, int height, int color) {
-        if (color == 0)
-            return;
-        color = getColor(color);
-
-        int x1 = x;
-        int x2 = x + width;
-        int y1 = y;
-        int y2 = y + height;
-
-        if (x2 < x1) {
-            int tmp = x1;
-            x1 = x2;
-            x2 = tmp;
-        }
-        if (y2 < y1) {
-            int tmp = y1;
-            y1 = y2;
-            y2 = tmp;
-        }
-
-        this.fill(x1, y1, x2, y2, color);
-    }
-
-    @Override
-    public void drawText(String text, int x, int y, int font, int color) {
-        drawText(1.0f, text, x, y, font, color);
-    }
-
-    @Override
-    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 lineIndex = 0;
-        for (String line : text.split("\n")) {
-            int finalColor = getColor(color);
-
-            matrices.push();
-            matrices.translate(x, y + (lineIndex * Fonts.getHeight()));
-            matrices.scale(scale, scale);
-
-            this.state.addText(
-                    new TextGuiElementRenderState(
-                            SaturnClient.client.textRenderer,
-                            ((Text) Fonts.setFont(line, font)).asOrderedText(),
-                            new Matrix3x2f(this.matrices.stack),
-                            0, font == 0 ? 1 : 8,
-                            finalColor, 0, false, this.scissorStack.peekLast()));
-
-            matrices.pop();
-
-            lineIndex++;
-        }
-    }
-
-    @Override
-    public int getScaledWindowWidth() {
-        return SaturnClient.client.getWindow().getScaledWidth();
-    }
-
-    @Override
-    public int getScaledWindowHeight() {
-        return SaturnClient.client.getWindow().getScaledHeight();
-    }
-
-    // Texture rendering
-    @Override
-    public void drawTexture(IdentifierRef sprite, int x, int y, float u, float v, int width, int height) {
-        drawTexture(sprite, x, y, u, v, width, height, -1);
-    }
-
-    @Override
-    public void drawTexture(IdentifierRef sprite, int x, int y, float u, float v, int width, int height, int color) {
-        drawTexture(sprite, x, y, u, v, width, height, width, height, width, height, color);
-    }
-
-    @Override
-    public void drawTexture(IdentifierRef sprite, int x, int y, float u, float v, int width, int height,
-            int regionWidth, int regionHeight, int textureWidth, int textureHeight) {
-        drawTexture(sprite, x, y, u, v, width, height, regionWidth, regionHeight, textureWidth, textureHeight, -1);
-    }
-
-    @Override
-    public void drawTexture(IdentifierRef sprite, int x, int y, float u, float v, int width, int height,
-            int regionWidth, int regionHeight, int textureWidth, int textureHeight, int color) {
-        drawTexturedQuad((Identifier) (Object) sprite, x, x + width, y, y + height,
-                (u + 0f) / textureWidth,
-                (u + regionWidth) / textureWidth,
-                (v + 0f) / textureHeight,
-                (v + regionHeight) / 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 (color == 0)
-            return;
-        color = getColor(color);
-
-        if (sprite.getPath().endsWith(".svg")) {
-            sprite = (Identifier) (Object) SvgTexture.getSvg(
-                    (IdentifierRef) (Object) sprite,
-                    (x2 - x1) * 2, (y2 - y1) * 2);
-        }
-
-        GpuTextureView gpuTextureView = SaturnClient.client.getTextureManager()
-                .getTexture(sprite).getGlTextureView();
-
-        this.state.addSimpleElement(new TexturedQuadGuiElementRenderState(
-                RenderPipelines.GUI_TEXTURED,
-                TextureSetup.withoutGlTexture(gpuTextureView),
-                new Matrix3x2f(this.matrices.stack),
-                x1, y1, x2, y2, u1, u2, v1, v2, color,
-                this.scissorStack.peekLast()));
-    }
-
-    // Scissor management
-    @Override
-    public void enableScissor(int x1, int y1, int x2, int y2) {
-        ScreenRect rect = new ScreenRect(x1, y1, x2 - x1, y2 - y1).transform(this.matrices.stack);
-        scissorStack.push(rect);
-    }
-
-    @Override
-    public void disableScissor() {
-        scissorStack.pop();
-    }
-
-    @Override
-    public boolean scissorContains(int x, int y) {
-        return scissorStack.contains(x, y);
-    }
-
-    public static class ScissorStack {
-        private final Deque<ScreenRect> stack = new ArrayDeque<>();
-
-        public ScreenRect push(ScreenRect rect) {
-            ScreenRect last = stack.peekLast();
-            if (last != null) {
-                ScreenRect intersection = Objects.requireNonNullElse(rect.intersection(last), ScreenRect.empty());
-                stack.addLast(intersection);
-                return intersection;
-            } else {
-                stack.addLast(rect);
-                return rect;
-            }
-        }
-
-        @Nullable
-        public ScreenRect pop() {
-            if (stack.isEmpty())
-                throw new IllegalStateException("Scissor stack underflow");
-            stack.removeLast();
-            return stack.peekLast();
-        }
-
-        @Nullable
-        public ScreenRect peekLast() {
-            return stack.peekLast();
-        }
-
-        public boolean contains(int x, int y) {
-            return stack.isEmpty() || stack.peekLast().contains(x, y);
-        }
-    }
-
-    // Item rendering
-    @Override
-    public void drawItem(ItemStackRef stack, int x, int y) {
-        drawItem(null, SaturnClient.client.world, stack, x, y, 0);
-    }
-
-    private void drawItem(@Nullable LivingEntity entity, @Nullable World world, ItemStackRef stack, int x, int y,
-            int seed) {
-        drawItem(entity, world, (ItemStack) (Object) 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()) {
-            KeyedItemRenderState keyedItemRenderState = new KeyedItemRenderState();
-            SaturnClient.client.getItemModelManager().clearAndUpdate(keyedItemRenderState, stack,
-                    ItemDisplayContext.GUI, world,
-                    entity, seed);
-
-            try {
-                this.state.addItem(new ItemGuiElementRenderState(stack.getItem().getName().toString(),
-                        new Matrix3x2f(this.matrices.stack), keyedItemRenderState, x, y,
-                        this.scissorStack.peekLast()));
-            } catch (Throwable throwable) {
-                CrashReport crashReport = CrashReport.create(throwable, "Rendering item");
-                CrashReportSection crashReportSection = crashReport.addElement("Item being rendered");
-                crashReportSection.add("Item Type", () -> String.valueOf(stack.getItem()));
-                crashReportSection.add("Item Components", () -> String.valueOf(stack.getComponents()));
-                crashReportSection.add("Item Foil", () -> String.valueOf(stack.hasGlint()));
-                throw new CrashException(crashReport);
-            }
-        }
-    }
-
-    @Override
-    public void drawSpriteStretched(SpriteRef sprite, int x, int y, int width, int height) {
-        drawSpriteStretched(sprite, x, y, width, height, -1);
-    }
-
-    @Override
-    public void drawSpriteStretched(SpriteRef sprite, int x, int y, int width, int height, int color) {
-        Sprite mcSprite = (Sprite) sprite;
-        if (color == 0 || width == 0 || height == 0)
-            return;
-
-        drawTexturedQuad(mcSprite.getAtlasId(), x, x + width, y, y + height,
-                mcSprite.getMinU(), mcSprite.getMaxU(), mcSprite.getMinV(), mcSprite.getMaxV(), color);
-    }
-
-    @Override
-    public void draw() {
-        // No-op for now
-    }
-
-    public void drawBorder(int x, int y, int width, int height, int color) {
-        fill(x, y, x + width, y + 1, color);
-        fill(x, y + height - 1, x + width, y + height, color);
-        fill(x, y + 1, x + 1, y + height - 1, color);
-        fill(x + width - 1, y + 1, x + width, y + height - 1, color);
-    }
-
-    public void addEntity(EntityRenderState entityState, float scale, Vector3f translation, Quaternionf rotation,
-            @Nullable Quaternionf overrideCameraAngle, int x1, int y1, int x2, int y2) {
-
-        Matrix3x2f mat = this.matrices.stack;
-        float offsetX = mat.m20;
-        float offsetY = mat.m21;
-        float scaleX = mat.m00; // current matrix X scale
-        float scaleY = mat.m11; // current matrix Y scale
-
-        int adjustedX1 = (int) (x1 * scaleX + offsetX);
-        int adjustedY1 = (int) (y1 * scaleY + offsetY);
-        int adjustedX2 = (int) (x2 * scaleX + offsetX);
-        int adjustedY2 = (int) (y2 * scaleY + offsetY);
-
-        float adjustedScale = scale * scaleX; // apply matrix scale to entity scale too
-
-        this.state.addSpecialElement(new EntityGuiElementRenderState(entityState, translation, rotation,
-                overrideCameraAngle, adjustedX1, adjustedY1, adjustedX2, adjustedY2, adjustedScale,
-                this.scissorStack.peekLast()));
-    }
-}

versions/1.21.10/src/main/java/org/saturnclient/impl/ui/SaturnScreenFabric.java

@@ -1,140 +0,0 @@
-package org.saturnclient.impl.ui;
-
-import java.time.Duration;
-import java.time.Instant;
-
-import org.saturnclient.ui.RenderScope;
-import org.saturnclient.ui.SaturnScreen;
-import org.saturnclient.ui.SaturnScreen.ScreenProvider;
-
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.gui.Click;
-import net.minecraft.client.gui.CubeMapRenderer;
-import net.minecraft.client.gui.DrawContext;
-import net.minecraft.client.gui.RotatingCubeMapRenderer;
-import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.input.KeyInput;
-import net.minecraft.client.texture.ResourceTexture;
-import net.minecraft.client.texture.TextureManager;
-import net.minecraft.text.Text;
-import net.minecraft.util.Identifier;
-
-public class SaturnScreenFabric extends Screen implements ScreenProvider {
-    protected static final Identifier PANORAMA = Identifier.of("saturnclient",
-            "textures/gui/title/background/panorama");
-    protected static final CubeMapRenderer PANORAMA_RENDERER = new CubeMapRenderer(PANORAMA);
-
-    public static final RotatingCubeMapRenderer ROTATING_PANORAMA_RENDERER;
-
-    static {
-        ROTATING_PANORAMA_RENDERER = new RotatingCubeMapRenderer(PANORAMA_RENDERER);
-    }
-
-    public final SaturnScreen screen;
-
-    public static void preload(MinecraftClient client) {
-        TextureManager textureManager = client.getTextureManager();
-        for (int i = 0; i < 6; i++) {
-            String var10001 = PANORAMA.getPath();
-            Identifier tex = PANORAMA.withPath(var10001 + "_" + i + ".png");
-            ResourceTexture resourceTexture = new ResourceTexture(tex);
-            textureManager.registerTexture(tex, resourceTexture);
-        }
-    }
-
-    public SaturnScreenFabric(SaturnScreen screen) {
-        super(Text.literal(screen.title));
-        screen.provider = this;
-        this.screen = screen;
-    }
-
-    @Override
-    protected void init() {
-        screen.init();
-    }
-
-    @Override
-    public void render(DrawContext context, int mouseX, int mouseY, float delta) {
-        if (screen.start == null) {
-            screen.start = Instant.now();
-        }
-        long elapsed = Duration.between(screen.start, Instant.now()).toMillis();
-
-        mouseX *= 2;
-        mouseY *= 2;
-
-        if (client.world == null && client.getCurrentServerEntry() == null) {
-            // ROTATING_PANORAMA_RENDERER.render(context, this.width, this.height, true);
-        }
-
-        RenderScope renderScope = new RenderScopeImpl(context);
-
-        screen.render(renderScope, mouseX, mouseY, delta, elapsed);
-    }
-
-    @Override
-    public boolean mouseClicked(Click click, boolean doubled) {
-        if (screen.mouseClicked(click.x(), click.y(), click.button())) {
-            return true;
-        }
-
-        return super.mouseClicked(click, doubled);
-    }
-
-    @Override
-    public boolean mouseDragged(Click click, double offsetX, double offsetY) {
-        if (screen.mouseDragged(click.x(), click.y(), click.button(), 0.0, 0.0)) {
-            return true;
-        }
-
-        return super.mouseDragged(click, offsetX, offsetY);
-    }
-
-    @Override
-    public boolean mouseReleased(Click click) {
-        if (screen.mouseReleased(click.x(), click.y(), click.button())) {
-            return true;
-        }
-
-        return super.mouseReleased(click);
-    }
-
-    @Override
-    public boolean mouseScrolled(double mouseX, double mouseY, double horizontalAmount, double verticalAmount) {
-        if (screen.mouseScrolled(mouseX, mouseY, horizontalAmount, verticalAmount)) {
-            return true;
-        }
-        return super.mouseScrolled(mouseX, mouseY, horizontalAmount, verticalAmount);
-    }
-
-    @Override
-    public boolean keyPressed(KeyInput input) {
-        if (screen.keyPressed(input.getKeycode(), input.scancode(), input.modifiers())) {
-            return true;
-        }
-
-        return super.keyPressed(input);
-    }
-
-    @Override
-    public void resize(MinecraftClient client, int width, int height) {
-        screen.resize(width, height);
-        super.resize(client, width, height);
-    }
-
-    @Override
-    public void close() {
-        this.screen.onClose();
-        super.close();
-    }
-
-    @Override
-    public int getWidth() {
-        return width * 2;
-    }
-
-    @Override
-    public int getHeight() {
-        return height * 2;
-    }
-}

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

@@ -1,64 +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.event.lifecycle.v1.ClientTickEvents;
-import net.minecraft.client.MinecraftClient;
-
-import org.saturnclient.client.ServiceClient;
-import org.saturnclient.cosmetics.Emotes;
-import org.saturnclient.common.provider.Providers;
-import org.saturnclient.impl.provider.GLFWProviderImpl;
-import org.saturnclient.impl.provider.FeatureProviderFabric;
-import org.saturnclient.impl.provider.RefConstructorImpl;
-import org.saturnclient.impl.provider.SaturnProviderImpl;
-import org.saturnclient.impl.ui.EntityDrawerImpl;
-import org.saturnclient.impl.ui.SaturnScreenFabric;
-import org.saturnclient.mod.ModManager;
-import org.saturnclient.saturnclient.event.KeyInputHandler;
-import org.saturnclient.config.Config;
-import org.saturnclient.config.ConfigManager;
-import org.saturnclient.ui.components.SkinPreview;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * 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();
-
-        Providers.saturn = new SaturnProviderImpl();
-        Providers.refConstructor = new RefConstructorImpl();
-        Providers.GLFW = new GLFWProviderImpl();
-        Providers.feature = new FeatureProviderFabric(client);
-        SkinPreview.DRAWER = new EntityDrawerImpl();
-
-        Config.init();
-        ModManager.init();
-
-        client.execute(() -> {
-            SaturnScreenFabric.preload(client);
-        });
-
-        ClientLifecycleEvents.CLIENT_STOPPING.register(_o -> ConfigManager.save());
-
-        ClientTickEvents.END_CLIENT_TICK.register(client -> {
-            for (org.saturnclient.mod.Mod m : ModManager.ENABLED_MODS) {
-                m.tick();
-            }
-        });
-
-        KeyInputHandler.register();
-        Emotes.initialize();
-        ServiceClient.initialize();
-    }
-}

versions/1.21.10/src/main/java/org/saturnclient/saturnclient/SaturnRenderState.java

@@ -1,10 +0,0 @@
-package org.saturnclient.saturnclient;
-
-import org.saturnclient.client.player.SaturnPlayer;
-
-import net.fabricmc.fabric.api.client.rendering.v1.RenderStateDataKey;
-
-public class SaturnRenderState {
-    public static RenderStateDataKey<SaturnPlayer> saturnDataKey = RenderStateDataKey
-            .create(() -> "saturn-client-player");
-}

versions/1.21.10/src/main/java/org/saturnclient/saturnclient/event/KeyInputHandler.java

@@ -1,55 +0,0 @@
-package org.saturnclient.saturnclient.event;
-
-import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
-import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
-import net.minecraft.client.option.KeyBinding;
-import net.minecraft.client.util.InputUtil;
-import net.minecraft.util.Identifier;
-
-import org.saturnclient.config.Config;
-import org.saturnclient.saturnclient.SaturnClient;
-import org.saturnclient.common.provider.Providers;
-import org.saturnclient.client.ServiceClient;
-import org.saturnclient.emotes.fabric.Emotes;
-import org.saturnclient.ui.screens.EmoteWheel;
-import org.saturnclient.ui.screens.ShiftMenu;
-
-import org.lwjgl.glfw.GLFW;
-
-/**
- * Handles keyboard input events for the Saturn Client.
- * Manages keybindings and their associated actions.
- */
-public class KeyInputHandler {
-    private static final Identifier KEY_CATEGORY = Identifier.of("saturnclient", "key.category.saturnclient");
-    private static final String MAIN_MENU_KEY_ID = "key.saturnclient.main_menu";
-    private static final int DEFAULT_MENU_KEY = GLFW.GLFW_KEY_RIGHT_SHIFT;
-    private static KeyBinding mainMenuKeyBinding;
-
-    public static void register() {
-        mainMenuKeyBinding = KeyBindingHelper.registerKeyBinding(
-                new KeyBinding(
-                        MAIN_MENU_KEY_ID,
-                        DEFAULT_MENU_KEY,
-                        KeyBinding.Category.create(KEY_CATEGORY)));
-
-        // Register the event handler for the main menu key
-        ClientTickEvents.END_CLIENT_TICK.register(client -> {
-            if (mainMenuKeyBinding.wasPressed()) {
-                Providers.saturn.getClient().setScreen(new ShiftMenu());
-            }
-
-            if (Config.openEmoteWheel.wasKeyPressed() && client.currentScreen == null
-                    && !InputUtil.isKeyPressed(client.getWindow(), GLFW.GLFW_KEY_F3)) {
-                Providers.saturn.getClient().setScreen(new EmoteWheel());
-            }
-
-            // Sneaking cancels your own emote, for everyone.
-            if (SaturnClient.client.player != null && SaturnClient.client.player.isSneaking()
-                    && Emotes.playing(SaturnClient.client.player.getUuid()).isPresent()) {
-                Emotes.stop(SaturnClient.client.player.getUuid());
-                ServiceClient.emote("");
-            }
-        });
-    }
-}

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

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

versions/1.21.10/src/main/java/org/saturnclient/saturnclient/mixin/PlayerEntityRendererMixin.java

@@ -1,61 +0,0 @@
-package org.saturnclient.saturnclient.mixin;
-
-import net.minecraft.client.network.ClientPlayerLikeEntity;
-import net.minecraft.client.render.entity.EntityRendererFactory;
-import net.minecraft.client.render.entity.LivingEntityRenderer;
-import net.minecraft.client.render.entity.PlayerEntityRenderer;
-import net.minecraft.client.render.entity.model.PlayerEntityModel;
-import net.minecraft.client.render.entity.state.PlayerEntityRenderState;
-import net.minecraft.entity.PlayerLikeEntity;
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.text.MutableText;
-import net.minecraft.text.Text;
-import net.minecraft.util.Formatting;
-
-import org.saturnclient.client.player.Roles;
-import org.saturnclient.client.player.SaturnPlayer;
-import org.saturnclient.impl.cosmetics.CloakFeatureRenderer;
-import org.saturnclient.impl.cosmetics.HatFeatureRenderer;
-import org.saturnclient.saturnclient.SaturnRenderState;
-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(PlayerEntityRenderer.class)
-public abstract class PlayerEntityRendererMixin
-        extends LivingEntityRenderer<PlayerEntity, PlayerEntityRenderState, PlayerEntityModel> {
-
-    protected PlayerEntityRendererMixin() {
-        super(null, null, 0.0f);
-    }
-
-    @Inject(method = "<init>", at = @At("TAIL"))
-    private void addCustomFeatureRenderer(EntityRendererFactory.Context ctx, boolean slim, CallbackInfo ci) {
-        this.addFeature(new HatFeatureRenderer(this));
-        this.addFeature(new CloakFeatureRenderer(this, ctx.getEquipmentModelLoader()));
-    }
-
-    @Inject(method = "updateRenderState", at = @At("TAIL"))
-    public <A extends PlayerLikeEntity & ClientPlayerLikeEntity> void updateRenderState(
-            A entity, PlayerEntityRenderState state,
-            float f, CallbackInfo ci) {
-        if (entity == null) {
-            return;
-        }
-
-        SaturnPlayer player = SaturnPlayer.get(entity.getUuid());
-
-        state.setData(SaturnRenderState.saturnDataKey, player);
-
-        if (player != null) {
-            MutableText iconText = Text.literal(Roles.getSaturnIndicator())
-                    .styled(style -> style.withColor(Roles.getIconColor(player.uuid)));
-
-            state.displayName = Text.empty()
-                    .append(iconText.copy())
-                    .append(Text.empty().formatted(Formatting.RESET))
-                    .append(state.displayName.copy());
-        }
-    }
-}

versions/1.21.10/src/main/java/org/saturnclient/saturnclient/mixin/SetScreenMixin.java

@@ -1,27 +0,0 @@
-package org.saturnclient.saturnclient.mixin;
-
-import org.saturnclient.config.Config;
-import org.saturnclient.impl.ui.SaturnScreenFabric;
-import org.saturnclient.ui.screens.TitleMenu;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.ModifyVariable;
-
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.gui.screen.TitleScreen;
-
-@Mixin(MinecraftClient.class)
-public class SetScreenMixin {
-    @ModifyVariable(method = "setScreen", at = @At("HEAD"), argsOnly = true)
-    private Screen replaceTitleScreen(Screen screen) {
-        if (Config.saturnTitleScreen.value) {
-            if (screen instanceof TitleScreen)
-                return new SaturnScreenFabric(new TitleMenu());
-            if (screen == null && ((MinecraftClient) (Object) this).world == null)
-                return new SaturnScreenFabric(new TitleMenu());
-        }
-
-        return screen;
-    }
-}

versions/1.21.10/src/main/java/org/saturnclient/saturnclient/mixin/SplashOverlayMixin.java

@@ -1,162 +0,0 @@
-package org.saturnclient.saturnclient.mixin;
-
-import java.util.Optional;
-import java.util.function.Consumer;
-
-import org.saturnclient.config.Theme;
-import org.saturnclient.impl.ui.RenderScopeImpl;
-import org.saturnclient.ui.RenderScope;
-import org.saturnclient.ui.resources.Textures;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Overwrite;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.Final;
-
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.gui.DrawContext;
-import net.minecraft.client.gui.screen.SplashOverlay;
-import net.minecraft.resource.ResourceReload;
-import net.minecraft.util.Util;
-import net.minecraft.util.math.MathHelper;
-
-@Mixin(SplashOverlay.class)
-public abstract class SplashOverlayMixin {
-
-    @Shadow
-    private MinecraftClient client;
-    @Shadow
-    private ResourceReload reload;
-
-    @Shadow
-    private long reloadCompleteTime;
-
-    @Shadow
-    private long reloadStartTime;
-
-    @Shadow
-    @Final
-    private boolean reloading;
-
-    @Shadow
-    @Final
-    private Consumer<Optional<Throwable>> exceptionHandler;
-
-    @Shadow
-    private float progress;
-
-    /**
-     * @author SaturnClient
-     * @reason Replace vanilla splash rendering completely but keep exit logic
-     */
-    @Overwrite
-    public void render(DrawContext context, int mouseX, int mouseY, float delta) {
-        int screenWidth = context.getScaledWindowWidth();
-        int screenHeight = context.getScaledWindowHeight();
-        long currentTime = Util.getMeasuringTimeMs();
-
-        // Initialize reload start time if not set
-        if (reloadStartTime == -1L) {
-            reloadStartTime = currentTime;
-        }
-
-        // Compute fade-out progress after reload completes
-        float fadeOutProgress = reloadCompleteTime > -1L
-                ? (float) (currentTime - reloadCompleteTime) / 1000f
-                : -1f;
-
-        int alpha = fadeOutProgress >= 0f
-                ? MathHelper.ceil((1.0f - MathHelper.clamp(fadeOutProgress - 1f, 0f, 1f)) * 255f)
-                : 255;
-
-        // Compute fade-in progress while reloading
-        float reloadProgress = reloadStartTime > -1L
-                ? (float) (currentTime - reloadStartTime) / 500f
-                : -1f;
-
-        // Get render scope for better UI
-        RenderScope scope = new RenderScopeImpl(context);
-
-        // Draw background overlay
-        if (fadeOutProgress >= 1.0F) {
-            renderCurrentScreen(context, mouseX, mouseY, delta);
-            int overlayAlpha = computeOverlayAlpha(fadeOutProgress - 1f);
-            scope.drawTexture(Textures.SPLASH, 0, 0, 0, 0, screenWidth, screenHeight,
-                    Theme.withAlpha(overlayAlpha, 0xFFFFFFFF));
-        } else if (reloading) {
-            if (reloadProgress < 1.0F) {
-                renderCurrentScreen(context, mouseX, mouseY, delta);
-            }
-            scope.drawTexture(Textures.SPLASH, 0, 0, 0, 0, screenWidth, screenHeight,
-                    Theme.withAlpha(alpha, 0xFFFFFFFF));
-        } else {
-            scope.drawTexture(Textures.SPLASH, 0, 0, 0, 0, screenWidth, screenHeight,
-                    Theme.withAlpha(alpha, 0xFFFFFFFF));
-        }
-
-        float u = this.reload.getProgress();
-        this.progress = MathHelper.clamp(this.progress * 0.95F + u * 0.050000012F, 0.0F, 1.0F);
-
-        // Draw central logo
-        drawLogo(scope, screenWidth, screenHeight, alpha);
-        renderProgressBar(scope, context, screenWidth, screenHeight, alpha);
-
-        // Remove overlay after fade-out completes
-        if (fadeOutProgress >= 2.0F) {
-            client.setOverlay(null);
-        }
-
-        // Handle reload completion and exceptions
-        handleReloadCompletion(context);
-    }
-
-    private void renderCurrentScreen(DrawContext context, int mouseX, int mouseY, float delta) {
-        if (client.currentScreen != null) {
-            client.currentScreen.render(context, mouseX, mouseY, delta);
-        }
-    }
-
-    /** Draw the main logo centered */
-    private void drawLogo(RenderScope scope, int screenWidth, int screenHeight, int alpha) {
-        scope.drawTexture(Textures.LOGO, (screenWidth - 60) / 2, ((screenHeight - 60) / 2) - 20, 0, 0, 60, 60,
-                Theme.withAlpha(alpha, 0xFFFFFFFF));
-    }
-
-    private void renderProgressBar(RenderScope scope, DrawContext context, int screenWidth, int screenHeight,
-            int alpha) {
-        int progressY = ((screenHeight - 5) / 2) + 25;
-        // context.drawBorder((screenWidth - 120) / 2, progressY, 120, 5,
-        // Theme.withAlpha(alpha, 0xFFFFFFFF));
-
-        int progressWidth = Math.min((int) (progress * 120), 120);
-        int progressX = (screenWidth - 120) / 2;
-
-        context.fill(progressX, progressY, progressX + progressWidth, progressY + 5,
-                Theme.withAlpha(alpha, 0xFFFFFFFF));
-    }
-
-    /** Compute overlay alpha from fade progress */
-    private int computeOverlayAlpha(float progress) {
-        return MathHelper.ceil((1.0F - MathHelper.clamp(progress, 0.0F, 1.0F)) * 255.0F);
-    }
-
-    /** Handle reload completion logic */
-    private void handleReloadCompletion(DrawContext context) {
-        float reloadProgress = reloadStartTime > -1L ? (float) (Util.getMeasuringTimeMs() - reloadStartTime) / 500f
-                : -1f;
-
-        if (reloadCompleteTime == -1L && reload.isComplete() && (!reloading || reloadProgress >= 2.0F)) {
-            try {
-                reload.throwException();
-                exceptionHandler.accept(Optional.empty());
-            } catch (Throwable ex) {
-                exceptionHandler.accept(Optional.of(ex));
-            }
-
-            reloadCompleteTime = Util.getMeasuringTimeMs();
-
-            if (client.currentScreen != null) {
-                client.currentScreen.init(client, context.getScaledWindowWidth(), context.getScaledWindowHeight());
-            }
-        }
-    }
-}

versions/1.21.10/src/main/java/org/saturnclient/saturnclient/mixin/TabListMixin.java

@@ -1,49 +0,0 @@
-package org.saturnclient.saturnclient.mixin;
-
-import net.minecraft.client.network.PlayerListEntry;
-import net.minecraft.scoreboard.Team;
-import net.minecraft.text.Text;
-
-import java.util.UUID;
-
-import org.saturnclient.client.player.Roles;
-import org.saturnclient.client.player.SaturnPlayer;
-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 com.mojang.authlib.GameProfile;
-
-@Mixin(PlayerListEntry.class)
-public abstract class TabListMixin {
-
-    /**
-     * Adds the Saturn Client icon to the player's name if they are online with
-     * Saturn Client, keeping any name, rank prefix or team formatting the server
-     * set.
-     */
-    @Inject(method = "getDisplayName", at = @At("RETURN"), cancellable = true)
-    private void saturn$addSaturnIcon(CallbackInfoReturnable<Text> cir) {
-        PlayerListEntry entry = (PlayerListEntry) (Object) this;
-        GameProfile profile = entry.getProfile();
-        String name = profile.name();
-        UUID uuid = profile.id();
-
-        if (SaturnPlayer.get(name, uuid) == null) {
-            return;
-        }
-
-        Text displayName = cir.getReturnValue();
-
-        // With no server-set name, vanilla shows the team-decorated profile name.
-        if (displayName == null) {
-            displayName = Team.decorateName(entry.getScoreboardTeam(), Text.literal(name));
-        }
-
-        cir.setReturnValue(Text.empty()
-                .append(Text.literal(Roles.getSaturnIndicator())
-                        .styled(style -> style.withColor(Roles.getIconColor(uuid))))
-                .append(displayName));
-    }
-}

versions/1.21.10/src/main/java/org/saturnclient/saturnclient/mixin/WhoAmI.java

@@ -1,32 +0,0 @@
-/*
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-/*
- * Original code from FokshaWasTaken (GitHub),
- * Repository: https://github.com/FokshaWasTaken/who-am-i/
-*/
-
-package org.saturnclient.saturnclient.mixin;
-
-import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
-import net.minecraft.client.render.entity.LivingEntityRenderer;
-import net.minecraft.entity.Entity;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-
-@Mixin(LivingEntityRenderer.class)
-public class WhoAmI {
-    @ModifyExpressionValue(method = "hasLabel(Lnet/minecraft/entity/LivingEntity;D)Z", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/MinecraftClient;getCameraEntity()Lnet/minecraft/entity/Entity;"))
-    public Entity obfuscateCameraEntity(Entity original) {
-        // hasLabel checks if the rendered entity is equal to the camera entity (aka our
-        // player),
-        // so by setting the camera entity to null in this instance makes the check
-        // always succeed
-        // this also allows to keep the other checks in mojang's code, such as checking
-        // if the hud is enabled etc.
-        return null;
-    }
-}

versions/1.21.10/src/main/resources/fabric.mod.json

@@ -1,28 +0,0 @@
-{
-  "schemaVersion": 1,
-  "id": "saturnclient",
-  "version": "${version}",
-  "name": "saturnclient",
-  "description": "The ultimate open source client",
-  "authors": ["Saturn", "ORUS"],
-  "contact": {
-    "website": "https://selimaj.dev",
-    "sources": "https://github.com/saturnclientmc/saturnclient"
-  },
-  "license": "Apache-2.0",
-  "icon": "assets/saturnclient/icon.png",
-  "environment": "client",
-  "entrypoints": {
-    "main": ["org.saturnclient.saturnclient.SaturnClient"]
-  },
-  "mixins": [
-    "saturnclient.mixins.json",
-    "features.mixins.json",
-    "impl.mixins.json"
-  ],
-  "depends": {
-    "fabricloader": ">=${loader_version}",
-    "fabric": "*",
-    "minecraft": "${minecraft_version}"
-  }
-}

versions/1.21.10/src/main/resources/features.mixins.json

@@ -1,20 +0,0 @@
-{
-  "required": true,
-  "minVersion": "0.8",
-  "package": "org.saturnclient.impl.features.mixins",
-  "compatibilityLevel": "JAVA_21",
-  "client": [
-    "render.GameRendererMixin",
-    "render.LightmapTextureManagerMixin",
-    "render.LivingEntityRendererMixin",
-    "render.LivingEntityRenderStateMixin",
-    "render.BackgroundRendererMixin",
-    "render.RenderMixin",
-    "world.TpsMixin",
-    "entity.CameraMixin",
-    "entity.EntityMixin"
-  ],
-  "injectors": {
-    "defaultRequire": 1
-  }
-}

versions/1.21.10/src/main/resources/impl.mixins.json

@@ -1,19 +0,0 @@
-{
-  "required": true,
-  "minVersion": "0.8",
-  "package": "org.saturnclient.impl.mixins",
-  "compatibilityLevel": "JAVA_21",
-  "client": [
-    "IdentifierMixin",
-    "ItemStackMixin",
-    "MinecraftClientMixin",
-    "QuaternionfMixin",
-    "WindowMixin",
-    "TextMixin",
-    "SpriteMixin",
-    "StatusEffectMixin"
-  ],
-  "injectors": {
-    "defaultRequire": 1
-  }
-}

versions/1.21.10/src/main/resources/saturnclient.mixins.json

@@ -1,17 +0,0 @@
-{
-  "required": true,
-  "minVersion": "0.8",
-  "package": "org.saturnclient.saturnclient.mixin",
-  "compatibilityLevel": "JAVA_21",
-  "client": [
-    "TabListMixin",
-    "PlayerEntityRendererMixin",
-    "WhoAmI",
-    "DrawContextAccessor",
-    "SplashOverlayMixin",
-    "SetScreenMixin"
-  ],
-  "injectors": {
-    "defaultRequire": 1
-  }
-}

versions/1.21.11/gradle.properties

@@ -9,7 +9,7 @@ org.gradle.configuration-cache=false
 # check these on https://fabricmc.net/develop
 minecraft_version=1.21.11
 yarn_mappings=1.21.11+build.4
-loader_version=0.19.0
+loader_version=0.19.5
 
 fabric_api_version=0.141.3+1.21.11
 

versions/1.21.4/build.gradle

@@ -1,101 +0,0 @@
-plugins {
-	id 'net.fabricmc.fabric-loom-remap' version "${loom_version}"
-	id 'maven-publish'
-}
-
-version = "${project.mod_version}+${project.minecraft_version}"
-group = project.maven_group
-
-base {
-	archivesName = project.archives_base_name
-}
-
-repositories {
-	maven { name = "Selimaj"; url = 'https://git.selimaj.dev/api/packages/selimaj-dev/maven' }
-}
-
-dependencies {
-	// To change the versions see the gradle.properties file
-	minecraft "com.mojang:minecraft:${project.minecraft_version}"
-	mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
-	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
-
-	// Fabric API. This is technically optional, but you probably want it anyway.
-	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}"
-	
-	// Saturn's emote library (limb bending, Emotecraft emotes)
-	include modImplementation("org.saturnclient:emotes-fabric:${project.emotes_version}+${project.minecraft_version}")
-
-	implementation project(":common")
-
-	include implementation("dev.selimaj:session-java:0.2.0")
-    include implementation("de.javagl:obj:0.4.0")
-    include implementation("com.formdev:svgSalamander:1.1.4")
-    include implementation("com.fasterxml.jackson.core:jackson-databind:2.17.0")
-    include implementation("com.fasterxml.jackson.core:jackson-annotations:2.17.0")
-    include implementation("com.fasterxml.jackson.core:jackson-core:2.17.0")
-}
-
-/*
- * ================================================================
- * 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
-        )
-    }
-}
-
-tasks.withType(JavaCompile).configureEach {
-	it.options.release = 21
-}
-
-java {
-	// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
-	// if it is present.
-	// If you remove this line, sources will not be generated.
-	withSourcesJar()
-
-	sourceCompatibility = JavaVersion.VERSION_21
-	targetCompatibility = JavaVersion.VERSION_21
-}
-
-jar {
-	inputs.property "archivesName", project.base.archivesName
-
-	from("LICENSE") {
-		rename { "${it}_${inputs.properties.archivesName}"}
-	}
-
-	from project(":common").sourceSets.main.output
-	duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-}
-
-// configure the maven publication
-publishing {
-	publications {
-		create("mavenJava", MavenPublication) {
-			artifactId = project.archives_base_name
-			from components.java
-		}
-	}
-
-	// See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
-	repositories {
-		// Add repositories to publish to here.
-		// Notice: This block does NOT have the same function as the block in the top level.
-		// The repositories here will be used for publishing your artifact, not for
-		// retrieving dependencies.
-	}
-}

versions/1.21.4/gradle.properties

@@ -9,8 +9,7 @@ org.gradle.configuration-cache=false
 # check these on https://fabricmc.net/develop
 minecraft_version=1.21.4
 yarn_mappings=1.21.4+build.8
-loader_version=0.18.4
-loom_version=1.17.21
+loader_version=0.19.5
 
 # Mod Properties
 maven_group=org.saturnclient