Expand Forge target matrix and release validation

Author: F1xGOD

.github/workflows/verify.yml

@@ -27,23 +27,33 @@ jobs:
           ./scripts/release/validate-targets.sh
           find scripts -type f -name '*.sh' -print0 | xargs -0 -n1 bash -n
 
+  matrix:
+    name: Read target matrix
+    runs-on: ubuntu-24.04
+    timeout-minutes: 5
+    outputs:
+      targets: ${{ steps.targets.outputs.matrix }}
+    steps:
+      - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
+        with:
+          persist-credentials: false
+      - id: targets
+        name: Validate and export targets
+        shell: bash
+        run: |
+          set -euo pipefail
+          ./scripts/release/validate-targets.sh
+          matrix=$(jq -c '{include: [.targets[] | {target: .id, java: (.java | tostring), build_task: .build_task}]}' release/targets.json)
+          echo "matrix=$matrix" >> "$GITHUB_OUTPUT"
+
   test:
     name: ${{ matrix.target }} (JDK ${{ matrix.java }})
+    needs: matrix
     runs-on: ubuntu-24.04
     timeout-minutes: 20
     strategy:
       fail-fast: false
-      matrix:
-        include:
-          - target: Forge 1.20.1
-            java: '17'
-            tasks: ':shared:protocol:test :platform:forge-1.20.1:test'
-          - target: Forge 1.21.1
-            java: '21'
-            tasks: ':shared:protocol:test :platform:forge-1.21.1:test'
-          - target: NeoForge 1.21.1
-            java: '21'
-            tasks: ':shared:protocol:test :platform:neoforge-1.21.1:test'
+      matrix: ${{ fromJSON(needs.matrix.outputs.targets) }}
     steps:
       - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
         with:
@@ -54,4 +64,4 @@ jobs:
           java-version: ${{ matrix.java }}
           cache: gradle
       - name: Build and test
-        run: ./gradlew ${{ matrix.tasks }} --no-daemon --stacktrace
+        run: ./gradlew :shared:protocol:test ${{ matrix.build_task }} --no-daemon --stacktrace

branding/README.md

@@ -0,0 +1,7 @@
+# Packaged branding
+
+`trueuuid-banner.png` is the canonical 960×325 Mods-screen banner. Adapter
+resource roots reference it through relative symlinks so every built JAR uses
+the same artwork without storing duplicate PNG files.
+
+`TrueUUID-banner.svg` at the repository root is the separate README banner.

branding/trueuuid-banner.png

@@ -3,5 +3,12 @@ plugins {
 }
 
 tasks.named('build') {
-    dependsOn ':shared:protocol:build', ':platform:forge-1.20.1:build', ':platform:neoforge-1.21.1:build', ':platform:forge-1.21.1:build'
+    dependsOn ':shared:protocol:build',
+            ':platform:forge-1.20.1:build',
+            ':platform:neoforge-1.21.1:build',
+            ':platform:forge-1.21.1:build',
+            ':platform:forge-1.21.3:build',
+            ':platform:forge-1.21.4:build',
+            ':platform:forge-1.21.5:build',
+            ':platform:forge-1.21.8:build'
 }

build.gradle

@@ -7,13 +7,19 @@ An adapter is the unit of support and release; a Git branch is not.
 
 | Target | Loader | Java | State | Notes |
 |---|---|---:|---|---|
