Skip to content

Fix -printsync command line option #782

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 2 commits into from
Oct 25, 2025
Merged

Fix -printsync command line option #782

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
caf690b
Fix -printsync command line option
mibac138 Oct 25, 2025
f6eef97
Remove unused SyncTransformer.liveType
mibac138 Oct 25, 2025
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
18 changes: 9 additions & 9 deletions Source/Client/Syncing/Handler/SyncDelegate.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
using HarmonyLib;
using Multiplayer.API;
using Multiplayer.Common;
using System;
using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using HarmonyLib;
using Multiplayer.API;
using Multiplayer.Client.Util;
using Multiplayer.Common;
using Verse;

namespace Multiplayer.Client
Expand Down Expand Up @@ -68,7 +68,7 @@ protected override void WriteTarget(object target, object[] args, SyncMethodWrit
var path = fieldPaths[i];

if (fieldTransformers[i] is SyncTransformer tr)
writer(tr.Writer.DynamicInvoke(val, target, args), tr.NetworkType, path);
writer(tr.writer.DynamicInvoke(val, target, args), tr.networkType, path);
else if (!fieldTypes[i].IsCompilerGenerated())
{
var type = (SyncType)fieldTypes[i];
Expand All @@ -92,7 +92,7 @@ protected override object ReadTarget(ByteReader data)
object value;

if (fieldTransformers[i] is SyncTransformer tr)
value = tr.Reader.DynamicInvoke(SyncSerialization.ReadSyncObject(data, tr.NetworkType));
value = tr.reader.DynamicInvoke(SyncSerialization.ReadSyncObject(data, tr.networkType));
else if (fieldType.IsCompilerGenerated())
value = Activator.CreateInstance(fieldType);
else
Expand Down Expand Up @@ -149,7 +149,7 @@ public ISyncDelegate TransformField<Live, Networked>(string field, Serializer<Li
if (!skipTypeCheck && fieldTypes[index] != typeof(Live))
throw new Exception($"Field transformer type mismatch for {this}: {fieldTypes[index]} != {typeof(Live)}");

fieldTransformers[index] = new(typeof(Live), typeof(Networked), serializer.Writer, serializer.Reader);
fieldTransformers[index] = new(typeof(Networked), serializer.Writer, serializer.Reader);
return this;
}

Expand Down Expand Up @@ -188,12 +188,12 @@ public override void Validate()
{
for (int i = 0; i < fieldTypes.Length; i++)
if (fieldTransformers[i] is SyncTransformer tr)
ValidateType($"Field {fieldPaths[i]} type", tr.NetworkType);
ValidateType($"Field {fieldPaths[i]} type", tr.networkType);
else if (!fieldTypes[i].IsCompilerGenerated())
ValidateType($"Field {fieldPaths[i]} type", fieldTypes[i]);

for (int i = 0; i < argTypes.Length; i++)
ValidateType($"Arg {i} type", argTransformers[i]?.NetworkType ?? argTypes[i]);
ValidateType($"Arg {i} type", argTransformers[i]?.networkType ?? argTypes[i]);
}

public override string ToString()
Expand Down
29 changes: 17 additions & 12 deletions Source/Client/Syncing/Handler/SyncMethod.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,21 @@
using HarmonyLib;
using Multiplayer.API;
using Multiplayer.Common;
using System;
using System.Linq;
using System.Reflection;
using HarmonyLib;
using Multiplayer.API;
using Multiplayer.Client.Util;
using Multiplayer.Common;
using MultiplayerLoader;
using Verse;

namespace Multiplayer.Client
{
public record SyncTransformer(Type LiveType, Type NetworkType, Delegate Writer, Delegate Reader);
public class SyncTransformer(Type networkType, Delegate writer, Delegate reader)
{
public Type networkType = networkType;
public Delegate writer = writer;
public Delegate reader = reader;
}

public delegate void SyncMethodWriter(object obj, SyncType type, string debugInfo);

Expand Down Expand Up @@ -108,7 +113,7 @@ void SyncObj(object obj, SyncType type, string debugInfo)
}

if (targetTransformer != null)
SyncObj(targetTransformer.Writer.DynamicInvoke(target, target, args), targetTransformer.NetworkType, "Target (transformed)");
SyncObj(targetTransformer.writer.DynamicInvoke(target, target, args), targetTransformer.networkType, "Target (transformed)");
else
WriteTarget(target, args, SyncObj);

Expand All @@ -118,7 +123,7 @@ void SyncObj(object obj, SyncType type, string debugInfo)

for (int i = 0; i < argTypes.Length; i++)
if (argTransformers[i] is { } trans)
SyncObj(trans.Writer.DynamicInvoke(args[i], target, args), trans.NetworkType, $"Arg {i} {argNames[i]} (transformed)");
SyncObj(trans.writer.DynamicInvoke(args[i], target, args), trans.networkType, $"Arg {i} {argNames[i]} (transformed)");

int mapId = map?.uniqueID ?? ScheduledCommand.Global;
writer.Log.Node("Map id: " + mapId);
Expand All @@ -142,7 +147,7 @@ public override void Handle(ByteReader data)
object target;

if (targetTransformer != null)
target = targetTransformer.Reader.DynamicInvoke(SyncSerialization.ReadSyncObject(data, targetTransformer.NetworkType));
target = targetTransformer.reader.DynamicInvoke(SyncSerialization.ReadSyncObject(data, targetTransformer.networkType));
else
target = ReadTarget(data);

Expand All @@ -163,7 +168,7 @@ public override void Handle(ByteReader data)

for (int i = 0; i < argTypes.Length; i++)
if (argTransformers[i] is { } trans)
args[i] = trans.Reader.DynamicInvoke(SyncSerialization.ReadSyncObject(data, trans.NetworkType));
args[i] = trans.reader.DynamicInvoke(SyncSerialization.ReadSyncObject(data, trans.networkType));

if (cancelIfAnyArgNull && args.Any(a => a == null))
return;
Expand Down Expand Up @@ -261,7 +266,7 @@ public ISyncMethod TransformArgument<Live, Networked>(int index, Serializer<Live
if (!skipTypeCheck && argTypes[index].type != typeof(Live))
throw new Exception($"Arg transformer type mismatch for {this}: {argTypes[index].type} != {typeof(Live)}");

argTransformers[index] = new(typeof(Live), typeof(Networked), serializer.Writer, serializer.Reader);
argTransformers[index] = new(typeof(Networked), serializer.Writer, serializer.Reader);
return this;
}

Expand All @@ -270,7 +275,7 @@ public ISyncMethod TransformTarget<Live, Networked>(Serializer<Live, Networked>
if (!skipTypeCheck && targetType != typeof(Live))
throw new Exception($"Target transformer type mismatch for {this}: {targetType} != {typeof(Live)}");

targetTransformer = new(typeof(Live), typeof(Networked), serializer.Writer, serializer.Reader);
targetTransformer = new(typeof(Networked), serializer.Writer, serializer.Reader);
return this;
}

Expand Down Expand Up @@ -305,10 +310,10 @@ public static SyncMethod LocalFunc(Type parentType, string parentMethod, string

public override void Validate()
{
ValidateType("Target type", targetTransformer?.NetworkType ?? targetType);
ValidateType("Target type", targetTransformer?.networkType ?? targetType);

for (int i = 0; i < argTypes.Length; i++)
ValidateType($"Arg {i} type", argTransformers[i]?.NetworkType ?? argTypes[i]);
ValidateType($"Arg {i} type", argTransformers[i]?.networkType ?? argTypes[i]);
}

public override string ToString()
Expand Down
Loading