charleslemaux/Mirror
1
0
Fork 0
mirror of https://github.com/MirrorNetworking/Mirror.git synced 2024-11-18 02:50:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Weaver.ResolveMethodWithArg moved to Resolvers

Browse Source
This commit is contained in:
vis2k 2019-01-02 13:15:24 +01:00
parent 6252201f21
commit 3a6a994e37
2 changed files with 64 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
Mirror/Weaver/Resolvers.cs
View File

@ -56,5 +56,46 @@ public static MethodReference ResolveMethodInParents(TypeReference tr, AssemblyD
// Could not find the method in this class, try the parent // Could not find the method in this class, try the parent
return ResolveMethodInParents(tr.Resolve().BaseType, scriptDef, name); return ResolveMethodInParents(tr.Resolve().BaseType, scriptDef, name);
} }
public static MethodReference ResolveMethodWithArg(TypeReference tr, AssemblyDefinition scriptDef, string name, TypeReference argType)
{
foreach (MethodDefinition methodRef in tr.Resolve().Methods)
{
if (methodRef.Name == name)
{
if (methodRef.Parameters.Count == 1)
{
if (methodRef.Parameters[0].ParameterType.FullName == argType.FullName)
{
return scriptDef.MainModule.ImportReference(methodRef);
}
}
}
}
Log.Error("ResolveMethodWithArg failed " + tr.Name + "::" + name + " " + argType);
Weaver.fail = true;
return null;
}
// System.Byte[] arguments need a version with a string
public static MethodReference ResolveMethodWithArg(TypeReference tr, AssemblyDefinition scriptDef, string name, string argTypeFullName)
{
foreach (var methodRef in tr.Resolve().Methods)
{
if (methodRef.Name == name)
{
if (methodRef.Parameters.Count == 1)
{
if (methodRef.Parameters[0].ParameterType.FullName == argTypeFullName)
{
return scriptDef.MainModule.ImportReference(methodRef);
}
}
}
}
Log.Error("ResolveMethodWithArg failed " + tr.Name + "::" + name + " " + argTypeFullName);
Weaver.fail = true;
return null;
}
} }
} }

87
Mirror/Weaver/Weaver.cs
View File