-| Minecraft 1.20.1 | Forge 47.4.10 | 17 | Active | Implemented in `platform/forge-1.20.1`; local Mojang login/UUID/name/skin run passed on 2026-07-12 with JDK 17. Yggdrasil, denial/timeout/grace, and migration rollback runs remain pending. |
-| Minecraft 1.21.1 | Forge 52.1.0 | 21 | Planned | Implemented independently in `platform/forge-1.21.1`; a local premium client/server login passed, but the full acceptance matrix remains incomplete. |
-| Minecraft 1.21.1 | NeoForge 21.1.213 | 21 | Planned | Implemented in `platform/neoforge-1.21.1`; the preserved `archive/neoforge-1.21.1-pre-monorepo` branch was API/lifecycle evidence only. Its JDK 21 build, shared fixtures, and codec/lifecycle tests pass, but no modded client/server matrix has run. |
+| Minecraft 1.20.1 | Forge 47.4.10 | 17 | Active | Implemented in `platform/forge-1.20.1` (independent pre-configuration-phase island). Local Mojang login/UUID/name/skin run passed on 2026-07-12 with JDK 17. Yggdrasil, denial/timeout/grace, and migration rollback runs remain pending. |
+| Minecraft 1.21.1 | Forge 52.1.0 | 21 | Planned | `platform/forge-1.21.1`; shares `platform/forge-common`. A local premium client/server login passed, but the full acceptance matrix remains incomplete. |
+| Minecraft 1.21.3 | Forge 53.1.0 | 21 | Planned | `platform/forge-1.21.3`; shares `platform/forge-common`. Build + mixin refmap + tests pass (2026-07-15). No login run yet. |
+| Minecraft 1.21.4 | Forge 54.1.14 | 21 | Planned | `platform/forge-1.21.4`; shares `platform/forge-common`. Build + mixin refmap + tests pass (2026-07-15). No login run yet. |
+| Minecraft 1.21.5 | Forge 55.1.10 | 21 | Planned | `platform/forge-1.21.5`; shares `platform/forge-common`. Build + mixin refmap + tests pass (2026-07-15). No login run yet. |
+| Minecraft 1.21.8 | Forge 58.1.0 | 21 | Planned | `platform/forge-1.21.8`; shares `platform/forge-common`. Uses the EventBus 7 seam. Build + mixin refmap + tests pass (2026-07-15). No login run yet. Candidate to cover 1.21.6/1.21.7 once those login runs pass. |
+| Minecraft 1.21.1 | NeoForge 21.1.213 | 21 | Planned | Implemented in `platform/neoforge-1.21.1`; the preserved `archive/neoforge-1.21.1-pre-monorepo` branch was API/lifecycle evidence only. Its JDK 21 build, shared fixtures, and codec/lifecycle tests pass, but no modded client/server matrix has run. NeoForge is deferred until the Forge line is login-validated. |
 | Minecraft 1.12.2 | Forge 14.23.5.2860 | 8 | Deferred legacy | Requires an isolated JDK 8 build and protocol-compatibility fixtures. |
 
 An empty folder, version range in metadata, or successful compilation alone is
 not a support claim. Every supported target needs a real two-sided login run.
+The five modern Forge modules build and pass unit tests, but all remain Planned
+until each has its own login run.
 
 ## Recorded runtime evidence
 
@@ -32,9 +38,13 @@ required before a release claim.
 |---|---|---|---|---|
 | 2026-07-12 | NeoForge 1.21.1 | NeoForge 21.1.213 / OpenJDK 21.0.11 | `platform/neoforge-1.21.1/build/libs/trueuuid-1.1.0-neoforge1.21.1.jar` | `:shared:protocol:test :platform:neoforge-1.21.1:build` passed. The adapter codec and lifecycle tests passed; safe endpoint verification is wired, but the real login acceptance matrix is pending. |
 | 2026-07-15 | Forge 1.21.1 | Forge 52.1.0 / OpenJDK 21.0.11 | `platform/forge-1.21.1/build/libs/trueuuid-1.1.0-forge1.21.1.jar` | JDK 21 build, shared fixtures, codec/lifecycle tests, and one real premium client/server login passed. The full matrix is still pending. |
+| 2026-07-15 | Forge 1.21.3 | Forge 53.1.0 / OpenJDK 21.0.11 | `platform/forge-1.21.3/build/libs/trueuuid-1.1.0-forge1.21.3.jar` | `:platform:forge-1.21.3:build` passed (shared `platform/forge-common` recompiled against 1.21.3 mappings; mixin refmap generated; unit tests passed). No login run. |
+| 2026-07-15 | Forge 1.21.4 | Forge 54.1.14 / OpenJDK 21.0.11 | `platform/forge-1.21.4/build/libs/trueuuid-1.1.0-forge1.21.4.jar` | `:platform:forge-1.21.4:build` passed (shared source recompiled against 1.21.4 mappings; refmap generated; unit tests passed). No login run. |
+| 2026-07-15 | Forge 1.21.5 | Forge 55.1.10 / OpenJDK 21.0.11 | `platform/forge-1.21.5/build/libs/trueuuid-1.1.0-forge1.21.5.jar` | `:platform:forge-1.21.5:build` passed (shared source recompiled against 1.21.5 mappings; refmap generated; unit tests passed). No login run. |
+| 2026-07-15 | Forge 1.21.8 | Forge 58.1.0 / OpenJDK 21.0.11 | `platform/forge-1.21.8/build/libs/trueuuid-1.1.0-forge1.21.8.jar` | `:platform:forge-1.21.8:build` passed against the EventBus 7 API (shared source + the `.listener` `@SubscribeEvent` seam; refmap generated; unit tests passed). No login run. |
 
 These build artifacts are validation outputs, not release artifacts or runtime
-support claims. Both rows remain Planned until the complete acceptance matrix
+support claims. Every row remains Planned until the complete acceptance matrix
 in `docs/development/adding-adapter.md` passes, including migration rollback.
 
 ## Target axes
@@ -48,15 +58,59 @@ Use one module per declared target:
 
 ```text
 platform/
-  forge-1.20.1/
-  forge-1.21.1/
+  forge-common/     # shared SOURCE root for the modern Forge line (not a module)
+  forge-1.20.1/     # independent pre-configuration-phase island
+  forge-1.21.1/     # \
+  forge-1.21.3/     #  } each recompiles forge-common against its own Forge/mappings
+  forge-1.21.4/     #  } and adds only its version-divergent shims
+  forge-1.21.5/     # /
+  forge-1.21.8/     # /  (EventBus 7)
   neoforge-1.21.1/
-  fabric-1.20.1/
 ```
 
 Directories are added only when they contain a compiling adapter. Shared code
 does not make an untested loader or Minecraft version supported.
 
