PvE/Torch
3
0
Fork 0
Code Issues 1 Pull Requests Actions Releases 21 Wiki Activity

fix patcher compat with __local thing

Browse Source
This commit is contained in:
zznty
2023-03-24 14:49:42 +07:00
parent 9c22948ce9
commit 9068558a53
4 changed files with 62 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
Torch.Server/packages.lock.json
View File

@@ -162,10 +162,10 @@
}, },
"HarmonyX": { "HarmonyX": {
"type": "Transitive", "type": "Transitive",
"resolved": "2.10.2-prerelease.3", "resolved": "2.10.2-prerelease.4",
"contentHash": "XnR2oKlFTCb7F+90OkJR0cqOYOsSPgsQrnX2v9qR0nmM6SPSET/v2SR9vjY/DQhBYUQia16NWv0Mwd8Ml4ZqKA==", "contentHash": "M/44/DhSu1WR8gL62aLPGKqAJ0rrgkw38nT3DgEvLAvyIoQLJmL2Jsn4/d4CC0eDT1Vv82cB9Mxgg0sFD3/qrQ==",
"dependencies": { "dependencies": {
"MonoModReorg.RuntimeDetour": "23.1.2-prerelease.1" "MonoModReorg.RuntimeDetour": "23.3.22.1"
} }
}, },
"JorgeSerrano.Json.JsonSnakeCaseNamingPolicy": { "JorgeSerrano.Json.JsonSnakeCaseNamingPolicy": {
@@ -318,48 +318,48 @@
}, },
"MonoModReorg.Backports": { "MonoModReorg.Backports": {
"type": "Transitive", "type": "Transitive",
"resolved": "23.1.2-prerelease.1", "resolved": "23.3.22.1",
"contentHash": "m1wlCgVjZTFJs3mUxmC1aE/O0RIvsNbSFBI/g93Bqzz1tHa+LhXFyrHzL60PeZMQBIPVy3CeDX4um/UrqLOn/g==", "contentHash": "nLx18prtZbS0nVO8YHElP+TUj1kkDswRgQpa9agt3tyNWke9Kqk5lVkGu87Y3cCMhG+m5Ai0ZDH0+V5B6bXF+Q==",
"dependencies": { "dependencies": {
"MonoModReorg.ILHelpers": "23.1.2-prerelease.1" "MonoModReorg.ILHelpers": "23.3.22.1"
} }
}, },
"MonoModReorg.Core": { "MonoModReorg.Core": {
"type": "Transitive", "type": "Transitive",
"resolved": "23.1.2-prerelease.1", "resolved": "23.3.22.1",
"contentHash": "t1Y89M0rbwUx2VjDMCJOWgtSdsi1F5KNu0O6JAMOtwo2EWJ0HfYj9nS8UWWPwrgRpsquGjqbmYA8jhb59F2a/A==", "contentHash": "Q3ZOgm6AOTL0icgcHsT/6mV5kYt6meqX3DEN1p/et5PxJsXUhVkiZfAptp8y/i+cO6HNgkcESpXEQ4jUWVwsDA==",
"dependencies": { "dependencies": {
"Mono.Cecil": "0.11.4", "Mono.Cecil": "0.11.4",
"MonoModReorg.Backports": "23.1.2-prerelease.1", "MonoModReorg.Backports": "23.3.22.1",
"MonoModReorg.ILHelpers": "23.1.2-prerelease.1", "MonoModReorg.ILHelpers": "23.3.22.1",
"MonoModReorg.Utils": "23.1.2-prerelease.1" "MonoModReorg.Utils": "23.3.22.1"
} }
}, },
"MonoModReorg.ILHelpers": { "MonoModReorg.ILHelpers": {
"type": "Transitive", "type": "Transitive",
"resolved": "23.1.2-prerelease.1", "resolved": "23.3.22.1",
"contentHash": "GVh1cmrTCAK0zHr3t8aHnKsyKIlDFiDERn++lCZomHcYc8dgcOAhpkZ7KmaKgZCTJuBIrc44RjpKFr/4ScQnGA==" "contentHash": "dHE/3VZtnTUTkQ34j8Gu6CxKes1QDL8tBuF3QElxHHpPl/QabGCK938k47WWRcRBMoP7IAthkn+Bob4H97rBgw=="
}, },
"MonoModReorg.RuntimeDetour": { "MonoModReorg.RuntimeDetour": {
"type": "Transitive", "type": "Transitive",
"resolved": "23.1.2-prerelease.1", "resolved": "23.3.22.1",
"contentHash": "UZyJ7OIbLCIBg+dzLejWq2paL1s11koUrq1noSLGCP9uNmFjwDPK+lRmGs0X4qg+Alfq6VsOpI45pGqmaAvP+Q==", "contentHash": "cUES3Hi7QJtBNe0qwVdjZOCDkZDaCpdqS6Au0RaCyQ1PDIR4av13E9qBNAEYew46sgPe0fOrU334md6DLDGHlQ==",
"dependencies": { "dependencies": {
"Mono.Cecil": "0.11.4", "Mono.Cecil": "0.11.4",
"MonoModReorg.Backports": "23.1.2-prerelease.1", "MonoModReorg.Backports": "23.3.22.1",
"MonoModReorg.Core": "23.1.2-prerelease.1", "MonoModReorg.Core": "23.3.22.1",
"MonoModReorg.ILHelpers": "23.1.2-prerelease.1", "MonoModReorg.ILHelpers": "23.3.22.1",
"MonoModReorg.Utils": "23.1.2-prerelease.1" "MonoModReorg.Utils": "23.3.22.1"
} }
}, },
"MonoModReorg.Utils": { "MonoModReorg.Utils": {
"type": "Transitive", "type": "Transitive",
"resolved": "23.1.2-prerelease.1", "resolved": "23.3.22.1",
"contentHash": "6N4LNG+x4RVPLOc8QWL7dc5sqWdl0gxR+4ASRd1CvvappsK84ISgD9qgeYHgQQtTgE+h6Cuqr3Om4Ly0roLfoA==", "contentHash": "q1cX0mbYxdw2WcE/qGBB84lVY/ffobEr46VQFuwGcWhtw6f1Ql1k4TZfs8gebpesSxHnca13grLeVHrUSpy1+g==",
"dependencies": { "dependencies": {
"Mono.Cecil": "0.11.4", "Mono.Cecil": "0.11.4",
"MonoModReorg.Backports": "23.1.2-prerelease.1", "MonoModReorg.Backports": "23.3.22.1",
"MonoModReorg.ILHelpers": "23.1.2-prerelease.1" "MonoModReorg.ILHelpers": "23.3.22.1"
} }
}, },
"Newtonsoft.Json": { "Newtonsoft.Json": {
@@ -585,11 +585,11 @@
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"ControlzEx": "[5.0.2, )", "ControlzEx": "[5.0.2, )",
"HarmonyX": "[2.10.2-prerelease.3, )", "HarmonyX": "[2.10.2-prerelease.4, )",
"MahApps.Metro": "[2.4.9, )", "MahApps.Metro": "[2.4.9, )",
"Microsoft.CodeAnalysis.CSharp": "[4.4.0, )", "Microsoft.CodeAnalysis.CSharp": "[4.4.0, )",
"Microsoft.CodeAnalysis.Common": "[4.4.0, )", "Microsoft.CodeAnalysis.Common": "[4.4.0, )",
"MonoModReorg.RuntimeDetour": "[23.1.2-prerelease.1, )", "MonoModReorg.RuntimeDetour": "[23.3.22.1, )",
"NLog": "[5.1.0, )", "NLog": "[5.1.0, )",
"System.ComponentModel.Annotations": "[5.0.0, )", "System.ComponentModel.Annotations": "[5.0.0, )",
"Torch.API": "[1.0.0, )", "Torch.API": "[1.0.0, )",

11
Torch/Managers/PatchManager/MSIL/MsilInstruction.cs
View File

@@ -133,6 +133,12 @@ namespace Torch.Managers.PatchManager.MSIL
case double @double when Operand is MsilOperandInline.MsilOperandDouble operandDouble: case double @double when Operand is MsilOperandInline.MsilOperandDouble operandDouble:
operandDouble.Value = @double; operandDouble.Value = @double;
break; break;
case byte @byte when Operand is MsilOperandInline.MsilOperandArgument operandArgument:
operandArgument.Value = new(@byte);
break;
case byte @byte when Operand is MsilOperandInline.MsilOperandLocal operandArgument:
operandArgument.Value = new(@byte);
break;
} }
Labels = instruction.labels.Select(b => new MsilLabel(b)).ToHashSet(); Labels = instruction.labels.Select(b => new MsilLabel(b)).ToHashSet();
@@ -153,7 +159,10 @@ namespace Torch.Managers.PatchManager.MSIL
MsilOperandInline.MsilOperandDouble msilOperandDouble => msilOperandDouble.Value, MsilOperandInline.MsilOperandDouble msilOperandDouble => msilOperandDouble.Value,
MsilOperandInline.MsilOperandInt32 msilOperandInt32 => msilOperandInt32.Value, MsilOperandInline.MsilOperandInt32 msilOperandInt32 => msilOperandInt32.Value,
MsilOperandInline.MsilOperandInt64 msilOperandInt64 => msilOperandInt64.Value, MsilOperandInline.MsilOperandInt64 msilOperandInt64 => msilOperandInt64.Value,
MsilOperandInline.MsilOperandLocal msilOperandLocal => msilOperandLocal.Value.Local, MsilOperandInline.MsilOperandLocal msilOperandLocal when OpCode.OperandType == OperandType.InlineVar => msilOperandLocal.Value.Local,
MsilOperandInline.MsilOperandLocal msilOperandLocal when OpCode.OperandType == OperandType.ShortInlineVar => (byte)msilOperandLocal.Value.Index,
MsilOperandInline.MsilOperandArgument msilOperandArgument when OpCode.OperandType == OperandType.InlineVar => msilOperandArgument.Value,
MsilOperandInline.MsilOperandArgument msilOperandArgument when OpCode.OperandType == OperandType.ShortInlineVar => (byte)msilOperandArgument.Value.Position,
MsilOperandInline.MsilOperandSignature msilOperandSignature => msilOperandSignature.Value, MsilOperandInline.MsilOperandSignature msilOperandSignature => msilOperandSignature.Value,
MsilOperandInline.MsilOperandSingle msilOperandSingle => msilOperandSingle.Value, MsilOperandInline.MsilOperandSingle msilOperandSingle => msilOperandSingle.Value,
MsilOperandInline.MsilOperandString msilOperandString => msilOperandString.Value, MsilOperandInline.MsilOperandString msilOperandString => msilOperandString.Value,

4
Torch/Torch.csproj
View File

@@ -24,12 +24,12 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="ControlzEx" Version="5.0.2" /> <PackageReference Include="ControlzEx" Version="5.0.2" />
<PackageReference Include="HarmonyX" Version="2.10.2-prerelease.3" /> <PackageReference Include="HarmonyX" Version="2.10.2-prerelease.4" />
<PackageReference Include="InfoOf.Fody" Version="2.1.1" PrivateAssets="all" /> <PackageReference Include="InfoOf.Fody" Version="2.1.1" PrivateAssets="all" />
<PackageReference Include="MahApps.Metro" Version="2.4.9" /> <PackageReference Include="MahApps.Metro" Version="2.4.9" />
<PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.4.0" /> <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.4.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.4.0" /> <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.4.0" />
<PackageReference Include="MonoModReorg.RuntimeDetour" Version="23.1.2-prerelease.1" /> <PackageReference Include="MonoModReorg.RuntimeDetour" Version="23.3.22.1" />
<PackageReference Include="NLog" Version="5.1.0" /> <PackageReference Include="NLog" Version="5.1.0" />
<PackageReference Include="PropertyChanged.Fody" Version="4.1.0" PrivateAssets="all" /> <PackageReference Include="PropertyChanged.Fody" Version="4.1.0" PrivateAssets="all" />
<PackageReference Include="protobuf-net" Version="3.1.26" /> <PackageReference Include="protobuf-net" Version="3.1.26" />