@ -1034,47 +1034,6 @@ static bool ProcessNetworkBehaviourType(TypeDefinition td)
return false; return false;
} }
static MethodReference ResolveMethodWithArg(TypeReference t, string name, TypeReference argType)
{
foreach (var methodRef in t.Resolve().Methods)
{
if (methodRef.Name == name)
{
if (methodRef.Parameters.Count == 1)
{
if (methodRef.Parameters[0].ParameterType.FullName == argType.FullName)
{
return scriptDef.MainModule.ImportReference(methodRef);
}
}
}
}
Log.Error("ResolveMethodWithArg failed " + t.Name + "::" + name + " " + argType);
fail = true;
return null;
}
// System.Byte[] arguments need a version with a string
static MethodReference ResolveMethodWithArg(TypeReference t, string name, string argTypeFullName)
{
foreach (var methodRef in t.Resolve().Methods)
{
if (methodRef.Name == name)
{
if (methodRef.Parameters.Count == 1)
{
if (methodRef.Parameters[0].ParameterType.FullName == argTypeFullName)
{
return scriptDef.MainModule.ImportReference(methodRef);
}
}
}
}
Log.Error("ResolveMethodWithArg failed " + t.Name + "::" + name + " " + argTypeFullName);
fail = true;
return null;
}
static MethodDefinition ResolveDefaultPublicCtor(TypeReference variable) static MethodDefinition ResolveDefaultPublicCtor(TypeReference variable)
{ {
foreach (MethodDefinition methodRef in variable.Resolve().Methods) foreach (MethodDefinition methodRef in variable.Resolve().Methods)
@ -1224,8 +1183,8 @@ static void SetupTargetTypes()
NetworkReaderReadInt32 = Resolvers.ResolveMethod(NetworkReaderType, scriptDef, "ReadInt32"); NetworkReaderReadInt32 = Resolvers.ResolveMethod(NetworkReaderType, scriptDef, "ReadInt32");
NetworkWriterWriteInt32 = ResolveMethodWithArg(NetworkWriterType, "Write", int32Type); NetworkWriterWriteInt32 = Resolvers.ResolveMethodWithArg(NetworkWriterType, scriptDef, "Write", int32Type);
NetworkWriterWriteInt16 = ResolveMethodWithArg(NetworkWriterType, "Write", int16Type); NetworkWriterWriteInt16 = Resolvers.ResolveMethodWithArg(NetworkWriterType, scriptDef, "Write", int16Type);
NetworkReaderReadPacked32 = Resolvers.ResolveMethod(NetworkReaderType, scriptDef, "ReadPackedUInt32"); NetworkReaderReadPacked32 = Resolvers.ResolveMethod(NetworkReaderType, scriptDef, "ReadPackedUInt32");
NetworkReaderReadPacked64 = Resolvers.ResolveMethod(NetworkReaderType, scriptDef, "ReadPackedUInt64"); NetworkReaderReadPacked64 = Resolvers.ResolveMethod(NetworkReaderType, scriptDef, "ReadPackedUInt64");
@ -1235,7 +1194,7 @@ static void SetupTargetTypes()
NetworkWriterWritePacked64 = Resolvers.ResolveMethod(NetworkWriterType, scriptDef, "WritePackedUInt64"); NetworkWriterWritePacked64 = Resolvers.ResolveMethod(NetworkWriterType, scriptDef, "WritePackedUInt64");
NetworkReadUInt16 = Resolvers.ResolveMethod(NetworkReaderType, scriptDef, "ReadUInt16"); NetworkReadUInt16 = Resolvers.ResolveMethod(NetworkReaderType, scriptDef, "ReadUInt16");
NetworkWriteUInt16 = ResolveMethodWithArg(NetworkWriterType, "Write", uint16Type); NetworkWriteUInt16 = Resolvers.ResolveMethodWithArg(NetworkWriterType, scriptDef, "Write", uint16Type);
CmdDelegateReference = m_UNetAssemblyDefinition.MainModule.GetType("Mirror.NetworkBehaviour/CmdDelegate"); CmdDelegateReference = m_UNetAssemblyDefinition.MainModule.GetType("Mirror.NetworkBehaviour/CmdDelegate");
CmdDelegateConstructor = Resolvers.ResolveMethod(CmdDelegateReference, scriptDef, ".ctor"); CmdDelegateConstructor = Resolvers.ResolveMethod(CmdDelegateReference, scriptDef, ".ctor");
@ -1340,10 +1299,10 @@ static void SetupWriteFunctions()
{ {
lists.writeFuncs = new Dictionary<string, MethodReference> lists.writeFuncs = new Dictionary<string, MethodReference>
{ {
{ singleType.FullName, ResolveMethodWithArg(NetworkWriterType, "Write", singleType) }, { singleType.FullName, Resolvers.ResolveMethodWithArg(NetworkWriterType, scriptDef, "Write", singleType) },
{ doubleType.FullName, ResolveMethodWithArg(NetworkWriterType, "Write", doubleType) }, { doubleType.FullName, Resolvers.ResolveMethodWithArg(NetworkWriterType, scriptDef, "Write", doubleType) },
{ boolType.FullName, ResolveMethodWithArg(NetworkWriterType, "Write", boolType) }, { boolType.FullName, Resolvers.ResolveMethodWithArg(NetworkWriterType, scriptDef, "Write", boolType) },
{ stringType.FullName, ResolveMethodWithArg(NetworkWriterType, "Write", stringType) }, { stringType.FullName, Resolvers.ResolveMethodWithArg(NetworkWriterType, scriptDef, "Write", stringType) },
{ int64Type.FullName, NetworkWriterWritePacked64 }, { int64Type.FullName, NetworkWriterWritePacked64 },
{ uint64Type.FullName, NetworkWriterWritePacked64 }, { uint64Type.FullName, NetworkWriterWritePacked64 },
{ int32Type.FullName, NetworkWriterWritePacked32 }, { int32Type.FullName, NetworkWriterWritePacked32 },
@ -1353,22 +1312,22 @@ static void SetupWriteFunctions()
{ byteType.FullName, NetworkWriterWritePacked32 }, { byteType.FullName, NetworkWriterWritePacked32 },
{ sbyteType.FullName, NetworkWriterWritePacked32 }, { sbyteType.FullName, NetworkWriterWritePacked32 },
{ charType.FullName, NetworkWriterWritePacked32 }, { charType.FullName, NetworkWriterWritePacked32 },
{ decimalType.FullName, ResolveMethodWithArg(NetworkWriterType, "Write", decimalType) }, { decimalType.FullName, Resolvers.ResolveMethodWithArg(NetworkWriterType, scriptDef, "Write", decimalType) },
{ vector2Type.FullName, ResolveMethodWithArg(NetworkWriterType, "Write", vector2Type) }, { vector2Type.FullName, Resolvers.ResolveMethodWithArg(NetworkWriterType, scriptDef, "Write", vector2Type) },
{ vector3Type.FullName, ResolveMethodWithArg(NetworkWriterType, "Write", vector3Type) }, { vector3Type.FullName, Resolvers.ResolveMethodWithArg(NetworkWriterType, scriptDef, "Write", vector3Type) },
{ vector4Type.FullName, ResolveMethodWithArg(NetworkWriterType, "Write", vector4Type) }, { vector4Type.FullName, Resolvers.ResolveMethodWithArg(NetworkWriterType, scriptDef, "Write", vector4Type) },
{ colorType.FullName, ResolveMethodWithArg(NetworkWriterType, "Write", colorType) }, { colorType.FullName, Resolvers.ResolveMethodWithArg(NetworkWriterType, scriptDef, "Write", colorType) },
{ color32Type.FullName, ResolveMethodWithArg(NetworkWriterType, "Write", color32Type) }, { color32Type.FullName, Resolvers.ResolveMethodWithArg(NetworkWriterType, scriptDef, "Write", color32Type) },
{ quaternionType.FullName, ResolveMethodWithArg(NetworkWriterType, "Write", quaternionType) }, { quaternionType.FullName, Resolvers.ResolveMethodWithArg(NetworkWriterType, scriptDef, "Write", quaternionType) },
{ rectType.FullName, ResolveMethodWithArg(NetworkWriterType, "Write", rectType) }, { rectType.FullName, Resolvers.ResolveMethodWithArg(NetworkWriterType, scriptDef, "Write", rectType) },
{ planeType.FullName, ResolveMethodWithArg(NetworkWriterType, "Write", planeType) }, { planeType.FullName, Resolvers.ResolveMethodWithArg(NetworkWriterType, scriptDef, "Write", planeType) },
{ rayType.FullName, ResolveMethodWithArg(NetworkWriterType, "Write", rayType) }, { rayType.FullName, Resolvers.ResolveMethodWithArg(NetworkWriterType, scriptDef, "Write", rayType) },
{ matrixType.FullName, ResolveMethodWithArg(NetworkWriterType, "Write", matrixType) }, { matrixType.FullName, Resolvers.ResolveMethodWithArg(NetworkWriterType, scriptDef, "Write", matrixType) },
{ guidType.FullName, ResolveMethodWithArg(NetworkWriterType, "Write", guidType) }, { guidType.FullName, Resolvers.ResolveMethodWithArg(NetworkWriterType, scriptDef, "Write", guidType) },
{ gameObjectType.FullName, ResolveMethodWithArg(NetworkWriterType, "Write", gameObjectType) }, { gameObjectType.FullName, Resolvers.ResolveMethodWithArg(NetworkWriterType, scriptDef, "Write", gameObjectType) },
{ NetworkIdentityType.FullName, ResolveMethodWithArg(NetworkWriterType, "Write", NetworkIdentityType) }, { NetworkIdentityType.FullName, Resolvers.ResolveMethodWithArg(NetworkWriterType, scriptDef, "Write", NetworkIdentityType) },
{ transformType.FullName, ResolveMethodWithArg(NetworkWriterType, "Write", transformType) }, { transformType.FullName, Resolvers.ResolveMethodWithArg(NetworkWriterType, scriptDef, "Write", transformType) },
{ "System.Byte[]", ResolveMethodWithArg(NetworkWriterType, "WriteBytesAndSize", "System.Byte[]") } { "System.Byte[]", Resolvers.ResolveMethodWithArg(NetworkWriterType, scriptDef, "WriteBytesAndSize", "System.Byte[]") }
}; };
} }