+## Modern Forge code sharing
+
+The 1.20.2+ payload-based login protocol is one family. Rather than duplicate the
+adapter across every 1.21.x patch, the version-independent code lives once in
+`platform/forge-common/src/main` (a **source** root, not a Gradle module) and each
+per-version module compiles it against its own Forge version and Minecraft
+mappings via:
+
+```gradle
+def forgeCommon = "${rootDir}/platform/forge-common/src/main"
+sourceSets.main.java.srcDir "${forgeCommon}/java"
+sourceSets.main.resources.srcDir "${forgeCommon}/resources"
+```
+
+There is no shared bytecode — only shared source — so every module still gets a
+correctly remapped jar and refmap. A file may live in `forge-common` only if it
+compiles unchanged against *every* module that includes it. Empirically, across
+Forge 52 (1.21.1) → 58 (1.21.8) the only divergence is:
+
+- the login/GUI mixins + `CustomQueryPayload` records + `ClientAccountStatus`
+  (copied per module; they compile unchanged because the login classes are stable
+  by name across the range), and
+- a one-file `TrueuuidForgeEvents` seam whose only version-specific line is the
+  `@SubscribeEvent` import — `net.minecraftforge.eventbus.api.SubscribeEvent`
+  (EventBus 6, Forge ≤ 55) vs `net.minecraftforge.eventbus.api.listener.SubscribeEvent`
+  (EventBus 7, Forge 56+).
+
+`forge-1.20.1` predates the configuration phase (different login classes, `@Mod`
+event API, and `ResourceLocation` constructor) and deliberately does **not** use
+this root. NeoForge will get the same treatment after the Forge line is
+login-validated.
+
+### Sharing a jar across patches
+
+Source is shared; a **jar** is per Forge build (each patch has its own Forge
+version and remapped refmap). A single module may still declare a wider
+`mods.toml` Minecraft range to cover adjacent patches (e.g. `forge-1.21.8`
+covering 1.21.6/1.21.7), but only after a two-sided login run passes on each
+covered patch. Modules default to their exact build patch until then.
+
 ## Branches and releases
 
 `main` contains the complete active target matrix and is the only integration

docs/architecture/target-matrix.md

@@ -47,6 +47,6 @@ mod_version=1.1.0
 # See https://maven.apache.org/guides/mini/guide-naming-conventions.html
 mod_group_id=cn.alini
 # The authors of the mod. This is a simple text string that is used for display purposes in the mod list.
-mod_authors=_YuWan
+mod_authors=YuWan-030, wish131400, F1xGOD
 # The description of the mod. This is a simple multiline text string that is used for display purposes in the mod list.
-mod_description=
+mod_description=A Minecraft authentication mod for offline-mode servers. It securely verifies premium accounts during login while keeping each player's access token on their own client.

gradle.properties

@@ -23,9 +23,9 @@ displayName = "${mod_name}" #mandatory
 # A URL to query for updates for this mod. See the JSON update specification https://docs.minecraftforge.net/en/latest/misc/updatechecker/
 #updateJSONURL="https://change.me.example.invalid/updates.json" #optional
 # A URL for the "homepage" for this mod, displayed in the mod UI
-displayURL = "https://github.com/YuWan-030" #optional
+displayURL = "https://github.com/YuWan-030/TrueUUID" #optional
 # A file name (in the root of the mod JAR) containing a logo for display
-#logoFile="trueuuid.png" #optional
+logoFile="trueuuid-banner.png" #optional
 # A text field displayed in the mod UI
 #credits="Thanks for this example mod goes to Java" #optional
 # A text field displayed in the mod UI

platform/forge-1.20.1/src/main/resources/META-INF/mods.toml

@@ -0,0 +1 @@
+../../../../../branding/trueuuid-banner.png

platform/forge-1.20.1/src/main/resources/trueuuid-banner.png

@@ -31,6 +31,16 @@ base {
     archivesName = 'trueuuid'
 }
 
+// Version-independent adapter code (entrypoint, config, runtime, registry,
+// login flow, net ids, mixin plugin) and identical resources (lang, mixins
+// config, pack.mcmeta) live once in platform/forge-common and are compiled by
+// every per-version Forge module against its own Forge/mappings. Only the
+// version-divergent shims (mixins, payloads, client render, mods.toml) stay in
+// this module's own src tree.
+def forgeCommon = "${rootDir}/platform/forge-common/src/main"
+sourceSets.main.java.srcDir "${forgeCommon}/java"
+sourceSets.main.resources.srcDir "${forgeCommon}/resources"
+
 java {
     toolchain.languageVersion = JavaLanguageVersion.of(21)
 }