Merge pull request 'Release workflow: upload through the public URL again; smaller jars' (#14 ) from release-public-url into master

Point common at the panorama downscale merge commit
Co-Authored-By: Claude Opus 5.5 <[email protected]>
2026-09-25 16:36:40 +00:00 · 2026-09-25 18:36:24 +02:00 · 2026-09-25 18:31:14 +02:00 · 2026-09-25 15:35:17 +00:00 · 2026-09-25 17:32:52 +02:00 · 2026-09-25 14:39:58 +00:00
28 changed files with 492 additions and 171 deletions
@@ -0,0 +1,97 @@
+name: Release
+
+# Publishing a release builds every Minecraft version and attaches the mod jars
+# to it. mod_version in gradle.properties is the source of truth: the release
+# tag must match it (a leading "v" is allowed), so bump mod_version in a PR
+# before tagging the release.
+#
+# To (re)attach jars to an existing release, run this workflow manually with
+# the release's tag.
+on:
+  release:
+    types: [published]
+  workflow_dispatch:
+    inputs:
+      tag:
+        description: Tag of the existing release to build and attach jars to
+        required: true
+
+permissions:
+  contents: write
+
+env:
+  TAG: ${{ github.event.release.tag_name || inputs.tag }}
+  # The public address. Uploads go through the Cloudflare tunnel, which caps
+  # request bodies at 100 MB, so each mod jar must stay under that.
+  GITEA_API: ${{ github.server_url }}/api/v1
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.TAG }}
+          submodules: true
+
+      - name: Check tag matches mod_version
+        run: |
+          MOD_VERSION="$(sed -n 's/^mod_version=//p' gradle.properties | tr -d '[:space:]')"
+          if [ "${TAG#v}" != "$MOD_VERSION" ]; then
+            echo "::error::Release tag '$TAG' doesn't match mod_version '$MOD_VERSION' in gradle.properties. Bump mod_version to '${TAG#v}' on the release branch, or tag the release '$MOD_VERSION'." >&2
+            exit 1
+          fi
+          echo "Building Saturn Client $MOD_VERSION"
+
+      - name: Set up Java 21
+        uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: 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
+
+      - name: Upload jars to the release
+        env:
+          TOKEN: ${{ secrets.GITEA_TOKEN }}
+          REPO: ${{ github.repository }}
+        run: |
+          shopt -s nullglob
+          jars=(build/allJars/*.jar)
+          if [ ${#jars[@]} -eq 0 ]; then
+            echo "No jars found in build/allJars" >&2
+            exit 1
+          fi
+
+          # Cloudflare in front of the server rejects uploads of 100 MB or more.
+          for jar in "${jars[@]}"; do
+            size=$(stat -c%s "$jar")
+            if [ "$size" -ge 100000000 ]; then
+              echo "::error::$(basename "$jar") is $((size / 1000000)) MB; uploads must be under 100 MB. Check what's taking space with: unzip -l \"$jar\" | sort -n" >&2
+              exit 1
+            fi
+          done
+
+          # Look the release up by tag so manual runs work too.
+          RELEASE_ID="$(curl --fail-with-body -sS -H "Authorization: token $TOKEN" \
+            "$GITEA_API/repos/$REPO/releases/tags/$TAG" \
+            | grep -o '"id":[0-9]*' | head -n1 | cut -d: -f2)"
+          if [ -z "$RELEASE_ID" ]; then
+            echo "No release found for tag $TAG" >&2
+            exit 1
+          fi
+
+          for jar in "${jars[@]}"; do
+            echo "Uploading $(basename "$jar") to release $TAG ($RELEASE_ID)"
+            curl --fail-with-body -sS -X POST \
+              -H "Authorization: token $TOKEN" \
+              -F "attachment=@$jar" \
+              "$GITEA_API/repos/$REPO/releases/$RELEASE_ID/assets"
+            echo
+          done
@@ -3,7 +3,7 @@ subprojects {

    repositories {
        maven { url "https://maven.fabricmc.net/" }
-        maven { url "https://jitpack.io" }
+        maven { url "https://git.selimaj.dev/api/packages/selimaj-dev/maven" }
        mavenCentral()
    }

@@ -4,4 +4,4 @@ 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

-mod_version=0.1.0-beta2
+mod_version=0.1.1-beta
@@ -12,7 +12,7 @@ base {

 repositories {
    // maven { name = "KoSmX Maven"; url = 'https://maven.kosmx.dev/' }
-	maven { name = "JitPack"; url = 'https://jitpack.io' }
+	maven { name = "Selimaj"; url = 'https://git.selimaj.dev/api/packages/selimaj-dev/maven' }
 }

 dependencies {
@@ -31,7 +31,7 @@ dependencies {

 	implementation project(":common")

-	include implementation("com.github.selimaj-dev:session-java:0.1.6")
+	include implementation("dev.selimaj:session-java:0.2.0")
    include implementation("de.javagl:obj:0.4.0")
    include implementation("com.formdev:svgSalamander:1.1.4")
    include implementation("com.fasterxml.jackson.core:jackson-databind:2.17.0")
@@ -3,6 +3,11 @@ package org.saturnclient.impl.provider;
 import java.awt.image.BufferedImage;
 import java.util.UUID;

+import net.fabricmc.loader.api.FabricLoader;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.toast.SystemToast;
+import net.minecraft.text.Text;
+
 import org.saturnclient.common.provider.SaturnProvider;
 import org.saturnclient.common.ref.asset.IdentifierRef;
 import org.saturnclient.common.ref.game.MinecraftClientRef;
@@ -59,6 +64,23 @@ public class SaturnProviderImpl implements SaturnProvider {
        SaturnClient.LOGGER.error(message, throwable);
    }

+    /** Shown longer than the vanilla default, since these ask the player to act. */
+    private static final SystemToast.Type WARNING_TOAST = new SystemToast.Type(15_000L);
+
+    @Override
+    public String getModVersion() {
+        return FabricLoader.getInstance().getModContainer(SaturnClient.MOD_ID)
+                .map(mod -> mod.getMetadata().getVersion().getFriendlyString())
+                .orElse("unknown");
+    }
+
+    @Override
+    public void showWarning(String title, String message) {
+        MinecraftClient client = MinecraftClient.getInstance();
+        client.execute(() -> client.getToastManager().add(
+                SystemToast.create(client, WARNING_TOAST, Text.literal(title), Text.literal(message))));
+    }
+
    @Override
    public void registerBufferedImageTexture(IdentifierRef i, BufferedImage bi) {
        IdentifierUtils.registerBufferedImageTextureFast(i, bi);
@@ -1,43 +1,49 @@
 package org.saturnclient.saturnclient.mixin;

 import net.minecraft.client.network.PlayerListEntry;
+import net.minecraft.scoreboard.Team;
 import net.minecraft.text.Text;
-import net.minecraft.util.Formatting;

 import java.util.UUID;

-import org.jetbrains.annotations.Nullable;
 import org.saturnclient.client.player.Roles;
 import org.saturnclient.client.player.SaturnPlayer;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Overwrite;
-import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;

 import com.mojang.authlib.GameProfile;

@Mixin(PlayerListEntry.class)
 public abstract class TabListMixin {

-    @Shadow
-    private GameProfile profile;
-
    /**
-     * @author HexLeo
-     * @reason Adds the Saturn Client icon to the player's name if they are online
-     *         with Saturn Client
+     * Adds the Saturn Client icon to the player's name if they are online with
+     * Saturn Client, keeping any name, rank prefix or team formatting the server
+     * set.
     */
-    @Overwrite
-    @Nullable
-    public Text getDisplayName() {
-        GameProfile profile = ((PlayerListEntry) (Object) this).getProfile();
+    @Inject(method = "getDisplayName", at = @At("RETURN"), cancellable = true)
+    private void saturn$addSaturnIcon(CallbackInfoReturnable<Text> cir) {
+        PlayerListEntry entry = (PlayerListEntry) (Object) this;
+        GameProfile profile = entry.getProfile();
        String name = profile.name();
        UUID uuid = profile.id();

-        if (SaturnPlayer.get(uuid) != null) {
-            return Text.literal(Roles.getSaturnIndicator())
-                    .styled(style -> style.withColor(Roles.getIconColor(uuid)))
-                    .append(Text.literal(name).styled(style -> style.withColor(Formatting.WHITE)));
+        if (SaturnPlayer.get(name, uuid) == null) {
+            return;
        }
-        return Text.literal(name);
+
+        Text displayName = cir.getReturnValue();
+
+        // With no server-set name, vanilla shows the team-decorated profile name.
+        if (displayName == null) {
+            displayName = Team.decorateName(entry.getScoreboardTeam(), Text.literal(name));
+        }
+
+        cir.setReturnValue(Text.empty()
+                .append(Text.literal(Roles.getSaturnIndicator())
+                        .styled(style -> style.withColor(Roles.getIconColor(uuid))))
+                .append(displayName));
    }
 }
@@ -12,7 +12,7 @@ base {

 repositories {
    // maven { name = "KoSmX Maven"; url = 'https://maven.kosmx.dev/' }
-	maven { name = "JitPack"; url = 'https://jitpack.io' }
+	maven { name = "Selimaj"; url = 'https://git.selimaj.dev/api/packages/selimaj-dev/maven' }
 }

 dependencies {
@@ -31,7 +31,7 @@ dependencies {

 	implementation project(":common")

-	include implementation("com.github.selimaj-dev:session-java:0.1.6")
+	include implementation("dev.selimaj:session-java:0.2.0")
    include implementation("de.javagl:obj:0.4.0")
    include implementation("com.formdev:svgSalamander:1.1.4")
    include implementation("com.fasterxml.jackson.core:jackson-databind:2.17.0")
@@ -3,6 +3,11 @@ package org.saturnclient.impl.provider;
 import java.awt.image.BufferedImage;
 import java.util.UUID;

+import net.fabricmc.loader.api.FabricLoader;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.toast.SystemToast;
+import net.minecraft.text.Text;
+
 import org.saturnclient.common.provider.SaturnProvider;
 import org.saturnclient.common.ref.asset.IdentifierRef;
 import org.saturnclient.common.ref.game.MinecraftClientRef;
@@ -59,6 +64,23 @@ public class SaturnProviderImpl implements SaturnProvider {
        SaturnClient.LOGGER.error(message, throwable);
    }

+    /** Shown longer than the vanilla default, since these ask the player to act. */
+    private static final SystemToast.Type WARNING_TOAST = new SystemToast.Type(15_000L);
+
+    @Override
+    public String getModVersion() {
+        return FabricLoader.getInstance().getModContainer(SaturnClient.MOD_ID)
+                .map(mod -> mod.getMetadata().getVersion().getFriendlyString())
+                .orElse("unknown");
+    }
+
+    @Override
+    public void showWarning(String title, String message) {
+        MinecraftClient client = MinecraftClient.getInstance();
+        client.execute(() -> client.getToastManager().add(
+                SystemToast.create(client, WARNING_TOAST, Text.literal(title), Text.literal(message))));
+    }
+
    @Override
    public void registerBufferedImageTexture(IdentifierRef i, BufferedImage bi) {
        IdentifierUtils.registerBufferedImageTextureFast(i, bi);
@@ -1,43 +1,49 @@
 package org.saturnclient.saturnclient.mixin;

 import net.minecraft.client.network.PlayerListEntry;
+import net.minecraft.scoreboard.Team;
 import net.minecraft.text.Text;
-import net.minecraft.util.Formatting;

 import java.util.UUID;

-import org.jetbrains.annotations.Nullable;
 import org.saturnclient.client.player.Roles;
 import org.saturnclient.client.player.SaturnPlayer;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Overwrite;
-import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;

 import com.mojang.authlib.GameProfile;

@Mixin(PlayerListEntry.class)
 public abstract class TabListMixin {

-    @Shadow
-    private GameProfile profile;
-
    /**
-     * @author HexLeo
-     * @reason Adds the Saturn Client icon to the player's name if they are online
-     *         with Saturn Client
+     * Adds the Saturn Client icon to the player's name if they are online with
+     * Saturn Client, keeping any name, rank prefix or team formatting the server
+     * set.
     */
-    @Overwrite
-    @Nullable
-    public Text getDisplayName() {
-        GameProfile profile = ((PlayerListEntry) (Object) this).getProfile();
+    @Inject(method = "getDisplayName", at = @At("RETURN"), cancellable = true)
+    private void saturn$addSaturnIcon(CallbackInfoReturnable<Text> cir) {
+        PlayerListEntry entry = (PlayerListEntry) (Object) this;
+        GameProfile profile = entry.getProfile();
        String name = profile.name();
        UUID uuid = profile.id();

-        if (SaturnPlayer.get(uuid) != null) {
-            return Text.literal(Roles.getSaturnIndicator())
-                    .styled(style -> style.withColor(Roles.getIconColor(uuid)))
-                    .append(Text.literal(name).styled(style -> style.withColor(Formatting.WHITE)));
+        if (SaturnPlayer.get(name, uuid) == null) {
+            return;
        }
-        return Text.literal(name);
+
+        Text displayName = cir.getReturnValue();
+
+        // With no server-set name, vanilla shows the team-decorated profile name.
+        if (displayName == null) {
+            displayName = Team.decorateName(entry.getScoreboardTeam(), Text.literal(name));
+        }
+
+        cir.setReturnValue(Text.empty()
+                .append(Text.literal(Roles.getSaturnIndicator())
+                        .styled(style -> style.withColor(Roles.getIconColor(uuid))))
+                .append(displayName));
    }
 }
@@ -12,7 +12,7 @@ base {

 repositories {
    maven { name = "KoSmX Maven"; url = 'https://maven.kosmx.dev/' }
-	maven { name = "JitPack"; url = 'https://jitpack.io' }
+	maven { name = "Selimaj"; url = 'https://git.selimaj.dev/api/packages/selimaj-dev/maven' }
 }

 dependencies {
@@ -31,7 +31,7 @@ dependencies {

 	implementation project(":common")

-	include implementation("com.github.selimaj-dev:session-java:0.1.6")
+	include implementation("dev.selimaj:session-java:0.2.0")
    include implementation("de.javagl:obj:0.4.0")
    include implementation("com.formdev:svgSalamander:1.1.4")
    include implementation("com.fasterxml.jackson.core:jackson-databind:2.17.0")
@@ -3,6 +3,11 @@ package org.saturnclient.impl.provider;
 import java.awt.image.BufferedImage;
 import java.util.UUID;

+import net.fabricmc.loader.api.FabricLoader;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.toast.SystemToast;
+import net.minecraft.text.Text;
+
 import org.saturnclient.common.provider.SaturnProvider;
 import org.saturnclient.common.ref.asset.IdentifierRef;
 import org.saturnclient.common.ref.game.MinecraftClientRef;
@@ -65,6 +70,23 @@ public class SaturnProviderImpl implements SaturnProvider {
        SaturnClient.LOGGER.error(message, throwable);
    }

+    /** Shown longer than the vanilla default, since these ask the player to act. */
+    private static final SystemToast.Type WARNING_TOAST = new SystemToast.Type(15_000L);
+
+    @Override
+    public String getModVersion() {
+        return FabricLoader.getInstance().getModContainer(SaturnClient.MOD_ID)
+                .map(mod -> mod.getMetadata().getVersion().getFriendlyString())
+                .orElse("unknown");
+    }
+
+    @Override
+    public void showWarning(String title, String message) {
+        MinecraftClient client = MinecraftClient.getInstance();
+        client.execute(() -> client.getToastManager().add(
+                SystemToast.create(client, WARNING_TOAST, Text.literal(title), Text.literal(message))));
+    }
+
    @Override
    public void registerBufferedImageTexture(IdentifierRef i, BufferedImage bi) {
        IdentifierUtils.registerBufferedImageTextureFast(i, bi);
@@ -1,43 +1,49 @@
 package org.saturnclient.saturnclient.mixin;

 import net.minecraft.client.network.PlayerListEntry;
+import net.minecraft.scoreboard.Team;
 import net.minecraft.text.Text;
-import net.minecraft.util.Formatting;

 import java.util.UUID;

-import org.jetbrains.annotations.Nullable;
 import org.saturnclient.client.player.Roles;
 import org.saturnclient.client.player.SaturnPlayer;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Overwrite;
-import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;

 import com.mojang.authlib.GameProfile;

@Mixin(PlayerListEntry.class)
 public abstract class TabListMixin {

-    @Shadow
-    private GameProfile profile;
-
    /**
-     * @author HexLeo
-     * @reason Adds the Saturn Client icon to the player's name if they are online
-     *         with Saturn Client
+     * Adds the Saturn Client icon to the player's name if they are online with
+     * Saturn Client, keeping any name, rank prefix or team formatting the server
+     * set.
     */
-    @Overwrite
-    @Nullable
-    public Text getDisplayName() {
-        GameProfile profile = ((PlayerListEntry) (Object) this).getProfile();
+    @Inject(method = "getDisplayName", at = @At("RETURN"), cancellable = true)
+    private void saturn$addSaturnIcon(CallbackInfoReturnable<Text> cir) {
+        PlayerListEntry entry = (PlayerListEntry) (Object) this;
+        GameProfile profile = entry.getProfile();
        String name = profile.getName();
        UUID uuid = profile.getId();

-        if (SaturnPlayer.get(name, uuid) != null) {
-            return Text.literal(Roles.getSaturnIndicator())
-                    .styled(style -> style.withColor(Roles.getIconColor(uuid)))
-                    .append(Text.literal(name).styled(style -> style.withColor(Formatting.WHITE)));
+        if (SaturnPlayer.get(name, uuid) == null) {
+            return;
        }
-        return Text.literal(name);
+
+        Text displayName = cir.getReturnValue();
+
+        // With no server-set name, vanilla shows the team-decorated profile name.
+        if (displayName == null) {
+            displayName = Team.decorateName(entry.getScoreboardTeam(), Text.literal(name));
+        }
+
+        cir.setReturnValue(Text.empty()
+                .append(Text.literal(Roles.getSaturnIndicator())
+                        .styled(style -> style.withColor(Roles.getIconColor(uuid))))
+                .append(displayName));
    }
 }
@@ -12,7 +12,7 @@ base {

 repositories {
    maven { name = "KoSmX Maven"; url = 'https://maven.kosmx.dev/' }
-	maven { name = "JitPack"; url = 'https://jitpack.io' }
+	maven { name = "Selimaj"; url = 'https://git.selimaj.dev/api/packages/selimaj-dev/maven' }
 }

 dependencies {
@@ -31,7 +31,7 @@ dependencies {

 	implementation project(":common")

-	include implementation("com.github.selimaj-dev:session-java:0.1.6")
+	include implementation("dev.selimaj:session-java:0.2.0")
    include implementation("de.javagl:obj:0.4.0")
    include implementation("com.formdev:svgSalamander:1.1.4")
    include implementation("com.fasterxml.jackson.core:jackson-databind:2.17.0")
@@ -3,6 +3,11 @@ package org.saturnclient.impl.provider;
 import java.awt.image.BufferedImage;
 import java.util.UUID;

+import net.fabricmc.loader.api.FabricLoader;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.toast.SystemToast;
+import net.minecraft.text.Text;
+
 import org.saturnclient.common.provider.SaturnProvider;
 import org.saturnclient.common.ref.asset.IdentifierRef;
 import org.saturnclient.common.ref.game.MinecraftClientRef;
@@ -65,6 +70,23 @@ public class SaturnProviderImpl implements SaturnProvider {
        SaturnClient.LOGGER.error(message, throwable);
    }

+    /** Shown longer than the vanilla default, since these ask the player to act. */
+    private static final SystemToast.Type WARNING_TOAST = new SystemToast.Type(15_000L);
+
+    @Override
+    public String getModVersion() {
+        return FabricLoader.getInstance().getModContainer(SaturnClient.MOD_ID)
+                .map(mod -> mod.getMetadata().getVersion().getFriendlyString())
+                .orElse("unknown");
+    }
+
+    @Override
+    public void showWarning(String title, String message) {
+        MinecraftClient client = MinecraftClient.getInstance();
+        client.execute(() -> client.getToastManager().add(
+                SystemToast.create(client, WARNING_TOAST, Text.literal(title), Text.literal(message))));
+    }
+
    @Override
    public void registerBufferedImageTexture(IdentifierRef i, BufferedImage bi) {
        IdentifierUtils.registerBufferedImageTextureFast(i, bi);
@@ -1,43 +1,49 @@
 package org.saturnclient.saturnclient.mixin;

 import net.minecraft.client.network.PlayerListEntry;
+import net.minecraft.scoreboard.Team;
 import net.minecraft.text.Text;
-import net.minecraft.util.Formatting;

 import java.util.UUID;

-import org.jetbrains.annotations.Nullable;
 import org.saturnclient.client.player.Roles;
 import org.saturnclient.client.player.SaturnPlayer;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Overwrite;
-import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;

 import com.mojang.authlib.GameProfile;

@Mixin(PlayerListEntry.class)
 public abstract class TabListMixin {

-    @Shadow
-    private GameProfile profile;
-
    /**
-     * @author HexLeo
-     * @reason Adds the Saturn Client icon to the player's name if they are online
-     *         with Saturn Client
+     * Adds the Saturn Client icon to the player's name if they are online with
+     * Saturn Client, keeping any name, rank prefix or team formatting the server
+     * set.
     */
-    @Overwrite
-    @Nullable
-    public Text getDisplayName() {
-        GameProfile profile = ((PlayerListEntry) (Object) this).getProfile();
+    @Inject(method = "getDisplayName", at = @At("RETURN"), cancellable = true)
+    private void saturn$addSaturnIcon(CallbackInfoReturnable<Text> cir) {
+        PlayerListEntry entry = (PlayerListEntry) (Object) this;
+        GameProfile profile = entry.getProfile();
        String name = profile.getName();
        UUID uuid = profile.getId();

-        if (SaturnPlayer.get(uuid) != null) {
-            return Text.literal(Roles.getSaturnIndicator())
-                    .styled(style -> style.withColor(Roles.getIconColor(uuid)))
-                    .append(Text.literal(name).styled(style -> style.withColor(Formatting.WHITE)));
+        if (SaturnPlayer.get(name, uuid) == null) {
+            return;
        }
-        return Text.literal(name);
+
+        Text displayName = cir.getReturnValue();
+
+        // With no server-set name, vanilla shows the team-decorated profile name.
+        if (displayName == null) {
+            displayName = Team.decorateName(entry.getScoreboardTeam(), Text.literal(name));
+        }
+
+        cir.setReturnValue(Text.empty()
+                .append(Text.literal(Roles.getSaturnIndicator())
+                        .styled(style -> style.withColor(Roles.getIconColor(uuid))))
+                .append(displayName));
    }
 }
@@ -12,7 +12,7 @@ base {

 repositories {
    // maven { name = "KoSmX Maven"; url = 'https://maven.kosmx.dev/' }
-	maven { name = "JitPack"; url = 'https://jitpack.io' }
+	maven { name = "Selimaj"; url = 'https://git.selimaj.dev/api/packages/selimaj-dev/maven' }
 }

 dependencies {
@@ -31,7 +31,7 @@ dependencies {

 	implementation project(":common")

-	include implementation("com.github.selimaj-dev:session-java:0.1.6")
+	include implementation("dev.selimaj:session-java:0.2.0")
    include implementation("de.javagl:obj:0.4.0")
    include implementation("com.formdev:svgSalamander:1.1.4")
    include implementation("com.fasterxml.jackson.core:jackson-databind:2.17.0")
@@ -3,6 +3,11 @@ package org.saturnclient.impl.provider;
 import java.awt.image.BufferedImage;
 import java.util.UUID;

+import net.fabricmc.loader.api.FabricLoader;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.toast.SystemToast;
+import net.minecraft.text.Text;
+
 import org.saturnclient.common.provider.SaturnProvider;
 import org.saturnclient.common.ref.asset.IdentifierRef;
 import org.saturnclient.common.ref.game.MinecraftClientRef;
@@ -59,6 +64,23 @@ public class SaturnProviderImpl implements SaturnProvider {
        SaturnClient.LOGGER.error(message, throwable);
    }

+    /** Shown longer than the vanilla default, since these ask the player to act. */
+    private static final SystemToast.Type WARNING_TOAST = new SystemToast.Type(15_000L);
+
+    @Override
+    public String getModVersion() {
+        return FabricLoader.getInstance().getModContainer(SaturnClient.MOD_ID)
+                .map(mod -> mod.getMetadata().getVersion().getFriendlyString())
+                .orElse("unknown");
+    }
+
+    @Override
+    public void showWarning(String title, String message) {
+        MinecraftClient client = MinecraftClient.getInstance();
+        client.execute(() -> client.getToastManager().add(
+                SystemToast.create(client, WARNING_TOAST, Text.literal(title), Text.literal(message))));
+    }
+
    @Override
    public void registerBufferedImageTexture(IdentifierRef i, BufferedImage bi) {
        IdentifierUtils.registerBufferedImageTextureFast(i, bi);
@@ -1,43 +1,49 @@
 package org.saturnclient.saturnclient.mixin;

 import net.minecraft.client.network.PlayerListEntry;
+import net.minecraft.scoreboard.Team;
 import net.minecraft.text.Text;
-import net.minecraft.util.Formatting;

 import java.util.UUID;

-import org.jetbrains.annotations.Nullable;
 import org.saturnclient.client.player.Roles;
 import org.saturnclient.client.player.SaturnPlayer;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Overwrite;
-import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;

 import com.mojang.authlib.GameProfile;

@Mixin(PlayerListEntry.class)
 public abstract class TabListMixin {

-    @Shadow
-    private GameProfile profile;
-
    /**
-     * @author HexLeo
-     * @reason Adds the Saturn Client icon to the player's name if they are online
-     *         with Saturn Client
+     * Adds the Saturn Client icon to the player's name if they are online with
+     * Saturn Client, keeping any name, rank prefix or team formatting the server
+     * set.
     */
-    @Overwrite
-    @Nullable
-    public Text getDisplayName() {
-        GameProfile profile = ((PlayerListEntry) (Object) this).getProfile();
+    @Inject(method = "getDisplayName", at = @At("RETURN"), cancellable = true)
+    private void saturn$addSaturnIcon(CallbackInfoReturnable<Text> cir) {
+        PlayerListEntry entry = (PlayerListEntry) (Object) this;
+        GameProfile profile = entry.getProfile();
        String name = profile.getName();
        UUID uuid = profile.getId();

-        if (SaturnPlayer.get(uuid) != null) {
-            return Text.literal(Roles.getSaturnIndicator())
-                    .styled(style -> style.withColor(Roles.getIconColor(uuid)))
-                    .append(Text.literal(name).styled(style -> style.withColor(Formatting.WHITE)));
+        if (SaturnPlayer.get(name, uuid) == null) {
+            return;
        }
-        return Text.literal(name);
+
+        Text displayName = cir.getReturnValue();
+
+        // With no server-set name, vanilla shows the team-decorated profile name.
+        if (displayName == null) {
+            displayName = Team.decorateName(entry.getScoreboardTeam(), Text.literal(name));
+        }
+
+        cir.setReturnValue(Text.empty()
+                .append(Text.literal(Roles.getSaturnIndicator())
+                        .styled(style -> style.withColor(Roles.getIconColor(uuid))))
+                .append(displayName));
    }
 }
@@ -12,7 +12,7 @@ base {

 repositories {
    // maven { name = "KoSmX Maven"; url = 'https://maven.kosmx.dev/' }
-	maven { name = "JitPack"; url = 'https://jitpack.io' }
+	maven { name = "Selimaj"; url = 'https://git.selimaj.dev/api/packages/selimaj-dev/maven' }
 }

 dependencies {
@@ -31,7 +31,7 @@ dependencies {

 	implementation project(":common")

-	include implementation("com.github.selimaj-dev:session-java:0.1.6")
+	include implementation("dev.selimaj:session-java:0.2.0")
    include implementation("de.javagl:obj:0.4.0")
    include implementation("com.formdev:svgSalamander:1.1.4")
    include implementation("com.fasterxml.jackson.core:jackson-databind:2.17.0")
@@ -3,6 +3,11 @@ package org.saturnclient.impl.provider;
 import java.awt.image.BufferedImage;
 import java.util.UUID;

+import net.fabricmc.loader.api.FabricLoader;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.toast.SystemToast;
+import net.minecraft.text.Text;
+
 import org.saturnclient.common.provider.SaturnProvider;
 import org.saturnclient.common.ref.asset.IdentifierRef;
 import org.saturnclient.common.ref.game.MinecraftClientRef;
@@ -59,6 +64,23 @@ public class SaturnProviderImpl implements SaturnProvider {
        SaturnClient.LOGGER.error(message, throwable);
    }

+    /** Shown longer than the vanilla default, since these ask the player to act. */
+    private static final SystemToast.Type WARNING_TOAST = new SystemToast.Type(15_000L);
+
+    @Override
+    public String getModVersion() {
+        return FabricLoader.getInstance().getModContainer(SaturnClient.MOD_ID)
+                .map(mod -> mod.getMetadata().getVersion().getFriendlyString())
+                .orElse("unknown");
+    }
+
+    @Override
+    public void showWarning(String title, String message) {
+        MinecraftClient client = MinecraftClient.getInstance();
+        client.execute(() -> client.getToastManager().add(
+                SystemToast.create(client, WARNING_TOAST, Text.literal(title), Text.literal(message))));
+    }
+
    @Override
    public void registerBufferedImageTexture(IdentifierRef i, BufferedImage bi) {
        IdentifierUtils.registerBufferedImageTextureFast(i, bi);
@@ -1,43 +1,49 @@
 package org.saturnclient.saturnclient.mixin;

 import net.minecraft.client.network.PlayerListEntry;
+import net.minecraft.scoreboard.Team;
 import net.minecraft.text.Text;
-import net.minecraft.util.Formatting;

 import java.util.UUID;

-import org.jetbrains.annotations.Nullable;
 import org.saturnclient.client.player.Roles;
 import org.saturnclient.client.player.SaturnPlayer;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Overwrite;
-import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;

 import com.mojang.authlib.GameProfile;

@Mixin(PlayerListEntry.class)
 public abstract class TabListMixin {

-    @Shadow
-    private GameProfile profile;
-
    /**
-     * @author HexLeo
-     * @reason Adds the Saturn Client icon to the player's name if they are online
-     *         with Saturn Client
+     * Adds the Saturn Client icon to the player's name if they are online with
+     * Saturn Client, keeping any name, rank prefix or team formatting the server
+     * set.
     */
-    @Overwrite
-    @Nullable
-    public Text getDisplayName() {
-        GameProfile profile = ((PlayerListEntry) (Object) this).getProfile();
+    @Inject(method = "getDisplayName", at = @At("RETURN"), cancellable = true)
+    private void saturn$addSaturnIcon(CallbackInfoReturnable<Text> cir) {
+        PlayerListEntry entry = (PlayerListEntry) (Object) this;
+        GameProfile profile = entry.getProfile();
        String name = profile.getName();
        UUID uuid = profile.getId();

-        if (SaturnPlayer.get(uuid) != null) {
-            return Text.literal(Roles.getSaturnIndicator())
-                    .styled(style -> style.withColor(Roles.getIconColor(uuid)))
-                    .append(Text.literal(name).styled(style -> style.withColor(Formatting.WHITE)));
+        if (SaturnPlayer.get(name, uuid) == null) {
+            return;
        }
-        return Text.literal(name);
+
+        Text displayName = cir.getReturnValue();
+
+        // With no server-set name, vanilla shows the team-decorated profile name.
+        if (displayName == null) {
+            displayName = Team.decorateName(entry.getScoreboardTeam(), Text.literal(name));
+        }
+
+        cir.setReturnValue(Text.empty()
+                .append(Text.literal(Roles.getSaturnIndicator())
+                        .styled(style -> style.withColor(Roles.getIconColor(uuid))))
+                .append(displayName));
    }
 }
@@ -12,7 +12,7 @@ base {

 repositories {
    // maven { name = "KoSmX Maven"; url = 'https://maven.kosmx.dev/' }
-	maven { name = "JitPack"; url = 'https://jitpack.io' }
+	maven { name = "Selimaj"; url = 'https://git.selimaj.dev/api/packages/selimaj-dev/maven' }
 }

 dependencies {
@@ -31,7 +31,7 @@ dependencies {

 	implementation project(":common")

-	include implementation("com.github.selimaj-dev:session-java:0.1.6")
+	include implementation("dev.selimaj:session-java:0.2.0")
    include implementation("de.javagl:obj:0.4.0")
    include implementation("com.formdev:svgSalamander:1.1.4")
    include implementation("com.fasterxml.jackson.core:jackson-databind:2.17.0")
@@ -3,6 +3,11 @@ package org.saturnclient.impl.provider;
 import java.awt.image.BufferedImage;
 import java.util.UUID;

+import net.fabricmc.loader.api.FabricLoader;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.toast.SystemToast;
+import net.minecraft.text.Text;
+
 import org.saturnclient.common.provider.SaturnProvider;
 import org.saturnclient.common.ref.asset.IdentifierRef;
 import org.saturnclient.common.ref.game.MinecraftClientRef;
@@ -59,6 +64,23 @@ public class SaturnProviderImpl implements SaturnProvider {
        SaturnClient.LOGGER.error(message, throwable);
    }

+    /** Shown longer than the vanilla default, since these ask the player to act. */
+    private static final SystemToast.Type WARNING_TOAST = new SystemToast.Type(15_000L);
+
+    @Override
+    public String getModVersion() {
+        return FabricLoader.getInstance().getModContainer(SaturnClient.MOD_ID)
+                .map(mod -> mod.getMetadata().getVersion().getFriendlyString())
+                .orElse("unknown");
+    }
+
+    @Override
+    public void showWarning(String title, String message) {
+        MinecraftClient client = MinecraftClient.getInstance();
+        client.execute(() -> client.getToastManager().add(
+                SystemToast.create(client, WARNING_TOAST, Text.literal(title), Text.literal(message))));
+    }
+
    @Override
    public void registerBufferedImageTexture(IdentifierRef i, BufferedImage bi) {
        IdentifierUtils.registerBufferedImageTextureFast(i, bi);
@@ -1,43 +1,49 @@
 package org.saturnclient.saturnclient.mixin;

 import net.minecraft.client.network.PlayerListEntry;
+import net.minecraft.scoreboard.Team;
 import net.minecraft.text.Text;
-import net.minecraft.util.Formatting;

 import java.util.UUID;

-import org.jetbrains.annotations.Nullable;
 import org.saturnclient.client.player.Roles;
 import org.saturnclient.client.player.SaturnPlayer;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Overwrite;
-import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;

 import com.mojang.authlib.GameProfile;

@Mixin(PlayerListEntry.class)
 public abstract class TabListMixin {

-    @Shadow
-    private GameProfile profile;
-
    /**
-     * @author HexLeo
-     * @reason Adds the Saturn Client icon to the player's name if they are online
-     *         with Saturn Client
+     * Adds the Saturn Client icon to the player's name if they are online with
+     * Saturn Client, keeping any name, rank prefix or team formatting the server
+     * set.
     */
-    @Overwrite
-    @Nullable
-    public Text getDisplayName() {
-        GameProfile profile = ((PlayerListEntry) (Object) this).getProfile();
+    @Inject(method = "getDisplayName", at = @At("RETURN"), cancellable = true)
+    private void saturn$addSaturnIcon(CallbackInfoReturnable<Text> cir) {
+        PlayerListEntry entry = (PlayerListEntry) (Object) this;
+        GameProfile profile = entry.getProfile();
        String name = profile.getName();
        UUID uuid = profile.getId();

-        if (SaturnPlayer.get(uuid) != null) {
-            return Text.literal(Roles.getSaturnIndicator())
-                    .styled(style -> style.withColor(Roles.getIconColor(uuid)))
-                    .append(Text.literal(name).styled(style -> style.withColor(Formatting.WHITE)));
+        if (SaturnPlayer.get(name, uuid) == null) {
+            return;
        }
-        return Text.literal(name);
+
+        Text displayName = cir.getReturnValue();
+
+        // With no server-set name, vanilla shows the team-decorated profile name.
+        if (displayName == null) {
+            displayName = Team.decorateName(entry.getScoreboardTeam(), Text.literal(name));
+        }
+
+        cir.setReturnValue(Text.empty()
+                .append(Text.literal(Roles.getSaturnIndicator())
+                        .styled(style -> style.withColor(Roles.getIconColor(uuid))))
+                .append(displayName));
    }
 }
@@ -12,7 +12,7 @@ base {

 repositories {
    // maven { name = "KoSmX Maven"; url = 'https://maven.kosmx.dev/' }
-	maven { name = "JitPack"; url = 'https://jitpack.io' }
+	maven { name = "Selimaj"; url = 'https://git.selimaj.dev/api/packages/selimaj-dev/maven' }
 }

 dependencies {
@@ -31,7 +31,7 @@ dependencies {

 	implementation project(":common")

-	include implementation("com.github.selimaj-dev:session-java:0.1.6")
+	include implementation("dev.selimaj:session-java:0.2.0")
    include implementation("de.javagl:obj:0.4.0")
    include implementation("com.formdev:svgSalamander:1.1.4")
    include implementation("com.fasterxml.jackson.core:jackson-databind:2.17.0")
@@ -3,6 +3,11 @@ package org.saturnclient.impl.provider;
 import java.awt.image.BufferedImage;
 import java.util.UUID;

+import net.fabricmc.loader.api.FabricLoader;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.toast.SystemToast;
+import net.minecraft.text.Text;
+
 import org.saturnclient.common.provider.SaturnProvider;
 import org.saturnclient.common.ref.asset.IdentifierRef;
 import org.saturnclient.common.ref.game.MinecraftClientRef;
@@ -59,6 +64,23 @@ public class SaturnProviderImpl implements SaturnProvider {
        SaturnClient.LOGGER.error(message, throwable);
    }

+    /** Shown longer than the vanilla default, since these ask the player to act. */
+    private static final SystemToast.Type WARNING_TOAST = new SystemToast.Type(15_000L);
+
+    @Override
+    public String getModVersion() {
+        return FabricLoader.getInstance().getModContainer(SaturnClient.MOD_ID)
+                .map(mod -> mod.getMetadata().getVersion().getFriendlyString())
+                .orElse("unknown");
+    }
+
+    @Override
+    public void showWarning(String title, String message) {
+        MinecraftClient client = MinecraftClient.getInstance();
+        client.execute(() -> client.getToastManager().add(
+                SystemToast.create(client, WARNING_TOAST, Text.literal(title), Text.literal(message))));
+    }
+
    @Override
    public void registerBufferedImageTexture(IdentifierRef i, BufferedImage bi) {
        IdentifierUtils.registerBufferedImageTextureFast(i, bi);
@@ -1,43 +1,49 @@
 package org.saturnclient.saturnclient.mixin;

 import net.minecraft.client.network.PlayerListEntry;
+import net.minecraft.scoreboard.Team;
 import net.minecraft.text.Text;
-import net.minecraft.util.Formatting;

 import java.util.UUID;

-import org.jetbrains.annotations.Nullable;
 import org.saturnclient.client.player.Roles;
 import org.saturnclient.client.player.SaturnPlayer;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Overwrite;
-import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;

 import com.mojang.authlib.GameProfile;

@Mixin(PlayerListEntry.class)
 public abstract class TabListMixin {

-    @Shadow
-    private GameProfile profile;
-
    /**
-     * @author HexLeo
-     * @reason Adds the Saturn Client icon to the player's name if they are online
-     *         with Saturn Client
+     * Adds the Saturn Client icon to the player's name if they are online with
+     * Saturn Client, keeping any name, rank prefix or team formatting the server
+     * set.
     */
-    @Overwrite
-    @Nullable
-    public Text getDisplayName() {
-        GameProfile profile = ((PlayerListEntry) (Object) this).getProfile();
+    @Inject(method = "getDisplayName", at = @At("RETURN"), cancellable = true)
+    private void saturn$addSaturnIcon(CallbackInfoReturnable<Text> cir) {
+        PlayerListEntry entry = (PlayerListEntry) (Object) this;
+        GameProfile profile = entry.getProfile();
        String name = profile.name();
        UUID uuid = profile.id();

-        if (SaturnPlayer.get(uuid) != null) {
-            return Text.literal(Roles.getSaturnIndicator())
-                    .styled(style -> style.withColor(Roles.getIconColor(uuid)))
-                    .append(Text.literal(name).styled(style -> style.withColor(Formatting.WHITE)));
+        if (SaturnPlayer.get(name, uuid) == null) {
+            return;
        }
-        return Text.literal(name);
+
+        Text displayName = cir.getReturnValue();
+
+        // With no server-set name, vanilla shows the team-decorated profile name.
+        if (displayName == null) {
+            displayName = Team.decorateName(entry.getScoreboardTeam(), Text.literal(name));
+        }
+
+        cir.setReturnValue(Text.empty()
+                .append(Text.literal(Roles.getSaturnIndicator())
+                        .styled(style -> style.withColor(Roles.getIconColor(uuid))))
+                .append(displayName));
    }
 }
Author	SHA1	Message	Date
selimaj-dev	14c16d8fe0	Merge pull request 'Release workflow: upload through the public URL again; smaller jars' (#14 ) from release-public-url into master Release / build (release) Successful in 18m36s Details	2026-09-25 16:36:40 +00:00
selimaj-devandclaude	e3d1e4a442	Point common at the panorama downscale merge commit Co-Authored-By: Claude Opus 5.5 <[email protected]>	2026-09-25 18:36:24 +02:00
selimaj-devandclaude	04605f6855	Upload release jars through the public URL again, with a size guard gitea:3000 isn't resolvable from act_runner's job containers, which run on their own Docker network. With the panorama downscaled in common the jars are ~45 MB, under the Cloudflare tunnel's 100 MB request limit, so upload through github.server_url again. Fail with a readable error before uploading if any jar is 100 MB or more. Co-Authored-By: Claude Opus 5.5 <[email protected]>	2026-09-25 18:31:14 +02:00
selimaj-dev	451ac986c0	Merge pull request 'Release workflow: upload through Gitea's internal address; add manual trigger' (#13 ) from release-upload-internal-url into master Reviewed-on: #13	2026-09-25 15:35:17 +00:00
selimaj-devandclaude	80d478d2c9	Upload release jars through Gitea's internal address The Cloudflare tunnel in front of git.selimaj.dev rejects the jar uploads with 413 Payload Too Large. Call the API at http://gitea:3000 instead, look the release up by tag, and add a workflow_dispatch trigger that builds a given tag and attaches the jars to its existing release. Co-Authored-By: Claude Opus 5.5 <[email protected]>	2026-09-25 17:32:52 +02:00
selimaj-dev	79719262a2	Merge pull request 'Release workflow: build every version and attach jars; release 0.1.1-beta' (#12 ) from release-workflow into master Release / build (release) Failing after 20m1s Details Reviewed-on: #12	2026-09-25 14:39:58 +00:00
selimaj-devandclaude	806c4ab643	Make mod_version the source of truth for releases; bump to 0.1.1-beta The release workflow no longer overrides mod_version from the tag. Instead it fails early unless the release tag (optionally prefixed with "v") matches mod_version in gradle.properties, so released jars always report the same version as the code the version check sees. Co-Authored-By: Claude Opus 5.5 <[email protected]>	2026-09-25 16:34:03 +02:00
selimaj-devandclaude	6ee8b64a38	Add release workflow that builds every version and attaches the jars On a published release, build all versions with buildAll using the tag as the mod version, and upload build/allJars/*.jar to the release. Co-Authored-By: Claude Opus 5.5 <[email protected]>	2026-09-25 16:33:42 +02:00
selimaj-dev	a97e5703c9	Merge pull request 'Mojang session auth and version check; release 0.1.0-beta3' (#11 ) from mojang-session-auth into master Reviewed-on: #11	2026-09-25 13:29:55 +00:00
selimaj-devandclaude	39f140dae1	Mojang session auth and version check; release 0.1.0-beta3 - Implement SaturnProvider.getModVersion() (Fabric mod metadata) and showWarning() (15 s SystemToast) in every version - Bump mod_version to 0.1.0-beta3, the first version on the new Mojang session-server authentication - Point common at its merge commit for the new auth flow and version check Fixes #7 Co-Authored-By: Claude Opus 5.5 <[email protected]>	2026-09-25 15:27:27 +02:00
selimaj-devandclaude	632591f8d8	Point common at its master merge commit Co-Authored-By: Claude Opus 5.5 <[email protected]>	2026-09-25 14:49:46 +02:00
selimaj-dev	66e994b5ab	Merge pull request 'Reconnect to the Saturn server and time out requests (session-java 0.2.0)' (#10 ) from reconnect-and-timeouts into master Reviewed-on: #10	2026-09-25 12:48:27 +00:00
selimaj-devandclaude	1d56094388	Use session-java 0.2.0 from the Gitea registry; reconnect and timeouts Replace JitPack (which can no longer build session-java since its GitHub repo is gone) with the Gitea package registry in every build file, move to dev.selimaj:session-java:0.2.0, and bump common for server reconnect and request timeouts. Fixes #4, fixes #5. Co-Authored-By: Claude Opus 5.5 <[email protected]>	2026-09-25 14:46:45 +02:00
selimaj-devandclaude	69f572288f	Point common at its master merge commit Co-Authored-By: Claude Opus 5.5 <[email protected]>	2026-09-25 14:11:20 +02:00
selimaj-dev	1a5c7f2a2c	Merge pull request 'Keep server tab names and team formatting; fix player lookups' (#9 ) from fix-tablist-and-player-lookups into master Reviewed-on: #9	2026-09-25 12:01:39 +00:00
selimaj-devandclaude	68734f6ac5	Keep server tab names and team formatting in the tab list TabListMixin @Overwrote PlayerListEntry.getDisplayName() and always returned the bare profile name, dropping server-set display names (rank prefixes, colours) and, by never returning null, vanilla's team decoration, for every player. Inject at RETURN instead: non-Saturn players keep the original value, and Saturn players get the icon in front of the original name, or the team-decorated profile name when the server set none. Also bump common for the player-lookup and thread-safety fixes. Fixes #3. Refs #2, #6. Co-Authored-By: Claude Opus 5.5 <[email protected]>	2026-09-25 14:00:39 +02:00