50
Torch/packages.lock.json
View File

@@ -14,11 +14,11 @@
}, },
"HarmonyX": { "HarmonyX": {
"type": "Direct", "type": "Direct",
"requested": "[2.10.2-prerelease.3, )", "requested": "[2.10.2-prerelease.4, )",
"resolved": "2.10.2-prerelease.3", "resolved": "2.10.2-prerelease.4",
"contentHash": "XnR2oKlFTCb7F+90OkJR0cqOYOsSPgsQrnX2v9qR0nmM6SPSET/v2SR9vjY/DQhBYUQia16NWv0Mwd8Ml4ZqKA==", "contentHash": "M/44/DhSu1WR8gL62aLPGKqAJ0rrgkw38nT3DgEvLAvyIoQLJmL2Jsn4/d4CC0eDT1Vv82cB9Mxgg0sFD3/qrQ==",
"dependencies": { "dependencies": {
"MonoModReorg.RuntimeDetour": "23.1.2-prerelease.1" "MonoModReorg.RuntimeDetour": "23.3.22.1"
} }
}, },
"InfoOf.Fody": { "InfoOf.Fody": {
@@ -65,15 +65,15 @@
}, },
"MonoModReorg.RuntimeDetour": { "MonoModReorg.RuntimeDetour": {
"type": "Direct", "type": "Direct",
"requested": "[23.1.2-prerelease.1, )", "requested": "[23.3.22.1, )",
"resolved": "23.1.2-prerelease.1", "resolved": "23.3.22.1",
"contentHash": "UZyJ7OIbLCIBg+dzLejWq2paL1s11koUrq1noSLGCP9uNmFjwDPK+lRmGs0X4qg+Alfq6VsOpI45pGqmaAvP+Q==", "contentHash": "cUES3Hi7QJtBNe0qwVdjZOCDkZDaCpdqS6Au0RaCyQ1PDIR4av13E9qBNAEYew46sgPe0fOrU334md6DLDGHlQ==",
"dependencies": { "dependencies": {
"Mono.Cecil": "0.11.4", "Mono.Cecil": "0.11.4",
"MonoModReorg.Backports": "23.1.2-prerelease.1", "MonoModReorg.Backports": "23.3.22.1",
"MonoModReorg.Core": "23.1.2-prerelease.1", "MonoModReorg.Core": "23.3.22.1",
"MonoModReorg.ILHelpers": "23.1.2-prerelease.1", "MonoModReorg.ILHelpers": "23.3.22.1",
"MonoModReorg.Utils": "23.1.2-prerelease.1" "MonoModReorg.Utils": "23.3.22.1"
} }
}, },
"NLog": { "NLog": {
@@ -157,36 +157,36 @@
}, },
"MonoModReorg.Backports": { "MonoModReorg.Backports": {
"type": "Transitive", "type": "Transitive",
"resolved": "23.1.2-prerelease.1", "resolved": "23.3.22.1",
"contentHash": "m1wlCgVjZTFJs3mUxmC1aE/O0RIvsNbSFBI/g93Bqzz1tHa+LhXFyrHzL60PeZMQBIPVy3CeDX4um/UrqLOn/g==", "contentHash": "nLx18prtZbS0nVO8YHElP+TUj1kkDswRgQpa9agt3tyNWke9Kqk5lVkGu87Y3cCMhG+m5Ai0ZDH0+V5B6bXF+Q==",
"dependencies": { "dependencies": {
"MonoModReorg.ILHelpers": "23.1.2-prerelease.1" "MonoModReorg.ILHelpers": "23.3.22.1"
} }
}, },
"MonoModReorg.Core": { "MonoModReorg.Core": {
"type": "Transitive", "type": "Transitive",
"resolved": "23.1.2-prerelease.1", "resolved": "23.3.22.1",
"contentHash": "t1Y89M0rbwUx2VjDMCJOWgtSdsi1F5KNu0O6JAMOtwo2EWJ0HfYj9nS8UWWPwrgRpsquGjqbmYA8jhb59F2a/A==", "contentHash": "Q3ZOgm6AOTL0icgcHsT/6mV5kYt6meqX3DEN1p/et5PxJsXUhVkiZfAptp8y/i+cO6HNgkcESpXEQ4jUWVwsDA==",
"dependencies": { "dependencies": {
"Mono.Cecil": "0.11.4", "Mono.Cecil": "0.11.4",
"MonoModReorg.Backports": "23.1.2-prerelease.1", "MonoModReorg.Backports": "23.3.22.1",
"MonoModReorg.ILHelpers": "23.1.2-prerelease.1", "MonoModReorg.ILHelpers": "23.3.22.1",
"MonoModReorg.Utils": "23.1.2-prerelease.1" "MonoModReorg.Utils": "23.3.22.1"
} }
}, },
"MonoModReorg.ILHelpers": { "MonoModReorg.ILHelpers": {
"type": "Transitive", "type": "Transitive",
"resolved": "23.1.2-prerelease.1", "resolved": "23.3.22.1",
"contentHash": "GVh1cmrTCAK0zHr3t8aHnKsyKIlDFiDERn++lCZomHcYc8dgcOAhpkZ7KmaKgZCTJuBIrc44RjpKFr/4ScQnGA==" "contentHash": "dHE/3VZtnTUTkQ34j8Gu6CxKes1QDL8tBuF3QElxHHpPl/QabGCK938k47WWRcRBMoP7IAthkn+Bob4H97rBgw=="
}, },
"MonoModReorg.Utils": { "MonoModReorg.Utils": {
"type": "Transitive", "type": "Transitive",
"resolved": "23.1.2-prerelease.1", "resolved": "23.3.22.1",
"contentHash": "6N4LNG+x4RVPLOc8QWL7dc5sqWdl0gxR+4ASRd1CvvappsK84ISgD9qgeYHgQQtTgE+h6Cuqr3Om4Ly0roLfoA==", "contentHash": "q1cX0mbYxdw2WcE/qGBB84lVY/ffobEr46VQFuwGcWhtw6f1Ql1k4TZfs8gebpesSxHnca13grLeVHrUSpy1+g==",
"dependencies": { "dependencies": {
"Mono.Cecil": "0.11.4", "Mono.Cecil": "0.11.4",
"MonoModReorg.Backports": "23.1.2-prerelease.1", "MonoModReorg.Backports": "23.3.22.1",
"MonoModReorg.ILHelpers": "23.1.2-prerelease.1" "MonoModReorg.ILHelpers": "23.3.22.1"
} }
}, },
"Newtonsoft.Json": { "Newtonsoft.Json": {