I need your help

[3ndetz]

Hey guys! we have a big problem: branch 1.21.11 is too far form the main. And RiaDev gave too much good bugfixes on main.
So we have 3 different branches:

• main (old, semi-stable)
• main -> RiaDev (stable, a lot of bugfixes)
• main -> 1.21.11 (very non-stable with lots of bugs on new version, but working on latest version and solved a lot of multiversioning problems)

And we have to decide where goes the future of the project: main -> RiaDev and then developing this and maybe later will be very hard port to 1.21.11 and later, or main -> 1.21.11 and then cherry-picking bugfixes from RiaDev's branches, but we need days for bugfixing 1.21.11 compatiblity remaining problems, especially in baritone and some in altoclef

[3ndetz]

@RiaDev1 what do you think we should do?

[3ndetz]

if you will merge your last fixes into 1.21.11 branch I'll totally merge it with main
but now I don't know what to do, all these branches have a lot of various fixes

[3ndetz]

@RiaDev1 I've cherry-picked all your PR #23 fixes onto the 1.21.11 branch (14 of 15 commits — skipped 5c8b99f because 1.21.11 already runs Gradle 9.4.1, no need to downgrade to 8.9).

Conflict resolutions worth flagging:

• MixinClientPlayerEntity.java: merged your try-catch around EXECUTOR.tick() with the 1.21.11 TungstenModDataContainer.isExecutorRunning() API (1.21.11 wraps the null/state check in a static helper). Result: try-catch preserved, uses the new API.
• Agent.java (in commit 84d40d9): kept your later proper fix from 4ad0734 (agent.airStrafingSpeed = player.airStrafingSpeed) and dropped the temporary 0.06f workaround. The earlier commit was a build-fix stopgap that the later commit superseded — applying both would have reintroduced the regression.
• .gitignore: kept both shredder/.classpath (1.21.11) and your wrapper-jar comment.

Per the plan in this issue: now 1.21.11 carries both the multiversioning infra and your bugfixes. Please rebase your branch onto the latest 1.21.11 (3b4cdc0) so we can merge it into main as the new base.

cc @3ndetz

[RiaDev1]

Hey, thanks for pinging me — I don't check GitHub that often so sorry for the late reply.

I think merging the bugfixes into main first makes sense, then rebase 1.21.11 on top of that. My fixes are all on main and don't touch version-specific stuff.

If you'd rather go the other way I can help too, just not always online so bear with me.

[RiaDev1]

Done. Rebased onto 1.21.11 (d6a08d9). The conflict resolutions look good — using isExecutorRunning() is cleaner, and dropping the 0.06f stopgap for the proper airStrafingSpeed fix is correct.

Let me know if there's anything else needed before merging into main.

[3ndetz]

@RiaDev1 thanks for the contributions! Now we're on the main, you can swtich to the main branch and rebase on it.