Skip to content

Port to 26.1.2 (Java 25, Mojmap): rebase #4990 on 1.21.11, all loaders incl. Forge#5061

Open
AndreNijman wants to merge 5 commits into
cabaletta:1.21.11from
AndreNijman:port-26.1.2
Open

Port to 26.1.2 (Java 25, Mojmap): rebase #4990 on 1.21.11, all loaders incl. Forge#5061
AndreNijman wants to merge 5 commits into
cabaletta:1.21.11from
AndreNijman:port-26.1.2

Conversation

@AndreNijman

@AndreNijman AndreNijman commented Jun 25, 2026

Copy link
Copy Markdown

Continues and completes #4990 by @fnltochka (their commits are preserved here). That PR was stuck at CONFLICTING with Forge unfinished; this rebases it onto the current 1.21.11 tip and finishes the loaders.

What changed vs #4990

  • Merged latest 1.21.11 and resolved the conflicts. They were all in build config (every Java source auto-merged). The base's recent "update unimined & gradle" commit had already converged on the same Unimined 1.4.2-SNAPSHOT the port needs, which is what unblocked Forge.
    • Kept the 26.1.2 loader versions (forge 64.0.8 / neoforge 73 / fabric 0.19.3).
    • Dropped parchment(...) — there is no 26.1.2 Parchment build — keeping mojmap + devFallbackNamespace "official".
    • Kept the base's newer runs config API (mainClass = ... / args.addAll([...])) and gradle-wrapper hardening.

Validation (built locally on Zulu JDK 25 w/ jmods)

Check Result
Fabric build ✅ incl. ProGuard (confirms the jmods/JDK-25 path)
NeoForge build
Forge build ✅ — this was the open TODO in #4990
:test ✅ passed
Mixin apply-time check MixinWorldRenderer#onStartHand params verified against the real 26.1.2 LevelRenderer#renderLevel bytecode (javap)

So this produces standalone jars for all three loaders (Fabric/NeoForge/Forge).

Still wants a human pass

  • An in-game smoke test (load a jar, confirm pathfinding) — couldn't run a real client in my build environment. Compile + tests + bytecode-verified mixins give high confidence, but a runtime check is worth doing before release.

fnltochka and others added 5 commits April 2, 2026 01:11
Copilot AI review requested due to automatic review settings June 25, 2026 01:56

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot encountered an error and was unable to review this pull request. You can try again by re-requesting a review.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants