Skip to content

Fix #521 #527

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
notfood merged 1 commit into from
Jul 1, 2025
Merged

Fix #521 #527

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
86 changes: 80 additions & 6 deletions Source/Client/Syncing/Game/SyncActions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
using System;
using System.Collections.Generic;
using System.Reflection;
using HarmonyLib;
using Verse;

namespace Multiplayer.Client
Expand All @@ -12,23 +13,96 @@ static class SyncActions
static SyncAction<FloatMenuOption, WorldObject, Caravan, object> SyncWorldObjCaravanMenus;
static SyncAction<FloatMenuOption, WorldObject, IEnumerable<IThingHolder>, CompLaunchable> SyncTransportPodMenus;

static Type CaravanActionConfirmationType;
static Type TransportPodActionConfirmationType;

public static void Init()
{
SyncWorldObjCaravanMenus = RegisterActions((WorldObject obj, Caravan c) => obj.GetFloatMenuOptions(c), o => ref o.action);
void Error(string error)
{
Multiplayer.loadingErrors = true;
Log.Error(error);
}

// TODO: Use MpMethodUtil instead if we decide to make it work with generic types/methods (already in MP Compat, so use it). Or remove this TODO if we decide not to.
CaravanActionConfirmationType = AccessTools.Inner(typeof(CaravanArrivalActionUtility), "<>c__DisplayClass0_1`1");
TransportPodActionConfirmationType = AccessTools.Inner(typeof(TransportPodsArrivalActionUtility), "<>c__DisplayClass0_0`1");

if (CaravanActionConfirmationType == null) Error($"Could not find type: {nameof(CaravanArrivalActionUtility)}.<>c__DisplayClass0_1<T>");
if (TransportPodActionConfirmationType == null) Error($"Could not find type: {nameof(TransportPodsArrivalActionUtility)}.<>c__DisplayClass0_0<T>");

SyncWorldObjCaravanMenus = RegisterActions((WorldObject obj, Caravan c) => obj.GetFloatMenuOptions(c), ActionGetter, WorldObjectCaravanMenuWrapper);
SyncWorldObjCaravanMenus.PatchAll(nameof(WorldObject.GetFloatMenuOptions));

SyncTransportPodMenus = RegisterActions((WorldObject obj, IEnumerable<IThingHolder> p, CompLaunchable r) => obj.GetTransportPodsFloatMenuOptions(p, r), o => ref o.action);
SyncTransportPodMenus = RegisterActions((WorldObject obj, IEnumerable<IThingHolder> p, CompLaunchable r) => obj.GetTransportPodsFloatMenuOptions(p, r), o => ref o.action, TransportPodMenuWrapper);
SyncTransportPodMenus.PatchAll(nameof(WorldObject.GetTransportPodsFloatMenuOptions));
}

static SyncAction<T, A, B, object> RegisterActions<T, A, B>(Func<A, B, IEnumerable<T>> func, ActionGetter<T> actionGetter)
private static ref Action ActionGetter(FloatMenuOption o) => ref o.action;

private static Action WorldObjectCaravanMenuWrapper(FloatMenuOption instance, WorldObject a, Caravan b, object c, Action original, Action sync)
{
if (instance.action.Method.DeclaringType is not { IsGenericType: true })
return null;

if (instance.action.Method.DeclaringType.GetGenericTypeDefinition() != CaravanActionConfirmationType)
return null;

return () =>
{
var field = AccessTools.DeclaredField(original.Target.GetType(), "action");
if (!Multiplayer.ExecutingCmds)
{
// If not in a synced call then replace the method that will be
// called by confirmation dialog with our synced method call.
field.SetValue(original.Target, sync);
original();
return;
}

// If we're in a synced call, just call the action itself (after confirmation dialog)
((Action)field.GetValue(original.Target))();
};
}

public static Action TransportPodMenuWrapper(FloatMenuOption instance, WorldObject worldObject, IEnumerable<IThingHolder> thingHolders, CompLaunchable compLaunchable, Action original, Action sync)
{
if (instance.action.Method.DeclaringType is not { IsGenericType: true })
return null;

if (instance.action.Method.DeclaringType.GetGenericTypeDefinition() != TransportPodActionConfirmationType)
return null;

return () =>
{
var field = AccessTools.DeclaredField(original.Target.GetType(), "uiConfirmationCallback");

if (Multiplayer.ExecutingCmds)
{
// Remove UI confirmation during synced commands so the method is just called directly
field.SetValue(original.Target, null);
original();
return;
}

var confirmation = (Action<Action>)field.GetValue(original.Target);
// If no confirmation dialog, just sync
if (confirmation == null)
sync();
// If there's a confirmation dialog, call it with sync as its synced method
else
confirmation(sync);
};
}

static SyncAction<T, A, B, object> RegisterActions<T, A, B>(Func<A, B, IEnumerable<T>> func, ActionGetter<T> actionGetter, ActionWrapper<T, A, B, object> actionWrapper = null)
{
return RegisterActions<T, A, B, object>((a, b, c) => func(a, b), actionGetter);
return RegisterActions<T, A, B, object>((a, b, c) => func(a, b), actionGetter, actionWrapper);
}

static SyncAction<T, A, B, C> RegisterActions<T, A, B, C>(Func<A, B, C, IEnumerable<T>> func, ActionGetter<T> actionGetter)
static SyncAction<T, A, B, C> RegisterActions<T, A, B, C>(Func<A, B, C, IEnumerable<T>> func, ActionGetter<T> actionGetter, ActionWrapper<T, A, B, C> actionWrapper = null)
{
var sync = new SyncAction<T, A, B, C>(func, actionGetter);
var sync = new SyncAction<T, A, B, C>(func, actionGetter, actionWrapper);
Sync.handlers.Add(sync);

return sync;
Expand Down
44 changes: 36 additions & 8 deletions Source/Client/Syncing/Handler/SyncAction.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@

namespace Multiplayer.Client
{
public delegate ref Action ActionGetter<T>(T t);
public delegate ref Action ActionGetter<in T>(T t);
public delegate Action ActionWrapper<in T, in A, in B, in C>(T instance, A a, B b, C c, Action original, Action syncAction);

public interface ISyncAction
{
Expand All @@ -20,11 +21,13 @@ public class SyncAction<T, A, B, C> : SyncHandler, ISyncAction
{
private Func<A, B, C, IEnumerable<T>> func;
private ActionGetter<T> actionGetter;
private ActionWrapper<T, A, B, C> actionWrapper;

public SyncAction(Func<A, B, C, IEnumerable<T>> func, ActionGetter<T> actionGetter)
public SyncAction(Func<A, B, C, IEnumerable<T>> func, ActionGetter<T> actionGetter, ActionWrapper<T, A, B, C> actionWrapper = null)
{
this.func = func;
this.actionGetter = actionGetter;
this.actionWrapper = actionWrapper ?? ((_, _, _, _, _, _) => null);
}

public IEnumerable<T> DoSync(A target, B arg0, C arg1)
Expand All @@ -40,7 +43,9 @@ public IEnumerable<T> DoSync(A target, B arg0, C arg1)
int j = i;
i++;
var original = actionGetter(t);
actionGetter(t) = () => ActualSync(target, arg0, arg1, original);
var sync = () => ActualSync(target, arg0, arg1, original);
var wrapper = actionWrapper(t, target, arg0, arg1, original, sync);
actionGetter(t) = wrapper ?? sync;

yield return t;
}
Expand Down Expand Up @@ -68,12 +73,18 @@ private void ActualSync(A target, B arg0, C arg1, Action original)
SyncSerialization.WriteSync(writer, arg0);
SyncSerialization.WriteSync(writer, arg1);

writer.WriteInt32(GenText.StableStringHash(original.Method.MethodDesc()));
Log.Message(original.Method.MethodDesc());
var methodDesc = original.Method.MethodDesc();
writer.Log.Node($"Method desc: {methodDesc}");
writer.WriteInt32(GenText.StableStringHash(methodDesc));

// If target is null then just sync the hash for null
var typeDesc = (original.Target?.GetType()).FullDescription();
writer.Log.Node($"Type desc: {typeDesc}");
writer.WriteInt32(GenText.StableStringHash(typeDesc));

int mapId = writer.MpContext().map?.uniqueID ?? -1;

writer.Log.Node("Map id: " + mapId);
writer.Log.Node($"Map id: {mapId}");
Multiplayer.WriterLog.AddCurrentNode(writer);

SendSyncCommand(mapId, writer);
Expand All @@ -85,9 +96,26 @@ public override void Handle(ByteReader data)
B arg0 = SyncSerialization.ReadSync<B>(data);
C arg1 = SyncSerialization.ReadSync<C>(data);

int descHash = data.ReadInt32();
int methodDescHash = data.ReadInt32();
int typeDescHash = data.ReadInt32();

var action = func(target, arg0, arg1)
.Where(t =>
{
var a = actionGetter(t);
// Match both the method description and target type description (including generics), or "null" string for the type
return GenText.StableStringHash(a.Method.MethodDesc()) == methodDescHash &&
GenText.StableStringHash((a.Target?.GetType()).FullDescription()) == typeDescHash;
})
.Select(t =>
{
var a = actionGetter(t);
var w = actionWrapper(t, target, arg0, arg1, a, null);
// Return the wrapper (if present) or the action itself
return w ?? a;
})
.FirstOrDefault();

var action = func(target, arg0, arg1).Select(t => actionGetter(t)).FirstOrDefault(a => GenText.StableStringHash(a.Method.MethodDesc()) == descHash);
action?.Invoke();
}

Expand Down
Loading