Merge pull request 'Bump the version to 0.1.5-beta' (#53) from release-0.1.5-beta into master

Reviewed-on: #53

.gitea/workflows/check.yml

@@ -19,15 +19,20 @@ jobs:
       # The JDK comes from the runner's tool cache. `cache: gradle` stores Gradle's
       # dependencies, Loom's Minecraft cache and the build cache in the runner's
       # actions cache.
-      - name: Set up Java 21
+      # 1.21.x builds with Java 21 and 26.x with Java 25. The last version listed is the default
+      # (Gradle runs on it), and the Gradle commands below point toolchain detection at both.
+      - name: Set up Java 25 and 21
         uses: actions/setup-java@v5
         with:
           distribution: temurin
-          java-version: 21
+          java-version: |
+            25
+            21
           cache: gradle
 
       - name: Compile all versions
         run: |
           chmod +x gradlew
           # --continue reports every version that fails, not just the first.
-          ./gradlew compileJava --no-daemon --stacktrace --continue
+          ./gradlew compileJava --no-daemon --stacktrace --continue \
+            -Porg.gradle.java.installations.fromEnv=JAVA_HOME_21_X64,JAVA_HOME_25_X64

.gitea/workflows/release.yml

@@ -47,18 +47,24 @@ jobs:
       # The JDK comes from the runner's tool cache. `cache: gradle` stores Gradle's
       # dependencies, Loom's Minecraft cache and the build cache in the runner's
       # actions cache.
-      - name: Set up Java 21
+      # 1.21.x builds with Java 21 and 26.x with Java 25. The last version listed is the default
+      # (Gradle runs on it), and the Gradle commands below point toolchain detection at both.
+      - name: Set up Java 25 and 21
         uses: actions/setup-java@v5
         with:
           distribution: temurin
-          java-version: 21
+          java-version: |
+            25
+            21
           cache: gradle
 
       - name: Build all versions
         run: |
           chmod +x gradlew
-          # buildAll remaps every versions/* project in parallel into build/allJars.
-          ./gradlew buildAll --no-daemon --stacktrace
+          # buildAll remaps every Minecraft version (two at a time, to stay within the
+          # Gradle heap) into build/allJars.
+          ./gradlew buildAll --no-daemon --stacktrace \
+            -Porg.gradle.java.installations.fromEnv=JAVA_HOME_21_X64,JAVA_HOME_25_X64
 
       - name: Upload jars to the release
         env:

README.MD

@@ -18,7 +18,7 @@
 Saturn Client is a free, open-source Minecraft client designed to enhance the gameplay experience while staying lightweight and customizable.
 Our goal is to build a clean, optimized client that the community can contribute to and improve together.
 
-Saturn runs on Fabric and supports **Minecraft 1.21.4 to 1.21.11**, with one build per version. If something doesn't work on your version, please open an issue.
+Saturn runs on Fabric and supports **Minecraft 1.21.4 to 1.21.11 and 26.1 to 26.3**, with one build per version (the 26.1 build also runs on 26.1.1 and 26.1.2). If something doesn't work on your version, please open an issue.
 
 ## Features
 
@@ -51,7 +51,7 @@ cd saturnclient
 ./gradlew :1.21.11:runClient          # launch a development client
 ```
 
-Building needs Java 21.
+Building needs Java 21. The 26.x versions compile with Java 25, which Gradle downloads when it isn't installed.
 
 ## Contributing
 

VERSION_GUIDE.md

@@ -4,13 +4,27 @@ How Saturn Client supports several Minecraft versions, and how to change or add
 
 ## Layout
 
-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/):
+Every supported Minecraft version (1.21.4 to 1.21.11, and 26.1 to 26.3) 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), 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>`.
+- `versions/<mc>/`: each version's `gradle.properties` (Minecraft, Fabric Loader and Fabric API versions), plus its `build/` and `run/` folders. Each version is the Gradle project `:<mc>`.
 
-`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`.
+`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 `loomx.loom_version` in the root `gradle.properties`.
+
+Minecraft is obfuscated up to 1.21.11 and ships with Mojang's names from 26.1. The `loom-back-compat` plugin (`loomx`) applies the matching Loom for each version: the remapping one for 1.21.x, whose jar is `remapJar`'s output, and the plain one for 26.x, whose jar is `jar`'s. 26.x also compiles with Java 25 (21 before), set per version in `build.gradle.kts`; Gradle downloads a missing JDK through the foojay resolver, and CI installs both. An optional `minecraft_compat` in a version's `gradle.properties` widens the Minecraft versions its jar loads on, as 26.1's does for its hotfixes.
+
+## Mappings
+
+Every version is built with Mojang's official names (`loom.officialMojangMappings()`), the names Minecraft itself ships from 26.1 on. Yarn isn't used any more: 1.21.11 has the last Yarn release.
+
+Mojang renames things between versions. `src/` uses the active version's (1.21.11's) names, and `stonecutter.gradle.kts` lists replacements that swap in each version's name when Stonecutter processes it: for example `Identifier`, which was `ResourceLocation` before 1.21.11, `AvatarRenderState`, which was `PlayerRenderState` before 1.21.9, and `GuiGraphics`, which is `GuiGraphicsExtractor` from 26.1. Add a replacement there when a rename touches many lines, and only for a name that appears nowhere else in `src/`: replacements work both ways, so the new name is also turned back into the old one for older versions (a `mulPose`/`rotate` replacement would rename `MatrixStackRef.rotate` too). From 26.2 the open screen and overlay live on `Gui` rather than `Minecraft`, so code goes through `impl.ui.Screens` for them.
+
+From 26.3 Minecraft uses SDL instead of GLFW, with SDL's numbers for keys (scancodes), modifiers and mouse buttons. Saturn keeps GLFW's numbers, which `common` uses and the config's keybinds store, and `impl.provider.Keys` converts at the boundary: key events and mouse buttons coming in, and key codes going to the game. Use `InputConstants`' key constants rather than GLFW's in version-specific code.
+
+26.3 also compiles every shader through SPIR-V, so shader inputs and outputs need an explicit `layout(location = …)`. Saturn's `glass.fsh` is shared by every version from 1.21.6 and switches its layout with the defines `GlassRenderer` sets, as it already did for `HAS_LINE_WIDTH`. A class that only moved package needs just a version comment on its import, and a renamed method a version comment where it's called.
+
+Released 1.21.x jars run on intermediary names (`method_1234`), not Mojang's, and Loom renames everything that refers to Minecraft when it builds them. So a mixin can't implement one of `common`'s Ref interfaces by relying on a vanilla method that happens to have the same name: the vanilla method is renamed in the jar, and the interface method is left without an implementation (`AbstractMethodError`). Shadow the vanilla method and implement the Ref method explicitly, as `WindowMixin` does. For the same reason, Ref methods mustn't share a name and parameters with a method of the class they're mixed into, or the mixin replaces the vanilla method in development.
 
 ## Version-specific code with Stonecutter
 
@@ -18,29 +32,29 @@ The code in `src/` is always plain Java for the **active** version (1.21.11, set
 
 ```java
 //? if >=1.21.9 {
-public void render(MatrixStack matrices, OrderedRenderCommandQueue queue, int light, PlayerEntityRenderState state, float limbAngle, float limbDistance) {
+public void submit(PoseStack matrices, SubmitNodeCollector output, int light, AvatarRenderState state, float limbAngle, float limbDistance) {
 //?} else
-//public void render(MatrixStack matrices, VertexConsumerProvider consumers, int light, PlayerEntityRenderState state, float limbAngle, float limbDistance) {
+//public void render(PoseStack matrices, MultiBufferSource output, int light, AvatarRenderState 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;
+import net.minecraft.client.renderer.rendertype.RenderTypes;
+import net.minecraft.client.renderer.rendertype.RenderSetup;
 //?} else {
-/*import net.minecraft.client.render.RenderPhase.Textures;
+/*import net.minecraft.client.renderer.RenderStateShard.MultiTextureStateShard;
 *///?}
 ```
 
 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. `WorldFeatureImpl.getWorldAge` and `SaturnScreenFabric.resize` are examples. Search for `TODO` to find what newer versions still lack.
+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 `NametagsMixin`, which hooks a method that 1.21.9 changed) can keep an empty class body on the other versions. An empty mixin changes nothing, and it keeps the mixin configs the same for every version, since JSON can't hold version comments.
+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`.
+Inactive code sits inside a `/* … */` comment, so it can't contain `/* … */` comments itself: use `//` comments in code that's only active for some versions. Version blocks can nest (Stonecutter writes an inactive block inside another as `/^ … ^/`, as in `GlassRenderer`), but for more than two ranges of the same thing, prefer `//?} else if <condition> {`, 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.
@@ -62,7 +76,7 @@ For bigger changes, `./gradlew buildAll` builds every version's jar into `build/
 
 ## Adding a Minecraft version
 
-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`.
+1. Create `versions/<new>/gradle.properties` with `minecraft_version`, `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`.
+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 (or when its class first loads, such as in a world), not at compile time, so launch it with `./gradlew :<new>:runClient`.
 4. The release workflow builds everything through `buildAll`, and "Publish to Modrinth" takes the game version from each jar's name, so neither needs changing.

build.gradle.kts

@@ -1,11 +1,14 @@
 // Builds one Minecraft version from the shared src/. Stonecutter runs this for each version in
 // stonecutterVersions (settings.gradle.kts), with that version's versions/<v>/gradle.properties.
 plugins {
-    id("net.fabricmc.fabric-loom-remap")
+    id("dev.kikugie.loom-back-compat")
     `maven-publish`
 }
 
 val minecraftVersion = property("minecraft_version") as String
+// The Minecraft versions the jar loads on (fabric.mod.json); a range where hotfixes share a jar.
+val minecraftCompat = findProperty("minecraft_compat") as String? ?: minecraftVersion
+val javaVersion = if (sc.current.parsed >= "26.1") 25 else 21
 val loaderVersion = property("loader_version") as String
 
 version = "${property("mod_version")}+$minecraftVersion"
@@ -17,7 +20,7 @@ base {
 
 dependencies {
     minecraft("com.mojang:minecraft:$minecraftVersion")
-    mappings("net.fabricmc:yarn:${property("yarn_mappings")}:v2")
+    loomx.applyMojangMappings()
     modImplementation("net.fabricmc:fabric-loader:$loaderVersion")
     modImplementation("net.fabricmc.fabric-api:fabric-api:${property("fabric_api_version")}")
 
@@ -42,23 +45,23 @@ dependencies {
 tasks.processResources {
     val values = mapOf(
         "version" to project.version.toString(),
-        "minecraft_version" to minecraftVersion,
+        "minecraft_version" to minecraftCompat,
         "loader_version" to loaderVersion,
+        "java" to "JAVA_$javaVersion",
     )
     inputs.properties(values)
     filteringCharset = "UTF-8"
-    filesMatching("fabric.mod.json") { expand(values) }
+    filesMatching(listOf("fabric.mod.json", "*.mixins.json")) { expand(values) }
 }
 
 tasks.withType<JavaCompile>().configureEach {
-    options.release = 21
+    options.release = javaVersion
 }
 
 java {
     // Loom attaches the sources jar to remapSourcesJar and build.
     withSourcesJar()
-    sourceCompatibility = JavaVersion.VERSION_21
-    targetCompatibility = JavaVersion.VERSION_21
+    toolchain.languageVersion = JavaLanguageVersion.of(javaVersion)
 }
 
 tasks.jar {

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.5-beta
 
 # Saturn's emote library (git.selimaj.dev/saturnclientmc/emotes)
-emotes_version=0.1.0
+emotes_version=0.1.2
 
-# Loom, for every Minecraft version (read in settings.gradle.kts).
-loom_version=1.17.21
+# Loom, for every Minecraft version (read by loom-back-compat).
+loomx.loom_version=1.17.21

settings.gradle.kts

@@ -5,16 +5,15 @@ pluginManagement {
         gradlePluginPortal()
         mavenCentral()
     }
-
-    // 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
-    }
 }
 
 plugins {
+    // Downloads the Java toolchain a version needs (Java 25 for 26.1+) when it isn't installed.
+    id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"
     id("dev.kikugie.stonecutter") version "0.9.8"
+    // Picks the Loom variant per version: remapping for 1.21.x, plain for the unobfuscated 26.1+.
+    // Its version is loomx.loom_version in gradle.properties.
+    id("dev.kikugie.loom-back-compat") version "0.4.2"
 }
 
 rootProject.name = "saturn-client"
@@ -22,8 +21,11 @@ rootProject.name = "saturn-client"
 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.4", "1.21.5", "1.21.6", "1.21.7", "1.21.8", "1.21.9", "1.21.10", "1.21.11")
+// versions/<v>/gradle.properties holds its Minecraft, Fabric Loader and Fabric API versions.
+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",
+    "26.1", "26.2", "26.3",
+)
 
 stonecutter {
     create(rootProject) {

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

@@ -1,40 +1,51 @@
 package org.saturnclient.impl.cosmetics;
 
 import java.util.Arrays;
+import java.util.Collections;
+import java.util.Map;
+import java.util.WeakHashMap;
 
 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.Animation;
+import org.saturnclient.emotes.core.Bone;
+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.render.OverlayTexture;
-import net.minecraft.client.render.VertexConsumer;
+import net.minecraft.client.model.geom.ModelPart;
+import net.minecraft.client.renderer.texture.OverlayTexture;
+import com.mojang.blaze3d.vertex.VertexConsumer;
 //? if >=1.21.9 {
-import net.minecraft.client.render.command.OrderedRenderCommandQueue;
+import net.minecraft.client.renderer.SubmitNodeCollector;
 //?} 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;
-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;
+//import net.minecraft.client.renderer.MultiBufferSource;
+import net.minecraft.client.resources.model.EquipmentClientInfo;
+import net.minecraft.client.resources.model.EquipmentAssetManager;
+import net.minecraft.client.resources.model.EquipmentClientInfo.LayerType;
+import net.minecraft.client.renderer.entity.layers.RenderLayer;
+import net.minecraft.client.renderer.entity.RenderLayerParent;
+//? if >=1.21.11 {
+import net.minecraft.client.model.player.PlayerModel;
+//?} else
+//import net.minecraft.client.model.PlayerModel;
+import net.minecraft.client.renderer.entity.state.AvatarRenderState;
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.core.component.DataComponents;
+import net.minecraft.world.item.equipment.Equippable;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.equipment.EquipmentAsset;
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.util.Mth;
 
 /**
  * The cloak renderer
@@ -43,8 +54,8 @@ import net.minecraft.util.math.Vec3d;
  * - **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;
+public class CloakFeatureRenderer extends RenderLayer<AvatarRenderState, PlayerModel> {
+    private final EquipmentAssetManager equipmentModelLoader;
     private static final int PARTS = 24;
     private final float[] segmentValues = new float[PARTS];
     private static final int H_PARTS = 6;
@@ -87,19 +98,19 @@ public class CloakFeatureRenderer extends FeatureRenderer<PlayerEntityRenderStat
     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) {
+    public CloakFeatureRenderer(RenderLayerParent<AvatarRenderState, PlayerModel> context,
+            EquipmentAssetManager 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);
+    private boolean hasCustomModelForLayer(ItemStack stack, EquipmentClientInfo.LayerType layerType) {
+        Equippable equippableComponent = (Equippable) stack
+                .get(DataComponents.EQUIPPABLE);
         if (equippableComponent != null && !equippableComponent.assetId().isEmpty()) {
-            EquipmentModel equipmentModel = this.equipmentModelLoader
-                    .get((RegistryKey<EquipmentAsset>) equippableComponent.assetId().get());
+            EquipmentClientInfo equipmentModel = this.equipmentModelLoader
+                    .get((ResourceKey<EquipmentAsset>) equippableComponent.assetId().get());
             return !equipmentModel.getLayers(layerType).isEmpty();
         } else {
             return false;
@@ -107,7 +118,7 @@ public class CloakFeatureRenderer extends FeatureRenderer<PlayerEntityRenderStat
     }
 
     private void vertex(VertexConsumer vc, Matrix4f posMat, Matrix3f normalMat,
-            Vec3d pos, int color,
+            net.minecraft.world.phys.Vec3 pos, int color,
             float u, float v, int overlay, int light,
             float nx, float ny, float nz) {
 
@@ -117,7 +128,7 @@ public class CloakFeatureRenderer extends FeatureRenderer<PlayerEntityRenderStat
         Vector3f n = new Vector3f(nx, ny, nz);
         n.mul(normalMat);
 
-        vc.vertex(
+        vc.addVertex(
                 p.x(), p.y(), p.z(),
                 color,
                 u, v,
@@ -125,13 +136,13 @@ public class CloakFeatureRenderer extends FeatureRenderer<PlayerEntityRenderStat
                 n.x(), n.y(), n.z());
     }
 
-    private void renderCapeQuad(VertexConsumer vertexConsumer, MatrixStack.Entry entry,
-            Vec3d bottomLeft, Vec3d bottomRight, Vec3d topRight, Vec3d topLeft,
+    private void renderCapeQuad(VertexConsumer vertexConsumer, PoseStack.Pose entry,
+            net.minecraft.world.phys.Vec3 bottomLeft, net.minecraft.world.phys.Vec3 bottomRight, net.minecraft.world.phys.Vec3 topRight, net.minecraft.world.phys.Vec3 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();
+        Matrix4f pos = entry.pose();
+        Matrix3f normalMat = entry.normal();
 
         int color = 0xFFFFFFFF; // white RGBA
 
@@ -154,8 +165,8 @@ public class CloakFeatureRenderer extends FeatureRenderer<PlayerEntityRenderStat
         }
     }
 
-    private void renderCape(MatrixStack.Entry entry, VertexConsumer vertexConsumer,
-            PlayerEntityRenderState playerState, int light, int overlay) {
+    private void renderCape(PoseStack.Pose entry, VertexConsumer vertexConsumer,
+            AvatarRenderState playerState, int light, int overlay) {
 
         float capeWidth = 10.0f / 16.0f;
         float capeHeight = 16.0f / 16.0f;
@@ -217,8 +228,8 @@ public class CloakFeatureRenderer extends FeatureRenderer<PlayerEntityRenderStat
         // 2. Grid
         // =============================
 
-        Vec3d[][] inner = new Vec3d[H_PARTS + 1][PARTS + 1];
-        Vec3d[][] outer = new Vec3d[H_PARTS + 1][PARTS + 1];
+        net.minecraft.world.phys.Vec3[][] inner = new net.minecraft.world.phys.Vec3[H_PARTS + 1][PARTS + 1];
+        net.minecraft.world.phys.Vec3[][] outer = new net.minecraft.world.phys.Vec3[H_PARTS + 1][PARTS + 1];
 
         for (int x = 0; x <= H_PARTS; x++) {
 
@@ -250,8 +261,8 @@ public class CloakFeatureRenderer extends FeatureRenderer<PlayerEntityRenderStat
                 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);
+                inner[x][i] = new net.minecraft.world.phys.Vec3(xPos, y - curveY, z - curveZ);
+                outer[x][i] = new net.minecraft.world.phys.Vec3(xPos, (y - curveY) - thickY, (z - curveZ) - thickZ);
             }
 
         }
@@ -276,15 +287,15 @@ public class CloakFeatureRenderer extends FeatureRenderer<PlayerEntityRenderStat
                 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];
+                net.minecraft.world.phys.Vec3 innerTL = inner[x + 1][i];
+                net.minecraft.world.phys.Vec3 innerTR = inner[x][i];
+                net.minecraft.world.phys.Vec3 innerBL = inner[x + 1][i + 1];
+                net.minecraft.world.phys.Vec3 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];
+                net.minecraft.world.phys.Vec3 outerTL = outer[x + 1][i];
+                net.minecraft.world.phys.Vec3 outerTR = outer[x][i];
+                net.minecraft.world.phys.Vec3 outerBL = outer[x + 1][i + 1];
+                net.minecraft.world.phys.Vec3 outerBR = outer[x][i + 1];
 
                 // FRONT
                 renderCapeQuad(vertexConsumer, entry,
@@ -306,10 +317,10 @@ public class CloakFeatureRenderer extends FeatureRenderer<PlayerEntityRenderStat
 
         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];
+            net.minecraft.world.phys.Vec3 innerTop = inner[H_PARTS][i];
+            net.minecraft.world.phys.Vec3 innerBot = inner[H_PARTS][i + 1];
+            net.minecraft.world.phys.Vec3 outerTop = outer[H_PARTS][i];
+            net.minecraft.world.phys.Vec3 outerBot = outer[H_PARTS][i + 1];
 
             float vStart = leftV1 + leftPartV * i;
             float vEnd = leftV1 + leftPartV * (i + 1);
@@ -327,10 +338,10 @@ public class CloakFeatureRenderer extends FeatureRenderer<PlayerEntityRenderStat
 
         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];
+            net.minecraft.world.phys.Vec3 innerTop = inner[0][i];
+            net.minecraft.world.phys.Vec3 innerBot = inner[0][i + 1];
+            net.minecraft.world.phys.Vec3 outerTop = outer[0][i];
+            net.minecraft.world.phys.Vec3 outerBot = outer[0][i + 1];
 
             float vStart = rightV1 + rightPartV * i;
             float vEnd = rightV1 + rightPartV * (i + 1);
@@ -348,10 +359,10 @@ public class CloakFeatureRenderer extends FeatureRenderer<PlayerEntityRenderStat
 
         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];
+            net.minecraft.world.phys.Vec3 outerL = outer[x][0];
+            net.minecraft.world.phys.Vec3 outerR = outer[x + 1][0];
+            net.minecraft.world.phys.Vec3 innerR = inner[x + 1][0];
+            net.minecraft.world.phys.Vec3 innerL = inner[x][0];
 
             float uStart = topU1 + (topU2 - topU1) * ((float) x / H_PARTS);
             float uEnd = topU1 + (topU2 - topU1) * ((float) (x + 1) / H_PARTS);
@@ -368,10 +379,10 @@ public class CloakFeatureRenderer extends FeatureRenderer<PlayerEntityRenderStat
 
         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];
+            net.minecraft.world.phys.Vec3 innerL = inner[x][PARTS];
+            net.minecraft.world.phys.Vec3 innerR = inner[x + 1][PARTS];
+            net.minecraft.world.phys.Vec3 outerR = outer[x + 1][PARTS];
+            net.minecraft.world.phys.Vec3 outerL = outer[x][PARTS];
 
             float uStart = bottomU1 + (bottomU2 - bottomU1) * ((float) x / H_PARTS);
             float uEnd = bottomU1 + (bottomU2 - bottomU1) * ((float) (x + 1) / H_PARTS);
@@ -383,6 +394,54 @@ public class CloakFeatureRenderer extends FeatureRenderer<PlayerEntityRenderStat
         }
     }
 
+    /** A torso bend past this curves the back more than a flat cloak can follow. */
+    private static final float MAX_CLOAK_BEND = (float) Math.toRadians(10);
+    /** Whether each animation bends the torso past that at any point. */
+    private static final Map<Animation, Boolean> BENDS_TORSO = Collections.synchronizedMap(new WeakHashMap<>());
+
+    /**
+     * Whether the player is playing an emote that curves the torso (a twerk, the griddy). The cloak
+     * would cut through the arched back, so it's hidden for the whole emote rather than only while
+     * the back is curved, which would flicker.
+     */
+    private static boolean playingTorsoBend(SaturnPlayer player) {
+        return org.saturnclient.emotes.fabric.Emotes.playing(player.uuid)
+                .map(playing -> BENDS_TORSO.computeIfAbsent(playing.animation(), CloakFeatureRenderer::bendsTorso))
+                .orElse(false);
+    }
+
+    private static boolean bendsTorso(Animation animation) {
+        for (float tick = 0; tick <= animation.length(); tick += 0.5f) {
+            if (animation.sample(tick).get(Bone.BODY).filter(body -> Math.abs(body.bend()) > MAX_CLOAK_BEND).isPresent()) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * An emote that bends the torso a little 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(PoseStack 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();
+        Quaternionf rotation = new Quaternionf().rotationAxis(bend.angleAt(0), axis.x(), axis.y(), axis.z());
+        //? if >=26.3 {
+        /*matrices.rotate(rotation);
+        *///?} else
+        matrices.mulPose(rotation);
+    }
+
     // 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)
@@ -397,17 +456,20 @@ public class CloakFeatureRenderer extends FeatureRenderer<PlayerEntityRenderStat
     private long lastUpdate = 0;
 
     @Override
-    public void render(MatrixStack matrices,
     //? if >=1.21.9 {
-            OrderedRenderCommandQueue output,
+    public void submit(PoseStack matrices,
     //?} else
-            //VertexConsumerProvider output,
-            int light, PlayerEntityRenderState state, float limbAngle, float limbDistance) {
-        if (state.invisible || !state.capeVisible
+    //public void render(PoseStack matrices,
             //? if >=1.21.9 {
-                || state.skinTextures.cape() != null) {
+            SubmitNodeCollector output,
             //?} else
-                //|| state.skinTextures.capeTexture() != null) {
+            //MultiBufferSource output,
+            int light, AvatarRenderState state, float limbAngle, float limbDistance) {
+        if (state.isInvisible || !state.showCape
+                //? if >=1.21.9 {
+                || state.skin.cape() != null) {
+                //?} else
+                //|| state.skin.capeTexture() != null) {
             return;
         }
 
@@ -416,13 +478,13 @@ public class CloakFeatureRenderer extends FeatureRenderer<PlayerEntityRenderStat
         //?} else
         //SaturnPlayer player = SaturnPlayer.get(state.name);
 
-        if (player == null) {
+        if (player == null || playingTorsoBend(player)) {
             return;
         }
 
         IdentifierRef customCape = Cloaks.getCurrentCloakTexture(player.cloak);
         if (customCape == null
-                || this.hasCustomModelForLayer(state.equippedChestStack, LayerType.WINGS)) {
+                || this.hasCustomModelForLayer(state.chestEquipment, LayerType.WINGS)) {
             return;
         }
 
@@ -434,26 +496,33 @@ public class CloakFeatureRenderer extends FeatureRenderer<PlayerEntityRenderStat
         skyLight = Math.max(skyLight, minBrightness);
         light = (skyLight << 20) | (blockLight << 4);
 
-        matrices.push();
+        matrices.pushPose();
+
+        // 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
+        PlayerModel model = this.getParentModel();
+        //? if >=1.21.5 {
+        model.root().translateAndRotate(matrices);
+        model.body.translateAndRotate(matrices);
+        //?} else {
+        /*model.root().translateAndRotate(matrices);
+        model.body.translateAndRotate(matrices);
+        *///?}
+        followBend(matrices, model.body);
 
         matrices.translate(0.0f, 0.0f, 0.12f);
 
-        if (this.hasCustomModelForLayer(state.equippedChestStack, LayerType.HUMANOID)) {
+        if (this.hasCustomModelForLayer(state.chestEquipment, 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 velX = Math.min(0.8f, state.capeLean / 108.0f);
+            float rawVelY = state.capeFlap;
             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));
+            float value = Math.max(0.0f, Math.min(2.0f, state.isVisuallySwimming ? 0.0f : velX + velY));
 
             if (Config.cloakPhysics.value) {
                 updateSegmentValues(segmentValues[0] + (value - segmentValues[0]) * 0.3f);
@@ -465,15 +534,15 @@ public class CloakFeatureRenderer extends FeatureRenderer<PlayerEntityRenderStat
 
         final int l = light;
 
-        horizontalCurve = MathHelper.clamp(state.field_53537 / 150.0f, -1.0f, 1.0f);
+        horizontalCurve = Mth.clamp(state.capeLean / 150.0f, -1.0f, 1.0f);
 
         //? if >=1.21.9 {
-        output.submitCustom(matrices, ShaderUtils.getRenderLayer(customCape), (entry, vertexConsumer) -> {
-            renderCape(entry, vertexConsumer, state, l, OverlayTexture.DEFAULT_UV);
+        output.submitCustomGeometry(matrices, ShaderUtils.getRenderLayer(customCape), (entry, vertexConsumer) -> {
+            renderCape(entry, vertexConsumer, state, l, OverlayTexture.NO_OVERLAY);
         });
         //?} else
-        //renderCape(matrices.peek(), output.getBuffer(ShaderUtils.getRenderLayer(customCape)), state, l, OverlayTexture.DEFAULT_UV);
+        //renderCape(matrices.last(), output.getBuffer(ShaderUtils.getRenderLayer(customCape)), state, l, OverlayTexture.NO_OVERLAY);
 
-        matrices.pop();
+        matrices.popPose();
     }
 }

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

@@ -1,56 +1,65 @@
 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;
+import net.minecraft.client.renderer.texture.OverlayTexture;
 //? if >=1.21.9 {
-import net.minecraft.client.render.command.OrderedRenderCommandQueue;
+import net.minecraft.client.renderer.SubmitNodeCollector;
 //?} 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;
+//import net.minecraft.client.renderer.MultiBufferSource;
+import net.minecraft.client.renderer.entity.layers.RenderLayer;
+import net.minecraft.client.renderer.entity.RenderLayerParent;
+//? if >=1.21.11 {
+import net.minecraft.client.model.player.PlayerModel;
+//?} else
+//import net.minecraft.client.model.PlayerModel;
+import net.minecraft.client.renderer.entity.state.AvatarRenderState;
+import com.mojang.blaze3d.vertex.PoseStack;
 
-public class HatFeatureRenderer extends FeatureRenderer<PlayerEntityRenderState, PlayerEntityModel> {
-    public HatFeatureRenderer(FeatureRendererContext<PlayerEntityRenderState, PlayerEntityModel> context) {
+public class HatFeatureRenderer extends RenderLayer<AvatarRenderState, PlayerModel> {
+    public HatFeatureRenderer(RenderLayerParent<AvatarRenderState, PlayerModel> context) {
         super(context);
     }
 
     @Override
-    public void render(MatrixStack matrices,
     //? if >=1.21.9 {
-            OrderedRenderCommandQueue output,
+    public void submit(PoseStack matrices,
     //?} else
-            //VertexConsumerProvider output,
-            int light, PlayerEntityRenderState state, float limbAngle, float limbDistance) {
+    //public void render(PoseStack matrices,
+            //? if >=1.21.9 {
+            SubmitNodeCollector output,
+            //?} else
+            //MultiBufferSource output,
+            int light, AvatarRenderState 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()) {
+        if (state.isInvisible || player == null || player.hat.isEmpty()) {
             return;
         }
 
-        matrices.push();
+        matrices.pushPose();
 
+        // 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)
+        PlayerModel model = this.getParentModel();
         //? if >=1.21.5 {
-        ModelPart head = this.getContextModel().head;
-        matrices.multiply(new Quaternionf().rotationZYX(head.roll, head.yaw, head.pitch));
-        //?} else
-        //this.getContextModel().head.rotate(matrices);
+        model.root().translateAndRotate(matrices);
+        model.head.translateAndRotate(matrices);
+        //?} else {
+        /*model.root().translateAndRotate(matrices);
+        model.head.translateAndRotate(matrices);
+        *///?}
 
         ObjModel.cosmetic("hat", player.hat).render(MtlLoader.cosmetic(player.hat),
                 matrices, output, light,
-                OverlayTexture.DEFAULT_UV);
+                OverlayTexture.NO_OVERLAY);
 
-        matrices.pop();
+        matrices.popPose();
     }
 }

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

@@ -8,15 +8,15 @@ import java.util.Map;
 
 import de.javagl.obj.*;
 
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.util.Identifier;
+import net.minecraft.client.Minecraft;
+import net.minecraft.resources.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()) {
+        try (InputStream is = Minecraft.getInstance().getResourceManager()
+                .getResource(mtlId).get().open()) {
             List<Mtl> mtlList = MtlReader.read(is);
             Map<String, Mtl> mtlMap = new java.util.LinkedHashMap<>();
             for (Mtl mtl : mtlList) {
@@ -51,6 +51,6 @@ public class MtlLoader {
         if (mtlId.isEmpty())
             mtlId = "white";
 
-        return of(Identifier.of("saturnclient", "models/cosmetic/materials/" + mtlId + ".mtl"));
+        return of(Identifier.fromNamespaceAndPath("saturnclient", "models/cosmetic/materials/" + mtlId + ".mtl"));
     }
 }

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

@@ -12,15 +12,16 @@ 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.Minecraft;
 //? if >=1.21.9 {
-import net.minecraft.client.render.command.OrderedRenderCommandQueue;
+import net.minecraft.client.renderer.SubmitNodeCollector;
 //?} else
-//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;
+//import net.minecraft.client.renderer.MultiBufferSource;
+import com.mojang.blaze3d.vertex.PoseStack;
+import org.joml.Quaternionf;
+import net.minecraft.server.packs.resources.Resource;
+import net.minecraft.server.packs.resources.ResourceManager;
+import net.minecraft.resources.Identifier;
 
 public class ObjModel {
     private static final ObjectMapper MAPPER = new ObjectMapper();
@@ -46,7 +47,7 @@ public class ObjModel {
     Config config;
 
     public static ObjModel cosmetic(String cosmeticKind, String id) {
-        return of(Identifier.of("saturnclient", "models/cosmetic/" + cosmeticKind + "/" + id.split("_")[0] + "/model"));
+        return of(Identifier.fromNamespaceAndPath("saturnclient", "models/cosmetic/" + cosmeticKind + "/" + id.split("_")[0] + "/model"));
     }
 
     public static ObjModel of(Identifier obj) {
@@ -59,8 +60,8 @@ public class ObjModel {
     }
 
     ObjModel(Identifier identifier) {
-        Identifier objId = Identifier.of(identifier.getNamespace(), identifier.getPath() + ".obj");
-        Identifier jsonId = Identifier.of(identifier.getNamespace(), identifier.getPath() + ".json");
+        Identifier objId = Identifier.fromNamespaceAndPath(identifier.getNamespace(), identifier.getPath() + ".obj");
+        Identifier jsonId = Identifier.fromNamespaceAndPath(identifier.getNamespace(), identifier.getPath() + ".json");
 
         try {
             this.obj = ObjRenderer.loadObj(objId);
@@ -69,11 +70,11 @@ public class ObjModel {
         }
 
         // Try loading JSON config if it exists
-        ResourceManager resourceManager = MinecraftClient.getInstance().getResourceManager();
+        ResourceManager resourceManager = Minecraft.getInstance().getResourceManager();
         Optional<Resource> resource = resourceManager.getResource(jsonId);
 
         if (resource.isPresent()) {
-            try (InputStream stream = resource.get().getInputStream()) {
+            try (InputStream stream = resource.get().open()) {
                 this.config = MAPPER.readValue(stream, Config.class);
             } catch (Exception e) {
                 e.printStackTrace();
@@ -81,29 +82,37 @@ public class ObjModel {
         }
     }
 
-    public void render(Map<String, Mtl> mtlMap, MatrixStack matrices,
+    public void render(Map<String, Mtl> mtlMap, PoseStack matrices,
             //? if >=1.21.9 {
-            OrderedRenderCommandQueue output,
+            SubmitNodeCollector output,
             //?} else
-            //VertexConsumerProvider output,
+            //MultiBufferSource output,
             int light, int overlay) {
-        matrices.push();
+        matrices.pushPose();
 
-        matrices.multiply(net.minecraft.util.math.RotationAxis.POSITIVE_X.rotationDegrees(180.0f));
-        matrices.multiply(net.minecraft.util.math.RotationAxis.POSITIVE_Y.rotationDegrees(180.0f));
+        rotate(matrices, com.mojang.math.Axis.XP.rotationDegrees(180.0f));
+        rotate(matrices, com.mojang.math.Axis.YP.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));
+            rotate(matrices, com.mojang.math.Axis.XP.rotationDegrees(config.rotation.x));
+            rotate(matrices, com.mojang.math.Axis.YP.rotationDegrees(config.rotation.y));
+            rotate(matrices, com.mojang.math.Axis.ZP.rotationDegrees(config.rotation.z));
         }
 
         ObjRenderer.renderObj(this.obj, mtlMap, matrices, output, light, overlay);
 
-        matrices.pop();
+        matrices.popPose();
+    }
+
+    // 26.3 renamed PoseStack's quaternion mulPose to rotate.
+    private static void rotate(PoseStack matrices, Quaternionf rotation) {
+        //? if >=26.3 {
+        /*matrices.rotate(rotation);
+        *///?} else
+        matrices.mulPose(rotation);
     }
 }

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

@@ -9,32 +9,35 @@ import org.saturnclient.impl.cosmetics.utils.ShaderUtils;
 
 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;
+import net.minecraft.client.Minecraft;
+//? if >=1.21.11 {
+import net.minecraft.client.renderer.rendertype.RenderType;
 //?} else
-//import net.minecraft.client.render.VertexConsumerProvider;
-import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.util.Identifier;
+//import net.minecraft.client.renderer.RenderType;
+import com.mojang.blaze3d.vertex.VertexConsumer;
+//? if >=1.21.9 {
+import net.minecraft.client.renderer.SubmitNodeCollector;
+//?} else
+//import net.minecraft.client.renderer.MultiBufferSource;
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.resources.Identifier;
 
 public class ObjRenderer {
 
     public static Obj loadObj(Identifier objId) throws IOException {
-        try (InputStream is = MinecraftClient.getInstance().getResourceManager()
-                .getResource(objId).get().getInputStream()) {
+        try (InputStream is = Minecraft.getInstance().getResourceManager()
+                .getResource(objId).get().open()) {
             return ObjReader.read(is);
         }
     }
 
     public static void renderObj(Obj obj,
             Map<String, Mtl> mtlMap,
-            MatrixStack matrices,
+            PoseStack matrices,
             //? if >=1.21.9 {
-            OrderedRenderCommandQueue output,
+            SubmitNodeCollector output,
             //?} else
-            //VertexConsumerProvider output,
+            //MultiBufferSource output,
             int light,
             int overlay) {
 
@@ -65,20 +68,20 @@ public class ObjRenderer {
                 }
             }
 
-            RenderLayer layer = ShaderUtils.getRenderLayer(texture);
+            RenderType layer = ShaderUtils.getRenderLayer(texture);
 
             final float fr = r, fg = g, fb = b;
             final Obj finalObj = groupObj;
 
             //? if >=1.21.9 {
-            output.submitCustom(matrices, layer,
+            output.submitCustomGeometry(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);
+            //drawGroup(finalObj, output.getBuffer(layer), matrices.last(), light, overlay, fr, fg, fb);
         }
     }
 
-    private static void drawGroup(Obj obj, VertexConsumer consumer, MatrixStack.Entry entry, int light, int overlay,
+    private static void drawGroup(Obj obj, VertexConsumer consumer, PoseStack.Pose entry, int light, int overlay,
             float r, float g, float b) {
         int faces = obj.getNumFaces();
 
@@ -93,7 +96,7 @@ public class ObjRenderer {
     }
 
     private static void writeVertex(Obj obj, ObjFace face, int index, VertexConsumer consumer,
-            MatrixStack.Entry matrix, int light, int overlay,
+            PoseStack.Pose matrix, int light, int overlay,
             float r, float g, float b) {
 
         FloatTuple pos = obj.getVertex(face.getVertexIndex(index));
@@ -118,11 +121,11 @@ public class ObjRenderer {
             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);
+        consumer.addVertex(matrix, x, y, z)
+                .setColor(r, g, b, 1f)
+                .setUv(u, v)
+                .setOverlay(overlay)
+                .setLight(light)
+                .setNormal(matrix, nx, ny, nz);
     }
 }

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

@@ -3,9 +3,9 @@ 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 com.mojang.blaze3d.platform.NativeImage;
+import net.minecraft.client.renderer.texture.DynamicTexture;
+import net.minecraft.resources.Identifier;
 
 import java.awt.image.BufferedImage;
 import java.awt.image.DataBufferInt;
@@ -28,7 +28,7 @@ public class IdentifierUtils {
                 int index = 0;
                 for (int y = 0; y < height; y++) {
                     for (int x = 0; x < width; x++) {
-                        nativeImage.setColorArgb(x, y, pixels[index++]);
+                        nativeImage.setPixel(x, y, pixels[index++]);
                     }
                 }
 
@@ -36,7 +36,7 @@ public class IdentifierUtils {
 
                 for (int y = 0; y < height; y++) {
                     for (int x = 0; x < width; x++) {
-                        nativeImage.setColorArgb(x, y, bufferedImage.getRGB(x, y));
+                        nativeImage.setPixel(x, y, bufferedImage.getRGB(x, y));
                     }
                 }
 
@@ -44,13 +44,13 @@ public class IdentifierUtils {
 
             SaturnClient.client.execute(() -> {
                 //? if >=1.21.5 {
-                NativeImageBackedTexture texture = new NativeImageBackedTexture(
+                DynamicTexture texture = new DynamicTexture(
                         () -> identifier.toString(),
                         nativeImage);
                 //?} else
-                //NativeImageBackedTexture texture = new NativeImageBackedTexture(nativeImage);
+                //DynamicTexture texture = new DynamicTexture(nativeImage);
 
-                SaturnClient.client.getTextureManager().registerTexture(identifier, texture);
+                SaturnClient.client.getTextureManager().register(identifier, texture);
             });
 
         } catch (Exception e) {

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

@@ -7,29 +7,38 @@ import org.saturnclient.cosmetics.utils.GifUtils;
 import com.mojang.blaze3d.pipeline.RenderPipeline;
 
 //? if >=1.21.5
-import net.minecraft.client.gl.RenderPipelines;
-import net.minecraft.client.render.RenderLayer;
+import net.minecraft.client.renderer.RenderPipelines;
+//? if >=1.21.11 {
+import net.minecraft.client.renderer.rendertype.RenderType;
+//?} else
+//import net.minecraft.client.renderer.RenderType;
 //? if <1.21.5 {
-/*import net.minecraft.client.render.RenderPhase;
-import net.minecraft.client.render.VertexFormat.DrawMode;
-import net.minecraft.client.render.VertexFormats;
+/*import net.minecraft.client.renderer.RenderStateShard;
+import com.mojang.blaze3d.vertex.VertexFormat.Mode;
+import com.mojang.blaze3d.vertex.DefaultVertexFormat;
 *///?}
 //? if >=1.21.11 {
-import net.minecraft.client.render.RenderLayers;
-import net.minecraft.client.render.RenderSetup;
-import net.minecraft.client.render.block.entity.AbstractEndPortalBlockEntityRenderer;
+import net.minecraft.client.renderer.rendertype.RenderTypes;
+import net.minecraft.client.renderer.rendertype.RenderSetup;
+import net.minecraft.client.renderer.blockentity.AbstractEndPortalRenderer;
 //?} else {
-/*import net.minecraft.client.render.RenderPhase.Textures;
-import net.minecraft.client.render.block.entity.EndPortalBlockEntityRenderer;
+/*import net.minecraft.client.renderer.RenderStateShard.MultiTextureStateShard;
+import net.minecraft.client.renderer.blockentity.TheEndPortalRenderer;
+*///?}
+import net.minecraft.resources.Identifier;
+//? if >=26.3
+//import com.mojang.renderpearl.api.pipeline.ColorTargetState;
+//? if >=26.1 {
+/*import java.util.HashMap;
+import java.util.Map;
 *///?}
-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 })
+                    RenderPipelines.END_PORTAL_SNIPPET })
                     .withLocation("pipeline/end_gateway")
                     .withShaderDefine("PORTAL_LAYERS", 16)
                     .withCull(false)
@@ -37,43 +46,43 @@ public class ShaderUtils {
     //?}
 
     //? if >=1.21.11 {
-    public static final RenderLayer END_GATEWAY = RenderLayer.of("end_gateway",
+    public static final RenderType END_GATEWAY = RenderType.create("end_gateway",
             RenderSetup.builder(END_GATEWAY_PIPELINE)
-                    .texture("Sampler0", AbstractEndPortalBlockEntityRenderer.SKY_TEXTURE)
-                    .texture("Sampler1", AbstractEndPortalBlockEntityRenderer.PORTAL_TEXTURE).build());
+                    .withTexture("Sampler0", AbstractEndPortalRenderer.END_SKY_LOCATION)
+                    .withTexture("Sampler1", AbstractEndPortalRenderer.END_PORTAL_LOCATION).createRenderSetup());
     //?} else if >=1.21.6 {
-    /*public static final RenderLayer END_GATEWAY = RenderLayer.of("end_gateway", 1536, false, false,
+    /*public static final RenderType END_GATEWAY = RenderType.create("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));
+            RenderType.CompositeState.builder()
+                    .setTextureState(MultiTextureStateShard.builder().add(TheEndPortalRenderer.END_SKY_LOCATION, false)
+                            .add(TheEndPortalRenderer.END_PORTAL_LOCATION, false).build())
+                    .createCompositeState(false));
     *///?} else if >=1.21.5 {
-    /*public static final RenderLayer END_GATEWAY = RenderLayer.of("end_gateway", 1536, false, false,
+    /*public static final RenderType END_GATEWAY = RenderType.create("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));
+            RenderType.CompositeState.builder()
+                    .setTextureState(MultiTextureStateShard.builder().add(TheEndPortalRenderer.END_SKY_LOCATION, false, false)
+                            .add(TheEndPortalRenderer.END_PORTAL_LOCATION, false, false).build())
+                    .createCompositeState(false));
     *///?} else {
-    /*public static final RenderLayer END_GATEWAY = RenderLayer.of(
+    /*public static final RenderType END_GATEWAY = RenderType.create(
             "end_gateway",
-            VertexFormats.POSITION,
-            DrawMode.QUADS,
+            DefaultVertexFormat.POSITION,
+            Mode.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)
+            RenderType.CompositeState.builder()
+                    .setShaderState(RenderType.RENDERTYPE_END_GATEWAY_SHADER)
+                    .setTextureState(MultiTextureStateShard.builder()
+                            .add(TheEndPortalRenderer.END_SKY_LOCATION, false, false)
+                            .add(TheEndPortalRenderer.END_PORTAL_LOCATION, false, false)
                             .build())
-                    .cull(RenderPhase.DISABLE_CULLING)
-                    .build(false));
+                    .setCullState(RenderStateShard.NO_CULL)
+                    .createCompositeState(false));
     *///?}
 
-    public static RenderLayer getRenderLayer(IdentifierRef texture) {
+    public static RenderType getRenderLayer(IdentifierRef texture) {
         String path = texture.toString();
         if (path.endsWith(".gif")) {
             return entityAlpha((Identifier) (Object) GifUtils.get(texture));
@@ -84,10 +93,32 @@ public class ShaderUtils {
         }
     }
 
-    private static RenderLayer entityAlpha(Identifier texture) {
-        //? if >=1.21.11 {
-        return RenderLayers.entityAlpha(texture);
+    // Cosmetics are drawn unlit, without the lightmap or the directional shading, as the dragon's
+    // alpha pipeline drew them before 26.1. 26.1 dropped that pipeline, so this is the entity shader
+    // with its lighting and overlay turned off.
+    //? if >=26.1 {
+    /*public static final RenderPipeline UNLIT_CUTOUT_PIPELINE = RenderPipelines.register(
+            RenderPipeline.builder(new RenderPipeline.Snippet[] {
+                    RenderPipelines.ENTITY_EMISSIVE_SNIPPET })
+                    .withLocation(Identifier.fromNamespaceAndPath("saturnclient", "pipeline/unlit_cutout"))
+                    .withShaderDefine("ALPHA_CUTOUT", 0.1f)
+                    .withShaderDefine("NO_CARDINAL_LIGHTING")
+                    .withShaderDefine("NO_OVERLAY")
+                    .withCull(false)
+                    // From 26.3 the snippet leaves the color target to each pipeline.
+                    //? if >=26.3
+                    //.withColorTargetState(ColorTargetState.DEFAULT)
+                    .build());
+    private static final Map<Identifier, RenderType> UNLIT_CUTOUT = new HashMap<>();
+    *///?}
+
+    private static RenderType entityAlpha(Identifier texture) {
+        //? if >=26.1 {
+        /*return UNLIT_CUTOUT.computeIfAbsent(texture, id -> RenderType.create("saturn_unlit_cutout",
+                RenderSetup.builder(UNLIT_CUTOUT_PIPELINE).withTexture("Sampler0", id).createRenderSetup()));
+        *///?} else if >=1.21.11 {
+        return RenderTypes.dragonExplosionAlpha(texture);
         //?} else
-        //return RenderLayer.getEntityAlpha(texture);
+        //return RenderType.dragonExplosionAlpha(texture);
     }
 }

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

@@ -2,32 +2,31 @@ 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;
+import net.minecraft.client.Minecraft;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.phys.EntityHitResult;
+import net.minecraft.world.phys.HitResult;
+import net.minecraft.world.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 {
 
-    private final MinecraftClient mc;
+    private final Minecraft mc;
 
-    public EntityFeatureImpl(MinecraftClient mc) {
+    public EntityFeatureImpl(Minecraft mc) {
         this.mc = mc;
     }
 
     @Override
     public boolean isTargetingLivingEntity() {
-        HitResult target = mc.crosshairTarget;
+        HitResult target = mc.hitResult;
         if (target == null || target.getType() != HitResult.Type.ENTITY)
             return false;
         Entity hit = ((EntityHitResult) target).getEntity();
@@ -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

@@ -1,6 +1,7 @@
 package org.saturnclient.impl.features.mixins.entity;
 
 import org.saturnclient.impl.features.entity.CameraOverriddenEntity;
+import org.saturnclient.impl.features.render.ZoomFov;
 import org.saturnclient.mod.mods.FreelookMod;
 import org.saturnclient.saturnclient.SaturnClient;
 import org.spongepowered.asm.mixin.Mixin;
@@ -9,14 +10,16 @@ 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;
+//? if >=26.1
+//import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
-import net.minecraft.client.network.ClientPlayerEntity;
-import net.minecraft.client.render.Camera;
-import net.minecraft.entity.Entity;
+import net.minecraft.client.player.LocalPlayer;
+import net.minecraft.client.Camera;
+import net.minecraft.world.entity.Entity;
 //? if >=1.21.11 {
-import net.minecraft.world.World;
+import net.minecraft.world.level.Level;
 //?} else
-//import net.minecraft.world.BlockView;
+//import net.minecraft.world.level.BlockGetter;
 
 @Mixin(Camera.class)
 public abstract class CameraMixin {
@@ -26,30 +29,51 @@ public abstract class CameraMixin {
     @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(
-            //? if >=1.21.11 {
-            World focusedBlock,
-            //?} else
-            //BlockView focusedBlock,
-            Entity cameraEntity,
-            boolean isThirdPerson,
-            boolean isFrontFacing,
-            float tickDelta,
-            CallbackInfo ci) {
-        if (FreelookMod.isFreeLooking() && cameraEntity instanceof ClientPlayerEntity) {
+    // Freelook keeps the camera's rotation after vanilla points it along the entity's view. From 26.1
+    // that happens in alignWithEntity, which takes the camera's own entity.
+    //? if >=26.1 {
+    /*@Shadow
+    public abstract Entity entity();
+
+    @Inject(method = "alignWithEntity", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/Camera;setRotation(FF)V", ordinal = 1, shift = At.Shift.AFTER))
+    public void lockRotation(float tickDelta, CallbackInfo ci) {
+        saturn$lockRotation(entity());
+    }
+
+    // The camera works out the FOV from 26.1 (GameRenderer.getFov before).
+    @Inject(method = "calculateFov", at = @At("RETURN"), cancellable = true)
+    private void onCalculateFov(float tickDelta, CallbackInfoReturnable<Float> cir) {
+        cir.setReturnValue(ZoomFov.apply(cir.getReturnValue()));
+    }
+    *///?} else if >=1.21.11 {
+    @Inject(method = "setup", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/Camera;setRotation(FF)V", ordinal = 1, shift = At.Shift.AFTER))
+    public void lockRotation(Level focusedBlock, Entity cameraEntity, boolean isThirdPerson, boolean isFrontFacing,
+            float tickDelta, CallbackInfo ci) {
+        saturn$lockRotation(cameraEntity);
+    }
+    //?} else {
+    /*@Inject(method = "setup", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/Camera;setRotation(FF)V", ordinal = 1, shift = At.Shift.AFTER))
+    public void lockRotation(BlockGetter focusedBlock, Entity cameraEntity, boolean isThirdPerson, boolean isFrontFacing,
+            float tickDelta, CallbackInfo ci) {
+        saturn$lockRotation(cameraEntity);
+    }
+    *///?}
+
+    @Unique
+    private void saturn$lockRotation(Entity cameraEntity) {
+        if (FreelookMod.isFreeLooking() && cameraEntity instanceof LocalPlayer) {
             CameraOverriddenEntity cameraOverriddenEntity = (CameraOverriddenEntity) cameraEntity;
 
             if (firstTime && SaturnClient.client.player != null) {
-                cameraOverriddenEntity.freelook$setCameraPitch(SaturnClient.client.player.getPitch());
-                cameraOverriddenEntity.freelook$setCameraYaw(SaturnClient.client.player.getYaw());
+                cameraOverriddenEntity.freelook$setCameraPitch(SaturnClient.client.player.getXRot());
+                cameraOverriddenEntity.freelook$setCameraYaw(SaturnClient.client.player.getYRot());
                 firstTime = false;
             }
             this.setRotation(cameraOverriddenEntity.freelook$getCameraYaw(),
                     cameraOverriddenEntity.freelook$getCameraPitch());
 
         }
-        if (!FreelookMod.isFreeLooking() && cameraEntity instanceof ClientPlayerEntity) {
+        if (!FreelookMod.isFreeLooking() && cameraEntity instanceof LocalPlayer) {
             firstTime = true;
         }
     }

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

@@ -8,9 +8,9 @@ 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;
+import net.minecraft.client.player.LocalPlayer;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.util.Mth;
 
 @Mixin(Entity.class)
 public class EntityMixin implements CameraOverriddenEntity {
@@ -20,15 +20,15 @@ public class EntityMixin implements CameraOverriddenEntity {
     @Unique
     private float cameraYaw;
 
-    @Inject(method = "changeLookDirection", at = @At("HEAD"), cancellable = true)
+    @Inject(method = "turn", 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) {
+        if (FreelookMod.isFreeLooking() && (Object) this instanceof LocalPlayer) {
             double pitchDelta = (yDelta * 0.15);
             double yawDelta = (xDelta * 0.15);
 
-            this.cameraPitch = MathHelper.clamp(this.cameraPitch + (float) pitchDelta, -90.0f, 90.0f);
+            this.cameraPitch = Mth.clamp(this.cameraPitch + (float) pitchDelta, -90.0f, 90.0f);
             this.cameraYaw += (float) yawDelta;
 
             ci.cancel();

src/main/java/org/saturnclient/impl/features/mixins/misc/NametagsMixin.java

@@ -1,101 +0,0 @@
-package org.saturnclient.impl.features.mixins.misc;
-
-import net.minecraft.client.render.entity.EntityRenderer;
-import org.spongepowered.asm.mixin.Mixin;
-//? if <1.21.9 {
-/*import net.minecraft.client.render.VertexConsumerProvider;
-import net.minecraft.client.render.entity.state.EntityRenderState;
-import net.minecraft.client.render.entity.state.LivingEntityRenderState;
-import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.text.Text;
-
-import org.saturnclient.impl.features.entity.EntityFeatureImpl;
-import org.saturnclient.impl.features.entity.HealthRenderState;
-import org.saturnclient.impl.features.mixins.render.LivingEntityRenderStateMixin;
-import org.saturnclient.mod.mods.NametagsMod;
-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;
-*///?}
-
-/**
- * Intercepts nametag rendering and replaces the displayed text with
- * the string produced by {@link NametagsMod#getNametagString}.
- *
- * Key changes from the original:
- *
- * <ul>
- * <li>The old {@code NametagsFabric.EntityStateImpl} bridge class is
- * replaced by {@link EntityFeatureImpl.RenderStateEntityState},
- * which wraps the {@link HealthRenderState} already injected into
- * the render state by {@link LivingEntityRenderStateMixin}.</li>
- * <li>The feature import changes from {@code Nametags} to
- * {@link NametagsMod}; the two static methods
- * ({@code shouldReplaceName} / {@code getNametagString}) are
- * unchanged in signature.</li>
- * <li>The entity's display name is extracted from the render state's
- * {@code nameVisible} / text fields where available, falling back
- * to the plain text string passed to this method.</li>
- * </ul>
- *
- * The re-entrancy guard ({@code saturn$rendering}) is kept intact to
- * prevent infinite recursion when we call {@code renderLabelIfPresent}
- * with the replacement text.
- */
-@Mixin(EntityRenderer.class)
-public abstract class NametagsMixin {
-    // TODO: 1.21.9 moved label rendering to the render queue (renderLabelIfPresent no longer takes a
-    // VertexConsumerProvider), so custom nametags only work on older versions. On 1.21.9+ this mixin is
-    // empty but stays registered, so features.mixins.json is the same for every version.
-    //? if <1.21.9 {
-    /*// Guards against the recursive call we make with the replacement text.
-    @Unique
-    private static final ThreadLocal<Boolean> saturn$rendering = ThreadLocal.withInitial(() -> false);
-
-    @Shadow
-    protected abstract <S extends EntityRenderState> void renderLabelIfPresent(
-            S state, Text text,
-            MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light);
-
-    @Inject(method = "renderLabelIfPresent", at = @At("HEAD"), cancellable = true)
-    private <S extends EntityRenderState> void saturn$replaceNametag(
-            S state, Text text,
-            MatrixStack matrices, VertexConsumerProvider vertexConsumers,
-            int light, CallbackInfo ci) {
-
-        // Skip our own recursive call
-        if (saturn$rendering.get())
-            return;
-
-        if (!NametagsMod.shouldReplaceName())
-            return;
-
-        // Only living entities carry health data
-        if (!(state instanceof LivingEntityRenderState living))
-            return;
-        if (!(living instanceof HealthRenderState hrs))
-            return;
-
-        // Build the platform-neutral EntityState from the render-state snapshot
-        // (health/type were written by LivingEntityRendererMixin at extract time).
-        String customName = text != null ? text.getString() : null;
-        EntityFeatureImpl.RenderStateEntityState entityState = new EntityFeatureImpl.RenderStateEntityState(
-                customName, hrs);
-
-        // Ask the feature for the replacement string
-        String replacement = NametagsMod.getNametagString(entityState);
-        if (replacement == null)
-            return; // feature decided not to replace this entity
-
-        ci.cancel();
-        saturn$rendering.set(true);
-        try {
-            renderLabelIfPresent(state, Text.literal(replacement), matrices, vertexConsumers, light);
-        } finally {
-            saturn$rendering.set(false);
-        }
-    }
-    *///?}
-}

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

@@ -1,22 +1,19 @@
 package org.saturnclient.impl.features.mixins.render;
 
 //? if >=1.21.6 {
-import net.minecraft.client.render.fog.FogRenderer;
+import net.minecraft.client.renderer.fog.FogRenderer;
 //?} else
-//import net.minecraft.client.render.BackgroundRenderer;
+//import net.minecraft.client.renderer.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;
 
-//? 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)
+    @ModifyVariable(method = "setupFog", at = @At("HEAD"), ordinal = 0, argsOnly = true)
     private static float modifyFogStart(float viewDistance) {
         if (NoFogMod.isActive()) {
             return viewDistance * 2.0f;

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

@@ -1,20 +1,29 @@
 package org.saturnclient.impl.features.mixins.render;
 
-import net.minecraft.client.render.GameRenderer;
+//? if >=1.21.6
+import net.minecraft.client.Minecraft;
+//? if >=1.21.6
+import net.minecraft.client.Options;
+import net.minecraft.client.renderer.GameRenderer;
 
-import org.saturnclient.mod.mods.FreelookMod;
-import org.saturnclient.mod.mods.ZoomMod;
+//? if >=1.21.6
+import org.saturnclient.impl.ui.SaturnScreenFabric;
+//? if >=1.21.6
+import org.saturnclient.impl.ui.Screens;
+import org.saturnclient.impl.features.render.ZoomFov;
 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;
 
 /**
- * Overrides the game's field-of-view when {@link ZoomMod} is active.
+ * Overrides the game's field-of-view when {@link org.saturnclient.mod.mods.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
+ * {@link org.saturnclient.mod.mods.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
@@ -28,14 +37,29 @@ public class GameRendererMixin {
      * After the vanilla FOV has been computed, divide it by the zoom
      * level to produce the narrowed field-of-view.
      */
+    // From 26.1 the camera works out the FOV, so CameraMixin applies the zoom there.
+    //? if <26.1 {
     @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);
-        } else if (FreelookMod.shouldZoomOut()) {
-            float zoomedFov = cir.getReturnValue() / FreelookMod.getZoomLevel();
-            cir.setReturnValue(zoomedFov);
+        cir.setReturnValue(ZoomFov.apply(cir.getReturnValue()));
     }
+    //?}
+
+    //? 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.
+    // From 26.1 the setting is read while extracting the options' render state.
+    //? if >=26.1
+    //@Redirect(method = "extractOptions", at = @At(value = "INVOKE",
+    //? if <26.1
+    @Redirect(method = "render", at = @At(value = "INVOKE",
+            target = "Lnet/minecraft/client/Options;getMenuBackgroundBlurriness()I"))
+    private int useSaturnBlur(Options options) {
+        if (Screens.current() instanceof SaturnScreenFabric saturnScreen) {
+            return saturnScreen.screen.getBackgroundBlur();
         }
+
+        return options.getMenuBackgroundBlurriness();
+    }
+    //?}
 }

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

@@ -3,7 +3,10 @@ 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;
+//? if >=26.1 {
+/*import net.minecraft.client.renderer.LightmapRenderStateExtractor;
+*///?} else
+import net.minecraft.client.renderer.LightTexture;
 
 import org.saturnclient.mod.mods.FullbrightMod;
 import org.spongepowered.asm.mixin.Mixin;
@@ -18,14 +21,21 @@ import org.spongepowered.asm.mixin.injection.At;
  * it is now {@link FullbrightMod}. The injection target and
  * strategy are unchanged.
  */
-@Mixin(LightmapTextureManager.class)
+// From 26.1 the gamma is worked out while extracting the lightmap's render state.
+//? if >=26.1 {
+/*@Mixin(LightmapRenderStateExtractor.class)
+*///?} else
+@Mixin(LightTexture.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))
+    //? if >=26.1 {
+    /*@ModifyExpressionValue(method = "extract", at = @At(value = "INVOKE", target = "Ljava/lang/Math;max(FF)F", ordinal = 0))
+    *///?} else
+    @ModifyExpressionValue(method = "updateLightTexture", at = @At(value = "INVOKE", target = "Ljava/lang/Math;max(FF)F", ordinal = 0))
     private float modifyGamma(float original) {
         if (FullbrightMod.shouldOverrideBrightness()) {
             return FullbrightMod.getBrightnessValue();

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

@@ -1,10 +1,9 @@
 package org.saturnclient.impl.features.mixins.render;
 
-import net.minecraft.client.render.entity.state.LivingEntityRenderState;
+import net.minecraft.client.renderer.entity.state.LivingEntityRenderState;
 
 import org.saturnclient.common.feature.EntityFeature;
 import org.saturnclient.impl.features.entity.HealthRenderState;
-import org.saturnclient.impl.features.mixins.misc.NametagsMixin;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
 
@@ -19,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

@@ -1,34 +1,35 @@
 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 net.minecraft.client.renderer.entity.LivingEntityRenderer;
+import net.minecraft.client.renderer.entity.state.LivingEntityRenderState;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.entity.monster.Monster;
+import net.minecraft.world.entity.AgeableMob;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.network.chat.Component;
 
 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> {
 
-    @Inject(method = "updateRenderState", at = @At("TAIL"))
+    @Inject(method = "extractRenderState", at = @At("TAIL"))
     private void saturn$captureHealth(T entity, S state, float tickDelta, CallbackInfo ci) {
         if (!(state instanceof HealthRenderState hrs))
             return;
@@ -37,15 +38,25 @@ public abstract class LivingEntityRendererMixin<T extends LivingEntity, S extend
 
         // Classify entity type for the nametag feature's filtering logic
         EntityFeature.EntityType type;
-        if (entity instanceof PlayerEntity)
+        if (entity instanceof Player)
             type = EntityFeature.EntityType.PLAYER;
-        else if (entity instanceof HostileEntity)
+        else if (entity instanceof Monster)
             type = EntityFeature.EntityType.HOSTILE;
-        else if (entity instanceof PassiveEntity)
+        else if (entity instanceof AgeableMob)
             type = EntityFeature.EntityType.PASSIVE;
         else
             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.nameTag != null) {
+            String replacement = NametagsMod.getNametagString(
+                    new EntityFeatureImpl.RenderStateEntityState(state.nameTag.getString(), hrs));
+            if (replacement != null) {
+                state.nameTag = Component.literal(replacement);
+            }
+        }
     }
 }

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

@@ -1,12 +1,16 @@
 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 net.minecraft.client.gui.Font;
+import net.minecraft.client.gui.GuiGraphics;
+//? if >=26.2 {
+/*import net.minecraft.client.gui.Hud;
+*///?} else
+import net.minecraft.client.gui.Gui;
+import net.minecraft.client.DeltaTracker;
 
 import org.saturnclient.impl.ui.RenderScopeImpl;
 import org.saturnclient.impl.ui.SaturnScreenFabric;
+import org.saturnclient.impl.ui.Screens;
 import org.saturnclient.mod.HudMod;
 import org.saturnclient.mod.Mod;
 import org.saturnclient.mod.ModLayout;
@@ -37,18 +41,25 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
  * {@link SaturnScreenFabric} / {@link HudEditor} pair; that is
  * unchanged infrastructure.
  */
-@Mixin(InGameHud.class)
+// The HUD is drawn by Hud from 26.2 (by Gui before).
+//? if >=26.2 {
+/*@Mixin(Hud.class)
+*///?} else
+@Mixin(Gui.class)
 public class RenderMixin {
 
+    //? if >=26.1 {
+    /*@Inject(method = "extractChat", at = @At("TAIL"))
+    *///?} else
     @Inject(method = "renderChat", at = @At("TAIL"))
-    public void renderMods(DrawContext context, RenderTickCounter tickCounter, CallbackInfo ci) {
-        TextRenderer textRenderer = SaturnClient.client.textRenderer;
+    public void renderMods(GuiGraphics context, DeltaTracker tickCounter, CallbackInfo ci) {
+        Font textRenderer = SaturnClient.client.font;
 
         // 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
+        if (Screens.current() instanceof SaturnScreenFabric f
                 && f.screen instanceof HudEditor)
             return;
 

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

@@ -1,7 +1,7 @@
 package org.saturnclient.impl.features.mixins.world;
 
-import net.minecraft.client.network.ClientPlayNetworkHandler;
-import net.minecraft.network.packet.s2c.play.WorldTimeUpdateS2CPacket;
+import net.minecraft.client.multiplayer.ClientPacketListener;
+import net.minecraft.network.protocol.game.ClientboundSetTimePacket;
 
 import org.saturnclient.mod.mods.TpsMod;
 import org.spongepowered.asm.mixin.Mixin;
@@ -20,11 +20,11 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
  * The only change from the original is renaming the import from
  * {@code feature.features.Tps} to {@link TpsMod}.
  */
-@Mixin(ClientPlayNetworkHandler.class)
+@Mixin(ClientPacketListener.class)
 public class TpsMixin {
 
-    @Inject(method = "onWorldTimeUpdate", at = @At("HEAD"))
-    private void onWorldTimeUpdate(WorldTimeUpdateS2CPacket packet, CallbackInfo ci) {
-        TpsMod.onTimePacket(packet.time());
+    @Inject(method = "handleSetTime", at = @At("HEAD"))
+    private void onWorldTimeUpdate(ClientboundSetTimePacket packet, CallbackInfo ci) {
+        TpsMod.onTimePacket(packet.gameTime());
     }
 }

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

@@ -2,8 +2,8 @@ package org.saturnclient.impl.features.network;
 
 import org.saturnclient.common.feature.NetworkFeature;
 
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.network.PlayerListEntry;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.multiplayer.PlayerInfo;
 
 /**
  * Fabric implementation of {@link NetworkFeature}.
@@ -14,23 +14,23 @@ import net.minecraft.client.network.PlayerListEntry;
  */
 public class NetworkFeatureImpl implements NetworkFeature {
 
-    private final MinecraftClient mc;
+    private final Minecraft mc;
 
-    public NetworkFeatureImpl(MinecraftClient mc) {
+    public NetworkFeatureImpl(Minecraft mc) {
         this.mc = mc;
     }
 
     @Override
     public boolean hasNetwork() {
-        return mc.getNetworkHandler() != null;
+        return mc.getConnection() != null;
     }
 
     @Override
     public int getPing() {
-        if (mc.player == null || mc.getNetworkHandler() == null)
+        if (mc.player == null || mc.getConnection() == null)
             return -1;
 
-        PlayerListEntry entry = mc.getNetworkHandler().getPlayerListEntry(mc.player.getUuid());
+        PlayerInfo entry = mc.getConnection().getPlayerInfo(mc.player.getUUID());
 
         return entry != null ? entry.getLatency() : -1;
     }

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

@@ -1,13 +1,13 @@
 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 net.minecraft.client.Minecraft;
+import net.minecraft.client.player.LocalPlayer;
+import net.minecraft.world.entity.EquipmentSlot;
+import net.minecraft.world.effect.MobEffectInstance;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.Items;
+import net.minecraft.core.registries.BuiltInRegistries;
+import net.minecraft.resources.Identifier;
 
 import org.saturnclient.common.feature.PlayerFeature;
 import org.saturnclient.common.ref.game.EffectRef;
@@ -29,9 +29,9 @@ import java.util.List;
  */
 public class PlayerFeatureImpl implements PlayerFeature {
 
-    private final MinecraftClient mc;
+    private final Minecraft mc;
 
-    public PlayerFeatureImpl(MinecraftClient mc) {
+    public PlayerFeatureImpl(Minecraft mc) {
         this.mc = mc;
     }
 
@@ -40,7 +40,7 @@ public class PlayerFeatureImpl implements PlayerFeature {
     // ---------------------------------------------------------------
 
     /** Returns the local player, or {@code null} if one is not loaded. */
-    private ClientPlayerEntity player() {
+    private LocalPlayer player() {
         return mc.player;
     }
 
@@ -78,42 +78,42 @@ public class PlayerFeatureImpl implements PlayerFeature {
 
     @Override
     public boolean isForwardPressed() {
-        return mc.options.forwardKey.isPressed();
+        return mc.options.keyUp.isDown();
     }
 
     @Override
     public boolean isBackPressed() {
-        return mc.options.backKey.isPressed();
+        return mc.options.keyDown.isDown();
     }
 
     @Override
     public boolean isLeftPressed() {
-        return mc.options.leftKey.isPressed();
+        return mc.options.keyLeft.isDown();
     }
 
     @Override
     public boolean isRightPressed() {
-        return mc.options.rightKey.isPressed();
+        return mc.options.keyRight.isDown();
     }
 
     @Override
     public boolean isJumpPressed() {
-        return mc.options.jumpKey.isPressed();
+        return mc.options.keyJump.isDown();
     }
 
     @Override
     public boolean isAttackPressed() {
-        return mc.options.attackKey.isPressed();
+        return mc.options.keyAttack.isDown();
     }
 
     @Override
     public boolean isUsePressed() {
-        return mc.options.useKey.isPressed();
+        return mc.options.keyUse.isDown();
     }
 
     @Override
     public boolean isSneaking() {
-        return hasPlayer() && player().isSneaking();
+        return hasPlayer() && player().isShiftKeyDown();
     }
 
     @Override
@@ -128,7 +128,7 @@ public class PlayerFeatureImpl implements PlayerFeature {
 
     @Override
     public boolean isOnGround() {
-        return hasPlayer() && player().isOnGround();
+        return hasPlayer() && player().onGround();
     }
 
     @Override
@@ -145,7 +145,7 @@ public class PlayerFeatureImpl implements PlayerFeature {
     public Velocity getVelocity() {
         if (!hasPlayer())
             return Velocity.ZERO;
-        var v = player().getVelocity();
+        var v = player().getDeltaMovement();
         return new Velocity(v.x, v.y, v.z);
     }
 
@@ -164,13 +164,13 @@ public class PlayerFeatureImpl implements PlayerFeature {
 
     @Override
     public ItemStackRef getMainHand() {
-        return wrap(hasPlayer() ? player().getMainHandStack() : ItemStack.EMPTY);
+        return wrap(hasPlayer() ? player().getMainHandItem() : ItemStack.EMPTY);
     }
 
     @Override
     public ItemStackRef getHelmet() {
         //? if >=1.21.5 {
-        return wrap(hasPlayer() ? player().getEquippedStack(EquipmentSlot.HEAD) : ItemStack.EMPTY);
+        return wrap(hasPlayer() ? player().getItemBySlot(EquipmentSlot.HEAD) : ItemStack.EMPTY);
         //?} else
         //return wrap(hasPlayer() ? player().getInventory().armor.get(3) : ItemStack.EMPTY);
     }
@@ -178,7 +178,7 @@ public class PlayerFeatureImpl implements PlayerFeature {
     @Override
     public ItemStackRef getChestplate() {
         //? if >=1.21.5 {
-        return wrap(hasPlayer() ? player().getEquippedStack(EquipmentSlot.CHEST) : ItemStack.EMPTY);
+        return wrap(hasPlayer() ? player().getItemBySlot(EquipmentSlot.CHEST) : ItemStack.EMPTY);
         //?} else
         //return wrap(hasPlayer() ? player().getInventory().armor.get(2) : ItemStack.EMPTY);
     }
@@ -186,7 +186,7 @@ public class PlayerFeatureImpl implements PlayerFeature {
     @Override
     public ItemStackRef getLeggings() {
         //? if >=1.21.5 {
-        return wrap(hasPlayer() ? player().getEquippedStack(EquipmentSlot.LEGS) : ItemStack.EMPTY);
+        return wrap(hasPlayer() ? player().getItemBySlot(EquipmentSlot.LEGS) : ItemStack.EMPTY);
         //?} else
         //return wrap(hasPlayer() ? player().getInventory().armor.get(1) : ItemStack.EMPTY);
     }
@@ -194,7 +194,7 @@ public class PlayerFeatureImpl implements PlayerFeature {
     @Override
     public ItemStackRef getBoots() {
         //? if >=1.21.5 {
-        return wrap(hasPlayer() ? player().getEquippedStack(EquipmentSlot.FEET) : ItemStack.EMPTY);
+        return wrap(hasPlayer() ? player().getItemBySlot(EquipmentSlot.FEET) : ItemStack.EMPTY);
         //?} else
         //return wrap(hasPlayer() ? player().getInventory().armor.get(0) : ItemStack.EMPTY);
     }
@@ -237,9 +237,9 @@ public class PlayerFeatureImpl implements PlayerFeature {
         if (!hasPlayer())
             return Collections.emptyList();
 
-        var effects = player().getActiveStatusEffects().values();
+        var effects = player().getActiveEffectsMap().values();
         List<EffectRef> result = new ArrayList<>(effects.size());
-        for (StatusEffectInstance instance : effects) {
+        for (MobEffectInstance instance : effects) {
             result.add((EffectRef) instance);
         }
         return result;
@@ -248,12 +248,12 @@ public class PlayerFeatureImpl implements PlayerFeature {
     @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));
+                (EffectRef) new MobEffectInstance(
+                        BuiltInRegistries.MOB_EFFECT.get(Identifier.withDefaultNamespace("speed")).get(), 12000, 2),
+                (EffectRef) new MobEffectInstance(
+                        BuiltInRegistries.MOB_EFFECT.get(Identifier.withDefaultNamespace("strength")).get(), 12000, 2),
+                (EffectRef) new MobEffectInstance(
+                        BuiltInRegistries.MOB_EFFECT.get(Identifier.withDefaultNamespace("fire_resistance")).get(), 12000, 2));
     }
 
     // ---------------------------------------------------------------

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

@@ -2,8 +2,8 @@ package org.saturnclient.impl.features.render;
 
 import org.saturnclient.common.feature.RenderFeature;
 
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.option.Perspective;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.CameraType;
 
 /**
  * Fabric implementation of {@link RenderFeature}.
@@ -14,9 +14,9 @@ import net.minecraft.client.option.Perspective;
  */
 public class RenderFeatureImpl implements RenderFeature {
 
-    private final MinecraftClient mc;
+    private final Minecraft mc;
 
-    public RenderFeatureImpl(MinecraftClient mc) {
+    public RenderFeatureImpl(Minecraft mc) {
         this.mc = mc;
     }
 
@@ -26,12 +26,12 @@ public class RenderFeatureImpl implements RenderFeature {
 
     @Override
     public int getScaledWindowWidth() {
-        return mc.getWindow().getScaledWidth();
+        return mc.getWindow().getGuiScaledWidth();
     }
 
     @Override
     public int getScaledWindowHeight() {
-        return mc.getWindow().getScaledHeight();
+        return mc.getWindow().getGuiScaledHeight();
     }
 
     // ---------------------------------------------------------------
@@ -40,7 +40,7 @@ public class RenderFeatureImpl implements RenderFeature {
 
     @Override
     public int getFps() {
-        return mc.getCurrentFps();
+        return mc.getFps();
     }
 
     // ---------------------------------------------------------------
@@ -49,16 +49,16 @@ public class RenderFeatureImpl implements RenderFeature {
 
     @Override
     public boolean isFirstPerson() {
-        return mc.options.getPerspective() == Perspective.FIRST_PERSON;
+        return mc.options.getCameraType() == CameraType.FIRST_PERSON;
     }
 
     @Override
     public void setFirstPerson() {
-        mc.options.setPerspective(Perspective.FIRST_PERSON);
+        mc.options.setCameraType(CameraType.FIRST_PERSON);
     }
 
     @Override
     public void setThirdPersonBack() {
-        mc.options.setPerspective(Perspective.THIRD_PERSON_BACK);
+        mc.options.setCameraType(CameraType.THIRD_PERSON_BACK);
     }
 }

src/main/java/org/saturnclient/impl/features/render/ZoomFov.java

@@ -0,0 +1,19 @@
+package org.saturnclient.impl.features.render;
+
+import org.saturnclient.mod.mods.FreelookMod;
+import org.saturnclient.mod.mods.ZoomMod;
+
+/** The zoom mods' change to the field of view, applied where each version computes it. */
+public final class ZoomFov {
+    private ZoomFov() {
+    }
+
+    public static float apply(float fov) {
+        if (ZoomMod.shouldZoom()) {
+            return fov / ZoomMod.getZoomLevel();
+        } else if (FreelookMod.shouldZoomOut()) {
+            return fov / FreelookMod.getZoomLevel();
+        }
+        return fov;
+    }
+}

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

@@ -2,7 +2,7 @@ package org.saturnclient.impl.features.world;
 
 import org.saturnclient.common.feature.WorldFeature;
 
-import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.Minecraft;
 
 /**
  * Fabric implementation of {@link WorldFeature}.
@@ -12,15 +12,15 @@ import net.minecraft.client.MinecraftClient;
  */
 public class WorldFeatureImpl implements WorldFeature {
 
-    private final MinecraftClient mc;
+    private final Minecraft mc;
 
-    public WorldFeatureImpl(MinecraftClient mc) {
+    public WorldFeatureImpl(Minecraft mc) {
         this.mc = mc;
     }
 
     @Override
     public boolean hasWorld() {
-        return mc.world != null;
+        return mc.level != null;
     }
 
     /**
@@ -31,10 +31,7 @@ public class WorldFeatureImpl implements WorldFeature {
      */
     @Override
     public long getWorldAge() {
-        //? if >=1.21.11 {
-        // TODO: not implemented on 1.21.11 yet.
-        return 0L;
-        //?} else
-        //return hasWorld() ? mc.world.getTime() : 0L;
+        // World.getTime() was a shortcut for this, and 1.21.11 removed it.
+        return hasWorld() ? mc.level.getLevelData().getGameTime() : 0L;
     }
 }

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

@@ -4,7 +4,7 @@ import org.saturnclient.common.ref.asset.IdentifierRef;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 
-import net.minecraft.util.Identifier;
+import net.minecraft.resources.Identifier;
 
 @Mixin(Identifier.class)
 public abstract class IdentifierMixin implements IdentifierRef {

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

@@ -4,7 +4,7 @@ import org.saturnclient.common.ref.game.ItemStackRef;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 
-import net.minecraft.item.ItemStack;
+import net.minecraft.world.item.ItemStack;
 
 @Mixin(ItemStack.class)
 public abstract class ItemStackMixin implements ItemStackRef {
@@ -15,5 +15,21 @@ public abstract class ItemStackMixin implements ItemStackRef {
     public abstract int getMaxDamage();
 
     @Shadow
-    public abstract int getDamage();
+    public abstract int getDamageValue();
+
+    // ItemStackRef's methods delegate to ItemStack's, whose names production renames.
+    @Override
+    public boolean isEmptyStack() {
+        return isEmpty();
+    }
+
+    @Override
+    public int getMaxItemDamage() {
+        return getMaxDamage();
+    }
+
+    @Override
+    public int getItemDamage() {
+        return getDamageValue();
+    }
 }

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

@@ -1,6 +1,6 @@
 package org.saturnclient.impl.mixins;
 
-import net.minecraft.client.util.math.MatrixStack;
+import com.mojang.blaze3d.vertex.PoseStack;
 import org.spongepowered.asm.mixin.Mixin;
 //? if <1.21.6 {
 /*import org.saturnclient.common.ref.render.MatrixStackRef;
@@ -9,7 +9,7 @@ import org.joml.Quaternionfc;
 //? if <1.21.5
 //import org.joml.Quaternionf;
 import org.spongepowered.asm.mixin.Shadow;
-import net.minecraft.util.math.RotationAxis;
+import com.mojang.math.Axis;
 *///?}
 
 /**
@@ -17,14 +17,14 @@ import net.minecraft.util.math.RotationAxis;
  * Matrix3x2fStack (Matrix3x2fStackRef) instead, so this mixin is empty but stays registered, keeping
  * impl.mixins.json the same for every version.
  */
-@Mixin(MatrixStack.class)
+@Mixin(PoseStack.class)
 //? if <1.21.6 {
 /*public abstract class MatrixStackMixin implements MatrixStackRef {
     @Shadow
-    public abstract void push();
+    public abstract void pushPose();
 
     @Shadow
-    public abstract void pop();
+    public abstract void popPose();
 
     @Shadow
     public abstract void translate(float x, float y, float z);
@@ -34,15 +34,26 @@ import net.minecraft.util.math.RotationAxis;
 
     @Shadow
     //? if >=1.21.5
-    public abstract void multiply(Quaternionfc quaternion);
+    public abstract void mulPose(Quaternionfc quaternion);
     //? if <1.21.5
-    //public abstract void multiply(Quaternionf quaternion);
+    //public abstract void mulPose(Quaternionf quaternion);
 
     @Shadow
     //? if >=1.21.5
-    public abstract void multiply(Quaternionfc quaternion, float originX, float originY, float originZ);
+    public abstract void rotateAround(Quaternionfc quaternion, float originX, float originY, float originZ);
     //? if <1.21.5
-    //public abstract void multiply(Quaternionf quaternion, float originX, float originY, float originZ);
+    //public abstract void rotateAround(Quaternionf quaternion, float originX, float originY, float originZ);
+
+    // MatrixStackRef's methods delegate to PoseStack's, whose names production renames.
+    @Override
+    public void push() {
+        pushPose();
+    }
+
+    @Override
+    public void pop() {
+        popPose();
+    }
 
     @Override
     public void translate(float x, float y) {
@@ -56,12 +67,12 @@ import net.minecraft.util.math.RotationAxis;
 
     @Override
     public void rotate(float angle, float originX, float originY, float originZ) {
-        multiply(RotationAxis.NEGATIVE_Z.rotationDegrees(angle), originX, originY, originZ);
+        rotateAround(Axis.ZN.rotationDegrees(angle), originX, originY, originZ);
     }
 
     @Override
     public void rotate(float angle) {
-        multiply(RotationAxis.NEGATIVE_Z.rotationDegrees(angle));
+        mulPose(Axis.ZN.rotationDegrees(angle));
     }
 }
 *///?} else

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

@@ -4,61 +4,61 @@ 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.impl.ui.Screens;
 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;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.screens.multiplayer.JoinMultiplayerScreen;
+import net.minecraft.client.gui.screens.options.OptionsScreen;
+import net.minecraft.client.gui.screens.worldselection.SelectWorldScreen;
+import net.minecraft.client.Options;
+import net.minecraft.client.User;
+import com.mojang.blaze3d.platform.Window;
+import net.minecraft.server.packs.resources.ReloadableResourceManager;
+import net.minecraft.resources.Identifier;
 
-@Mixin(MinecraftClient.class)
+@Mixin(Minecraft.class)
 public abstract class MinecraftClientMixin implements MinecraftClientRef {
     @Shadow
-    public File runDirectory;
+    public File gameDirectory;
 
     @Shadow
     private Window window;
 
     @Shadow
-    private ReloadableResourceManagerImpl resourceManager;
+    private ReloadableResourceManager resourceManager;
 
     @Shadow
-    public GameOptions options;
+    public Options options;
 
     @Shadow
-    private Session session;
+    private User user;
 
     @Shadow
-    public abstract void setScreen(@Nullable Screen screen);
+    public abstract void stop();
 
-    @Shadow
     @Override
-    public abstract void scheduleStop();
+    public void scheduleStop() {
+        stop();
+    }
 
     @Override
     public File getRunDirectory() {
-        return runDirectory;
+        return gameDirectory;
     }
 
     @Override
     public InputStream getResource(IdentifierRef identifier) {
         try {
-            return resourceManager.getResource((Identifier) (Object) identifier).get().getInputStream();
+            return resourceManager.getResource((Identifier) (Object) identifier).get().open();
         } catch (Exception e) {
             return null;
         }
@@ -71,7 +71,7 @@ public abstract class MinecraftClientMixin implements MinecraftClientRef {
 
     @Override
     public void setScreen(SaturnScreen screen) {
-        this.setScreen(new SaturnScreenFabric(screen));
+        Screens.set(new SaturnScreenFabric(screen));
     }
 
     @Override
@@ -80,42 +80,48 @@ public abstract class MinecraftClientMixin implements MinecraftClientRef {
 
         switch (screen) {
             case SelectWorld:
-                this.setScreen(new SelectWorldScreen(exitTarget));
+                Screens.set(new SelectWorldScreen(exitTarget));
                 break;
 
             case Multiplayer:
-                this.setScreen(new MultiplayerScreen(exitTarget));
+                Screens.set(new JoinMultiplayerScreen(exitTarget));
                 break;
 
             case Options:
-                this.setScreen(new OptionsScreen(exitTarget, this.options));
+                // Only 26.1 and 26.2 take whether a world is open.
+                //? if >=26.3 {
+                /*Screens.set(new OptionsScreen(exitTarget, this.options));
+                *///?} else if >=26.1 {
+                /*Screens.set(new OptionsScreen(exitTarget, this.options, ((Minecraft) (Object) this).level != null));
+                *///?} else
+                Screens.set(new OptionsScreen(exitTarget, this.options));
                 break;
         }
     }
 
     @Override
     public String getAccessToken() {
-        if (session == null) {
+        if (user == null) {
             return null;
         }
 
-        return this.session.getAccessToken();
+        return this.user.getAccessToken();
     }
 
     @Override
     public UUID getUuid() {
-        if (session == null) {
+        if (user == null) {
             return null;
         }
-        return this.session.getUuidOrNull();
+        return this.user.getProfileId();
     }
 
     @Override
     public String getUsername() {
-        if (session == null) {
+        if (user == null) {
             return null;
         }
-        return this.session.getUsername();
+        return this.user.getName();
     }
 
     @Override
@@ -131,13 +137,13 @@ public abstract class MinecraftClientMixin implements MinecraftClientRef {
     @Override
     @SuppressWarnings("resource")
     public String getPlayerListEntry(UUID uuid) {
-        var client = (MinecraftClient) (Object) this;
-        var handler = client.getNetworkHandler();
+        var client = (Minecraft) (Object) this;
+        var handler = client.getConnection();
 
         if (handler == null)
             return null;
 
-        var entry = handler.getPlayerListEntry(uuid);
+        var entry = handler.getPlayerInfo(uuid);
         if (entry == null)
             return null;
 
@@ -150,13 +156,13 @@ public abstract class MinecraftClientMixin implements MinecraftClientRef {
     @Override
     @SuppressWarnings("resource")
     public UUID getPlayerListEntryUUID(String name) {
-        var client = (MinecraftClient) (Object) this;
-        var handler = client.getNetworkHandler();
+        var client = (Minecraft) (Object) this;
+        var handler = client.getConnection();
 
         if (handler == null)
             return null;
 
-        var entry = handler.getPlayerListEntry(name);
+        var entry = handler.getPlayerInfo(name);
         if (entry == null)
             return null;
 

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

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

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

@@ -8,26 +8,40 @@ 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;
+//? if >=26.2 {
+/*import net.minecraft.client.gui.Hud;
+*///?} else
+import net.minecraft.client.gui.Gui;
+import net.minecraft.world.effect.MobEffect;
+import net.minecraft.world.effect.MobEffectInstance;
+import net.minecraft.core.Holder;
+import net.minecraft.resources.Identifier;
 
-@Mixin(StatusEffectInstance.class)
+@Mixin(MobEffectInstance.class)
 public abstract class StatusEffectMixin implements EffectRef {
 
     @Shadow
-    public abstract boolean shouldShowIcon();
+    public abstract boolean showIcon();
 
     @Shadow
-    public abstract boolean isInfinite();
+    public abstract boolean isInfiniteDuration();
 
     @Shadow
     public abstract int getDuration();
 
     @Shadow
-    public abstract RegistryEntry<StatusEffect> getEffectType();
+    public abstract Holder<MobEffect> getEffect();
+
+    // EffectRef's methods delegate to MobEffectInstance's, whose names production renames.
+    @Override
+    public boolean shouldShowIcon() {
+        return showIcon();
+    }
+
+    @Override
+    public boolean isInfinite() {
+        return isInfiniteDuration();
+    }
 
     @Override
     public SpriteRef getIcon() {
@@ -35,16 +49,19 @@ public abstract class StatusEffectMixin implements EffectRef {
         //? if >=1.21.9 {
         return null;
         //?} else if >=1.21.6 {
-        //return (SpriteRef) SaturnClient.client.getGuiAtlasManager().getSprite((InGameHud.getEffectTexture(getEffectType())));
+        //return (SpriteRef) SaturnClient.client.getGuiSprites().getSprite((Gui.getMobEffectSprite(getEffect())));
         //?} else
-        //return (SpriteRef) SaturnClient.client.getStatusEffectSpriteManager().getSprite(getEffectType());
+        //return (SpriteRef) SaturnClient.client.getMobEffectTextures().get(getEffect());
     }
 
     // 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());
+        //? if >=26.2 {
+        /*Identifier id = Hud.getMobEffectSprite(getEffect());
+        *///?} else
+        Identifier id = Gui.getMobEffectSprite(getEffect());
 
         return IdentifierRef.of(id.getNamespace(), "textures/" + id.getPath() + ".png");
     }

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

@@ -5,25 +5,25 @@ 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.network.chat.Style;
+import net.minecraft.network.chat.Component;
 //? if >=1.21.9
-import net.minecraft.text.StyleSpriteSource.Font;
-import net.minecraft.util.Identifier;
+import net.minecraft.network.chat.FontDescription.Resource;
+import net.minecraft.resources.Identifier;
 
-@Mixin(Text.class)
+@Mixin(Component.class)
 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))));
+        return (TextRef) (Component) (((Component) this).copy().setStyle(Style.EMPTY.withFont(new Resource((Identifier) (Object) font))));
         //?} else
-        //return (TextRef) (((Text) this).copy().setStyle(Style.EMPTY.withFont((Identifier) (Object) font)));
+        //return (TextRef) (((Component) this).copy().setStyle(Style.EMPTY.withFont((Identifier) (Object) font)));
     }
 
     @Override
     public default int getWidth() {
-        return SaturnClient.client.textRenderer.getWidth((Text) this);
+        return SaturnClient.client.font.width((Component) this);
     }
 }

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

@@ -4,19 +4,41 @@ 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;
+import com.mojang.blaze3d.platform.Window;
 
 @Mixin(Window.class)
 public abstract class WindowMixin implements WindowRef {
+    @Shadow
+    public abstract int getScreenWidth();
+
+    @Shadow
+    public abstract int getScreenHeight();
+
+    // The framebuffer's size
     @Shadow
     public abstract int getWidth();
 
     @Shadow
     public abstract int getHeight();
 
-    @Shadow
-    public abstract int getFramebufferWidth();
+    // WindowRef's methods delegate to Window's, whose names production renames.
+    @Override
+    public int getWindowWidth() {
+        return getScreenWidth();
+    }
 
-    @Shadow
-    public abstract int getFramebufferHeight();
+    @Override
+    public int getWindowHeight() {
+        return getScreenHeight();
+    }
+
+    @Override
+    public int getFramebufferWidth() {
+        return getWidth();
+    }
+
+    @Override
+    public int getFramebufferHeight() {
+        return getHeight();
+    }
 }

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

@@ -1,6 +1,6 @@
 package org.saturnclient.impl.provider;
 
-import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.Minecraft;
 
 import org.saturnclient.common.feature.*;
 import org.saturnclient.common.provider.FeatureProvider;
@@ -33,7 +33,7 @@ public class FeatureProviderFabric implements FeatureProvider {
     private final RenderFeature render;
     private final NetworkFeature network;
 
-    public FeatureProviderFabric(MinecraftClient mc) {
+    public FeatureProviderFabric(Minecraft mc) {
         this.player = new PlayerFeatureImpl(mc);
         this.world = new WorldFeatureImpl(mc);
         this.entity = new EntityFeatureImpl(mc);

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

@@ -1,18 +1,36 @@
 package org.saturnclient.impl.provider;
 
+// 26.3 uses SDL, not GLFW; Keys converts Saturn's GLFW key codes to its own.
+//? if >=26.3 {
+/*import com.mojang.blaze3d.platform.InputConstants;
+*///?} else
 import org.lwjgl.glfw.GLFW;
 import org.saturnclient.common.provider.GLFWProvider;
+import org.saturnclient.impl.ui.Screens;
 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;
+        //? if >=26.3 {
+        /*int gameKey = Keys.toGame(key);
+        return gameKey >= 0 && InputConstants.isKeyDown(gameKey) && Screens.current() == null;
+        *///?} else {
+        //? if >=1.21.9 {
+        long window = SaturnClient.client.getWindow().handle();
+        //?} else
+        //long window = SaturnClient.client.getWindow().getWindow();
+        return GLFW.glfwGetKey(window, key) == GLFW.GLFW_PRESS
+                && Screens.current() == null;
+        //?}
     }
 
     @Override
     public String getKeyName(int key) {
+        //? if >=26.3 {
+        /*int gameKey = Keys.toGame(key);
+        return gameKey < 0 ? null : InputConstants.Type.KEYBOARD.getOrCreate(gameKey).getDisplayName().getString();
+        *///?} else
         return GLFW.glfwGetKeyName(key, GLFW.glfwGetKeyScancode(key));
     }
 }

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

@@ -0,0 +1,189 @@
+package org.saturnclient.impl.provider;
+
+//? if >=26.3 {
+/*import com.mojang.blaze3d.platform.InputConstants;
+import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap;
+import org.saturnclient.common.provider.GLFWProvider;
+*///?}
+
+/**
+ * Saturn's key codes are GLFW's, which the config's keybinds store. From 26.3 Minecraft uses SDL,
+ * whose keys (scancodes), modifiers and mouse buttons are numbered differently, so these convert
+ * between the two there. Before 26.3 Minecraft's numbers are GLFW's and pass through.
+ */
+public final class Keys {
+    private Keys() {
+    }
+
+    //? if >=26.3 {
+    /*private static final Int2IntOpenHashMap TO_GAME = new Int2IntOpenHashMap();
+    private static final Int2IntOpenHashMap TO_SATURN = new Int2IntOpenHashMap();
+
+    private static void key(int glfw, int game) {
+        TO_GAME.put(glfw, game);
+        TO_SATURN.put(game, glfw);
+    }
+
+    // GLFW's key codes, and the same keys' constants in 26.3
+    static {
+        TO_GAME.defaultReturnValue(-1);
+        TO_SATURN.defaultReturnValue(-1);
+        key(32, InputConstants.KEY_SPACE);
+        key(39, InputConstants.KEY_APOSTROPHE);
+        key(44, InputConstants.KEY_COMMA);
+        key(45, InputConstants.KEY_MINUS);
+        key(46, InputConstants.KEY_PERIOD);
+        key(47, InputConstants.KEY_SLASH);
+        key(48, InputConstants.KEY_0);
+        key(49, InputConstants.KEY_1);
+        key(50, InputConstants.KEY_2);
+        key(51, InputConstants.KEY_3);
+        key(52, InputConstants.KEY_4);
+        key(53, InputConstants.KEY_5);
+        key(54, InputConstants.KEY_6);
+        key(55, InputConstants.KEY_7);
+        key(56, InputConstants.KEY_8);
+        key(57, InputConstants.KEY_9);
+        key(59, InputConstants.KEY_SEMICOLON);
+        key(61, InputConstants.KEY_EQUALS);
+        key(65, InputConstants.KEY_A);
+        key(66, InputConstants.KEY_B);
+        key(67, InputConstants.KEY_C);
+        key(68, InputConstants.KEY_D);
+        key(69, InputConstants.KEY_E);
+        key(70, InputConstants.KEY_F);
+        key(71, InputConstants.KEY_G);
+        key(72, InputConstants.KEY_H);
+        key(73, InputConstants.KEY_I);
+        key(74, InputConstants.KEY_J);
+        key(75, InputConstants.KEY_K);
+        key(76, InputConstants.KEY_L);
+        key(77, InputConstants.KEY_M);
+        key(78, InputConstants.KEY_N);
+        key(79, InputConstants.KEY_O);
+        key(80, InputConstants.KEY_P);
+        key(81, InputConstants.KEY_Q);
+        key(82, InputConstants.KEY_R);
+        key(83, InputConstants.KEY_S);
+        key(84, InputConstants.KEY_T);
+        key(85, InputConstants.KEY_U);
+        key(86, InputConstants.KEY_V);
+        key(87, InputConstants.KEY_W);
+        key(88, InputConstants.KEY_X);
+        key(89, InputConstants.KEY_Y);
+        key(90, InputConstants.KEY_Z);
+        key(91, InputConstants.KEY_LBRACKET);
+        key(92, InputConstants.KEY_BACKSLASH);
+        key(93, InputConstants.KEY_RBRACKET);
+        key(96, InputConstants.KEY_GRAVE);
+        key(256, InputConstants.KEY_ESCAPE);
+        key(257, InputConstants.KEY_RETURN);
+        key(258, InputConstants.KEY_TAB);
+        key(259, InputConstants.KEY_BACKSPACE);
+        key(260, InputConstants.KEY_INSERT);
+        key(261, InputConstants.KEY_DELETE);
+        key(262, InputConstants.KEY_RIGHT);
+        key(263, InputConstants.KEY_LEFT);
+        key(264, InputConstants.KEY_DOWN);
+        key(265, InputConstants.KEY_UP);
+        key(266, InputConstants.KEY_PAGEUP);
+        key(267, InputConstants.KEY_PAGEDOWN);
+        key(268, InputConstants.KEY_HOME);
+        key(269, InputConstants.KEY_END);
+        key(280, InputConstants.KEY_CAPSLOCK);
+        key(281, InputConstants.KEY_SCROLLLOCK);
+        key(282, InputConstants.KEY_NUMLOCK);
+        key(283, InputConstants.KEY_PRINTSCREEN);
+        key(284, InputConstants.KEY_PAUSE);
+        key(290, InputConstants.KEY_F1);
+        key(291, InputConstants.KEY_F2);
+        key(292, InputConstants.KEY_F3);
+        key(293, InputConstants.KEY_F4);
+        key(294, InputConstants.KEY_F5);
+        key(295, InputConstants.KEY_F6);
+        key(296, InputConstants.KEY_F7);
+        key(297, InputConstants.KEY_F8);
+        key(298, InputConstants.KEY_F9);
+        key(299, InputConstants.KEY_F10);
+        key(300, InputConstants.KEY_F11);
+        key(301, InputConstants.KEY_F12);
+        key(302, InputConstants.KEY_F13);
+        key(303, InputConstants.KEY_F14);
+        key(304, InputConstants.KEY_F15);
+        key(305, InputConstants.KEY_F16);
+        key(306, InputConstants.KEY_F17);
+        key(307, InputConstants.KEY_F18);
+        key(308, InputConstants.KEY_F19);
+        key(309, InputConstants.KEY_F20);
+        key(310, InputConstants.KEY_F21);
+        key(311, InputConstants.KEY_F22);
+        key(312, InputConstants.KEY_F23);
+        key(313, InputConstants.KEY_F24);
+        key(320, InputConstants.KEY_NUMPAD0);
+        key(321, InputConstants.KEY_NUMPAD1);
+        key(322, InputConstants.KEY_NUMPAD2);
+        key(323, InputConstants.KEY_NUMPAD3);
+        key(324, InputConstants.KEY_NUMPAD4);
+        key(325, InputConstants.KEY_NUMPAD5);
+        key(326, InputConstants.KEY_NUMPAD6);
+        key(327, InputConstants.KEY_NUMPAD7);
+        key(328, InputConstants.KEY_NUMPAD8);
+        key(329, InputConstants.KEY_NUMPAD9);
+        key(330, InputConstants.KEY_NUMPADCOMMA);
+        key(332, InputConstants.KEY_MULTIPLY);
+        key(334, InputConstants.KEY_ADD);
+        key(335, InputConstants.KEY_NUMPADENTER);
+        key(336, InputConstants.KEY_NUMPADEQUALS);
+        key(340, InputConstants.KEY_LSHIFT);
+        key(341, InputConstants.KEY_LCONTROL);
+        key(342, InputConstants.KEY_LALT);
+        key(343, InputConstants.KEY_LGUI);
+        key(344, InputConstants.KEY_RSHIFT);
+        key(345, InputConstants.KEY_RCONTROL);
+        key(346, InputConstants.KEY_RALT);
+        key(347, InputConstants.KEY_RGUI);
+    }
+    *///?}
+
+    /** A Saturn (GLFW) key code as the game's, or -1 */
+    public static int toGame(int key) {
+        //? if >=26.3 {
+        /*return TO_GAME.get(key);
+        *///?} else
+        return key;
+    }
+
+    /** A key code from the game as Saturn's (GLFW), or -1 */
+    public static int toSaturn(int key) {
+        //? if >=26.3 {
+        /*return TO_SATURN.get(key);
+        *///?} else
+        return key;
+    }
+
+    /** The game's modifier flags as GLFW's */
+    public static int modifiersToSaturn(int modifiers) {
+        //? if >=26.3 {
+        /*int glfw = 0;
+        if ((modifiers & InputConstants.MOD_SHIFT) != 0) glfw |= GLFWProvider.GLFW_MOD_SHIFT;
+        if ((modifiers & InputConstants.MOD_CONTROL) != 0) glfw |= GLFWProvider.GLFW_MOD_CONTROL;
+        if ((modifiers & InputConstants.MOD_ALT) != 0) glfw |= GLFWProvider.GLFW_MOD_ALT;
+        if ((modifiers & InputConstants.MOD_SUPER) != 0) glfw |= GLFWProvider.GLFW_MOD_SUPER;
+        if ((modifiers & InputConstants.MOD_CAPS_LOCK) != 0) glfw |= GLFWProvider.GLFW_MOD_CAPS_LOCK;
+        if ((modifiers & InputConstants.MOD_NUM_LOCK) != 0) glfw |= GLFWProvider.GLFW_MOD_NUM_LOCK;
+        return glfw;
+        *///?} else
+        return modifiers;
+    }
+
+    /** A mouse button from the game as GLFW's (left 0, right 1, middle 2, then the side buttons) */
+    public static int mouseButtonToSaturn(int button) {
+        //? if >=26.3 {
+        /*if (button == InputConstants.MOUSE_BUTTON_LEFT) return 0;
+        if (button == InputConstants.MOUSE_BUTTON_RIGHT) return 1;
+        if (button == InputConstants.MOUSE_BUTTON_MIDDLE) return 2;
+        return button - 1;
+        *///?} else
+        return button;
+    }
+}

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

@@ -4,22 +4,22 @@ 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;
+import net.minecraft.network.chat.Component;
+import net.minecraft.resources.Identifier;
 
 public class RefConstructorImpl implements RefConstructorProvider {
     @Override
     public IdentifierRef identifier(String fullPath) {
-        return (IdentifierRef) (Object) Identifier.of(fullPath);
+        return (IdentifierRef) (Object) Identifier.parse(fullPath);
     }
 
     @Override
     public IdentifierRef identifier(String namespace, String path) {
-        return (IdentifierRef) (Object) Identifier.of(namespace, path);
+        return (IdentifierRef) (Object) Identifier.fromNamespaceAndPath(namespace, path);
     }
 
     @Override
     public TextRef text(String text) {
-        return (TextRef) (Text) Text.literal(text);
+        return (TextRef) (Component) Component.literal(text);
     }
 }

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;
-import net.minecraft.text.Text;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.components.toasts.SystemToast;
+//? if >=1.21.9 {
+import net.minecraft.world.entity.player.PlayerSkin;
+//?} else
+//import net.minecraft.client.resources.PlayerSkin;
+import net.minecraft.network.chat.Component;
+import net.minecraft.resources.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;
@@ -48,7 +57,24 @@ 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);
+    private static final SystemToast.SystemToastId WARNING_TOAST = new SystemToast.SystemToastId(15_000L);
+
+    @Override
+    public IdentifierRef getPlayerSkin() {
+        if (playerSkin == null) {
+            Minecraft client = Minecraft.getInstance();
+            // 1.21.9 moved SkinTextures and renamed the skin provider's lookup.
+            //? if >=1.21.9 {
+            Supplier<PlayerSkin> textures = client.getSkinManager().createLookup(client.getGameProfile(), false);
+            playerSkin = () -> textures.get().body().texturePath();
+            //?} else {
+            /*Supplier<PlayerSkin> textures = client.getSkinManager().lookupInsecure(client.getGameProfile());
+            playerSkin = () -> textures.get().texture();
+            *///?}
+        }
+
+        return (IdentifierRef) (Object) playerSkin.get();
+    }
 
     @Override
     public String getModVersion() {
@@ -59,9 +85,14 @@ public class SaturnProviderImpl implements SaturnProvider {
 
     @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))));
+        Minecraft client = Minecraft.getInstance();
+        //? if >=26.2 {
+        /*client.execute(() -> SystemToast.add(client.gui.toastManager(), WARNING_TOAST, Component.literal(title),
+                Component.literal(message)));
+        *///?} else {
+        client.execute(() -> client.getToastManager().addToast(
+                SystemToast.multiline(client, WARNING_TOAST, Component.literal(title), Component.literal(message))));
+        //?}
     }
 
     @Override

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

@@ -7,58 +7,56 @@ 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;
+import net.minecraft.client.renderer.entity.EntityRenderDispatcher;
 //?} 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;
+//import net.minecraft.client.renderer.entity.EntityRenderDispatcher;
+import net.minecraft.client.renderer.entity.EntityRenderer;
+import net.minecraft.client.renderer.entity.state.EntityRenderState;
+import net.minecraft.world.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);
-        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();
+        Quaternionf quaternionf2 = new Quaternionf();
+        float j = entity.yBodyRot;
+        float k = entity.getYRot();
+        float l = entity.getXRot();
+        float m = entity.yHeadRotO;
+        float n = entity.yHeadRot;
+        entity.yBodyRot = 180.0F + yaw;
+        entity.setYRot(180.0F + yaw);
+        entity.setXRot(0.0F);
+        entity.yHeadRot = entity.getYRot();
+        entity.yHeadRotO = entity.getYRot();
         float o = entity.getScale();
-        Vector3f vector3f = new Vector3f(0.0F, entity.getHeight() / 2.0F + scale * o, 0.0F);
+        Vector3f vector3f = new Vector3f(0.0F, entity.getBbHeight() / 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;
+        entity.yBodyRot = j;
+        entity.setYRot(k);
+        entity.setXRot(l);
+        entity.yHeadRotO = m;
+        entity.yHeadRot = n;
         renderScope.disableScissor();
     }
 
@@ -66,13 +64,13 @@ public class EntityDrawerImpl implements EntityDrawer {
             Vector3f translation, Quaternionf rotation, @Nullable Quaternionf overrideCameraAngle,
             LivingEntity entity) {
         //? if >=1.21.9 {
-        EntityRenderManager entityRenderDispatcher = SaturnClient.client.getEntityRenderDispatcher();
+        EntityRenderDispatcher 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 entityRenderState = entityRenderer.createRenderState(entity, 1.0F);
         //? if <1.21.11
-        //entityRenderState.hitbox = null;
+        //entityRenderState.hitboxesRenderState = null;
 
         if (renderScope instanceof RenderScopeImpl i)
             i.addEntity(entityRenderState, scale, translation, rotation, overrideCameraAngle, x1, y1, x2, y2);
@@ -83,95 +81,95 @@ public class EntityDrawerImpl implements EntityDrawer {
 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.DiffuseLighting;
-import net.minecraft.client.render.entity.EntityRenderDispatcher;
-import net.minecraft.entity.LivingEntity;
+import com.mojang.blaze3d.platform.Lighting;
+import net.minecraft.client.renderer.entity.EntityRenderDispatcher;
+import net.minecraft.world.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 mouseX,
-            float mouseY, LivingEntity entity, float angle, boolean negativeAngle) {
+            float yaw, LivingEntity entity) {
         float g = (float) (x1 + x2) / 2.0F;
         float h = (float) (y1 + y2) / 2.0F;
-        renderScope.enableScissor(0, 6, x2, y2);
-        float i = (float) Math.atan((double) ((g - mouseX) / 40.0F));
-        float j = (float) Math.atan((double) ((h - mouseY) / 40.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();
+        float k = entity.yBodyRot;
+        float l = entity.getYRot();
+        float m = entity.getXRot();
         //? if >=1.21.5
-        float n = entity.lastHeadYaw;
+        float n = entity.yHeadRotO;
         //? if <1.21.5
-        //float n = entity.prevHeadYaw;
-        float o = entity.headYaw;
-        entity.setYaw(angle);
-        entity.bodyYaw = angle;
-        entity.setPitch(-(j * 20.0F));
-        entity.headYaw = negativeAngle ? (i * 40.0F) + 180f : -(i * 40.0F);
+        //float n = entity.yHeadRotO;
+        float o = entity.yHeadRot;
+        entity.setYRot(180.0F + yaw);
+        entity.yBodyRot = 180.0F + yaw;
+        entity.setXRot(0.0F);
+        entity.yHeadRot = entity.getYRot();
         //? if >=1.21.5
-        entity.lastHeadYaw = entity.getHeadYaw();
+        entity.yHeadRotO = entity.getYHeadRot();
         //? if <1.21.5
-        //entity.prevHeadYaw = entity.getHeadYaw();
+        //entity.yHeadRotO = entity.getYHeadRot();
         entity.setCustomNameVisible(false);
 
         float p = entity.getScale();
-        Vector3f vector3f = new Vector3f(0.0F, entity.getHeight() / 2.0F + f * p, 0.0F);
+        Vector3f vector3f = new Vector3f(0.0F, entity.getBbHeight() / 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);
+        entity.yBodyRot = k;
+        entity.setYRot(l);
+        entity.setXRot(m);
         //? if >=1.21.5
-        entity.lastHeadYaw = n;
+        entity.yHeadRotO = n;
         //? if <1.21.5
-        //entity.prevHeadYaw = n;
-        entity.headYaw = o;
+        //entity.yHeadRotO = n;
+        entity.yHeadRot = 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.pushPose();
             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.matrices.mulPose(quaternionf);
             scopeImpl.draw();
             //? if >=1.21.5
-            DiffuseLighting.disableGuiDepthLighting();
+            Lighting.setupForFlatItems();
             //? if <1.21.5
-            //DiffuseLighting.method_34742();
+            //Lighting.setupForEntityInInventory();
             EntityRenderDispatcher entityRenderDispatcher = SaturnClient.client.getEntityRenderDispatcher();
 
-            entityRenderDispatcher.setRenderShadows(false);
+            entityRenderDispatcher.setRenderShadow(false);
             scopeImpl.draw((vertexConsumers) -> {
                 entityRenderDispatcher.render(entity, 0.0, 0.0, 0.0, 1.0F,
                         scopeImpl.matrices, vertexConsumers, 15728880);
             });
 
             scopeImpl.draw();
-            entityRenderDispatcher.setRenderShadows(true);
+            entityRenderDispatcher.setRenderShadow(true);
             scopeImpl.getMatrixStack().pop();
-            DiffuseLighting.enableGuiDepthLighting();
+            Lighting.setupFor3DItems();
         }
 
     }
 
     @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, entity, angle,
-                    negativeAngle);
+        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,459 @@
+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;
+//? if >=26.1
+//import java.util.LinkedHashSet;
+import java.util.Map;
+//? if >=26.1
+//import java.util.Set;
+
+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 com.mojang.blaze3d.pipeline.RenderTarget;
+import net.minecraft.client.renderer.PostChainConfig;
+import net.minecraft.client.renderer.PostChain;
+import net.minecraft.client.renderer.RenderPipelines;
+import com.mojang.blaze3d.pipeline.TextureTarget;
+import net.minecraft.client.renderer.LevelTargetBundle;
+//? if >=26.2 {
+/*import com.mojang.blaze3d.GpuFormat;
+import net.minecraft.client.renderer.BindGroupLayouts;
+*///?}
+//? if >=26.1 {
+/*import net.minecraft.client.renderer.Projection;
+import net.minecraft.client.renderer.ProjectionMatrixBuffer;
+*///?} else
+import net.minecraft.client.renderer.CachedOrthoProjectionMatrixBuffer;
+import net.minecraft.client.renderer.texture.AbstractTexture;
+import net.minecraft.client.gui.render.TextureSetup;
+import com.mojang.blaze3d.resource.CrossFrameResourcePool;
+import net.minecraft.resources.Identifier;
+
+public final class GlassRenderer {
+    public static final RenderPipeline PIPELINE = RenderPipeline.builder(RenderPipelines.GUI_TEXTURED_SNIPPET)
+            .withLocation(Identifier.fromNamespaceAndPath("saturnclient", "pipeline/glass"))
+            .withFragmentShader(Identifier.fromNamespaceAndPath("saturnclient", "core/glass"))
+            //? if >=26.2 {
+            /*.withBindGroupLayout(BindGroupLayouts.SAMPLER1)
+            *///?} else
+            .withSampler("Sampler1")
+            // The transforms block ends with LineWidth before 1.21.11 (see glass.fsh).
+            //? if <1.21.11
+            //.withShaderDefine("HAS_LINE_WIDTH")
+            // 26.3 compiles through SPIR-V and moved TextureMat up the transforms block.
+            //? if >=26.3
+            //.withShaderDefine("EXPLICIT_LOCATIONS").withShaderDefine("TEXTURE_MAT_SECOND")
+            .build();
+
+    private static final Identifier BLUR = Identifier.withDefaultNamespace("post_effect/blur.json");
+    //? if >=26.1 {
+    /*private static final Projection PROJECTION = new Projection();
+    private static final ProjectionMatrixBuffer PROJECTION_BUFFER = new ProjectionMatrixBuffer("saturn glass");
+
+    static {
+        // As vanilla sets up its post chains' projection; the chain sizes it when it runs.
+        PROJECTION.setupOrtho(0.1f, 1000f, 1f, 1f, false);
+    }
+    *///?} else
+    private static final CachedOrthoProjectionMatrixBuffer PROJECTION = new CachedOrthoProjectionMatrixBuffer("saturn glass", 0.1f, 1000f, false);
+    // For the blurs' intermediate targets, freed once unused for a few frames
+    private static final CrossFrameResourcePool POOL = new CrossFrameResourcePool(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, PostChain> BLURS = new HashMap<>();
+    private static final Map<Integer, TextureTarget> BACKDROPS = new HashMap<>();
+
+    private GlassRenderer() {
+    }
+
+    // From 26.1 the GUI is built before the frame's world is drawn, so the main framebuffer still
+    // holds the last frame, glass included. The copies wait until the GUI renderer is about to draw
+    // (GuiRendererMixin), when it holds this frame's world and panorama.
+    //? if >=26.1 {
+    /*private static final Set<Integer> PENDING = new LinkedHashSet<>();
+    *///?}
+
+    private static RenderTarget mainTarget() {
+        //? if >=26.2 {
+        /*return SaturnClient.client.gameRenderer.mainRenderTarget();
+        *///?} else
+        return SaturnClient.client.getMainRenderTarget();
+    }
+
+    // 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) {
+        RenderTarget main = mainTarget();
+        int width = main.width;
+        int height = main.height;
+
+        TextureTarget backdrop = BACKDROPS.get(blur);
+        if (backdrop == null) {
+            // From 26.3 the depth format picks the depth buffer (none here); 26.2 takes a flag.
+            //? if >=26.3 {
+            /*backdrop = new TextureTarget("Saturn glass " + blur, width, height, GpuFormat.RGBA8_UNORM, null);
+            *///?} else if >=26.2 {
+            /*backdrop = new TextureTarget("Saturn glass " + blur, width, height, false, GpuFormat.RGBA8_UNORM);
+            *///?} else
+            backdrop = new TextureTarget("Saturn glass " + blur, width, height, false);
+            BACKDROPS.put(blur, backdrop);
+        } else if (backdrop.width != width || backdrop.height != height) {
+            backdrop.resize(width, height);
+        }
+        //? if <1.21.11
+        //backdrop.getColorTexture().setTextureFilter(FilterMode.LINEAR, false);
+
+        //? if >=26.1 {
+        /*PENDING.add(blur);
+    }
+
+    // Copies and blurs the backdrops the GUI asked for this frame. GuiRendererMixin calls it once the
+    // world and the panorama are drawn, before the GUI.
+    public static void blurPendingBackdrops() {
+        RenderTarget main = mainTarget();
+        for (int blur : PENDING) {
+            TextureTarget backdrop = BACKDROPS.get(blur);
+            // The GUI already refers to the backdrop's texture, so after a resize it keeps the last
+            // frame's until the next one.
+            if (backdrop != null && backdrop.width == main.width && backdrop.height == main.height) {
+                blurBackdrop(main, backdrop, blur);
+            }
+        }
+        PENDING.clear();
+    }
+
+    private static void blurBackdrop(RenderTarget main, TextureTarget backdrop, int blur) {
+        int width = main.width;
+        int height = main.height;
+        *///?}
+        RenderSystem.getDevice().createCommandEncoder().copyTextureToTexture(
+                main.getColorTexture(), backdrop.getColorTexture(), 0, 0, 0, 0, 0, width, height);
+
+        PostChain processor = getBlur(blur);
+        if (processor != null) {
+            processor.process(backdrop, POOL);
+        }
+        POOL.endFrame();
+        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).getColorTextureView();
+        //? if >=1.21.11
+        return TextureSetup.doubleTexture(mask.getTextureView(), mask.getSampler(), backdrop, RenderSystem.getSamplerCache().getClampToEdge(FilterMode.LINEAR));
+        //? if <1.21.11
+        //return TextureSetup.doubleTexture(mask.getTextureView(), 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());
+            // The GUI already refers to this frame's pending backdrops.
+            //? if >=26.1
+            //unused &= !PENDING.contains(entry.getKey());
+            if (unused) {
+                entry.getValue().destroyBuffers();
+            }
+            return unused;
+        });
+        BLURS.entrySet().removeIf(entry -> {
+            boolean unused = entry.getKey() != kept && !isSet(entry.getKey());
+            // The GUI already refers to this frame's pending backdrops.
+            //? if >=26.1
+            //unused &= !PENDING.contains(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 PostChain 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 PostChain loadBlur(int blur) {
+        try (Reader reader = SaturnClient.client.getResourceManager().getResourceOrThrow(BLUR).openAsReader()) {
+            JsonElement json = JsonParser.parseReader(reader);
+            setRadius(json, blur);
+
+            PostChainConfig pipeline = PostChainConfig.CODEC.parse(JsonOps.INSTANCE, json).getOrThrow();
+            return PostChain.load(pipeline, SaturnClient.client.getTextureManager(),
+                    //? if >=26.1 {
+                    /*LevelTargetBundle.MAIN_TARGETS, Identifier.fromNamespaceAndPath("saturnclient", "glass_blur_" + blur), PROJECTION, PROJECTION_BUFFER);
+                    *///?} else
+                    LevelTargetBundle.MAIN_TARGETS, Identifier.fromNamespaceAndPath("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 com.mojang.blaze3d.pipeline.RenderTarget;
+import net.minecraft.client.renderer.PostChain;
+import net.minecraft.client.renderer.RenderPipelines;
+import com.mojang.blaze3d.pipeline.TextureTarget;
+import net.minecraft.client.renderer.LevelTargetBundle;
+import net.minecraft.client.renderer.RenderType;
+import net.minecraft.client.renderer.RenderStateShard;
+import com.mojang.blaze3d.resource.CrossFrameResourcePool;
+import net.minecraft.resources.Identifier;
+
+public final class GlassRenderer {
+    private static final RenderPipeline PIPELINE = RenderPipeline.builder(RenderPipelines.GUI_TEXTURED_SNIPPET)
+            .withLocation(Identifier.fromNamespaceAndPath("saturnclient", "pipeline/glass"))
+            .withFragmentShader(Identifier.fromNamespaceAndPath("saturnclient", "core/glass_pre_1_21_6"))
+            .withSampler("Sampler1")
+            .build();
+
+    private static final Identifier BLUR = Identifier.withDefaultNamespace("blur");
+    // For the blur's intermediate target, freed once unused for a few frames
+    private static final CrossFrameResourcePool POOL = new CrossFrameResourcePool(3);
+
+    private static final Map<Integer, TextureTarget> BACKDROPS = new HashMap<>();
+    // By mask and blur
+    private static final Map<String, RenderType> LAYERS = new HashMap<>();
+    // The game behind the screen before the screen blurs it, which glass is blurred from
+    private static TextureTarget 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.getMainRenderTarget(), 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) {
+        RenderTarget from = background != null ? background : SaturnClient.client.getMainRenderTarget();
+        TextureTarget backdrop = copy(from, BACKDROPS.get(blur), "Saturn glass " + blur);
+        BACKDROPS.put(blur, backdrop);
+
+        PostChain processor = SaturnClient.client.getShaderManager().getPostChain(BLUR,
+                LevelTargetBundle.MAIN_TARGETS);
+        if (processor != null) {
+            processor.process(backdrop, POOL, pass -> pass.setUniform("Radius", (float) blur));
+        }
+        POOL.endFrame();
+        release(blur);
+    }
+
+    // Draws glass through mask with the copy blurred by blur
+    public static RenderType getLayer(Identifier mask, int blur) {
+        return LAYERS.computeIfAbsent(mask + " " + blur, key -> RenderType.create("saturn_glass", 786432, PIPELINE,
+                RenderType.CompositeState.builder()
+                        .setTextureState(new RenderStateShard.EmptyTextureStateShard(() -> {
+                            RenderSystem.setShaderTexture(0,
+                                    SaturnClient.client.getTextureManager().getTexture(mask).getTexture());
+                            RenderSystem.setShaderTexture(1, BACKDROPS.get(blur).getColorTexture());
+                        }, () -> {
+                        }))
+                        .createCompositeState(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().destroyBuffers();
+            }
+            return unused;
+        });
+    }
+
+    // Copies from into to, made or resized to match
+    private static TextureTarget copy(RenderTarget from, TextureTarget to, String name) {
+        int width = from.width;
+        int height = from.height;
+
+        if (to == null) {
+            to = new TextureTarget(name, width, height, false);
+        } else if (to.width != width || to.height != height) {
+            to.resize(width, height);
+        }
+        to.getColorTexture().setTextureFilter(FilterMode.LINEAR, false);
+
+        RenderSystem.getDevice().createCommandEncoder().copyTextureToTexture(
+                from.getColorTexture(), to.getColorTexture(), 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.renderer.ShaderDefines;
+import com.mojang.blaze3d.pipeline.RenderTarget;
+import net.minecraft.client.renderer.PostChain;
+import net.minecraft.client.renderer.ShaderProgram;
+import com.mojang.blaze3d.pipeline.TextureTarget;
+import net.minecraft.client.renderer.LevelTargetBundle;
+import net.minecraft.client.renderer.RenderType;
+import net.minecraft.client.renderer.RenderStateShard;
+import com.mojang.blaze3d.vertex.VertexFormat;
+import com.mojang.blaze3d.vertex.DefaultVertexFormat;
+import com.mojang.blaze3d.resource.CrossFrameResourcePool;
+import net.minecraft.resources.Identifier;
+
+public final class GlassRenderer {
+    private static final ShaderProgram PROGRAM = new ShaderProgram(Identifier.fromNamespaceAndPath("saturnclient", "core/glass"),
+            DefaultVertexFormat.POSITION_TEX_COLOR, ShaderDefines.EMPTY);
+
+    private static final Identifier BLUR = Identifier.withDefaultNamespace("blur");
+    // For the blur's intermediate target, freed once unused for a few frames
+    private static final CrossFrameResourcePool POOL = new CrossFrameResourcePool(3);
+
+    private static final Map<Integer, TextureTarget> BACKDROPS = new HashMap<>();
+    // By mask and blur
+    private static final Map<String, RenderType> LAYERS = new HashMap<>();
+    // The game behind the screen before the screen blurs it, which glass is blurred from
+    private static TextureTarget 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.getMainRenderTarget(), 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) {
+        RenderTarget from = background != null ? background : SaturnClient.client.getMainRenderTarget();
+        TextureTarget backdrop = copy(from, BACKDROPS.get(blur));
+        BACKDROPS.put(blur, backdrop);
+
+        PostChain processor = SaturnClient.client.getShaderManager().getPostChain(BLUR,
+                LevelTargetBundle.MAIN_TARGETS);
+        if (processor != null) {
+            processor.setUniform("Radius", blur);
+            processor.process(backdrop, POOL);
+        }
+        POOL.endFrame();
+        release(blur);
+        SaturnClient.client.getMainRenderTarget().bindWrite(false);
+    }
+
+    // Draws glass through mask with the copy blurred by blur
+    public static RenderType getLayer(Identifier mask, int blur) {
+        return LAYERS.computeIfAbsent(mask + " " + blur, key -> RenderType.create("saturn_glass",
+                DefaultVertexFormat.POSITION_TEX_COLOR, VertexFormat.Mode.QUADS, 786432,
+                RenderType.CompositeState.builder()
+                        .setTextureState(new RenderStateShard.EmptyTextureStateShard(() -> {
+                            RenderSystem.setShaderTexture(0, mask);
+                            RenderSystem.setShaderTexture(1, BACKDROPS.get(blur).getColorTextureId());
+                        }, () -> {
+                        }))
+                        .setShaderState(new RenderStateShard.ShaderStateShard(PROGRAM))
+                        .setTransparencyState(RenderStateShard.TRANSLUCENT_TRANSPARENCY)
+                        .createCompositeState(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().destroyBuffers();
+            }
+            return unused;
+        });
+    }
+
+    // Copies from into to, made or resized to match
+    private static TextureTarget copy(RenderTarget from, TextureTarget to) {
+        int width = from.width;
+        int height = from.height;
+
+        if (to == null) {
+            to = new TextureTarget(width, height, false);
+        } else if (to.width != width || to.height != height) {
+            to.resize(width, height);
+        }
+        to.setFilterMode(GL11.GL_LINEAR);
+
+        GlStateManager._glBindFramebuffer(GL30.GL_READ_FRAMEBUFFER, from.frameBufferId);
+        GlStateManager._glBindFramebuffer(GL30.GL_DRAW_FRAMEBUFFER, to.frameBufferId);
+        GlStateManager._glBlitFrameBuffer(0, 0, width, height, 0, 0, width, height, GL11.GL_COLOR_BUFFER_BIT,
+                GL11.GL_NEAREST);
+        SaturnClient.client.getMainRenderTarget().bindWrite(false);
+        return to;
+    }
+}
+*///?}

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

@@ -5,7 +5,9 @@ package org.saturnclient.impl.ui;
 //? 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;
@@ -26,33 +28,32 @@ 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.renderer.RenderPipelines;
+import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.navigation.ScreenRectangle;
+import net.minecraft.client.gui.render.state.ColoredRectangleRenderState;
 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.gui.render.state.GuiItemRenderState;
+import net.minecraft.client.gui.render.state.GuiTextRenderState;
+import net.minecraft.client.gui.render.state.BlitRenderState;
+import net.minecraft.client.gui.render.state.pip.GuiEntityRenderState;
+import net.minecraft.client.renderer.entity.state.EntityRenderState;
 //? if >=1.21.7 {
-import net.minecraft.client.render.item.KeyedItemRenderState;
+import net.minecraft.client.renderer.item.TrackingItemStackRenderState;
 //?} else
-//import net.minecraft.client.render.item.ItemRenderState;
-//? if >=1.21.11
-import net.minecraft.client.texture.AbstractTexture;
-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;
+//import net.minecraft.client.renderer.item.ItemStackRenderState;
+import net.minecraft.client.renderer.texture.AbstractTexture;
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import net.minecraft.client.gui.render.TextureSetup;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.item.ItemDisplayContext;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.network.chat.Component;
+import net.minecraft.resources.Identifier;
+import net.minecraft.ReportedException;
+import net.minecraft.CrashReport;
+import net.minecraft.CrashReportCategory;
+import net.minecraft.world.level.Level;
 
 public class RenderScopeImpl implements RenderScope {
 
@@ -61,9 +62,11 @@ 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());
+    public RenderScopeImpl(GuiGraphics context) {
+        this(context.pose(), ((DrawContextAccessor) (Object) context).getState());
     }
 
     public RenderScopeImpl(Matrix3x2fStack matrices, GuiRenderState state) {
@@ -92,10 +95,10 @@ public class RenderScopeImpl implements RenderScope {
 
     @Override
     public void fill(int x1, int y1, int x2, int y2, int color) {
-        this.state.addSimpleElement(
-                new ColoredQuadGuiElementRenderState(
+        this.state.submitGuiElement(
+                new ColoredRectangleRenderState(
                         RenderPipelines.GUI,
-                        TextureSetup.empty(),
+                        TextureSetup.noTexture(),
                         new Matrix3x2f(this.matrices.stack),
                         x1, y1, x2, y2, color, color,
                         this.scissorStack.peekLast()));
@@ -146,10 +149,10 @@ public class RenderScopeImpl implements RenderScope {
             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(),
+            this.state.submitText(
+                    new GuiTextRenderState(
+                            SaturnClient.client.font,
+                            ((Component) Fonts.setFont(line, font)).getVisualOrderText(),
                             new Matrix3x2f(this.matrices.stack),
                             0, font == 0 ? 1 : 8,
                             //? if >=1.21.11 {
@@ -165,12 +168,12 @@ public class RenderScopeImpl implements RenderScope {
 
     @Override
     public int getScaledWindowWidth() {
-        return SaturnClient.client.getWindow().getScaledWidth();
+        return SaturnClient.client.getWindow().getGuiScaledWidth();
     }
 
     @Override
     public int getScaledWindowHeight() {
-        return SaturnClient.client.getWindow().getScaledHeight();
+        return SaturnClient.client.getWindow().getGuiScaledHeight();
     }
 
     // Texture rendering
@@ -214,26 +217,45 @@ public class RenderScopeImpl implements RenderScope {
         }
 
         GpuTextureView gpuTextureView = SaturnClient.client.getTextureManager()
-                .getTexture(sprite).getGlTextureView();
+                .getTexture(sprite).getTextureView();
 
         //? if >=1.21.11
         AbstractTexture abstractTexture = SaturnClient.client.getTextureManager().getTexture(sprite);
 
-        this.state.addSimpleElement(new TexturedQuadGuiElementRenderState(
+        this.state.submitGuiElement(new BlitRenderState(
                 RenderPipelines.GUI_TEXTURED,
                 //? if >=1.21.11 {
-                TextureSetup.of(gpuTextureView, abstractTexture.getSampler()),
+                TextureSetup.singleTexture(gpuTextureView, abstractTexture.getSampler()),
                 //?} else
-                //TextureSetup.withoutGlTexture(gpuTextureView),
+                //TextureSetup.singleTexture(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.submitGuiElement(new BlitRenderState(
+                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) {
-        ScreenRect rect = new ScreenRect(x1, y1, x2 - x1, y2 - y1).transform(this.matrices.stack);
+        ScreenRectangle rect = new ScreenRectangle(x1, y1, x2 - x1, y2 - y1).transformAxisAligned(this.matrices.stack);
         scissorStack.push(rect);
     }
 
@@ -248,12 +270,12 @@ public class RenderScopeImpl implements RenderScope {
     }
 
     public static class ScissorStack {
-        private final Deque<ScreenRect> stack = new ArrayDeque<>();
+        private final Deque<ScreenRectangle> stack = new ArrayDeque<>();
 
-        public ScreenRect push(ScreenRect rect) {
-            ScreenRect last = stack.peekLast();
+        public ScreenRectangle push(ScreenRectangle rect) {
+            ScreenRectangle last = stack.peekLast();
             if (last != null) {
-                ScreenRect intersection = Objects.requireNonNullElse(rect.intersection(last), ScreenRect.empty());
+                ScreenRectangle intersection = Objects.requireNonNullElse(rect.intersection(last), ScreenRectangle.empty());
                 stack.addLast(intersection);
                 return intersection;
             } else {
@@ -263,7 +285,7 @@ public class RenderScopeImpl implements RenderScope {
         }
 
         @Nullable
-        public ScreenRect pop() {
+        public ScreenRectangle pop() {
             if (stack.isEmpty())
                 throw new IllegalStateException("Scissor stack underflow");
             stack.removeLast();
@@ -271,48 +293,51 @@ public class RenderScopeImpl implements RenderScope {
         }
 
         @Nullable
-        public ScreenRect peekLast() {
+        public ScreenRectangle peekLast() {
             return stack.peekLast();
         }
 
         public boolean contains(int x, int y) {
-            return stack.isEmpty() || stack.peekLast().contains(x, y);
+            return stack.isEmpty() || stack.peekLast().containsPoint(x, y);
         }
     }
 
     // Item rendering
     @Override
     public void drawItem(ItemStackRef stack, int x, int y) {
-        drawItem(null, SaturnClient.client.world, stack, x, y, 0);
+        drawItem(null, SaturnClient.client.level, stack, x, y, 0);
     }
 
-    private void drawItem(@Nullable LivingEntity entity, @Nullable World world, ItemStackRef stack, int x, int y,
+    private void drawItem(@Nullable LivingEntity entity, @Nullable Level 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,
+    private void drawItem(@Nullable LivingEntity entity, @Nullable Level world, ItemStack stack, int x, int y, int seed,
             int z) {
         if (!stack.isEmpty()) {
             //? if >=1.21.7 {
-            KeyedItemRenderState keyedItemRenderState = new KeyedItemRenderState();
+            TrackingItemStackRenderState keyedItemRenderState = new TrackingItemStackRenderState();
             //?} else
-            //ItemRenderState keyedItemRenderState = new ItemRenderState();
-            SaturnClient.client.getItemModelManager().clearAndUpdate(keyedItemRenderState, stack,
+            //ItemStackRenderState keyedItemRenderState = new ItemStackRenderState();
+            SaturnClient.client.getItemModelResolver().updateForTopItem(keyedItemRenderState, stack,
                     ItemDisplayContext.GUI, world,
                     entity, seed);
 
             try {
-                this.state.addItem(new ItemGuiElementRenderState(stack.getItem().getName().toString(),
+                //? if >=26.1 {
+                /*this.state.submitItem(new GuiItemRenderState(
+                *///?} else
+                this.state.submitItem(new GuiItemRenderState(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);
+                CrashReport crashReport = CrashReport.forThrowable(throwable, "Rendering item");
+                CrashReportCategory crashReportSection = crashReport.addCategory("Item being rendered");
+                crashReportSection.setDetail("Item Type", () -> String.valueOf(stack.getItem()));
+                crashReportSection.setDetail("Item Components", () -> String.valueOf(stack.getComponents()));
+                crashReportSection.setDetail("Item Foil", () -> String.valueOf(stack.hasFoil()));
+                throw new ReportedException(crashReport);
             }
         }
     }
@@ -324,12 +349,12 @@ public class RenderScopeImpl implements RenderScope {
 
     @Override
     public void drawSpriteStretched(SpriteRef sprite, int x, int y, int width, int height, int color) {
-        Sprite mcSprite = (Sprite) sprite;
+        TextureAtlasSprite mcSprite = (TextureAtlasSprite) 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);
+        drawTexturedQuad(mcSprite.atlasLocation(), x, x + width, y, y + height,
+                mcSprite.getU0(), mcSprite.getU1(), mcSprite.getV0(), mcSprite.getV1(), color);
     }
 
     @Override
@@ -360,7 +385,7 @@ public class RenderScopeImpl implements RenderScope {
 
         float adjustedScale = scale * scaleX; // apply matrix scale to entity scale too
 
-        this.state.addSpecialElement(new EntityGuiElementRenderState(entityState, translation, rotation,
+        this.state.submitPicturesInPictureState(new GuiEntityRenderState(entityState, translation, rotation,
                 overrideCameraAngle, adjustedX1, adjustedY1, adjustedX2, adjustedY2, adjustedScale,
                 this.scissorStack.peekLast()));
     }
@@ -368,7 +393,9 @@ public class RenderScopeImpl implements RenderScope {
 //?} 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;
@@ -386,55 +413,57 @@ 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;
+import net.minecraft.client.gui.Font;
+import net.minecraft.client.gui.Font.DisplayMode;
+import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.navigation.ScreenRectangle;
+import com.mojang.blaze3d.platform.Lighting;
+import net.minecraft.client.renderer.texture.OverlayTexture;
+import net.minecraft.client.renderer.RenderType;
+import com.mojang.blaze3d.vertex.VertexConsumer;
+import net.minecraft.client.renderer.MultiBufferSource;
+import net.minecraft.client.renderer.item.ItemStackRenderState;
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import com.mojang.blaze3d.platform.Window;
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.world.entity.LivingEntity;
 //? if >=1.21.5
-import net.minecraft.item.ItemDisplayContext;
+import net.minecraft.world.item.ItemDisplayContext;
 //? if <1.21.5
-//import net.minecraft.item.ModelTransformationMode;
-import net.minecraft.item.ItemStack;
+//import net.minecraft.world.item.ItemDisplayContext;
+import net.minecraft.world.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;
+import net.minecraft.network.chat.Component;
+import net.minecraft.resources.Identifier;
+import net.minecraft.ReportedException;
+import net.minecraft.CrashReport;
+import net.minecraft.CrashReportCategory;
+import net.minecraft.world.level.Level;
 
 public class RenderScopeImpl implements RenderScope {
     // ----------------------------
     // Fields
     // ----------------------------
-    public MatrixStack matrices;
-    public VertexConsumerProvider.Immediate vertexConsumers;
+    public PoseStack matrices;
+    public MultiBufferSource.BufferSource vertexConsumers;
     private ScissorStack scissorStack = new ScissorStack();
     private int opacity = 255 << 24;
-    private final ItemRenderState itemRenderState;
+    // The glass blurs made for this scope's frame
+    private final Set<Integer> capturedBlurs = new HashSet<>();
+    private final ItemStackRenderState itemRenderState;
 
     // ----------------------------
     // Constructors
     // ----------------------------
-    public RenderScopeImpl(DrawContext context) {
-        this(context.getMatrices(), ((DrawContextAccessor) context).getVertexConsumers());
+    public RenderScopeImpl(GuiGraphics context) {
+        this(context.pose(), ((DrawContextAccessor) context).getVertexConsumers());
     }
 
-    public RenderScopeImpl(MatrixStack matrices, VertexConsumerProvider.Immediate vertexConsumers) {
+    public RenderScopeImpl(PoseStack matrices, MultiBufferSource.BufferSource vertexConsumers) {
         this.matrices = matrices;
         this.vertexConsumers = vertexConsumers;
         this.scissorStack = new ScissorStack();
-        this.itemRenderState = new ItemRenderState();
+        this.itemRenderState = new ItemStackRenderState();
     }
 
     // ----------------------------
@@ -466,22 +495,22 @@ public class RenderScopeImpl implements RenderScope {
     // ----------------------------
     @Override
     public void draw() {
-        this.vertexConsumers.draw();
+        this.vertexConsumers.endBatch();
     }
 
     @Override
     public int getScaledWindowWidth() {
-        return SaturnClient.client.getWindow().getScaledWidth();
+        return SaturnClient.client.getWindow().getGuiScaledWidth();
     }
 
     @Override
     public int getScaledWindowHeight() {
-        return SaturnClient.client.getWindow().getScaledHeight();
+        return SaturnClient.client.getWindow().getGuiScaledHeight();
     }
 
-    public void draw(Consumer<VertexConsumerProvider> drawer) {
+    public void draw(Consumer<MultiBufferSource> drawer) {
         drawer.accept(this.vertexConsumers);
-        this.vertexConsumers.draw();
+        this.vertexConsumers.endBatch();
     }
 
     // ----------------------------
@@ -493,7 +522,7 @@ public class RenderScopeImpl implements RenderScope {
             return;
         color = getColor(color);
 
-        Matrix4f matrix4f = this.matrices.peek().getPositionMatrix();
+        Matrix4f matrix4f = this.matrices.last().pose();
 
         int x1 = x;
         int x2 = x + width;
@@ -511,11 +540,11 @@ public class RenderScopeImpl implements RenderScope {
             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);
+        VertexConsumer vertexConsumer = this.vertexConsumers.getBuffer(RenderType.gui());
+        vertexConsumer.addVertex(matrix4f, x1, y1, 0).setColor(color);
+        vertexConsumer.addVertex(matrix4f, x1, y2, 0).setColor(color);
+        vertexConsumer.addVertex(matrix4f, x2, y2, 0).setColor(color);
+        vertexConsumer.addVertex(matrix4f, x2, y1, 0).setColor(color);
     }
 
     @Override
@@ -524,15 +553,15 @@ public class RenderScopeImpl implements RenderScope {
     }
 
     public void fill(int x1, int y1, int x2, int y2, int z, int color) {
-        fill(RenderLayer.getGui(), x1, y1, x2, y2, z, color);
+        fill(RenderType.gui(), x1, y1, x2, y2, z, color);
     }
 
-    public void fill(RenderLayer layer, int x1, int y1, int x2, int y2, int color) {
+    public void fill(RenderType 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();
+    public void fill(RenderType layer, int x1, int y1, int x2, int y2, int z, int color) {
+        Matrix4f matrix4f = this.matrices.last().pose();
         if (x1 < x2) {
             int tmp = x1;
             x1 = x2;
@@ -545,10 +574,10 @@ public class RenderScopeImpl implements RenderScope {
         }
 
         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);
+        vertexConsumer.addVertex(matrix4f, x1, y1, z).setColor(color);
+        vertexConsumer.addVertex(matrix4f, x1, y2, z).setColor(color);
+        vertexConsumer.addVertex(matrix4f, x2, y2, z).setColor(color);
+        vertexConsumer.addVertex(matrix4f, x2, y1, z).setColor(color);
     }
 
     @Override
@@ -577,13 +606,13 @@ public class RenderScopeImpl implements RenderScope {
         int i = 0;
         for (String line : text.split("\n")) {
             color = getColor(color);
-            matrices.push();
+            matrices.pushPose();
             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();
+            Font textRenderer = SaturnClient.client.font;
+            textRenderer.drawInBatch((Component) Fonts.setFont(line, font), 0, font == 0 ? 1 : 7, color, false,
+                    matrices.last().pose(), vertexConsumers, DisplayMode.NORMAL, 0, 15728880);
+            matrices.popPose();
             i++;
         }
     }
@@ -622,12 +651,12 @@ public class RenderScopeImpl implements RenderScope {
 
     @Override
     public void drawSpriteStretched(SpriteRef saturnSprite, int x, int y, int width, int height, int color) {
-        Sprite sprite = (Sprite) saturnSprite;
+        TextureAtlasSprite sprite = (TextureAtlasSprite) 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);
+            drawTexturedQuad(sprite.atlasLocation(), x, x + width, y, y + height,
+                    sprite.getU0(), sprite.getU1(), sprite.getV0(), sprite.getV1(), color);
         }
     }
 
@@ -646,18 +675,45 @@ public class RenderScopeImpl implements RenderScope {
         y2 *= 4;
         color = getColor(color);
 
-        matrices.push();
+        matrices.pushPose();
         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();
+        RenderType renderLayer = RenderType.guiTextured(sprite);
+        Matrix4f matrix4f = matrices.last().pose();
         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();
+        vertexConsumer.addVertex(matrix4f, x1, y1, 0).setUv(u1, v1).setColor(color);
+        vertexConsumer.addVertex(matrix4f, x1, y2, 0).setUv(u1, v2).setColor(color);
+        vertexConsumer.addVertex(matrix4f, x2, y2, 0).setUv(u2, v2).setColor(color);
+        vertexConsumer.addVertex(matrix4f, x2, y1, 0).setUv(u2, v1).setColor(color);
+        matrices.popPose();
+    }
+
+    @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.pushPose();
+        matrices.scale(0.25f, 0.25f, 1.0f);
+        Matrix4f matrix4f = matrices.last().pose();
+        VertexConsumer vertexConsumer = vertexConsumers.getBuffer(GlassRenderer.getLayer((Identifier) (Object) mask, blur));
+        vertexConsumer.addVertex(matrix4f, x1, y1, 0).setUv(0, 0).setColor(color);
+        vertexConsumer.addVertex(matrix4f, x1, y2, 0).setUv(0, 1).setColor(color);
+        vertexConsumer.addVertex(matrix4f, x2, y2, 0).setUv(1, 1).setColor(color);
+        vertexConsumer.addVertex(matrix4f, x2, y1, 0).setUv(1, 0).setColor(color);
+        matrices.popPose();
     }
 
     // ----------------------------
@@ -665,55 +721,55 @@ public class RenderScopeImpl implements RenderScope {
     // ----------------------------
     @Override
     public void drawItem(ItemStackRef item, int x, int y) {
-        drawItem(SaturnClient.client.player, SaturnClient.client.world, item, x, y, 0);
+        drawItem(SaturnClient.client.player, SaturnClient.client.level, item, x, y, 0);
     }
 
-    private void drawItem(@Nullable LivingEntity entity, @Nullable World world, ItemStackRef stack, int x, int y,
+    private void drawItem(@Nullable LivingEntity entity, @Nullable Level 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,
+    private void drawItem(@Nullable LivingEntity entity, @Nullable Level 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);
+        SaturnClient.client.getItemModelResolver().appendItemLayers(itemRenderState, stack, ItemDisplayContext.GUI, world, entity, seed);
         //? if >=1.21.5
-        SaturnClient.client.getItemModelManager().clearAndUpdate(this.itemRenderState, stack, ItemDisplayContext.GUI, world, entity, seed);
+        SaturnClient.client.getItemModelResolver().updateForTopItem(this.itemRenderState, stack, ItemDisplayContext.GUI, world, entity, seed);
         //? if <1.21.5
-        //SaturnClient.client.getItemModelManager().update(itemRenderState, stack, ModelTransformationMode.GUI, false, world, entity, seed);
+        //SaturnClient.client.getItemModelResolver().updateForTopItem(itemRenderState, stack, ItemDisplayContext.GUI, false, world, entity, seed);
 
-        this.matrices.push();
+        this.matrices.pushPose();
         //? 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));
+        //this.matrices.translate(x + 8, y + 8, 150 + (itemRenderState.isGui3d() ? z : 0));
 
         try {
             this.matrices.scale(16.0F, -16.0F, 16.0F);
-            boolean bl = !this.itemRenderState.isSideLit();
+            boolean bl = !this.itemRenderState.usesBlockLight();
             if (bl) {
                 this.draw();
-                DiffuseLighting.disableGuiDepthLighting();
+                Lighting.setupForFlatItems();
             }
 
-            this.itemRenderState.render(this.matrices, this.vertexConsumers, 15728880, OverlayTexture.DEFAULT_UV);
+            this.itemRenderState.render(this.matrices, this.vertexConsumers, 15728880, OverlayTexture.NO_OVERLAY);
             this.draw();
             if (bl) {
-                DiffuseLighting.enableGuiDepthLighting();
+                Lighting.setupFor3DItems();
             }
         } 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);
+            CrashReport crashReport = CrashReport.forThrowable(throwable, "Rendering item");
+            CrashReportCategory crashReportSection = crashReport.addCategory("Item being rendered");
+            crashReportSection.setDetail("Item Type", () -> String.valueOf(stack.getItem()));
+            crashReportSection.setDetail("Item Components", () -> String.valueOf(stack.getComponents()));
+            crashReportSection.setDetail("Item Foil", () -> String.valueOf(stack.hasFoil()));
+            throw new ReportedException(crashReport);
         }
 
-        this.matrices.pop();
+        this.matrices.popPose();
     }
 
     // ----------------------------
@@ -721,8 +777,8 @@ public class RenderScopeImpl implements RenderScope {
     // ----------------------------
     @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());
+        ScreenRectangle screenRect = new ScreenRectangle(x1, y1, x2 - x1, y2 - y1)
+                .transformAxisAligned(matrices.last().pose());
         setScissor(scissorStack.push(screenRect));
     }
 
@@ -736,15 +792,15 @@ public class RenderScopeImpl implements RenderScope {
         return scissorStack.containsPoint(x, y);
     }
 
-    private void setScissor(@Nullable ScreenRect rect) {
+    private void setScissor(@Nullable ScreenRectangle rect) {
         draw();
         if (rect != null) {
             Window window = SaturnClient.client.getWindow();
-            int framebufferHeight = window.getFramebufferHeight();
-            double scaleFactor = window.getScaleFactor();
+            int framebufferHeight = window.getHeight();
+            double scaleFactor = window.getGuiScale();
             RenderSystem.enableScissor(
-                    (int) (rect.getLeft() * scaleFactor),
-                    (int) (framebufferHeight - rect.getBottom() * scaleFactor),
+                    (int) (rect.left() * scaleFactor),
+                    (int) (framebufferHeight - rect.bottom() * scaleFactor),
                     Math.max(0, (int) (rect.width() * scaleFactor)),
                     Math.max(0, (int) (rect.height() * scaleFactor)));
         } else {
@@ -753,13 +809,13 @@ public class RenderScopeImpl implements RenderScope {
     }
 
     static class ScissorStack {
-        private final Deque<ScreenRect> stack = new ArrayDeque<>();
+        private final Deque<ScreenRectangle> stack = new ArrayDeque<>();
 
-        public ScreenRect push(ScreenRect p_281812_) {
-            ScreenRect screenrectangle = this.stack.peekLast();
+        public ScreenRectangle push(ScreenRectangle p_281812_) {
+            ScreenRectangle screenrectangle = this.stack.peekLast();
             if (screenrectangle != null) {
-                ScreenRect screenrectangle1 = Objects.requireNonNullElse(p_281812_.intersection(screenrectangle),
-                        ScreenRect.empty());
+                ScreenRectangle screenrectangle1 = Objects.requireNonNullElse(p_281812_.intersection(screenrectangle),
+                        ScreenRectangle.empty());
                 this.stack.addLast(screenrectangle1);
                 return screenrectangle1;
             } else {
@@ -769,7 +825,7 @@ public class RenderScopeImpl implements RenderScope {
         }
 
         @Nullable
-        public ScreenRect pop() {
+        public ScreenRectangle pop() {
             if (this.stack.isEmpty()) {
                 throw new IllegalStateException("Scissor stack underflow");
             } else {
@@ -779,7 +835,7 @@ public class RenderScopeImpl implements RenderScope {
         }
 
         public boolean containsPoint(int p_329411_, int p_333404_) {
-            return this.stack.isEmpty() ? true : this.stack.peek().contains(p_329411_, p_333404_);
+            return this.stack.isEmpty() ? true : this.stack.peek().containsPoint(p_329411_, p_333404_);
         }
     }
 }

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

@@ -3,56 +3,81 @@ package org.saturnclient.impl.ui;
 import java.time.Duration;
 import java.time.Instant;
 
+import org.saturnclient.config.Config;
+import org.saturnclient.impl.provider.Keys;
 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.Minecraft;
 //? 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;
-//? 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.client.input.MouseButtonEvent;
+import net.minecraft.client.renderer.CubeMap;
+import net.minecraft.client.gui.GuiGraphics;
+//? if >=26.1 {
+/*import net.minecraft.client.renderer.Panorama;
+*///?} else
+import net.minecraft.client.renderer.PanoramaRenderer;
+import net.minecraft.client.gui.screens.Screen;
+//? if >=1.21.6 {
+import net.minecraft.client.renderer.texture.CubeMapTexture;
+//?} else {
+/*import net.minecraft.client.renderer.texture.SimpleTexture;
+import net.minecraft.client.renderer.texture.TextureManager;
 *///?}
-import net.minecraft.client.texture.ResourceTexture;
-import net.minecraft.client.texture.TextureManager;
-import net.minecraft.text.Text;
-import net.minecraft.util.Identifier;
+//? if >=1.21.9
+import net.minecraft.client.input.KeyEvent;
+//? if <1.21.6 {
+/*import net.minecraft.client.renderer.PostChain;
+import net.minecraft.client.renderer.LevelTargetBundle;
+import com.mojang.blaze3d.resource.CrossFrameResourcePool;
+*///?}
+import net.minecraft.network.chat.Component;
+import net.minecraft.resources.Identifier;
 
 public class SaturnScreenFabric extends Screen implements ScreenProvider {
-    protected static final Identifier PANORAMA = Identifier.of("saturnclient",
+    protected static final Identifier PANORAMA = Identifier.fromNamespaceAndPath("saturnclient",
             "textures/gui/title/background/panorama");
-    protected static final CubeMapRenderer PANORAMA_RENDERER = new CubeMapRenderer(PANORAMA);
+    public static final CubeMap PANORAMA_RENDERER = new CubeMap(PANORAMA);
 
-    public static final RotatingCubeMapRenderer ROTATING_PANORAMA_RENDERER;
+    // From 26.1 vanilla draws the panorama from its own cube map; GuiRendererMixin swaps in Saturn's.
+    //? if >=26.1 {
+    /*public static final Panorama ROTATING_PANORAMA_RENDERER = new Panorama();
+    *///?} else {
+    public static final PanoramaRenderer ROTATING_PANORAMA_RENDERER;
 
     static {
-        ROTATING_PANORAMA_RENDERER = new RotatingCubeMapRenderer(PANORAMA_RENDERER);
+        ROTATING_PANORAMA_RENDERER = new PanoramaRenderer(PANORAMA_RENDERER);
     }
+    //?}
 
     //? if <1.21.6
-    //private final Pool pool = new Pool(3);
+    //private final CrossFrameResourcePool pool = new CrossFrameResourcePool(3);
     public final SaturnScreen screen;
 
-    public static void preload(MinecraftClient client) {
-        TextureManager textureManager = client.getTextureManager();
+    /** 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(Minecraft client) {
+        //? 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().registerAndLoad(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);
+            SimpleTexture resourceTexture = new SimpleTexture(tex);
+            textureManager.registerAndLoad(tex, resourceTexture);
         }
+        *///?}
+        panoramaReady = true;
     }
 
     public SaturnScreenFabric(SaturnScreen screen) {
-        super(Text.literal(screen.title));
+        super(Component.literal(screen.title));
         screen.provider = this;
         this.screen = screen;
     }
@@ -65,35 +90,44 @@ public class SaturnScreenFabric extends Screen implements ScreenProvider {
     //? if <1.21.6
     //@SuppressWarnings("deprecation")
     @Override
-    public void render(DrawContext context, int mouseX, int mouseY, float delta) {
+    //? if >=26.1 {
+    /*public void extractRenderState(GuiGraphics context, int mouseX, int mouseY, float delta) {
+    *///?} else
+    public void render(GuiGraphics 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;
+        screen.updateScale();
 
-        // TODO: the panorama and the background blur (screen.backgroundBlur) are only drawn before
-        // 1.21.6 so far. See also issue #23.
-        if (client.world == null && client.getCurrentServerEntry() == null) {
-            //? if <1.21.6
-            //ROTATING_PANORAMA_RENDERER.render(context, this.width, this.height, screen.backgroundOpacity, delta);
+        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);
         }
 
-        //? if <1.21.6 {
-        /*PostEffectProcessor postEffectProcessor = this.client.getShaderLoader().loadPostEffect(
-                Identifier.ofVanilla("blur"),
-                DefaultFramebufferSet.MAIN_ONLY);
+        // Glass is blurred from the game as it is before this screen blurs it.
+        if (Config.usesGlass()) {
+            context.flush();
+            GlassRenderer.saveBackground();
+        }
+
+        float radius = screen.getBackgroundBlur();
+        PostChain postEffectProcessor = radius < 1 ? null : this.minecraft.getShaderManager().getPostChain(
+                Identifier.withDefaultNamespace("blur"),
+                LevelTargetBundle.MAIN_TARGETS);
 
         if (postEffectProcessor != null) {
-            float radius = screen.backgroundBlur * Math.min((float) elapsed / 700, 1.0f);
             //? if >=1.21.5
-            postEffectProcessor.render(this.client.getFramebuffer(), this.pool, pass -> pass.setUniform("Radius", radius));
+            postEffectProcessor.process(this.minecraft.getMainRenderTarget(), this.pool, pass -> pass.setUniform("Radius", radius));
             //? if <1.21.5
-            //postEffectProcessor.setUniforms("Radius", radius);
+            //postEffectProcessor.setUniform("Radius", radius);
             //? if <1.21.5
-            //postEffectProcessor.render(this.client.getFramebuffer(), this.pool);
+            //postEffectProcessor.process(this.minecraft.getMainRenderTarget(), this.pool);
         }
         *///?}
 
@@ -102,11 +136,48 @@ public class SaturnScreenFabric extends Screen implements ScreenProvider {
         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
+    //? if >=26.1 {
+    /*public void extractBackground(GuiGraphics context, int mouseX, int mouseY, float delta) {
+    *///?} else
+    public void renderBackground(GuiGraphics 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()) {
+            //? if >=26.2 {
+            /*ROTATING_PANORAMA_RENDERER.extractRenderState(context, this.width, this.height);
+            *///?} else if >=26.1 {
+            /*ROTATING_PANORAMA_RENDERER.extractRenderState(context, this.width, this.height, true);
+            *///?} else
+            ROTATING_PANORAMA_RENDERER.render(context, this.width, this.height, true);
+        }
+
+        if (screen.getBackgroundBlur() >= 1) {
+            context.blurBeforeThisStratum();
+        }
+
+        if (minecraft.level != null) {
+            //? if >=26.1 {
+            /*extractMenuBackground(context);
+            *///?} else
+            renderMenuBackground(context);
+        }
+    }
+    //?}
+
+    /** Whether Saturn's panorama is behind the screen: outside a world, once it's loaded. */
+    private boolean isShowingPanorama() {
+        return panoramaReady && minecraft.level == null && minecraft.getCurrentServer() == 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())) {
+    public boolean mouseClicked(MouseButtonEvent click, boolean doubled) {
+        if (screen.mouseClicked(click.x(), click.y(), Keys.mouseButtonToSaturn(click.button()))) {
             return true;
         }
 
@@ -114,9 +185,9 @@ public class SaturnScreenFabric extends Screen implements ScreenProvider {
     }
 
     @Override
-    public boolean mouseDragged(Click click, double offsetX, double offsetY) {
-        // TODO: 1.21.8 passes the drag deltas; check whether offsetX/offsetY are the same on 1.21.9+.
-        if (screen.mouseDragged(click.x(), click.y(), click.button(), 0.0, 0.0)) {
+    public boolean mouseDragged(MouseButtonEvent click, double offsetX, double offsetY) {
+        // 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(), Keys.mouseButtonToSaturn(click.button()), offsetX, offsetY)) {
             return true;
         }
 
@@ -124,8 +195,8 @@ public class SaturnScreenFabric extends Screen implements ScreenProvider {
     }
 
     @Override
-    public boolean mouseReleased(Click click) {
-        if (screen.mouseReleased(click.x(), click.y(), click.button())) {
+    public boolean mouseReleased(MouseButtonEvent click) {
+        if (screen.mouseReleased(click.x(), click.y(), Keys.mouseButtonToSaturn(click.button()))) {
             return true;
         }
 
@@ -167,8 +238,12 @@ public class SaturnScreenFabric extends Screen implements ScreenProvider {
 
     //? if >=1.21.9 {
     @Override
-    public boolean keyPressed(KeyInput input) {
-        if (screen.keyPressed(input.getKeycode(), input.scancode(), input.modifiers())) {
+    public boolean keyPressed(KeyEvent input) {
+        // 26.3's key() is SDL's scancode; Saturn's key codes are GLFW's (see Keys).
+        //? if >=26.3 {
+        /*if (screen.keyPressed(Keys.toSaturn(input.key()), input.key(), Keys.modifiersToSaturn(input.modifiers()))) {
+        *///?} else
+        if (screen.keyPressed(input.input(), input.scancode(), input.modifiers())) {
             return true;
         }
 
@@ -184,28 +259,39 @@ public class SaturnScreenFabric extends Screen implements ScreenProvider {
     }
     *///?}
 
-    // TODO: resize isn't hooked on 1.21.11 yet.
-    //? if <1.21.11 {
+    //? 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) {
+    public void resize(Minecraft client, int width, int height) {
         screen.resize(width, height);
         super.resize(client, width, height);
     }
     *///?}
 
     @Override
-    public void close() {
+    public void onClose() {
         this.screen.onClose();
-        super.close();
+        super.onClose();
+    }
+
+    // ScreenProvider's close, separate from the vanilla onClose above.
+    @Override
+    public void close() {
+        onClose();
     }
 
     @Override
     public int getWidth() {
-        return width * 2;
+        return width;
     }
 
     @Override
     public int getHeight() {
-        return height * 2;
+        return height;
     }
 }

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

@@ -0,0 +1,33 @@
+package org.saturnclient.impl.ui;
+
+import org.jetbrains.annotations.Nullable;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.screens.Screen;
+
+/** The open screen and overlay, which Minecraft holds before 26.2 and its Gui from 26.2. */
+public final class Screens {
+    private Screens() {
+    }
+
+    public static @Nullable Screen current() {
+        //? if >=26.2 {
+        /*return Minecraft.getInstance().gui.screen();
+        *///?} else
+        return Minecraft.getInstance().screen;
+    }
+
+    public static void set(@Nullable Screen screen) {
+        //? if >=26.2 {
+        /*Minecraft.getInstance().gui.setScreen(screen);
+        *///?} else
+        Minecraft.getInstance().setScreen(screen);
+    }
+
+    public static void clearOverlay() {
+        //? if >=26.2 {
+        /*Minecraft.getInstance().gui.setOverlay(null);
+        *///?} else
+        Minecraft.getInstance().setOverlay(null);
+    }
+}

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

@@ -3,7 +3,7 @@ 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 net.minecraft.client.Minecraft;
 
 import org.saturnclient.client.ServiceClient;
 import org.saturnclient.cosmetics.Emotes;
@@ -29,12 +29,12 @@ 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;
+    public static Minecraft client;
 
     @Override
     public void onInitialize() {
         LOGGER.info("Initializing " + MOD_ID);
-        client = MinecraftClient.getInstance();
+        client = Minecraft.getInstance();
 
         Providers.saturn = new SaturnProviderImpl();
         Providers.refConstructor = new RefConstructorImpl();

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

@@ -1,21 +1,25 @@
 package org.saturnclient.saturnclient.event;
 
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
+//? if >=26.1 {
+/*import net.fabricmc.fabric.api.client.keymapping.v1.KeyMappingHelper;
+*///?} else
 import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
-import net.minecraft.client.option.KeyBinding;
-import net.minecraft.client.util.InputUtil;
+import net.minecraft.client.KeyMapping;
+import com.mojang.blaze3d.platform.InputConstants;
 //? if >=1.21.9
-import net.minecraft.util.Identifier;
+import net.minecraft.resources.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.impl.ui.SaturnScreenFabric;
+import org.saturnclient.impl.ui.Screens;
 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.
@@ -23,46 +27,62 @@ import org.lwjgl.glfw.GLFW;
  */
 public class KeyInputHandler {
     //? if >=1.21.9 {
-    private static final Identifier KEY_CATEGORY = Identifier.of("saturnclient", "key.category.saturnclient");
+    private static final Identifier KEY_CATEGORY = Identifier.fromNamespaceAndPath("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;
+    private static final int DEFAULT_MENU_KEY = InputConstants.KEY_RSHIFT;
+    private static KeyMapping mainMenuKeyBinding;
 
     public static void register() {
-        //? if >=1.21.9 {
-        mainMenuKeyBinding = KeyBindingHelper.registerKeyBinding(
-                new KeyBinding(
+        //? if >=26.1 {
+        /*mainMenuKeyBinding = KeyMappingHelper.registerKeyMapping(
+                new KeyMapping(
                         MAIN_MENU_KEY_ID,
                         DEFAULT_MENU_KEY,
-                        KeyBinding.Category.create(KEY_CATEGORY)));
-        //?} else {
-        /*mainMenuKeyBinding = KeyBindingHelper.registerKeyBinding(new KeyBinding(
+                        KeyMapping.Category.register(KEY_CATEGORY)));
+        *///?} else if >=1.21.9 {
+        mainMenuKeyBinding = KeyBindingHelper.registerKeyBinding(
+                new KeyMapping(
                         MAIN_MENU_KEY_ID,
-                InputUtil.Type.KEYSYM,
+                        DEFAULT_MENU_KEY,
+                        KeyMapping.Category.register(KEY_CATEGORY)));
+        //?} else {
+        /*mainMenuKeyBinding = KeyBindingHelper.registerKeyBinding(new KeyMapping(
+                MAIN_MENU_KEY_ID,
+                InputConstants.Type.KEYSYM,
                 DEFAULT_MENU_KEY,
                 KEY_CATEGORY));
         *///?}
 
         // Register the event handler for the main menu key
         ClientTickEvents.END_CLIENT_TICK.register(client -> {
-            if (mainMenuKeyBinding.wasPressed()) {
+            if (mainMenuKeyBinding.consumeClick()) {
                 Providers.saturn.getClient().setScreen(new ShiftMenu());
             }
 
-            if (Config.openEmoteWheel.wasKeyPressed() && client.currentScreen == null
-                    //? if >=1.21.9 {
-                    && !InputUtil.isKeyPressed(client.getWindow(), GLFW.GLFW_KEY_F3)) {
+            // 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 >=26.3 {
+                    /*&& !InputConstants.isKeyDown(InputConstants.KEY_F3)) {
+                    *///?} else if >=1.21.9 {
+                    && !InputConstants.isKeyDown(client.getWindow(), InputConstants.KEY_F3)) {
                     //?} else
-                    //&& !InputUtil.isKeyPressed(client.getWindow().getHandle(), GLFW.GLFW_KEY_F3)) {
+                    //&& !InputConstants.isKeyDown(client.getWindow().getWindow(), InputConstants.KEY_F3)) {
+                if (Screens.current() == null) {
                     Providers.saturn.getClient().setScreen(new EmoteWheel());
+                } else if (Screens.current() instanceof SaturnScreenFabric saturnScreen
+                        && saturnScreen.screen instanceof EmoteWheel) {
+                    saturnScreen.onClose();
+                }
             }
 
             // 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());
+            if (SaturnClient.client.player != null && SaturnClient.client.player.isShiftKeyDown()
+                    && Emotes.playing(SaturnClient.client.player.getUUID()).isPresent()) {
+                Emotes.stop(SaturnClient.client.player.getUUID());
                 ServiceClient.emote("");
             }
         });

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

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

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

@@ -0,0 +1,46 @@
+package org.saturnclient.saturnclient.mixin;
+
+//? if >=26.1 {
+/*import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+import net.minecraft.client.gui.render.GuiRenderer;
+import net.minecraft.client.renderer.CubeMap;
+import org.saturnclient.impl.ui.GlassRenderer;
+import org.saturnclient.impl.ui.SaturnScreenFabric;
+import org.saturnclient.impl.ui.Screens;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+*///?} else
+import net.minecraft.client.Minecraft;
+import org.spongepowered.asm.mixin.Mixin;
+
+/**
+ * From 26.1 GuiRenderer draws the menu panorama from its own cube map, which is vanilla's. While a
+ * Saturn screen is open, this draws Saturn's panorama instead. It also blurs the glass backdrops
+ * once the panorama is drawn. Before 26.1 SaturnScreenFabric draws
+ * the panorama itself, so this mixin is empty there, and it targets Minecraft because GuiRenderer
+ * doesn't exist before 1.21.6. It stays registered, keeping saturnclient.mixins.json the same for
+ * every version.
+ */
+//? if >=26.1 {
+/*@Mixin(GuiRenderer.class)
+public class GuiRendererMixin {
+    @WrapOperation(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/CubeMap;render(FF)V"))
+    private void saturn$drawSaturnPanorama(CubeMap cubeMap, float xRot, float yRot, Operation<Void> original) {
+        boolean saturnScreen = Screens.current() instanceof SaturnScreenFabric;
+        original.call(saturnScreen ? SaturnScreenFabric.PANORAMA_RENDERER : cubeMap, xRot, yRot);
+    }
+
+    // The glass backdrops are copied here, with the frame's world and panorama drawn and the GUI not
+    // yet: the GUI is built before the frame is drawn (see GlassRenderer).
+    @Inject(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/render/GuiRenderer;prepare()V"))
+    private void saturn$blurGlassBackdrops(CallbackInfo ci) {
+        GlassRenderer.blurPendingBackdrops();
+    }
+}
+*///?} else {
+@Mixin(Minecraft.class)
+public class GuiRendererMixin {
+}
+//?}

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

@@ -1,20 +1,23 @@
 package org.saturnclient.saturnclient.mixin;
 
 //? if >=1.21.9 {
-import net.minecraft.client.network.ClientPlayerLikeEntity;
-import net.minecraft.entity.PlayerLikeEntity;
+import net.minecraft.client.entity.ClientAvatarEntity;
+import net.minecraft.world.entity.Avatar;
 //?} 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.Entity;
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.text.MutableText;
-import net.minecraft.text.Text;
-import net.minecraft.util.Formatting;
+//import net.minecraft.client.player.AbstractClientPlayer;
+import net.minecraft.client.renderer.entity.EntityRendererProvider;
+import net.minecraft.client.renderer.entity.LivingEntityRenderer;
+import net.minecraft.client.renderer.entity.player.AvatarRenderer;
+//? if >=1.21.11 {
+import net.minecraft.client.model.player.PlayerModel;
+//?} else
+//import net.minecraft.client.model.PlayerModel;
+import net.minecraft.client.renderer.entity.state.AvatarRenderState;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.network.chat.MutableComponent;
+import net.minecraft.network.chat.Component;
+import net.minecraft.ChatFormatting;
 
 import org.saturnclient.client.player.Roles;
 import org.saturnclient.client.player.SaturnPlayer;
@@ -26,56 +29,54 @@ 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)
+@Mixin(AvatarRenderer.class)
 public abstract class PlayerEntityRendererMixin
-        extends LivingEntityRenderer<PlayerEntity, PlayerEntityRenderState, PlayerEntityModel> {
+        extends LivingEntityRenderer<Player, AvatarRenderState, PlayerModel> {
 
     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()));
+    private void addCustomFeatureRenderer(EntityRendererProvider.Context ctx, boolean slim, CallbackInfo ci) {
+        this.addLayer(new HatFeatureRenderer(this));
+        this.addLayer(new CloakFeatureRenderer(this, ctx.getEquipmentAssets()));
     }
 
-    // Stores the SaturnPlayer in the render state and adds the role icon to the name. Render state
-    // data only exists from 1.21.8.
-    // TODO: 1.21.6 and 1.21.7 don't show the role icon in player names.
+    // 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) {
+    @Inject(method = "extractRenderState", at = @At("TAIL"))
+    public <A extends Avatar & ClientAvatarEntity> void updateRenderState(
+            A entity, AvatarRenderState state, float f, CallbackInfo ci) {
         saturn$applyPlayer(entity, state);
     }
-    //?} else if >=1.21.8 {
-    /*@Inject(method = "updateRenderState", at = @At("TAIL"))
+    //?} else {
+    /*@Inject(method = "extractRenderState", at = @At("TAIL"))
     public void updateRenderState(
-            AbstractClientPlayerEntity entity, PlayerEntityRenderState state, float f, CallbackInfo ci) {
+            AbstractClientPlayer entity, AvatarRenderState state, float f, CallbackInfo ci) {
         saturn$applyPlayer(entity, state);
     }
     *///?}
 
-    //? if >=1.21.8 {
-    private void saturn$applyPlayer(Entity entity, PlayerEntityRenderState state) {
+    private void saturn$applyPlayer(Entity entity, AvatarRenderState state) {
         if (entity == null) {
             return;
         }
 
-        SaturnPlayer player = SaturnPlayer.get(entity.getUuid());
+        SaturnPlayer player = SaturnPlayer.get(entity.getUUID());
 
+        //? if >=1.21.8
         state.setData(SaturnRenderState.saturnDataKey, player);
 
-        if (player != null && state.displayName != null) {
-            MutableText iconText = Text.literal(Roles.getSaturnIndicator())
-                    .styled(style -> style.withColor(Roles.getIconColor(player.uuid)));
+        if (player != null && state.nameTag != null) {
+            MutableComponent iconText = Component.literal(Roles.getSaturnIndicator())
+                    .withStyle(style -> style.withColor(Roles.getIconColor(player.uuid)));
 
-            state.displayName = Text.empty()
+            state.nameTag = Component.empty()
                     .append(iconText.copy())
-                    .append(Text.empty().formatted(Formatting.RESET))
-                    .append(state.displayName.copy());
+                    .append(Component.empty().withStyle(ChatFormatting.RESET))
+                    .append(state.nameTag.copy());
         }
     }
-    //?}
 }

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

@@ -7,18 +7,24 @@ 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;
+import net.minecraft.client.Minecraft;
+//? if >=26.2
+//import net.minecraft.client.gui.Gui;
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.client.gui.screens.TitleScreen;
 
-@Mixin(MinecraftClient.class)
+// Screens are opened through Gui from 26.2 (through Minecraft before).
+//? if >=26.2 {
+/*@Mixin(Gui.class)
+*///?} else
+@Mixin(Minecraft.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)
+            if (screen == null && Minecraft.getInstance().level == null)
                 return new SaturnScreenFabric(new TitleMenu());
         }
 

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

@@ -1,5 +1,7 @@
 package org.saturnclient.saturnclient.mixin;
 
+import org.saturnclient.impl.ui.Screens;
+
 import java.util.Optional;
 import java.util.function.Consumer;
 
@@ -12,67 +14,73 @@ 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.client.Minecraft;
+import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.screens.LoadingOverlay;
 //? if >=1.21.11
-import net.minecraft.client.util.Window;
-import net.minecraft.resource.ResourceReload;
+import com.mojang.blaze3d.platform.Window;
+import net.minecraft.server.packs.resources.ReloadInstance;
+//? if >=1.21.11 {
 import net.minecraft.util.Util;
-import net.minecraft.util.math.MathHelper;
+//?} else
+//import net.minecraft.Util;
+import net.minecraft.util.Mth;
 
-@Mixin(SplashOverlay.class)
+@Mixin(LoadingOverlay.class)
 public abstract class SplashOverlayMixin {
 
     @Shadow
-    private MinecraftClient client;
+    private Minecraft minecraft;
     @Shadow
-    private ResourceReload reload;
+    private ReloadInstance reload;
 
     @Shadow
-    private long reloadCompleteTime;
+    private long fadeOutStart;
 
     @Shadow
-    private long reloadStartTime;
+    private long fadeInStart;
 
     @Shadow
     @Final
-    private boolean reloading;
+    private boolean fadeIn;
 
     @Shadow
     @Final
-    private Consumer<Optional<Throwable>> exceptionHandler;
+    private Consumer<Optional<Throwable>> onFinish;
 
     @Shadow
-    private float progress;
+    private float currentProgress;
 
     /**
      * @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();
+    //? if >=26.1 {
+    /*public void extractRenderState(GuiGraphics context, int mouseX, int mouseY, float delta) {
+    *///?} else
+    public void render(GuiGraphics context, int mouseX, int mouseY, float delta) {
+        int screenWidth = context.guiWidth();
+        int screenHeight = context.guiHeight();
+        long currentTime = Util.getMillis();
 
         // Initialize reload start time if not set
-        if (reloadStartTime == -1L) {
-            reloadStartTime = currentTime;
+        if (fadeInStart == -1L) {
+            fadeInStart = currentTime;
         }
 
         // Compute fade-out progress after reload completes
-        float fadeOutProgress = reloadCompleteTime > -1L
-                ? (float) (currentTime - reloadCompleteTime) / 1000f
+        float fadeOutProgress = fadeOutStart > -1L
+                ? (float) (currentTime - fadeOutStart) / 1000f
                 : -1f;
 
         int alpha = fadeOutProgress >= 0f
-                ? MathHelper.ceil((1.0f - MathHelper.clamp(fadeOutProgress - 1f, 0f, 1f)) * 255f)
+                ? Mth.ceil((1.0f - Mth.clamp(fadeOutProgress - 1f, 0f, 1f)) * 255f)
                 : 255;
 
         // Compute fade-in progress while reloading
-        float reloadProgress = reloadStartTime > -1L
-                ? (float) (currentTime - reloadStartTime) / 500f
+        float reloadProgress = fadeInStart > -1L
+                ? (float) (currentTime - fadeInStart) / 500f
                 : -1f;
 
         // Get render scope for better UI
@@ -84,7 +92,7 @@ public abstract class SplashOverlayMixin {
             int overlayAlpha = computeOverlayAlpha(fadeOutProgress - 1f);
             scope.drawTexture(Textures.SPLASH, 0, 0, 0, 0, screenWidth, screenHeight,
                     Theme.withAlpha(overlayAlpha, 0xFFFFFFFF));
-        } else if (reloading) {
+        } else if (fadeIn) {
             if (reloadProgress < 1.0F) {
                 renderCurrentScreen(context, mouseX, mouseY, delta);
             }
@@ -95,8 +103,8 @@ public abstract class SplashOverlayMixin {
                     Theme.withAlpha(alpha, 0xFFFFFFFF));
         }
 
-        float u = this.reload.getProgress();
-        this.progress = MathHelper.clamp(this.progress * 0.95F + u * 0.050000012F, 0.0F, 1.0F);
+        float u = this.reload.getActualProgress();
+        this.currentProgress = Mth.clamp(this.currentProgress * 0.95F + u * 0.050000012F, 0.0F, 1.0F);
 
         // Draw central logo
         drawLogo(scope, screenWidth, screenHeight, alpha);
@@ -104,16 +112,19 @@ public abstract class SplashOverlayMixin {
 
         // Remove overlay after fade-out completes
         if (fadeOutProgress >= 2.0F) {
-            client.setOverlay(null);
+            Screens.clearOverlay();
         }
 
         // 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);
+    private void renderCurrentScreen(GuiGraphics context, int mouseX, int mouseY, float delta) {
+        if (Screens.current() != null) {
+            //? if >=26.1 {
+            /*Screens.current().extractRenderState(context, mouseX, mouseY, delta);
+            *///?} else
+            Screens.current().render(context, mouseX, mouseY, delta);
         }
     }
 
@@ -123,14 +134,19 @@ public abstract class SplashOverlayMixin {
                 Theme.withAlpha(alpha, 0xFFFFFFFF));
     }
 
-    private void renderProgressBar(RenderScope scope, DrawContext context, int screenWidth, int screenHeight,
+    private void renderProgressBar(RenderScope scope, GuiGraphics context, int screenWidth, int screenHeight,
             int alpha) {
         int progressY = ((screenHeight - 5) / 2) + 25;
-        // TODO: the loading bar's border isn't drawn on 1.21.9+ yet.
-        //? if <1.21.9
-        //context.drawBorder((screenWidth - 120) / 2, progressY, 120, 5, Theme.withAlpha(alpha, 0xFFFFFFFF));
+        //? if >=26.1 {
+        /*context.outline((screenWidth - 120) / 2, progressY, 120, 5, Theme.withAlpha(alpha, 0xFFFFFFFF));
+        *///?} else if >=1.21.11 {
+        context.renderOutline((screenWidth - 120) / 2, progressY, 120, 5, Theme.withAlpha(alpha, 0xFFFFFFFF));
+        //?} else if >=1.21.9 {
+        /*context.submitOutline((screenWidth - 120) / 2, progressY, 120, 5, Theme.withAlpha(alpha, 0xFFFFFFFF));
+        *///?} else
+        //context.renderOutline((screenWidth - 120) / 2, progressY, 120, 5, Theme.withAlpha(alpha, 0xFFFFFFFF));
 
-        int progressWidth = Math.min((int) (progress * 120), 120);
+        int progressWidth = Math.min((int) (currentProgress * 120), 120);
         int progressX = (screenWidth - 120) / 2;
 
         context.fill(progressX, progressY, progressX + progressWidth, progressY + 5,
@@ -139,31 +155,31 @@ public abstract class SplashOverlayMixin {
 
     /** 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);
+        return Mth.ceil((1.0F - Mth.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
+    private void handleReloadCompletion(GuiGraphics context) {
+        float reloadProgress = fadeInStart > -1L ? (float) (Util.getMillis() - fadeInStart) / 500f
                 : -1f;
 
-        if (reloadCompleteTime == -1L && reload.isComplete() && (!reloading || reloadProgress >= 2.0F)) {
+        if (fadeOutStart == -1L && reload.isDone() && (!fadeIn || reloadProgress >= 2.0F)) {
             try {
-                reload.throwException();
-                exceptionHandler.accept(Optional.empty());
+                reload.checkExceptions();
+                onFinish.accept(Optional.empty());
             } catch (Throwable ex) {
-                exceptionHandler.accept(Optional.of(ex));
+                onFinish.accept(Optional.of(ex));
             }
 
-            reloadCompleteTime = Util.getMeasuringTimeMs();
+            fadeOutStart = Util.getMillis();
 
             //? if >=1.21.11
-            Window window = client.getWindow();
-            if (client.currentScreen != null) {
+            Window window = minecraft.getWindow();
+            if (Screens.current() != null) {
                 //? if >=1.21.11 {
-                client.currentScreen.init(window.getScaledWidth(), window.getScaledHeight());
+                Screens.current().init(window.getGuiScaledWidth(), window.getGuiScaledHeight());
                 //?} else
-                //client.currentScreen.init(client, context.getScaledWindowWidth(), context.getScaledWindowHeight());
+                //Screens.current().init(minecraft, context.guiWidth(), context.guiHeight());
             }
         }
     }

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

@@ -1,8 +1,8 @@
 package org.saturnclient.saturnclient.mixin;
 
-import net.minecraft.client.network.PlayerListEntry;
-import net.minecraft.scoreboard.Team;
-import net.minecraft.text.Text;
+import net.minecraft.client.multiplayer.PlayerInfo;
+import net.minecraft.world.scores.PlayerTeam;
+import net.minecraft.network.chat.Component;
 
 import java.util.UUID;
 
@@ -15,7 +15,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 import com.mojang.authlib.GameProfile;
 
-@Mixin(PlayerListEntry.class)
+@Mixin(PlayerInfo.class)
 public abstract class TabListMixin {
 
     /**
@@ -23,9 +23,9 @@ public abstract class TabListMixin {
      * 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;
+    @Inject(method = "getTabListDisplayName", at = @At("RETURN"), cancellable = true)
+    private void saturn$addSaturnIcon(CallbackInfoReturnable<Component> cir) {
+        PlayerInfo entry = (PlayerInfo) (Object) this;
         GameProfile profile = entry.getProfile();
         //? if >=1.21.9 {
         String name = profile.name();
@@ -39,16 +39,16 @@ public abstract class TabListMixin {
             return;
         }
 
-        Text displayName = cir.getReturnValue();
+        Component 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));
+            displayName = PlayerTeam.formatNameForTeam(entry.getTeam(), Component.literal(name));
         }
 
-        cir.setReturnValue(Text.empty()
-                .append(Text.literal(Roles.getSaturnIndicator())
-                        .styled(style -> style.withColor(Roles.getIconColor(uuid))))
+        cir.setReturnValue(Component.empty()
+                .append(Component.literal(Roles.getSaturnIndicator())
+                        .withStyle(style -> style.withColor(Roles.getIconColor(uuid))))
                 .append(displayName));
     }
 }

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

@@ -12,14 +12,14 @@
 package org.saturnclient.saturnclient.mixin;
 
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
-import net.minecraft.client.render.entity.LivingEntityRenderer;
-import net.minecraft.entity.Entity;
+import net.minecraft.client.renderer.entity.LivingEntityRenderer;
+import net.minecraft.world.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;"))
+    @ModifyExpressionValue(method = "shouldShowName(Lnet/minecraft/world/entity/LivingEntity;D)Z", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/Minecraft;getCameraEntity()Lnet/minecraft/world/entity/Entity;"))
     public Entity obfuscateCameraEntity(Entity original) {
         // hasLabel checks if the rendered entity is equal to the camera entity (aka our
         // player),

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

@@ -0,0 +1,55 @@
+#version 330
+// 26.3 compiles shaders through SPIR-V, which needs every input and output's location.
+#ifdef EXPLICIT_LOCATIONS
+#extension GL_ARB_separate_shader_objects : require
+#endif
+
+// 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), and 26.3 moved TextureMat up
+// (TEXTURE_MAT_SECOND). 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;
+#ifdef TEXTURE_MAT_SECOND
+    mat4 TextureMat;
+#endif
+    vec4 ColorModulator;
+    vec3 ModelOffset;
+#ifndef TEXTURE_MAT_SECOND
+    mat4 TextureMat;
+#endif
+#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;
+
+#ifdef EXPLICIT_LOCATIONS
+layout(location = 0) in vec2 texCoord0;
+layout(location = 1) in vec4 vertexColor;
+
+layout(location = 0) out vec4 fragColor;
+#else
+in vec2 texCoord0;
+in vec4 vertexColor;
+
+out vec4 fragColor;
+#endif
+
+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/fabric.mod.json

@@ -22,7 +22,7 @@
   ],
   "depends": {
     "fabricloader": ">=${loader_version}",
-    "fabric": "*",
+    "fabric-api": "*",
     "minecraft": "${minecraft_version}"
   }
 }

src/main/resources/features.mixins.json

@@ -2,14 +2,13 @@
   "required": true,
   "minVersion": "0.8",
   "package": "org.saturnclient.impl.features.mixins",
-  "compatibilityLevel": "JAVA_21",
+  "compatibilityLevel": "${java}",
   "client": [
     "render.GameRendererMixin",
     "render.LightmapTextureManagerMixin",
     "render.LivingEntityRendererMixin",
     "render.LivingEntityRenderStateMixin",
     "render.BackgroundRendererMixin",
-    "misc.NametagsMixin",
     "render.RenderMixin",
     "world.TpsMixin",
     "entity.CameraMixin",

src/main/resources/impl.mixins.json

@@ -2,7 +2,7 @@
   "required": true,
   "minVersion": "0.8",
   "package": "org.saturnclient.impl.mixins",
-  "compatibilityLevel": "JAVA_21",
+  "compatibilityLevel": "${java}",
   "client": [
     "IdentifierMixin",
     "ItemStackMixin",

src/main/resources/saturnclient.mixins.json

@@ -2,14 +2,15 @@
   "required": true,
   "minVersion": "0.8",
   "package": "org.saturnclient.saturnclient.mixin",
-  "compatibilityLevel": "JAVA_21",
+  "compatibilityLevel": "${java}",
   "client": [
     "TabListMixin",
     "PlayerEntityRendererMixin",
     "WhoAmI",
     "DrawContextAccessor",
     "SplashOverlayMixin",
-    "SetScreenMixin"
+    "SetScreenMixin",
+    "GuiRendererMixin"
   ],
   "injectors": {
     "defaultRequire": 1

stonecutter.gradle.kts

@@ -6,6 +6,31 @@ plugins {
 // "Reset active project" before committing.
 stonecutter active "1.21.11"
 
+// src/ uses 1.21.11's Mojang names (the active version). These names changed in the versions given,
+// so Stonecutter swaps in each version's name when it processes it.
+stonecutter parameters {
+    for ((since, old, new) in listOf(
+        Triple("1.21.11", "ResourceLocation", "Identifier"),
+        Triple("1.21.9", "PlayerRenderer", "AvatarRenderer"),
+        Triple("1.21.9", "PlayerRenderState", "AvatarRenderState"),
+        Triple("26.1", "GuiGraphics", "GuiGraphicsExtractor"),
+        Triple("26.1", "net.minecraft.client.gui.render.state", "net.minecraft.client.renderer.state.gui"),
+        // GuiRenderState's methods
+        Triple("26.1", "submitGuiElement", "addGuiElement"),
+        Triple("26.1", "submitText", "addText"),
+        Triple("26.1", "submitItem", "addItem"),
+        Triple("26.1", "submitPicturesInPictureState", "addPicturesInPictureState"),
+        // 26.3 moves Blaze3D's API to renderpearl
+        Triple("26.3", "com.mojang.blaze3d.GpuFormat", "com.mojang.renderpearl.api.GpuFormat"),
+        Triple("26.3", "com.mojang.blaze3d.pipeline.RenderPipeline", "com.mojang.renderpearl.api.pipeline.RenderPipeline"),
+        Triple("26.3", "com.mojang.blaze3d.textures", "com.mojang.renderpearl.api.textures"),
+    )) {
+        replacements.regex(eval(current.version, ">=$since")) {
+            replace("\\b${Regex.escape(old)}\\b", new, "\\b${Regex.escape(new)}\\b", old)
+        }
+    }
+}
+
 subprojects {
     apply(plugin = "java")
 
@@ -55,17 +80,22 @@ subprojects {
 
 tasks.register("buildAll") {
     group = "build"
-    description = "Builds every Minecraft version's remapped jar and collects them in build/allJars"
+    description = "Builds every Minecraft version's mod jar and collects them in build/allJars"
 
-    val remapJars = subprojects.flatMap { it.tasks.matching { task -> task.name == "remapJar" } }
-    dependsOn(remapJars)
+    // The mod jar is remapJar's output for 1.21.x, and jar's for 26.1+, which isn't obfuscated.
+    val modJars = subprojects.filter { it.name != "common" }.flatMap { project ->
+        val unobfuscated = project.name.substringBefore('.').toInt() >= 26
+        val task = if (unobfuscated) "jar" else "remapJar"
+        project.tasks.matching { it.name == task }
+    }
+    dependsOn(modJars)
 
     doLast {
         val outputDir = layout.buildDirectory.dir("allJars").get().asFile
         outputDir.mkdirs()
-        remapJars.map { (it as AbstractArchiveTask).archiveFile.get().asFile }
+        modJars.map { (it as AbstractArchiveTask).archiveFile.get().asFile }
             .filter { it.exists() && !it.name.contains("sources") }
             .forEach { it.copyTo(outputDir.resolve(it.name), overwrite = true) }
-        println("All remapped jars collected in: $outputDir")
+        println("All mod jars collected in: $outputDir")
     }
 }

versions/1.21.10/gradle.properties

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

versions/1.21.11/gradle.properties

@@ -8,8 +8,7 @@ org.gradle.configuration-cache=false
 # Fabric Properties
 # 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/gradle.properties

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

versions/1.21.5/gradle.properties

@@ -8,8 +8,7 @@ org.gradle.configuration-cache=false
 # Fabric Properties
 # check these on https://fabricmc.net/develop
 minecraft_version=1.21.5
-yarn_mappings=1.21.5+build.1
-loader_version=0.18.4
+loader_version=0.19.5
 
 fabric_api_version=0.128.2+1.21.5
 

versions/1.21.6/gradle.properties

@@ -8,8 +8,7 @@ org.gradle.configuration-cache=false
 # Fabric Properties
 # check these on https://fabricmc.net/develop
 minecraft_version=1.21.6
-yarn_mappings=1.21.6+build.1
-loader_version=0.18.5
+loader_version=0.19.5
 
 fabric_api_version=0.128.2+1.21.6
 

versions/1.21.7/gradle.properties

@@ -8,8 +8,7 @@ org.gradle.configuration-cache=false
 # Fabric Properties
 # check these on https://fabricmc.net/develop
 minecraft_version=1.21.7
-yarn_mappings=1.21.7+build.8
-loader_version=0.19.0
+loader_version=0.19.5
 
 fabric_api_version=0.129.0+1.21.7
 

versions/1.21.8/gradle.properties

@@ -8,8 +8,7 @@ org.gradle.configuration-cache=false
 # Fabric Properties
 # check these on https://fabricmc.net/develop
 minecraft_version=1.21.8
-yarn_mappings=1.21.8+build.1
-loader_version=0.19.0
+loader_version=0.19.5
 
 fabric_api_version=0.136.1+1.21.8
 

versions/1.21.9/gradle.properties

@@ -8,8 +8,7 @@ org.gradle.configuration-cache=false
 # Fabric Properties
 # check these on https://fabricmc.net/develop
 minecraft_version=1.21.9
-yarn_mappings=1.21.9+build.1
-loader_version=0.19.0
+loader_version=0.19.5
 
 fabric_api_version=0.134.1+1.21.9
 

versions/26.1/gradle.properties

@@ -0,0 +1,19 @@
+# Done to increase the memory available to gradle.
+org.gradle.jvmargs=-Xmx1G
+org.gradle.parallel=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
+
+# Fabric Properties
+# check these on https://fabricmc.net/develop
+minecraft_version=26.1
+# Built against 26.1 and allowed on its hotfixes (26.1.1, 26.1.2).
+minecraft_compat=~26.1
+loader_version=0.19.5
+
+fabric_api_version=0.145.1+26.1
+
+# Mod Properties
+maven_group=org.saturnclient
+archives_base_name=saturn-client

versions/26.2/gradle.properties

@@ -0,0 +1,17 @@
+# Done to increase the memory available to gradle.
+org.gradle.jvmargs=-Xmx1G
+org.gradle.parallel=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
+
+# Fabric Properties
+# check these on https://fabricmc.net/develop
+minecraft_version=26.2
+loader_version=0.19.5
+
+fabric_api_version=0.161.0+26.2
+
+# Mod Properties
+maven_group=org.saturnclient
+archives_base_name=saturn-client

versions/26.3/gradle.properties

@@ -0,0 +1,17 @@
+# Done to increase the memory available to gradle.
+org.gradle.jvmargs=-Xmx1G
+org.gradle.parallel=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
+
+# Fabric Properties
+# check these on https://fabricmc.net/develop
+minecraft_version=26.3
+loader_version=0.19.5
+
+fabric_api_version=0.161.0+26.3
+
+# Mod Properties
+maven_group=org.saturnclient
+archives_base_name=saturn-client