Fix Exosuit Framework multiplayer desyncs by 1Anton10 · Pull Request #597 · rwmt/Multiplayer-Compatibility

1Anton10 · 2026-06-23T11:51:00Z

Summary

Rewrite ExosuitFramework compat for current Exosuit/Mechsuit namespaces (old WalkerGear.* patches were no-ops).
Sync gizmos, float menus, turrets, catapult jump, and RNG usage in combat/repair.
Fix multiplayer desyncs from unsynced job creation:
- Rewrite LayDown/Wait_Asleep → WG_SleepInWalkerCore in Pawn_JobTracker.StartJob.
- Block JobReplacerPatch in MP (it cancelled StartJob and issued local TryTakeOrderedJob).
- Redirect TryMakeJob_GearOn/GearOff to synced StartJob instead of blocking gear logic in MP.
Fix startup crash: defer type-dependent lambda/sync registration to LatePatch.
Harden init: skip missing methods/lambdas with warnings; avoid duplicating ITab sync covered by Exosuit MP.RegisterAll().
Thread safety: PatchPushPopRand runs in LatePatch (avoids texture creation on background thread).
Gizmos: patch Building_EjectorBay Find.CurrentMap on compiler-generated lambdas 0–1.
RunAndGun kotobike fork: register roolo.RunAndGun.kotobike, sync CompRunAndGun.isEnabled, gizmo toggle via lambda delegate.
CE Move While Reloading (himawari): apply missing TryCastNextBurstShot patch when kotobike/memegoddess RunAndGun is active; skip CEMoveReload PawnGotoAction hijack outside reload in MP so movement uses vanilla MP job sync.

Load order (important)

Multiplayer Compatibility must load immediately after Multiplayer and before Vanilla Expanded Framework (see About.xml loadBefore). Exosuit Framework loads after VEF.

Multiplayer → Multiplayer Compatibility → HugsLib → VEF → Exosuit Framework → …

Test plan

Load order: MP → MpCompat → HugsLib → VEF → Exosuit (no red warning on MpCompat).
Player.log contains:
- MPCompat :: Initialized compatibility for aoba.exosuit.framework
- MPCompat :: Initialized compatibility for himawari.moveWhileReloading (if MWR active)
Exosuit: get in/out, modules ITab, turret, sleep (no GetNextJobID desync).
CE + RunAndGun kotobike + Move While Reloading + Simple Sidearms: draft, shoot, reload while moving, sidearm swap.
Host + client: no new MpDesyncs during combat with above mod stack.

Notes

CE + RunAndGun + Move While Reloading stack had two MP issues outside Exosuit: CEMoveReload static init only detected roolo.RunAndGun (not kotobike), and Prefix_PawnGotoAction bypassed MP job sync when not reloading.

Update compat for the Exosuit/Mechsuit rewrite: sync gizmos, ITab work, turrets, and RNG; block unsynced job creation from sleep/gear patches. Co-authored-by: Cursor <cursoragent@cursor.com>

Defer type-dependent gizmo and sync registrations to LatePatch so Exosuit assemblies are loaded before lambda lookup. Co-authored-by: Cursor <cursoragent@cursor.com>

Use safe lambda/sync registration in LatePatch, drop redundant ITab sync methods already covered by Exosuit MP.RegisterAll(), and log successful init without aborting the whole compat class. Co-authored-by: Cursor <cursoragent@cursor.com>

Defer RNG patches to LatePatch so Exosuit_Core static init does not create textures on a background thread. Drop obsolete MaintenanceBay lambda sync (covered by Exosuit MP.RegisterAll), and patch EjectorBay Find.CurrentMap on compiler-generated lambdas instead of GetGizmos. Co-authored-by: Cursor <cursoragent@cursor.com>

Register roolo.RunAndGun.kotobike and sync CompRunAndGun.isEnabled. Add MoveWhileReloading compat for himawari fork (kotobike burst patch, MP-safe PawnGoto outside reload). Redirect Exosuit gear on/off to synced StartJob instead of blocking TryMakeJob in multiplayer. Co-authored-by: Cursor <cursoragent@cursor.com>

…tart Register iterator delegates via Sync.RegisterSyncDelegate(MethodInfo) instead of broken nested-type lookup. Harden Exosuit pawn gizmos, module damage, and gear job routing; sync RunAndGun isEnabled for kotobike; patch System.Random in flee logic; fix case-insensitive mod loader matching for Move While Reloading. Co-authored-by: Cursor <cursoragent@cursor.com>

notfood

This PR is testing my patience.

notfood · 2026-06-23T20:24:54Z

