Update plugin fabric-loom to v1.17.3

Reviewed-on: #5

.gitea/workflows/build-release.yml

@@ -1,81 +0,0 @@
-name: Build and Release
-
-on:
-  push:
-    branches:
-      - main
-    tags:
-      - "v*"
-  pull_request:
-  workflow_dispatch:
-
-permissions:
-  contents: write
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    container:
-      image: gradle:8.11.1-jdk21
-    env:
-      GITEA_TOKEN: ${{ github.token }}
-      GITEA_API_URL: ${{ github.server_url }}/api/v1
-      GITEA_REPO: ${{ github.repository }}
-      GITEA_REPO_URL: ${{ github.server_url }}/${{ github.repository }}.git
-      GITEA_REF_NAME: ${{ github.ref_name }}
-      GITEA_SHA: ${{ github.sha }}
-    steps:
-      - name: Prepare source
-        shell: bash
-        run: |
-          set -euo pipefail
-
-          if [ ! -f build.gradle ]; then
-            git -c http.extraHeader="Authorization: token ${GITEA_TOKEN}" \
-              clone --depth 1 "${GITEA_REPO_URL}" .
-          fi
-
-      - name: Build
-        shell: bash
-        run: |
-          set -euo pipefail
-          gradle --no-daemon clean build
-
-      - name: Publish Gitea release
-        if: github.event_name != 'pull_request'
-        shell: bash
-        run: |
-          set -euo pipefail
-
-          jar_path="$(ls -1 build/libs/*.jar | head -n 1)"
-          if [[ "${GITHUB_REF}" == refs/tags/* ]]; then
-            release_tag="${GITEA_REF_NAME}"
-            release_name="${GITEA_REF_NAME}"
-            prerelease=false
-          else
-            release_tag="build-${GITEA_SHA:0:7}"
-            release_name="build-${GITEA_SHA:0:7}"
-            prerelease=true
-          fi
-
-          release_payload="$(printf '{"tag_name":"%s","name":"%s","body":"Automated build for %s.","draft":false,"prerelease":%s}' \
-            "${release_tag}" "${release_name}" "${release_name}" "${prerelease}")"
-
-          release_json="$(curl -fsS \
-            -H "Authorization: token ${GITEA_TOKEN}" \
-            -H "Content-Type: application/json" \
-            -d "${release_payload}" \
-            "${GITEA_API_URL}/repos/${GITEA_REPO}/releases")"
-
-          release_id="$(printf '%s' "${release_json}" | sed -n 's/.*"id":[[:space:]]*\([0-9][0-9]*\).*/\1/p' | head -n 1)"
-          if [ -z "${release_id}" ]; then
-            echo "Failed to parse release ID from response:"
-            printf '%s\n' "${release_json}"
-            exit 1
-          fi
-
-          curl -fsS \
-            -H "Authorization: token ${GITEA_TOKEN}" \
-            -H "Content-Type: multipart/form-data" \
-            -F "attachment=@${jar_path}" \
-            "${GITEA_API_URL}/repos/${GITEA_REPO}/releases/${release_id}/assets?name=$(basename "${jar_path}")"

.gitea/workflows/dev-verify.yml

@@ -0,0 +1,37 @@
+name: Dev Verify
+
+on:
+  push:
+    branches:
+      - dev
+  pull_request:
+    branches:
+      - dev
+  workflow_dispatch:
+
+jobs:
+  verify:
+    runs-on: ubuntu-latest
+    container:
+      image: gradle:8.14.5-jdk21
+    env:
+      GITEA_TOKEN: ${{ github.token }}
+      GITEA_API_URL: ${{ github.server_url }}/api/v1
+      GITEA_REPO: ${{ github.repository }}
+      GITEA_REPO_URL: ${{ github.server_url }}/${{ github.repository }}.git
+    steps:
+      - name: Prepare source
+        shell: bash
+        run: |
+          set -euo pipefail
+
+          if [ ! -f build.gradle ]; then
+            git -c http.extraHeader="Authorization: token ${GITEA_TOKEN}" \
+              clone --depth 1 "${GITEA_REPO_URL}" .
+          fi
+
+      - name: Verify
+        shell: bash
+        run: |
+          set -euo pipefail
+          gradle --no-daemon compileClientJava

.gitea/workflows/main-release.yml

@@ -0,0 +1,177 @@
+name: Build and Release
+
+on:
+  push:
+    branches:
+      - main
+    tags:
+      - "v*"
+  pull_request:
+  workflow_dispatch:
+
+permissions:
+  contents: write
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    container:
+      image: gradle:8.14.5-jdk21
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - minecraft_version: "1.21.1"
+            yarn_mappings: "1.21.1+build.3"
+            fabric_version: "0.116.10+1.21.1"
+          - minecraft_version: "1.21.2"
+            yarn_mappings: "1.21.2+build.1"
+            fabric_version: "0.106.1+1.21.2"
+          - minecraft_version: "1.21.3"
+            yarn_mappings: "1.21.3+build.2"
+            fabric_version: "0.114.1+1.21.3"
+          - minecraft_version: "1.21.4"
+            yarn_mappings: "1.21.4+build.8"
+            fabric_version: "0.119.4+1.21.4"
+          - minecraft_version: "1.21.5"
+            yarn_mappings: "1.21.5+build.1"
+            fabric_version: "0.128.2+1.21.5"
+          - minecraft_version: "1.21.6"
+            yarn_mappings: "1.21.6+build.1"
+            fabric_version: "0.128.2+1.21.6"
+          - minecraft_version: "1.21.7"
+            yarn_mappings: "1.21.7+build.8"
+            fabric_version: "0.129.0+1.21.7"
+          - minecraft_version: "1.21.8"
+            yarn_mappings: "1.21.8+build.1"
+            fabric_version: "0.136.1+1.21.8"
+          - minecraft_version: "1.21.9"
+            yarn_mappings: "1.21.9+build.1"
+            fabric_version: "0.134.1+1.21.9"
+          - minecraft_version: "1.21.10"
+            yarn_mappings: "1.21.10+build.3"
+            fabric_version: "0.138.4+1.21.10"
+          - minecraft_version: "1.21.11"
+            yarn_mappings: "1.21.11+build.4"
+            fabric_version: "0.141.3+1.21.11"
+    env:
+      GITEA_TOKEN: ${{ github.token }}
+      GITEA_API_URL: ${{ github.server_url }}/api/v1
+      GITEA_REPO_URL: ${{ github.server_url }}/${{ github.repository }}.git
+    steps:
+      - name: Prepare source
+        shell: bash
+        run: |
+          set -euo pipefail
+
+          if [ ! -f build.gradle ]; then
+            git -c http.extraHeader="Authorization: token ${GITEA_TOKEN}" \
+              clone --depth 1 "${GITEA_REPO_URL}" .
+          fi
+
+      - name: Build
+        shell: bash
+        run: |
+          set -euo pipefail
+
+          echo "Building Minecraft ${{ matrix.minecraft_version }}"
+          gradle --no-daemon clean build \
+            -Pminecraft_version="${{ matrix.minecraft_version }}" \
+            -Pyarn_mappings="${{ matrix.yarn_mappings }}" \
+            -Pfabric_version="${{ matrix.fabric_version }}"
+
+          mkdir -p release-artifacts
+
+          jar_path=""
+          shopt -s nullglob
+          for candidate in build/libs/*.jar; do
+            case "$(basename "${candidate}")" in
+              *-sources.jar|*-dev.jar)
+                continue
+                ;;
+            esac
+
+            jar_path="${candidate}"
+            break
+          done
+
+          if [ -z "${jar_path}" ]; then
+            echo "No build jar found for Minecraft ${{ matrix.minecraft_version }}"
+            exit 1
+          fi
+
+          cp "${jar_path}" "release-artifacts/sign-leak-shield-${{ matrix.minecraft_version }}.jar"
+
+      - name: Upload build artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: sign-leak-shield-${{ matrix.minecraft_version }}
+          path: release-artifacts/sign-leak-shield-${{ matrix.minecraft_version }}.jar
+          if-no-files-found: error
+          retention-days: 7
+
+  publish:
+    needs: build
+    if: github.event_name != 'pull_request'
+    runs-on: ubuntu-latest
+    container:
+      image: gradle:8.14.5-jdk21
+    env:
+      GITEA_TOKEN: ${{ github.token }}
+      GITEA_API_URL: ${{ github.server_url }}/api/v1
+      GITEA_REPO: ${{ github.repository }}
+      GITEA_REF_NAME: ${{ github.ref_name }}
+      GITEA_SHA: ${{ github.sha }}
+    steps:
+      - name: Download build artifacts
+        uses: actions/download-artifact@v4
+        with:
+          path: versioned-jars
+          pattern: sign-leak-shield-*
+          merge-multiple: true
+
+      - name: Publish Gitea release
+        shell: bash
+        run: |
+          set -euo pipefail
+
+          shopt -s nullglob
+          jar_paths=(versioned-jars/*.jar)
+          if [ "${#jar_paths[@]}" -eq 0 ]; then
+            echo "No build artifacts were downloaded"
+            exit 1
+          fi
+
+          if [[ "${GITHUB_REF}" == refs/tags/* ]]; then
+            release_tag="${GITEA_REF_NAME}"
+            release_name="${GITEA_REF_NAME}"
+            prerelease=false
+          else
+            release_tag="build-${GITEA_SHA:0:7}"
+            release_name="build-${GITEA_SHA:0:7}"
+            prerelease=false
+          fi
+
+          release_payload="$(printf '{"tag_name":"%s","name":"%s","body":"Automated parallel build for Minecraft 1.21.1 through 1.21.11.","draft":false,"prerelease":%s}' \
+            "${release_tag}" "${release_name}" "${prerelease}")"
+
+          release_json="$(curl -fsS \
+            -H "Authorization: token ${GITEA_TOKEN}" \
+            -H "Content-Type: application/json" \
+            -d "${release_payload}" \
+            "${GITEA_API_URL}/repos/${GITEA_REPO}/releases")"
+
+          release_id="$(printf '%s' "${release_json}" | sed -n 's/.*"id":[[:space:]]*\([0-9][0-9]*\).*/\1/p' | head -n 1)"
+          if [ -z "${release_id}" ]; then
+            echo "Failed to parse release ID from response:"
+            printf '%s\n' "${release_json}"
+            exit 1
+          fi
+
+          for jar_path in "${jar_paths[@]}"; do
+            curl -fsS \
+              -H "Authorization: token ${GITEA_TOKEN}" \
+              -H "Content-Type: multipart/form-data" \
+              -F "attachment=@${jar_path}" \
+              "${GITEA_API_URL}/repos/${GITEA_REPO}/releases/${release_id}/assets?name=$(basename "${jar_path}")"
+          done

.gitignore

@@ -1,26 +1,31 @@
-# ---> Java
+# ---> Java
-# Compiled class file
+# Compiled class file
-*.class
+*.class
-
+
-# Log file
+# Log file
-*.log
+*.log
-
+
-# BlueJ files
+# BlueJ files
-*.ctxt
+*.ctxt
-
+
-# Mobile Tools for Java (J2ME)
+# Mobile Tools for Java (J2ME)
-.mtj.tmp/
+.mtj.tmp/
-
+
-# Package Files #
+# Package Files #
-*.jar
+*.jar
-*.war
+*.war
-*.nar
+*.nar
-*.ear
+*.ear
-*.zip
+*.zip
-*.tar.gz
+*.tar.gz
-*.rar
+*.rar
-
+
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-hs_err_pid*
+hs_err_pid*
-replay_pid*
+replay_pid*
-
+
+.gradle/*
+.gradle/
+build/*
+build/
+

README.md

@@ -4,9 +4,13 @@
 >
 > This mod was built with the help of AI.
 
-This is a Fabric client mod for Minecraft 1.21.1 that defensively patches forced sign-editor translation and keybind leak probes.
+![Main Release](https://dock-it.dev/OnniSystems/SignShield/actions/workflows/main-release.yml/badge.svg?branch=main)
 
-Bypass's Anti Mod systems on Donut SMP and otehr like it.
+![Dev Verify](https://dock-it.dev/OnniSystems/SignShield/actions/workflows/dev-verify.yml/badge.svg?branch=dev)
+
+This is a Fabric client mod for Minecraft 1.21.11 that defensively patches forced sign-editor translation and keybind leak probes.
+
+Bypass's Anti Mod systems on Donut SMP and others like it.
 
 Build:
 
@@ -17,5 +21,5 @@ Build:
 
 Notes:
 
-- The project targets Fabric for Minecraft 1.21.1.
+- The project targets Fabric for Minecraft 1.21.11.
 - The implementation is scoped to forced sign editor traffic and only rewrites matching outgoing sign update packets.

build.gradle

@@ -5,6 +5,8 @@ plugins {
 
 version = project.mod_version
 group = project.maven_group
+def modVersion = project.version.toString()
+def minecraftVersion = project.minecraft_version.toString()
 
 base {
     archivesName = project.archives_base_name
@@ -15,6 +17,11 @@ repositories {
 }
 
 loom {
+    mixin {
+        useLegacyMixinAp = true
+        defaultRefmapName = "client-signleakshield.refmap.json"
+    }
+
     splitEnvironmentSourceSets()
 
     mods {
@@ -33,10 +40,14 @@ dependencies {
 }
 
 processResources {
-    inputs.property "version", project.version
+    inputs.property "version", modVersion
+    inputs.property "minecraft_version", minecraftVersion
 
     filesMatching("fabric.mod.json") {
-        expand "version": inputs.properties.version
+        expand([
+                "version": modVersion,
+                "minecraft_version": minecraftVersion
+        ])
     }
 }
 

gradle.properties

@@ -1,13 +1,15 @@
-org.gradle.jvmargs=-Xmx2G
+org.gradle.jvmargs=-Xmx2G -Dfile.encoding=UTF-8
 org.gradle.parallel=true
 org.gradle.caching=true
+org.gradle.daemon=true
+org.gradle.configuration-cache=false
 
-minecraft_version=1.21.1
+minecraft_version=1.21.11
-yarn_mappings=1.21.1+build.3
+yarn_mappings=1.21.11+build.4
 loader_version=0.18.4
-loom_version=1.9.1
+loom_version=1.17.3
-fabric_version=0.116.8+1.21.1
+fabric_version=0.141.3+1.21.11
 
-mod_version=1.0.0
+mod_version=1.0.2
 maven_group=com.example
 archives_base_name=sign-leak-shield

renovate.json

@@ -0,0 +1,3 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json"
+}

src/client/java/com/example/signleakshield/SignLeakShieldClient.java

@@ -1,15 +1,16 @@
-package com.example.signleakshield;
+package com.example.signleakshield;
-
+
-import net.fabricmc.api.ClientModInitializer;
+import net.fabricmc.api.ClientModInitializer;
-import org.slf4j.Logger;
+import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.slf4j.LoggerFactory;
-
+
-public final class SignLeakShieldClient implements ClientModInitializer {
+public final class SignLeakShieldClient implements ClientModInitializer {
-    public static final String MOD_ID = "signleakshield";
+    public static final String MOD_ID = "signleakshield";
-    public static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID);
+    public static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID);
-
+
-    @Override
+    @Override
-    public void onInitializeClient() {
+    public void onInitializeClient() {
-        LOGGER.info("Sign Leak Shield initialized");
+        SignLeakShieldTraceLog.reset();
-    }
+        SignLeakShieldTraceLog.info("Sign Leak Shield initialized");
-}
+    }
+}

src/client/java/com/example/signleakshield/SignLeakShieldTraceLog.java

@@ -0,0 +1,58 @@
+package com.example.signleakshield;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.StandardOpenOption;
+import java.time.OffsetDateTime;
+import java.time.format.DateTimeFormatter;
+
+public final class SignLeakShieldTraceLog {
+    private static final Path LOG_PATH = Paths.get("logs", "signleakshield-trace.log");
+
+    private SignLeakShieldTraceLog() {
+    }
+
+    public static synchronized void reset() {
+        try {
+            Files.deleteIfExists(LOG_PATH);
+        } catch (IOException ignored) {
+        }
+    }
+
+    public static void info(String message) {
+        SignLeakShieldClient.LOGGER.info(message);
+        append(message);
+    }
+
+    public static void info(String format, Object... args) {
+        info(String.format(format, args));
+    }
+
+    private static synchronized void append(String message) {
+        try {
+            Path parent = LOG_PATH.getParent();
+            if (parent != null) {
+                Files.createDirectories(parent);
+            }
+
+            String line = String.format(
+                "%s %s%n",
+                DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(OffsetDateTime.now()),
+                message
+            );
+
+            Files.writeString(
+                LOG_PATH,
+                line,
+                StandardCharsets.UTF_8,
+                StandardOpenOption.CREATE,
+                StandardOpenOption.APPEND,
+                StandardOpenOption.WRITE
+            );
+        } catch (IOException ignored) {
+        }
+    }
+}

src/client/java/com/example/signleakshield/TextSanitizer.java

@@ -1,50 +1,86 @@
-package com.example.signleakshield;
+package com.example.signleakshield;
-
+
-import net.minecraft.text.KeybindTextContent;
+import net.minecraft.text.KeybindTextContent;
-import net.minecraft.text.PlainTextContent;
+import net.minecraft.text.PlainTextContent;
-import net.minecraft.text.Text;
+import net.minecraft.text.Text;
-import net.minecraft.text.TextContent;
+import net.minecraft.text.TextContent;
-import net.minecraft.text.TranslatableTextContent;
+import net.minecraft.text.TranslatableTextContent;
-
+
 public final class TextSanitizer {
-    private TextSanitizer() {
+    private static final String[] SUSPICIOUS_KEY_PARTS = {
-    }
+        "gey.glazed.",
-
+        "key.meteor-client.",
+        "meteor-client",
+        "meteorline",
+        "meteorclient",
+        "metiorclient",
+        "meteordevelopment.meteorclient",
+        "itemscroller",
+        "moremousetweaks",
+        "invmove",
+        "autototem",
+        "smartoffhand",
+        "freecam",
+        "jsmacros",
+        "inventoryprofiles",
+        "tweakeroo",
+        "soundboard",
+        "accurateblockplacement"
+    };
+
+    private TextSanitizer() {
+    }
+
     public static boolean isSuspicious(Text text) {
         if (text == null) {
             return false;
         }
-
+
         TextContent content = text.getContent();
 
-        if (content instanceof TranslatableTextContent || content instanceof KeybindTextContent) {
+        if (content instanceof TranslatableTextContent translatable) {
-            return true;
+            if (isBlacklistedKey(translatable.getKey())) {
-        }
-
-        for (Text sibling : text.getSiblings()) {
-            if (isSuspicious(sibling)) {
                 return true;
             }
+
+            for (Object arg : translatable.getArgs()) {
+                if (isSuspiciousArgument(arg)) {
+                    return true;
+                }
+            }
+
+            return false;
         }
 
-        return false;
+        if (content instanceof KeybindTextContent keybind) {
-    }
+            String key = keybind.getKey();
-
+            return key != null && !VanillaKeybinds.isVanillaKey(key);
-    public static String sanitize(Text text) {
-        StringBuilder out = new StringBuilder();
-        append(text, out);
-        return out.toString();
-    }
-
-    private static void append(Text text, StringBuilder out) {
-        if (text == null) {
-            return;
         }
-
+
-        TextContent content = text.getContent();
+        for (Text sibling : text.getSiblings()) {
-
+            if (isSuspicious(sibling)) {
-        if (content instanceof PlainTextContent plain) {
+                return true;
-            out.append(plain.string());
+            }
+        }
+
+        return false;
+    }
+
+    public static String sanitize(Text text) {
+        StringBuilder out = new StringBuilder();
+        append(text, out);
+        return out.toString();
+    }
+
+    private static void append(Text text, StringBuilder out) {
+        if (text == null) {
+            return;
+        }
+
+        TextContent content = text.getContent();
+
+        if (content instanceof PlainTextContent plain) {
+            out.append(plain.string());
         } else if (content instanceof TranslatableTextContent translatable) {
             String fallback = translatable.getFallback();
             if (fallback != null && !fallback.isEmpty()) {
@@ -53,13 +89,61 @@ public final class TextSanitizer {
                 out.append(translatable.getKey());
             }
         } else if (content instanceof KeybindTextContent keybind) {
-            out.append(keybind.getKey());
+            String key = keybind.getKey();
+            out.append(key != null ? key : "");
         } else {
             out.append(text.getString());
         }
-
+
-        for (Text sibling : text.getSiblings()) {
+        for (Text sibling : text.getSiblings()) {
-            append(sibling, out);
+            append(sibling, out);
+        }
+    }
+
+    private static boolean isBlacklistedKey(String key) {
+        if (key == null || key.isEmpty()) {
+            return false;
         }
+
+        String lower = key.toLowerCase();
+        for (String part : SUSPICIOUS_KEY_PARTS) {
+            if (lower.contains(part)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    private static boolean isSuspiciousArgument(Object arg) {
+        if (arg == null) {
+            return false;
+        }
+
+        if (arg instanceof Text text) {
+            return isSuspicious(text);
+        }
+
+        if (arg instanceof KeybindTextContent keybind) {
+            return !VanillaKeybinds.isVanillaKey(keybind.getKey());
+        }
+
+        if (arg instanceof TranslatableTextContent translatable) {
+            if (isBlacklistedKey(translatable.getKey())) {
+                return true;
+            }
+
+            for (Object nested : translatable.getArgs()) {
+                if (isSuspiciousArgument(nested)) {
+                    return true;
+                }
+            }
+        }
+
+        if (arg instanceof CharSequence sequence) {
+            return isBlacklistedKey(sequence.toString());
+        }
+
+        return false;
     }
 }

src/client/java/com/example/signleakshield/VanillaKeybinds.java

@@ -0,0 +1,81 @@
+package com.example.signleakshield;
+
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.option.GameOptions;
+import net.minecraft.client.option.KeyBinding;
+
+import java.lang.reflect.Field;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
+public final class VanillaKeybinds {
+    private static volatile Set<String> vanillaKeys;
+
+    private VanillaKeybinds() {
+    }
+
+    public static boolean isVanillaKey(String key) {
+        if (key == null || key.isEmpty()) {
+            return false;
+        }
+
+        Set<String> keys = vanillaKeys;
+        if (keys == null) {
+            keys = loadVanillaKeys();
+            if (keys != null) {
+                vanillaKeys = keys;
+            }
+        }
+
+        return keys != null && keys.contains(key);
+    }
+
+    private static Set<String> loadVanillaKeys() {
+        MinecraftClient client = MinecraftClient.getInstance();
+        if (client == null || client.options == null) {
+            return null;
+        }
+
+        Set<String> keys = new HashSet<>();
+
+        for (Field field : GameOptions.class.getDeclaredFields()) {
+            Class<?> type = field.getType();
+            if (!KeyBinding.class.isAssignableFrom(type) && !KeyBinding[].class.isAssignableFrom(type)) {
+                continue;
+            }
+
+            try {
+                field.setAccessible(true);
+                Object value = field.get(client.options);
+                collectKeyBindings(keys, value);
+            } catch (IllegalAccessException | RuntimeException ignored) {
+            }
+        }
+
+        return Collections.unmodifiableSet(keys);
+    }
+
+    private static void collectKeyBindings(Set<String> keys, Object value) {
+        if (value instanceof KeyBinding keyBinding) {
+            String translationKey = keyBinding.getTranslationKey();
+            if (translationKey != null && !translationKey.isEmpty()) {
+                keys.add(translationKey);
+            }
+            return;
+        }
+
+        if (value instanceof KeyBinding[] keyBindings) {
+            for (KeyBinding keyBinding : keyBindings) {
+                if (keyBinding == null) {
+                    continue;
+                }
+
+                String translationKey = keyBinding.getTranslationKey();
+                if (translationKey != null && !translationKey.isEmpty()) {
+                    keys.add(translationKey);
+                }
+            }
+        }
+    }
+}

src/client/java/com/example/signleakshield/mixin/ClientConnectionMixin.java

@@ -1,67 +1,121 @@
-package com.example.signleakshield.mixin;
+package com.example.signleakshield.mixin;
-
+
-import com.example.signleakshield.ExploitState;
+import com.example.signleakshield.ExploitState;
-import com.example.signleakshield.SignLeakShieldClient;
+import com.example.signleakshield.SignLeakShieldTraceLog;
-import com.example.signleakshield.TextSanitizer;
+import com.example.signleakshield.TextSanitizer;
-import net.minecraft.network.ClientConnection;
+import net.minecraft.network.ClientConnection;
-import net.minecraft.network.PacketCallbacks;
+import net.minecraft.network.PacketCallbacks;
-import net.minecraft.network.packet.Packet;
+import net.minecraft.network.packet.Packet;
-import net.minecraft.network.packet.c2s.play.UpdateSignC2SPacket;
+import net.minecraft.network.packet.c2s.play.UpdateSignC2SPacket;
-import net.minecraft.text.Text;
+import net.minecraft.text.Text;
-import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.BlockPos;
-import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.ModifyVariable;
+import org.spongepowered.asm.mixin.injection.ModifyVariable;
-
+
-import java.util.Arrays;
+import java.util.Arrays;
-
+
-@Mixin(ClientConnection.class)
+@Mixin(ClientConnection.class)
-public abstract class ClientConnectionMixin {
+public abstract class ClientConnectionMixin {
-    @ModifyVariable(method = "send(Lnet/minecraft/network/packet/Packet;Lnet/minecraft/network/PacketCallbacks;Z)V", at = @At("HEAD"), argsOnly = true)
+    @ModifyVariable(method = "send(Lnet/minecraft/network/packet/Packet;)V", at = @At("HEAD"), argsOnly = true)
-    private Packet<?> signleakshield$rewriteOutgoing(Packet<?> packet) {
+    private Packet<?> signleakshield$rewriteOutgoing(Packet<?> packet) {
-        if (!(packet instanceof UpdateSignC2SPacket signPacket)) {
+        if (packet instanceof UpdateSignC2SPacket signPacket) {
-            return packet;
+            ExploitState.ForcedOpenContext forcedOpen = ExploitState.pendingForcedOpen;
-        }
+            ExploitState.CapturedSignData captured = ExploitState.SIGNS.get(signPacket.getPos());
-
+            SignLeakShieldTraceLog.info(
-        ExploitState.ForcedOpenContext forcedOpen = ExploitState.pendingForcedOpen;
+                "Outgoing sign packet observed: pos=%s front=%s forcedOpen=%s captured=%s packetText=%s",
-        if (forcedOpen == null) {
+                signPacket.getPos(),
-            return packet;
+                signPacket.isFront(),
-        }
+                forcedOpen == null ? "null" : forcedOpen.pos() + "/front=" + forcedOpen.front() + "/ageMs=" + (System.currentTimeMillis() - forcedOpen.timeMs()),
-
+                captured == null ? "null" : "suspicious=" + captured.isSuspicious(),
-        BlockPos pos = signPacket.getPos();
+                Arrays.toString(signPacket.getText())
-        if (!forcedOpen.pos().equals(pos)) {
+            );
-            return packet;
+        }
-        }
+
-
+        if (!(packet instanceof UpdateSignC2SPacket signPacket)) {
-        if (forcedOpen.front() != signPacket.isFront()) {
+            return packet;
-            return packet;
+        }
-        }
+
-
+        ExploitState.ForcedOpenContext forcedOpen = ExploitState.pendingForcedOpen;
-        long ageMs = System.currentTimeMillis() - forcedOpen.timeMs();
+        if (forcedOpen == null) {
-        if (ageMs < 0L || ageMs > 5000L) {
+            SignLeakShieldTraceLog.info(
-            return packet;
+                "Outgoing sign packet not rewritten: no pending forced-open context for pos=%s front=%s",
-        }
+                signPacket.getPos(),
-
+                signPacket.isFront()
+            );
+            return packet;
+        }
+
+        BlockPos pos = signPacket.getPos();
+        if (!forcedOpen.pos().equals(pos)) {
+            SignLeakShieldTraceLog.info(
+                "Outgoing sign packet not rewritten: pos mismatch packet=%s forcedOpen=%s",
+                pos,
+                forcedOpen.pos()
+            );
+            return packet;
+        }
+
+        if (forcedOpen.front() != signPacket.isFront()) {
+            SignLeakShieldTraceLog.info(
+                "Outgoing sign packet not rewritten: front mismatch packet=%s forcedOpen=%s",
+                signPacket.isFront(),
+                forcedOpen.front()
+            );
+            return packet;
+        }
+
+        long ageMs = System.currentTimeMillis() - forcedOpen.timeMs();
+        if (ageMs < 0L || ageMs > 5000L) {
+            SignLeakShieldTraceLog.info(
+                "Outgoing sign packet not rewritten: forced-open age out of range pos=%s front=%s ageMs=%s",
+                pos,
+                signPacket.isFront(),
+                ageMs
+            );
+            return packet;
+        }
+
         ExploitState.CapturedSignData captured = ExploitState.SIGNS.get(pos);
         if (captured == null || !captured.isSuspicious()) {
-            return packet;
+            SignLeakShieldTraceLog.info(
+                "Outgoing sign packet allowed: captured sign missing or not blacklisted pos=%s front=%s capturedPresent=%s",
+                pos,
+                signPacket.isFront(),
+                captured != null
+            );
+            return packet;
         }
 
-        Text[] lines = signPacket.isFront() ? captured.getFront() : captured.getBack();
+        Text[] textLines;
-        String line1 = TextSanitizer.sanitize(lines[0]);
+        textLines = signPacket.isFront() ? captured.getFront() : captured.getBack();
-        String line2 = TextSanitizer.sanitize(lines[1]);
+        String[] originalResponse = signPacket.getText();
-        String line3 = TextSanitizer.sanitize(lines[2]);
-        String line4 = TextSanitizer.sanitize(lines[3]);
 
-        SignLeakShieldClient.LOGGER.info(
+        String line1 = TextSanitizer.sanitize(textLines[0]);
-            "Blocked forced sign translation event at {} front={}: got={}, returned={}",
+        String line2 = TextSanitizer.sanitize(textLines[1]);
+        String line3 = TextSanitizer.sanitize(textLines[2]);
+        String line4 = TextSanitizer.sanitize(textLines[3]);
+        String[] returnedResponse = new String[] { line1, line2, line3, line4 };
+
+        SignLeakShieldTraceLog.info(
+            "Blocked forced sign translation event at %s front=%s: receivedSign=%s, unmodifiedResponse=%s, returned=%s",
             pos,
             signPacket.isFront(),
-            Arrays.toString(signPacket.getText()),
+            describeTextLines(textLines),
-            Arrays.toString(new String[] { line1, line2, line3, line4 })
+            Arrays.toString(originalResponse),
+            Arrays.toString(returnedResponse)
         );
 
         ExploitState.clearForcedOpen();
         return new UpdateSignC2SPacket(pos, signPacket.isFront(), line1, line2, line3, line4);
     }
+
+    private static String describeTextLines(Text[] lines) {
+        String[] values = new String[lines.length];
+        for (int i = 0; i < lines.length; i++) {
+            values[i] = lines[i] != null ? lines[i].getString() : "";
+        }
+
+        return Arrays.toString(values);
+    }
 }

src/client/java/com/example/signleakshield/mixin/ClientPlayNetworkHandlerBlockEntityUpdateMixin.java

@@ -1,29 +1,30 @@
-package com.example.signleakshield.mixin;
+package com.example.signleakshield.mixin;
-
+
-import com.example.signleakshield.ExploitState;
+import com.example.signleakshield.ExploitState;
-import com.example.signleakshield.SignTextExtractor;
+import com.example.signleakshield.SignLeakShieldTraceLog;
-import net.minecraft.block.entity.BlockEntityType;
+import com.example.signleakshield.SignTextExtractor;
-import net.minecraft.client.network.ClientPlayNetworkHandler;
+import net.minecraft.block.entity.BlockEntityType;
-import net.minecraft.network.packet.s2c.play.BlockEntityUpdateS2CPacket;
+import net.minecraft.client.network.ClientPlayNetworkHandler;
-import net.minecraft.util.math.BlockPos;
+import net.minecraft.network.packet.s2c.play.BlockEntityUpdateS2CPacket;
-import org.spongepowered.asm.mixin.Mixin;
+import net.minecraft.util.math.BlockPos;
-import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.Inject;
-
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-@Mixin(ClientPlayNetworkHandler.class)
+
-public abstract class ClientPlayNetworkHandlerBlockEntityUpdateMixin {
+@Mixin(ClientPlayNetworkHandler.class)
-    @Inject(method = "onBlockEntityUpdate", at = @At("HEAD"))
+public abstract class ClientPlayNetworkHandlerBlockEntityUpdateMixin {
-    private void signleakshield$captureSign(BlockEntityUpdateS2CPacket packet, CallbackInfo ci) {
+    @Inject(method = "onBlockEntityUpdate(Lnet/minecraft/network/packet/s2c/play/BlockEntityUpdateS2CPacket;)V", at = @At("HEAD"))
-        if (packet.getNbt() == null) {
+    private void signleakshield$captureSign(BlockEntityUpdateS2CPacket packet, CallbackInfo ci) {
-            return;
+        if (packet.getNbt() == null) {
-        }
+            return;
-
+        }
-        if (packet.getBlockEntityType() != BlockEntityType.SIGN && packet.getBlockEntityType() != BlockEntityType.HANGING_SIGN) {
+
-            return;
+        if (packet.getBlockEntityType() != BlockEntityType.SIGN && packet.getBlockEntityType() != BlockEntityType.HANGING_SIGN) {
-        }
+            return;
-
+        }
-        BlockPos pos = packet.getPos();
+
-        ExploitState.SIGNS.put(pos.toImmutable(), SignTextExtractor.fromNbt(packet.getNbt()));
+        BlockPos pos = packet.getPos();
-    }
+        ExploitState.SIGNS.put(pos.toImmutable(), SignTextExtractor.fromNbt(packet.getNbt()));
-}
+    }
+}

src/client/java/com/example/signleakshield/mixin/ClientPlayNetworkHandlerChunkDataMixin.java

@@ -1,32 +1,33 @@
-package com.example.signleakshield.mixin;
+package com.example.signleakshield.mixin;
-
+
-import com.example.signleakshield.ExploitState;
+import com.example.signleakshield.ExploitState;
-import com.example.signleakshield.SignTextExtractor;
+import com.example.signleakshield.SignLeakShieldTraceLog;
-import net.minecraft.block.entity.BlockEntityType;
+import com.example.signleakshield.SignTextExtractor;
-import net.minecraft.client.network.ClientPlayNetworkHandler;
+import net.minecraft.block.entity.BlockEntityType;
-import net.minecraft.network.packet.s2c.play.ChunkDataS2CPacket;
+import net.minecraft.client.network.ClientPlayNetworkHandler;
-import net.minecraft.nbt.NbtCompound;
+import net.minecraft.network.packet.s2c.play.ChunkDataS2CPacket;
-import net.minecraft.util.math.BlockPos;
+import net.minecraft.nbt.NbtCompound;
-import org.spongepowered.asm.mixin.Mixin;
+import net.minecraft.util.math.BlockPos;
-import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.Inject;
-
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-@Mixin(ClientPlayNetworkHandler.class)
+
-public abstract class ClientPlayNetworkHandlerChunkDataMixin {
+@Mixin(ClientPlayNetworkHandler.class)
-    @Inject(method = "onChunkData", at = @At("HEAD"))
+public abstract class ClientPlayNetworkHandlerChunkDataMixin {
-    private void signleakshield$captureChunkData(ChunkDataS2CPacket packet, CallbackInfo ci) {
+    @Inject(method = "onChunkData(Lnet/minecraft/network/packet/s2c/play/ChunkDataS2CPacket;)V", at = @At("HEAD"))
-        packet.getChunkData().getBlockEntities(packet.getChunkX(), packet.getChunkZ()).accept((localPos, type, nbt) -> {
+    private void signleakshield$captureChunkData(ChunkDataS2CPacket packet, CallbackInfo ci) {
-            if (nbt == null) {
+        packet.getChunkData().getBlockEntities(packet.getChunkX(), packet.getChunkZ()).accept((localPos, type, nbt) -> {
-                return;
+            if (nbt == null) {
-            }
+                return;
-
+            }
-            if (type != BlockEntityType.SIGN && type != BlockEntityType.HANGING_SIGN) {
+
-                return;
+            if (type != BlockEntityType.SIGN && type != BlockEntityType.HANGING_SIGN) {
-            }
+                return;
-
+            }
-            BlockPos pos = localPos.toImmutable();
+
-            ExploitState.SIGNS.put(pos, SignTextExtractor.fromNbt((NbtCompound) nbt));
+            BlockPos pos = localPos.toImmutable();
-        });
+            ExploitState.SIGNS.put(pos, SignTextExtractor.fromNbt((NbtCompound) nbt));
-    }
+        });
-}
+    }
+}

src/client/java/com/example/signleakshield/mixin/ClientPlayNetworkHandlerSignEditorOpenMixin.java

@@ -1,17 +1,23 @@
-package com.example.signleakshield.mixin;
+package com.example.signleakshield.mixin;
-
+
-import com.example.signleakshield.ExploitState;
+import com.example.signleakshield.ExploitState;
-import net.minecraft.client.network.ClientPlayNetworkHandler;
+import com.example.signleakshield.SignLeakShieldTraceLog;
-import net.minecraft.network.packet.s2c.play.SignEditorOpenS2CPacket;
+import net.minecraft.client.network.ClientPlayNetworkHandler;
-import org.spongepowered.asm.mixin.Mixin;
+import net.minecraft.network.packet.s2c.play.SignEditorOpenS2CPacket;
-import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.Inject;
-
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-@Mixin(ClientPlayNetworkHandler.class)
+
-public abstract class ClientPlayNetworkHandlerSignEditorOpenMixin {
+@Mixin(ClientPlayNetworkHandler.class)
-    @Inject(method = "onSignEditorOpen", at = @At("HEAD"))
+public abstract class ClientPlayNetworkHandlerSignEditorOpenMixin {
-    private void signleakshield$rememberForcedOpen(SignEditorOpenS2CPacket packet, CallbackInfo ci) {
+    @Inject(method = "onSignEditorOpen", at = @At("HEAD"))
-        ExploitState.rememberForcedOpen(packet.getPos(), packet.isFront());
+    private void signleakshield$rememberForcedOpen(SignEditorOpenS2CPacket packet, CallbackInfo ci) {
-    }
+        SignLeakShieldTraceLog.info(
-}
+            "Sign editor open received: pos=%s front=%s",
+            packet.getPos(),
+            packet.isFront()
+        );
+        ExploitState.rememberForcedOpen(packet.getPos(), packet.isFront());
+    }
+}

src/main/resources/fabric.mod.json

@@ -23,8 +23,8 @@
   ],
   "depends": {
     "fabricloader": ">=0.18.4",
-    "minecraft": "1.21.1",
+    "minecraft": "${minecraft_version}",
     "java": ">=21",
     "fabric-api": "*"
   }
-}
+}

src/main/resources/signleakshield.mixins.json

@@ -1,6 +1,7 @@
 {
   "required": true,
   "package": "com.example.signleakshield.mixin",
+  "refmap": "client-signleakshield.refmap.json",
   "compatibilityLevel": "JAVA_21",
   "client": [
     "ClientConnectionMixin",