-            MpCompat.RegisterLambdaMethod("WalkerGear.ModuleComp_EmergencyEject", nameof(ThingComp.CompGetWornGizmosExtra), 1);
+            try
+            {
+                var lambda = MpMethodUtil.GetLambda(ejectorType, nameof(Building.GetGizmos), MethodType.Normal, null, ord);


I do not believe every gizmo should be synced. Double check this.

notfood · 2026-06-23T20:26:10Z

+            PatchTurrets();
+            PatchCatapult();
+            PatchExosuitDamage();
+            Log.Message("MPCompat :: Initialized compatibility for aoba.exosuit.framework");


Remove. No need to double log it.

notfood · 2026-06-23T20:30:29Z

+            "Exosuit.Exosuit_Core:ExosuitDestory",
+            "Exosuit.MechUtility:DissambleFrom",
+            "Exosuit.Verb_MeleeSweep:DoSweep",
+            "Exosuit.Building_AutoRepairArm:Tick",


Suspicious, not every Rand call needs it, specially Tick. The calls from AI are already under push pop, you only need to protect those from UI.

notfood · 2026-06-23T20:31:17Z

+    {
+        var getGizmos = AccessTools.Method(typeof(Pawn), nameof(Pawn.GetGizmos));
+        if (getGizmos == null)
+            return;


Return with no warning?

notfood · 2026-06-23T20:32:11Z

+            finalizer: new HarmonyMethod(typeof(ExosuitFramework), nameof(RecoverPawnGetGizmos)));
+    }
+
+    private static void GuardPawnGizmoResultBeforeExosuit(ref IEnumerable<Gizmo> __result)


What's the reason for this?

notfood · 2026-06-23T20:43:55Z

+        return registered.Count > 0 ? registered.ToArray() : null;
+    }
+
+    private static ISyncMethod[] TryRegisterLambdaMethod(string parentType, string parentMethod, params int[] lambdaOrdinals)


Ok that's enough for me.

notfood · 2026-06-23T20:44:44Z

+
+namespace Multiplayer.Compat;
+
+/// <summary>CE - Move while reloading (Continue) by himawari</summary>


I thought this was about Exosuit Framework.

notfood · 2026-06-23T20:45:28Z


 namespace Multiplayer.Compat
 {
    /// <summary>RunAndGun by roolo</summary>


notfood · 2026-06-23T20:45:51Z


            MpCompatLoader.Load(content);
            harmony.PatchAll();
+            MultiplayerReconnectFix.Apply();


notfood · 2026-06-23T20:46:28Z

+/// Fixes RimWorld Multiplayer reconnect after "fix and restart" on mod mismatch.
+/// Host stale pendingSteam blocks repeat Steam P2P approval; lingering join slots block the same username.
+/// </summary>
+public static class MultiplayerReconnectFix


Steam P2P reconnect after fix-and-restart belongs in rwmt/Multiplayer, not the compatibility layer. Co-authored-by: Cursor <cursoragent@cursor.com>

Co-authored-by: Cursor <cursoragent@cursor.com>

Align ExosuitFramework with maintainer feedback: selective gizmo sync, restore maintenance bay API sync, remove broad Rand/gizmo guards, cache ApplyDamageToModules via MethodInvoker, and drop catapult DoJump sync. Remove MoveWhileReloading and revert RunAndGun from this PR; those will follow as separate changes. Keep MpCompat lambda/state-machine helpers needed for Exosuit float menu provider sync. Co-authored-by: Cursor <cursoragent@cursor.com>

1Anton10 · 2026-06-23T21:54:08Z

Response to review (requested changes)

Thanks for the detailed review. I've pushed a revision that addresses each point below. RunAndGun / Move While Reloading / MultiplayerReconnectFix are removed from this PR — they will follow as separate PRs if still needed.

Gizmo syncing — not every gizmo

Agreed. Reverted to selective sync matching the original WalkerGear intent, adapted to Exosuit type names:

Target	Ordinals	Why
`Patch_Pawn_GetGizmos.Postfix`	0, 1	Player get-in / get-out buttons
`Building_EjectorBay.GetGizmos`	0, 1	Eject to tile / launch to map (`CurrentMap`)
`Building_MaintenanceBay.GetGizmos`	0, 2	Get in / toggle auto-repair
`ModuleComp_EmergencyEject.CompGetWornGizmosExtra`	1	Safety toggle (eject goes through synced `Eject()`)

Removed: blanket sync of CompModuleWeapon (0,1,2), CompTurretGun.GetGizmos (0–3), ejector lambda 2 (release → Eject()).

Double log removed

Removed Log.Message("MPCompat :: Initialized compatibility for aoba.exosuit.framework"). Loader already logs compat init.

`PatchPushPopRand` removed

Removed entirely. Combat / tick paths (Tick, TryCastShot, damage methods) are already under MP's RNG push/pop from AI. No UI-only Rand desync was reproduced after fixing job/gizmo sync. Will add back only a specific UI entry point if testing shows one.

`PatchExosuitPawnGetGizmosSafety` removed

Removed the Pawn.GetGizmos guard + finalizer. This was a workaround for Exosuit's postfix calling __result.ToList() on null; with selective gizmo sync the crash no longer reproduces in our tests. If it returns on a specific Exosuit version we will patch Exosuit's postfix directly instead of globally wrapping Pawn.GetGizmos.

Maintenance bay / float menu sync restored

Restored from upstream compat (renamed types):

MP.RegisterSyncMethod(Building_MaintenanceBay, "AddOrReplaceModule")
MP.RegisterSyncMethod(Building_MaintenanceBay, "RemoveModules")
Float menu lambdas + FloatMenuOptionProvider_ExosuitDown

Exosuit_Core:Eject registered in PatchJobs (same role as old WalkerGear_Core:Eject).

`ApplyDamageToModules` — fast delegate

Replaced per-hit AccessTools.Method + Invoke with MethodInvoker.GetHandler cached at init on Exosuit_Core.ApplyDamageToModules.

`PatchCatapult` — no `DoJump`

Removed WG_AbilityVerb_QuickJump.DoJump sync. Abilities are already synced by MP; syncing one overload of four was incorrect. Kept only WG_PawnFlyer.GetOptionsForTile (0, 1) for catapult tile picker UI.

`TryRegisterLambdaMethod` helpers removed

Removed local wrappers; call MpCompat.RegisterLambdaMethod / RegisterLambdaDelegate directly like other compat classes.

Out of scope for this PR

Change	Action
`MoveWhileReloading.cs`	Removed — separate PR
`RunandGun.cs` kotobike toggle	Reverted — separate PR
`MultiplayerReconnectFix`	Already removed; fix belongs in Multiplayer mod itself

Kept in this PR (with justification)

MpCompat.RegisterLambdaDelegateInternal + MpMethodUtil iterator lookup: needed for FloatMenuOptionProvider_ExosuitDown.GetOptionsFor — lambdas live inside <GetOptionsFor>d__N state machines, not direct nested display classes. Without this, init throws Could not find method ... in Exosuit.FloatMenuOptionProvider_ExosuitDown.

MpCompatLoader case-insensitive PackageId match: fixes compat not loading when workshop PackageId casing differs from [MpCompatFor] attribute.

Testing

MP session start without Exosuit lambda init errors
Pawn get-in/out gizmos visible on client
Maintenance bay module add/remove
Ejector bay map actions
Long session desync regression (host + client)

Happy to split further or drop anything that still looks too broad.

sviyh · 2026-06-24T14:36:21Z

This PR is testing my patience.

Yeah, my hype is pretty much gone. I realized I spent a week reworking grav ship patch after doing an initial implementation using claudecode. You have to learn the frameworks and read everything still. Maybe the next iteration of coding agents/tools will do better.

1Anton10 and others added 6 commits June 23, 2026 16:40

Fix Exosuit Framework multiplayer desyncs

cf84789

Update compat for the Exosuit/Mechsuit rewrite: sync gizmos, ITab work, turrets, and RNG; block unsynced job creation from sleep/gear patches. Co-authored-by: Cursor <cursoragent@cursor.com>

Fix Exosuit compat init crash on load

a24ccff

Defer type-dependent gizmo and sync registrations to LatePatch so Exosuit assemblies are loaded before lambda lookup. Co-authored-by: Cursor <cursoragent@cursor.com>

notfood requested changes Jun 23, 2026

View reviewed changes

1Anton10 and others added 3 commits June 24, 2026 02:40

Remove MpCompat reconnect workaround now fixed upstream in Multiplayer

fcf7dae

Steam P2P reconnect after fix-and-restart belongs in rwmt/Multiplayer, not the compatibility layer. Co-authored-by: Cursor <cursoragent@cursor.com>

Delete MultiplayerReconnectFix.cs (moved to Multiplayer mod)

8e8446c

Co-authored-by: Cursor <cursoragent@cursor.com>


		namespace Multiplayer.Compat;

		/// <summary>CE - Move while reloading (Continue) by himawari</summary>

Uh oh!

Uh oh!

Conversation

1Anton10 commented Jun 23, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Load order (important)

Test plan

Notes

Uh oh!

notfood left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

1Anton10 commented Jun 23, 2026

Response to review (requested changes)

Gizmo syncing — not every gizmo

Double log removed

PatchPushPopRand removed

PatchExosuitPawnGetGizmosSafety removed

Maintenance bay / float menu sync restored

ApplyDamageToModules — fast delegate

PatchCatapult — no DoJump

TryRegisterLambdaMethod helpers removed

Out of scope for this PR

Kept in this PR (with justification)

Testing

Uh oh!

sviyh commented Jun 24, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

1Anton10 commented Jun 23, 2026 •

edited

Loading

`PatchPushPopRand` removed

`PatchExosuitPawnGetGizmosSafety` removed

`ApplyDamageToModules` — fast delegate

`PatchCatapult` — no `DoJump`

`TryRegisterLambdaMethod` helpers removed

sviyh commented Jun 24, 2026 •

edited

Loading