AmongUsMods/Reactor
1
0 Fork 0
mirror of https://github.com/NuclearPowered/Reactor.git synced 2026-10-20 01:46:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: AmongUsMods/Reactor:localize
AmongUsMods/Reactor:master AmongUsMods/Reactor:localize
AmongUsMods/Reactor:2.5.1 AmongUsMods/Reactor:2.5.0 AmongUsMods/Reactor:2.4.0 AmongUsMods/Reactor:2.3.1 AmongUsMods/Reactor:2.3.0 AmongUsMods/Reactor:2.2.0 AmongUsMods/Reactor:2.1.0 AmongUsMods/Reactor:2.0.0 AmongUsMods/Reactor:1.2.8 AmongUsMods/Reactor:1.2.7 AmongUsMods/Reactor:1.2.6 AmongUsMods/Reactor:1.2.5 AmongUsMods/Reactor:1.2.4 AmongUsMods/Reactor:1.2.3 AmongUsMods/Reactor:1.2.2 AmongUsMods/Reactor:1.2.1 AmongUsMods/Reactor:1.2.0 AmongUsMods/Reactor:1.2.0-rc.1 AmongUsMods/Reactor:1.1.0 AmongUsMods/Reactor:1.0.0-rc.1
...
compare: AmongUsMods/Reactor:2.2.0
AmongUsMods/Reactor:master AmongUsMods/Reactor:localize
AmongUsMods/Reactor:2.5.1 AmongUsMods/Reactor:2.5.0 AmongUsMods/Reactor:2.4.0 AmongUsMods/Reactor:2.3.1 AmongUsMods/Reactor:2.3.0 AmongUsMods/Reactor:2.2.0 AmongUsMods/Reactor:2.1.0 AmongUsMods/Reactor:2.0.0 AmongUsMods/Reactor:1.2.8 AmongUsMods/Reactor:1.2.7 AmongUsMods/Reactor:1.2.6 AmongUsMods/Reactor:1.2.5 AmongUsMods/Reactor:1.2.4 AmongUsMods/Reactor:1.2.3 AmongUsMods/Reactor:1.2.2 AmongUsMods/Reactor:1.2.1 AmongUsMods/Reactor:1.2.0 AmongUsMods/Reactor:1.2.0-rc.1 AmongUsMods/Reactor:1.1.0 AmongUsMods/Reactor:1.0.0-rc.1
15 Commits
localize ... 2.2.0
Author SHA1 Message Date
js6pak 6eb0bf19c3 2023.7.11 2023-07-12 03:04:16 +02:00
Simon Kellyandjs6pak f63569d2e0 Fix positioning of the version shower on different aspect ratios (#73) 
Co-authored-by: js6pak <me@6pak.dev>
 2023-06-17 18:14:31 +02:00
js6pak c84d36a3f6 Don't disable auth server on officials 
Since 2023.6.13 official servers went back to using DTLS for auth only
 2023-06-15 21:46:21 +02:00
js6pak 89146cea4f Update to 2023.6.13 2023-06-15 21:46:21 +02:00
js6pak 8553a2aa83 Ensure minimum width for imgui windows 2023-03-21 02:04:35 +01:00
js6pak 30027d89ea Fix sealed warnings 2023-01-15 19:21:14 +01:00
js6pak 375a4170e7 Log game version 2023-01-07 16:34:57 +01:00
js6pak 4deb5f88b9 Fix MaxImpostors patch on 2022.12.8+ 2023-01-06 19:18:38 +01:00
js6pak 2407a99569 2.1.0 2022-12-22 12:55:08 +01:00
js6pak eded2830cc Update to 2022.12.8 2022-12-09 20:48:30 +01:00
js6pak 9ef4bd5dc6 Merge pull request #67 from miniduikboot/fix/cofindgame 2022-12-04 23:07:28 +01:00
miniduikbootandEdward Smale 678730ed0f Fix Game lists not working on legacy mm servers 
This happens because InnerNetClient.CoConnect now sets the default
LastDisconnectReason to Unknown instead of ExitGame, which breaks the
public game list screen.

Co-Authored-By: Edward Smale <essmale2005@gmail.com>
 2022-12-02 19:33:58 +01:00
js6pak da20e0990e Fix occasional NRE 2022-10-27 11:42:17 +02:00
js6pak 9246458919 Kick for not having reactor only when necessary 2022-10-27 11:41:41 +02:00
js6pak fa4cc03e33 Don't send chat messages if quick chat only is enabled 2022-10-27 11:31:45 +02:00
22 changed files with 582 additions and 296 deletions
Expand all files Collapse all files

No files matched your search

AmongUs.props
+2 -2
View File
@@ -1,7 +1,7 @@
<Project> <Project>
<ItemGroup> <ItemGroup>
<PackageReference Include="BepInEx.Unity.IL2CPP" Version="6.0.0-be.662" Private="false" ExcludeAssets="runtime;native" /> <PackageReference Include="BepInEx.Unity.IL2CPP" Version="6.0.0-be.670" Private="false" ExcludeAssets="runtime;native" />
<PackageReference Include="AmongUs.GameLibs.Steam" Version="2022.10.25" PrivateAssets="all" /> <PackageReference Include="AmongUs.GameLibs.Steam" Version="2023.7.11" PrivateAssets="all" />
<PackageReference Include="BepInEx.AutoPlugin" Version="1.1.0" PrivateAssets="all" /> <PackageReference Include="BepInEx.AutoPlugin" Version="1.1.0" PrivateAssets="all" />
<PackageReference Include="BepInEx.IL2CPP.MSBuild" Version="2.0.1" PrivateAssets="all" ExcludeAssets="runtime" /> <PackageReference Include="BepInEx.IL2CPP.MSBuild" Version="2.0.1" PrivateAssets="all" ExcludeAssets="runtime" />
Directory.Build.props
+1 -1
View File
@@ -8,7 +8,7 @@
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile> <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
<VersionPrefix>2.0.0</VersionPrefix> <VersionPrefix>2.2.0</VersionPrefix>
<VersionSuffix>dev</VersionSuffix> <VersionSuffix>dev</VersionSuffix>
<Authors>NuclearPowered</Authors> <Authors>NuclearPowered</Authors>
Reactor.Benchmarks/AssetBundleBenchmarks.cs
+1 -1
View File
@@ -16,7 +16,7 @@ namespace Reactor.Benchmarks;
[StopOnFirstError, Config(typeof(Config))] [StopOnFirstError, Config(typeof(Config))]
public class AssetBundleBenchmarks public class AssetBundleBenchmarks
{ {
private class Config : ManualConfig private sealed class Config : ManualConfig
{ {
public Config() public Config()
{ {
Reactor.Benchmarks/packages.lock.json
+110 -65
View File
@@ -4,9 +4,9 @@
"net6.0": { "net6.0": {
"AmongUs.GameLibs.Steam": { "AmongUs.GameLibs.Steam": {
"type": "Direct", "type": "Direct",
"requested": "[2022.10.25, )", "requested": "[2023.7.11, )",
"resolved": "2022.10.25", "resolved": "2023.7.11",
"contentHash": "PWgkH/VvMlShVhZB8G432q0tnMaNVZrbIdbEMCZN/fETUlT/ch+qQj4PdTcZhPHREbnJHH3ijHxlca1d7QMBcQ==" "contentHash": "e5zbU+4AYnp1zAQDizO5GRIh1kemkgCa8rFVAcr9bxeupkBu5dwwdHxArWv/pUybIJTZfOPjkOnicZ2qKWLX7g=="
}, },
"BenchmarkDotNet": { "BenchmarkDotNet": {
"type": "Direct", "type": "Direct",
@@ -42,19 +42,19 @@
}, },
"BepInEx.Unity.IL2CPP": { "BepInEx.Unity.IL2CPP": {
"type": "Direct", "type": "Direct",
"requested": "[6.0.0-be.662, )", "requested": "[6.0.0-be.670, )",
"resolved": "6.0.0-be.662", "resolved": "6.0.0-be.670",
"contentHash": "fn7jQ88IBmjssoY9XjGBTg3cULkS+N/le/eUijYf2VV8raWok/6cU/GbU9bejkJS8g+2MvzIwnROAhAxvrGI2Q==", "contentHash": "dhzCrem44oFxhOICCJ9eoSUbaKSsGGyBUfUQW9WFljCwIK8o4Cx5BiuXAkYoRjr2DhpzLpPDyPZDRImUqH0bwA==",
"dependencies": { "dependencies": {
"BepInEx.Core": "6.0.0-be.662", "BepInEx.Core": "6.0.0-be.670",
"BepInEx.Unity.Common": "6.0.0-be.662", "BepInEx.Unity.Common": "6.0.0-be.670",
"HarmonyX": "2.10.0", "HarmonyX": "2.10.1",
"Iced": "1.17.0", "Iced": "1.18.0",
"Il2CppInterop.Generator": "1.3.0", "Il2CppInterop.Generator": "1.4.6-ci.354",
"Il2CppInterop.HarmonySupport": "1.3.0", "Il2CppInterop.HarmonySupport": "1.4.6-ci.354",
"Il2CppInterop.Runtime": "1.3.0", "Il2CppInterop.Runtime": "1.4.6-ci.354",
"MonoMod.RuntimeDetour": "22.5.1.1", "MonoMod.RuntimeDetour": "22.5.1.1",
"Samboy063.Cpp2IL.Core": "2022.0.7.2" "Samboy063.Cpp2IL.Core": "2022.1.0-development.866"
} }
}, },
"StyleCop.Analyzers": { "StyleCop.Analyzers": {
@@ -66,10 +66,40 @@
"StyleCop.Analyzers.Unstable": "1.2.0.435" "StyleCop.Analyzers.Unstable": "1.2.0.435"
} }
}, },
"AsmResolver": {
"type": "Transitive",
"resolved": "5.1.0",
"contentHash": "7PjujQzgQ3wjzqZYT4CY8SV6zx7FY6swIwj3Yk4QLolLqo9sBPb7FLF3W30QFvCsCkNfiVWXlSbeZKs4xGgQOQ=="
},
"AsmResolver.DotNet": {
"type": "Transitive",
"resolved": "5.1.0",
"contentHash": "oKrBU94OaSrbbTwydvpLRFalYxozrNXGkl13nIkm823ZFQtPNYOiOMJb5DQLvkCJlWyis7q865tg803T5zg9IA==",
"dependencies": {
"AsmResolver.PE": "5.1.0",
"System.Text.Json": "6.0.7"
}
},
"AsmResolver.PE": {
"type": "Transitive",
"resolved": "5.1.0",
"contentHash": "XD3iAgLSInJIODKUUlpHWXf8MR9H1SFMb1lsmabb4GxxxnDQRPjMxjglv2NOCjQQuNB2Oh0bvjHE7ewf82UqyQ==",
"dependencies": {
"AsmResolver.PE.File": "5.1.0"
}
},
"AsmResolver.PE.File": {
"type": "Transitive",
"resolved": "5.1.0",
"contentHash": "YituBYe0Fh471sXQMfu+f4tWKX/JZvRwrX6g/SVsr4XkUIUzYi/aGT3/QvjHoYx19fE1KYOB6zBKqPkkOK7HPw==",
"dependencies": {
"AsmResolver": "5.1.0"
}
},
"AssetRipper.VersionUtilities": { "AssetRipper.VersionUtilities": {
"type": "Transitive", "type": "Transitive",
"resolved": "1.2.1", "resolved": "1.3.1",
"contentHash": "knQ/W1YwTZS2AbdaZh+nhyyBEZQPQDcahhSOnh88i+cdg4/FEoFJiCwaavgFvCMNuUeHTbcZc4qttF8WQ8xLIA==" "contentHash": "/1D18NOpqm7rS7+qVUbAReVMNWwgDuYpsnf0RkX1Aah/I0a0irqldoFJ+Kku7YdbSm0zqD+Z6iYUGKoP3GwTNQ=="
}, },
"BenchmarkDotNet.Annotations": { "BenchmarkDotNet.Annotations": {
"type": "Transitive", "type": "Transitive",
@@ -78,18 +108,18 @@
}, },
"BepInEx.Core": { "BepInEx.Core": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.0.0-be.662", "resolved": "6.0.0-be.670",
"contentHash": "VVBeCD/KQVy0/TK3V6SD8QZ/es35Xb1mEz/+PbBs3ST1yUC1r7k2JOymhSnmghVqf6UsvlMglOO9pljqhuE/Pw==", "contentHash": "7CbbMNZfb+1VHjFKh/ErFBOOEYrVCIkng/B3/HPcbNioySC7qdT1ztfYqs6YjQia4krEic+LV3ew86B/hTg+hw==",
"dependencies": { "dependencies": {
"HarmonyX": "2.10.0", "HarmonyX": "2.10.1",
"MonoMod.Utils": "22.5.1.1", "MonoMod.Utils": "22.5.1.1",
"SemanticVersioning": "2.0.2" "SemanticVersioning": "2.0.2"
} }
}, },
"BepInEx.Unity.Common": { "BepInEx.Unity.Common": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.0.0-be.662", "resolved": "6.0.0-be.670",
"contentHash": "BgETw6+snwY//3xjQxLiiEAFRmXaMTcSkg+1UQz6fVBG0YA5Usm/m4GflhTc3nwF61KO3Iznn1AORi5CwLJoUw==", "contentHash": "FSzWILgwepZ7CpA34ew1WyO75lNjxkfX86uwo2172lbhmLkgoAdQbNun8dxKJCDlIevmTDga76yr/WPrTXELvA==",
"dependencies": { "dependencies": {
"AssetRipper.VersionUtilities": "1.2.1", "AssetRipper.VersionUtilities": "1.2.1",
"MonoMod.Utils": "22.5.1.1" "MonoMod.Utils": "22.5.1.1"
@@ -100,10 +130,15 @@
"resolved": "2.4.3", "resolved": "2.4.3",
"contentHash": "U2FC9Y8NyIxxU6MpFFdWWu1xwiqz/61v/Doou7kmVjpeIEMLWyiNNkzNlSE84kyJ0O1LKApuEj5z48Ow0Hi4OQ==" "contentHash": "U2FC9Y8NyIxxU6MpFFdWWu1xwiqz/61v/Doou7kmVjpeIEMLWyiNNkzNlSE84kyJ0O1LKApuEj5z48Ow0Hi4OQ=="
}, },
"Disarm": {
"type": "Transitive",
"resolved": "2022.1.0-master.26",
"contentHash": "YnZEbRGr0nG+N3G8WbRQ4Lkg8dTD3oso9iJlCVBmyhEyhLyqs+drBs1kWQbQqFPnb9mi/RJ++R9bPb+L3HF03Q=="
},
"HarmonyX": { "HarmonyX": {
"type": "Transitive", "type": "Transitive",
"resolved": "2.10.0", "resolved": "2.10.1",
"contentHash": "4ayiy/dlCiW86K2N7Jvbf+VpI5wvP7dncv/6oRmfwRi32UCmCRzCGzsxdMfzJZkp6/26oBW+DrD8vi4UejzVAg==", "contentHash": "9LodMC9Y0u1TW96eKJoWrFJFpmzbgojEO38/Q+e7c1mFPhmHt8xcR8qhI06iF1rf0Dnsk+hqENFVSgbtwl/bEw==",
"dependencies": { "dependencies": {
"MonoMod.RuntimeDetour": "22.3.23.4", "MonoMod.RuntimeDetour": "22.3.23.4",
"System.Reflection.Emit": "4.7.0" "System.Reflection.Emit": "4.7.0"
@@ -111,13 +146,13 @@
}, },
"Iced": { "Iced": {
"type": "Transitive", "type": "Transitive",
"resolved": "1.17.0", "resolved": "1.18.0",
"contentHash": "8x+HCVTl/HHTGpscH3vMBhV8sknN/muZFw9s3TsI8SA6+c43cOTCi2+jE4KsU8pNLbJ++iF2ZFcpcXHXtDglnw==" "contentHash": "G60lZOvbvqttA+SBSv/yY6/wUboXKJlkffhSNR9iOrx0M5gpcK1TRr6xrFR+qAhqIAhvrsPF1jkn9fYb4lEufQ=="
}, },
"Il2CppInterop.Common": { "Il2CppInterop.Common": {
"type": "Transitive", "type": "Transitive",
"resolved": "1.3.0", "resolved": "1.4.6-ci.354",
"contentHash": "IR3BrZXvL2nvJAn4pruPMgC78Y87hVa5xTYZCuHN67OzRD6WDl5dTO55vtvTl8dXFALKvlN+spja2tXhVuquOw==", "contentHash": "aCP3kr39YQw5GVqE9Q8c5y7f9CEKdFxpUhIqYgQBtrEz5Z/KCbHhjuOf/lSuFrjl6Vub/BKk6k+UbMRdoSvC1w==",
"dependencies": { "dependencies": {
"Iced": "1.17.0", "Iced": "1.17.0",
"Microsoft.Extensions.Logging.Abstractions": "6.0.1", "Microsoft.Extensions.Logging.Abstractions": "6.0.1",
@@ -126,36 +161,31 @@
}, },
"Il2CppInterop.Generator": { "Il2CppInterop.Generator": {
"type": "Transitive", "type": "Transitive",
"resolved": "1.3.0", "resolved": "1.4.6-ci.354",
"contentHash": "FuhPxbh/K4K94U3xac/ClMaaBp+MZ4aIaqi5dR0QihyGQoombT+OM/A22RwAIzbaCTbFbvabWaAuOSgB69ZwWQ==", "contentHash": "y30sxc9mMv0bUzCPDr73xiI6fiu7ksmnEm6XULTGU/5JEGv2aw++/71bLOEYCscNbZTa2JT4yYrLCXCj3GSekg==",
"dependencies": { "dependencies": {
"Il2CppInterop.Common": "1.3.0", "Il2CppInterop.Common": "1.4.6-ci.354",
"Mono.Cecil": "0.11.3" "Mono.Cecil": "0.11.3"
} }
}, },
"Il2CppInterop.HarmonySupport": { "Il2CppInterop.HarmonySupport": {
"type": "Transitive", "type": "Transitive",
"resolved": "1.3.0", "resolved": "1.4.6-ci.354",
"contentHash": "VppBnXtbMNGFhX8a1gg/85E883t2pW/+FZyV7eOaOXMNQyorg++u+kUFOIYwNpzTVqxWmMeoPS0DH0toVpjoKA==", "contentHash": "mQV5A+B/qtI6kSXEGx/UswiqjFKw13/yyviawnStfRKbLMW+XFsdMgGSkOVZd/TiDtF9ZG4Xt7DbkbFu26WjyA==",
"dependencies": { "dependencies": {
"HarmonyX": "2.10.0", "HarmonyX": "2.10.0",
"Il2CppInterop.Runtime": "1.3.0" "Il2CppInterop.Runtime": "1.4.6-ci.354"
} }
}, },
"Il2CppInterop.Runtime": { "Il2CppInterop.Runtime": {
"type": "Transitive", "type": "Transitive",
"resolved": "1.3.0", "resolved": "1.4.6-ci.354",
"contentHash": "8A+N2yvja960Ap+s2RpW7Nb6HSpyuXJy2ipIlU+1erYU9SWHMyU9JZzUZGOhwWXJChKGvRmDdTZAg12k1+72dg==", "contentHash": "Xe5md9z+KIthdEcjfUjmoOhvM3gTI3SPyocqvuzEHoov5jQ/HhIPv5hUZzTSm+2nzn3XplENNE8vlBPvQ1o6OA==",
"dependencies": { "dependencies": {
"Iced": "1.17.0", "Iced": "1.17.0",
"Il2CppInterop.Common": "1.3.0" "Il2CppInterop.Common": "1.4.6-ci.354"
} }
}, },
"IndexRange": {
"type": "Transitive",
"resolved": "1.0.0",
"contentHash": "6TgS1JLSUkpmPLfXBPaAgB39ZUix8E4soXWk2XSDcscVe84i1JKzIAtA7jHbRHSkOOrcr6YA0MpLCeq98y9mYQ=="
},
"js6pak.Gee.External.Capstone": { "js6pak.Gee.External.Capstone": {
"type": "Transitive", "type": "Transitive",
"resolved": "2.1.0", "resolved": "2.1.0",
@@ -440,38 +470,41 @@
}, },
"Samboy063.Cpp2IL.Core": { "Samboy063.Cpp2IL.Core": {
"type": "Transitive", "type": "Transitive",
"resolved": "2022.0.7.2", "resolved": "2022.1.0-development.866",
"contentHash": "e17CAhKSxdAp7vFcYEVxjSc7t7rcvVGBipGhgE9tAjRXY85wZXLlHEVO0AEvMRkLmf9U+if4wK/nZEC1AX6VqQ==", "contentHash": "QPMuix/3jRngWBdNSLhAbm9BHYf95Ln1Ph1eCK/cDZdVibxFDFP3a6Yczyx1p7GbN7bRQwrhs2skPJSS/z3m2w==",
"dependencies": { "dependencies": {
"HarmonyX": "2.5.5", "AsmResolver.DotNet": "5.1.0",
"Iced": "1.11.1", "Disarm": "2022.1.0-master.26",
"IndexRange": "1.0.0", "Iced": "1.18.0",
"Mono.Cecil": "0.11.4", "Samboy063.LibCpp2IL": "2022.1.0-development.866",
"Samboy063.LibCpp2IL": "2022.0.7.2", "StableNameDotNet": "0.1.0-development.866",
"System.Runtime.InteropServices": "4.3.0",
"System.ValueTuple": "4.5.0",
"js6pak.Gee.External.Capstone": "2.1.0" "js6pak.Gee.External.Capstone": "2.1.0"
} }
}, },
"Samboy063.LibCpp2IL": { "Samboy063.LibCpp2IL": {
"type": "Transitive", "type": "Transitive",
"resolved": "2022.0.7.2", "resolved": "2022.1.0-development.866",
"contentHash": "DpVeU0dQkUJCpbw0f1xKOG8vimdK2oYhrVABC7HDE3/ikGjhnMZd3i5b1joKDHZ+AiL90TWOaEXPcy24rCZ0dA==", "contentHash": "EcJSWTfQko8SQozozoUT+aQJVWC8wj8C0YUiPBF4rNRId19yTKp2IXcXnI747v+8/aal222QR6WHfoBK2WlVLg==",
"dependencies": { "dependencies": {
"IndexRange": "1.0.0", "AssetRipper.VersionUtilities": "1.3.1",
"Samboy063.WasmDisassembler": "2022.0.2" "Samboy063.WasmDisassembler": "2022.1.0-development.866"
} }
}, },
"Samboy063.WasmDisassembler": { "Samboy063.WasmDisassembler": {
"type": "Transitive", "type": "Transitive",
"resolved": "2022.0.2", "resolved": "2022.1.0-development.866",
"contentHash": "2uu+xBb7M3HKfBx9tAY6jiDieAf0hRnQjSmGX+7IdE6i24dYsx6TYgtrLvRx5lOuF2M8DijZ5H8yQ1pcuCs2SA==" "contentHash": "2QK8F3eISkLcoW/Nt7wtxyQh31EXAqEMBVXXjEnuxyvXpBXxOIGpjmE3pWhGwxQwDCbe4zBsLF1zUiqq3/pXRA=="
}, },
"SemanticVersioning": { "SemanticVersioning": {
"type": "Transitive", "type": "Transitive",
"resolved": "2.0.2", "resolved": "2.0.2",
"contentHash": "4EQgYdNZ92SyaO7YFk6olVnebF5V+jrHyMUjvPq89tLeMo8NSfgDF+6Zwq/lgh9j/0yfQp9Lkm0ZA0rUATCZFA==" "contentHash": "4EQgYdNZ92SyaO7YFk6olVnebF5V+jrHyMUjvPq89tLeMo8NSfgDF+6Zwq/lgh9j/0yfQp9Lkm0ZA0rUATCZFA=="
}, },
"StableNameDotNet": {
"type": "Transitive",
"resolved": "0.1.0-development.866",
"contentHash": "DJb8x4dV3ucDgM12sU28HxCdeqY/JudJbeJG6mgXWDJzpFZw2Jd7JF1pKFRNLzh/0gpo8bCGLQS9gOWZmBjdtg=="
},
"StyleCop.Analyzers.Unstable": { "StyleCop.Analyzers.Unstable": {
"type": "Transitive", "type": "Transitive",
"resolved": "1.2.0.435", "resolved": "1.2.0.435",
@@ -832,8 +865,8 @@
}, },
"System.Runtime.CompilerServices.Unsafe": { "System.Runtime.CompilerServices.Unsafe": {
"type": "Transitive", "type": "Transitive",
"resolved": "5.0.0", "resolved": "6.0.0",
"contentHash": "ZD9TMpsmYJLrxbbmdvhwt9YEgG5WntEnZ/d1eH8JBX9LBp+Ju8BSBhUGbZMNVHHomWo2KVImJhTDl2hIgw/6MA==" "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg=="
}, },
"System.Runtime.Extensions": { "System.Runtime.Extensions": {
"type": "Transitive", "type": "Transitive",
@@ -1042,6 +1075,23 @@
"System.Runtime.CompilerServices.Unsafe": "4.5.0" "System.Runtime.CompilerServices.Unsafe": "4.5.0"
} }
}, },
"System.Text.Encodings.Web": {
"type": "Transitive",
"resolved": "6.0.0",
"contentHash": "Vg8eB5Tawm1IFqj4TVK1czJX89rhFxJo9ELqc/Eiq0eXy13RK00eubyU6TJE6y+GQXjyV5gSfiewDUZjQgSE0w==",
"dependencies": {
"System.Runtime.CompilerServices.Unsafe": "6.0.0"
}
},
"System.Text.Json": {
"type": "Transitive",
"resolved": "6.0.7",
"contentHash": "/Tf/9XjprpHolbcDOrxsKVYy/mUG/FS7aGd9YUgBVEiHeQH4kAE0T1sMbde7q6B5xcrNUsJ5iW7D1RvHudQNqA==",
"dependencies": {
"System.Runtime.CompilerServices.Unsafe": "6.0.0",
"System.Text.Encodings.Web": "6.0.0"
}
},
"System.Threading": { "System.Threading": {
"type": "Transitive", "type": "Transitive",
"resolved": "4.3.0", "resolved": "4.3.0",
@@ -1066,17 +1116,12 @@
"resolved": "4.5.4", "resolved": "4.5.4",
"contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==" "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg=="
}, },
"System.ValueTuple": {
"type": "Transitive",
"resolved": "4.5.0",
"contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ=="
},
"reactor": { "reactor": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"BepInEx.Unity.IL2CPP": "[6.0.0-be.662, )" "BepInEx.Unity.IL2CPP": "[6.0.0-be.670, )"
} }
} }
} }
} }
} }
Reactor.Debugger/DebuggerPlugin.cs
+11 -3
View File
@@ -1,6 +1,7 @@
using System; using System;
using System.Linq; using System.Linq;
using AmongUs.Data; using AmongUs.Data;
using AmongUs.GameOptions;
using BepInEx; using BepInEx;
using BepInEx.Unity.IL2CPP; using BepInEx.Unity.IL2CPP;
using HarmonyLib; using HarmonyLib;
@@ -25,8 +26,15 @@ public partial class DebuggerPlugin : BasePlugin
{ {
Component = this.AddComponent<DebuggerComponent>(); Component = this.AddComponent<DebuggerComponent>();
GameOptionsData.MaxImpostors = GameOptionsData.RecommendedImpostors = Enumerable.Repeat((int) byte.MaxValue, byte.MaxValue).ToArray(); var maxImpostors = (Il2CppStructArray<int>) Enumerable.Repeat((int) byte.MaxValue, byte.MaxValue).ToArray();
GameOptionsData.MinPlayers = Enumerable.Repeat(1, 4).ToArray(); GameOptionsData.MaxImpostors = GameOptionsData.RecommendedImpostors = maxImpostors;
NormalGameOptionsV07.MaxImpostors = NormalGameOptionsV07.RecommendedImpostors = maxImpostors;
HideNSeekGameOptionsV07.MaxImpostors = maxImpostors;
var minPlayers = (Il2CppStructArray<int>) Enumerable.Repeat(1, byte.MaxValue).ToArray();
GameOptionsData.MinPlayers = minPlayers;
NormalGameOptionsV07.MinPlayers = minPlayers;
HideNSeekGameOptionsV07.MinPlayers = minPlayers;
Harmony.PatchAll(); Harmony.PatchAll();
} }
@@ -52,7 +60,7 @@ public partial class DebuggerPlugin : BasePlugin
if (GUILayout.Button("Force game end")) if (GUILayout.Button("Force game end"))
{ {
ShipStatus.Instance.enabled = false; ShipStatus.Instance.enabled = false;
ShipStatus.RpcEndGame(GameOverReason.ImpostorDisconnect, false); GameManager.Instance.RpcEndGame(GameOverReason.ImpostorDisconnect, false);
} }
if (GUILayout.Button("Call a meeting")) if (GUILayout.Button("Call a meeting"))
Reactor.Debugger/Patches.cs
+7 -1
View File
@@ -1,4 +1,5 @@
using System.Linq; using System.Linq;
using AmongUs.GameOptions;
using HarmonyLib; using HarmonyLib;
using Il2CppInterop.Runtime.InteropTypes.Arrays; using Il2CppInterop.Runtime.InteropTypes.Arrays;
using Reactor.Utilities; using Reactor.Utilities;
@@ -35,10 +36,13 @@ internal static class Patches
} }
} }
[HarmonyPatch(typeof(ShipStatus), nameof(ShipStatus.CheckEndCriteria))] [HarmonyPatch]
[HarmonyPriority(Priority.First)] [HarmonyPriority(Priority.First)]
public static class CheckEndCriteriaPatch public static class CheckEndCriteriaPatch
{ {
[HarmonyPatch(typeof(LogicGameFlow), nameof(LogicGameFlow.CheckEndCriteria))]
[HarmonyPatch(typeof(LogicGameFlowNormal), nameof(LogicGameFlow.CheckEndCriteria))]
[HarmonyPatch(typeof(LogicGameFlowHnS), nameof(LogicGameFlow.CheckEndCriteria))]
public static bool Prefix() public static bool Prefix()
{ {
return !PluginSingleton<DebuggerPlugin>.Instance.Component.DisableGameEnd; return !PluginSingleton<DebuggerPlugin>.Instance.Component.DisableGameEnd;
@@ -61,6 +65,8 @@ internal static class Patches
{ {
public static void Postfix(GameOptionsMenu __instance) public static void Postfix(GameOptionsMenu __instance)
{ {
if (GameOptionsManager.Instance.CurrentGameOptions.GameMode != GameModes.Normal) return;
__instance.Children __instance.Children
.Single(o => o.Title == StringNames.GameNumImpostors) .Single(o => o.Title == StringNames.GameNumImpostors)
.Cast<NumberOption>() .Cast<NumberOption>()
Reactor.Debugger/packages.lock.json
+113 -63
View File
@@ -4,9 +4,9 @@
"net6.0": { "net6.0": {
"AmongUs.GameLibs.Steam": { "AmongUs.GameLibs.Steam": {
"type": "Direct", "type": "Direct",
"requested": "[2022.10.25, )", "requested": "[2023.7.11, )",
"resolved": "2022.10.25", "resolved": "2023.7.11",
"contentHash": "PWgkH/VvMlShVhZB8G432q0tnMaNVZrbIdbEMCZN/fETUlT/ch+qQj4PdTcZhPHREbnJHH3ijHxlca1d7QMBcQ==" "contentHash": "e5zbU+4AYnp1zAQDizO5GRIh1kemkgCa8rFVAcr9bxeupkBu5dwwdHxArWv/pUybIJTZfOPjkOnicZ2qKWLX7g=="
}, },
"BepInEx.AutoPlugin": { "BepInEx.AutoPlugin": {
"type": "Direct", "type": "Direct",
@@ -22,19 +22,19 @@
}, },
"BepInEx.Unity.IL2CPP": { "BepInEx.Unity.IL2CPP": {
"type": "Direct", "type": "Direct",
"requested": "[6.0.0-be.662, )", "requested": "[6.0.0-be.670, )",
"resolved": "6.0.0-be.662", "resolved": "6.0.0-be.670",
"contentHash": "fn7jQ88IBmjssoY9XjGBTg3cULkS+N/le/eUijYf2VV8raWok/6cU/GbU9bejkJS8g+2MvzIwnROAhAxvrGI2Q==", "contentHash": "dhzCrem44oFxhOICCJ9eoSUbaKSsGGyBUfUQW9WFljCwIK8o4Cx5BiuXAkYoRjr2DhpzLpPDyPZDRImUqH0bwA==",
"dependencies": { "dependencies": {
"BepInEx.Core": "6.0.0-be.662", "BepInEx.Core": "6.0.0-be.670",
"BepInEx.Unity.Common": "6.0.0-be.662", "BepInEx.Unity.Common": "6.0.0-be.670",
"HarmonyX": "2.10.0", "HarmonyX": "2.10.1",
"Iced": "1.17.0", "Iced": "1.18.0",
"Il2CppInterop.Generator": "1.3.0", "Il2CppInterop.Generator": "1.4.6-ci.354",
"Il2CppInterop.HarmonySupport": "1.3.0", "Il2CppInterop.HarmonySupport": "1.4.6-ci.354",
"Il2CppInterop.Runtime": "1.3.0", "Il2CppInterop.Runtime": "1.4.6-ci.354",
"MonoMod.RuntimeDetour": "22.5.1.1", "MonoMod.RuntimeDetour": "22.5.1.1",
"Samboy063.Cpp2IL.Core": "2022.0.7.2" "Samboy063.Cpp2IL.Core": "2022.1.0-development.866"
} }
}, },
"StyleCop.Analyzers": { "StyleCop.Analyzers": {
@@ -46,34 +46,69 @@
"StyleCop.Analyzers.Unstable": "1.2.0.435" "StyleCop.Analyzers.Unstable": "1.2.0.435"
} }
}, },
"AsmResolver": {
"type": "Transitive",
"resolved": "5.1.0",
"contentHash": "7PjujQzgQ3wjzqZYT4CY8SV6zx7FY6swIwj3Yk4QLolLqo9sBPb7FLF3W30QFvCsCkNfiVWXlSbeZKs4xGgQOQ=="
},
"AsmResolver.DotNet": {
"type": "Transitive",
"resolved": "5.1.0",
"contentHash": "oKrBU94OaSrbbTwydvpLRFalYxozrNXGkl13nIkm823ZFQtPNYOiOMJb5DQLvkCJlWyis7q865tg803T5zg9IA==",
"dependencies": {
"AsmResolver.PE": "5.1.0",
"System.Text.Json": "6.0.7"
}
},
"AsmResolver.PE": {
"type": "Transitive",
"resolved": "5.1.0",
"contentHash": "XD3iAgLSInJIODKUUlpHWXf8MR9H1SFMb1lsmabb4GxxxnDQRPjMxjglv2NOCjQQuNB2Oh0bvjHE7ewf82UqyQ==",
"dependencies": {
"AsmResolver.PE.File": "5.1.0"
}
},
"AsmResolver.PE.File": {
"type": "Transitive",
"resolved": "5.1.0",
"contentHash": "YituBYe0Fh471sXQMfu+f4tWKX/JZvRwrX6g/SVsr4XkUIUzYi/aGT3/QvjHoYx19fE1KYOB6zBKqPkkOK7HPw==",
"dependencies": {
"AsmResolver": "5.1.0"
}
},
"AssetRipper.VersionUtilities": { "AssetRipper.VersionUtilities": {
"type": "Transitive", "type": "Transitive",
"resolved": "1.2.1", "resolved": "1.3.1",
"contentHash": "knQ/W1YwTZS2AbdaZh+nhyyBEZQPQDcahhSOnh88i+cdg4/FEoFJiCwaavgFvCMNuUeHTbcZc4qttF8WQ8xLIA==" "contentHash": "/1D18NOpqm7rS7+qVUbAReVMNWwgDuYpsnf0RkX1Aah/I0a0irqldoFJ+Kku7YdbSm0zqD+Z6iYUGKoP3GwTNQ=="
}, },
"BepInEx.Core": { "BepInEx.Core": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.0.0-be.662", "resolved": "6.0.0-be.670",
"contentHash": "VVBeCD/KQVy0/TK3V6SD8QZ/es35Xb1mEz/+PbBs3ST1yUC1r7k2JOymhSnmghVqf6UsvlMglOO9pljqhuE/Pw==", "contentHash": "7CbbMNZfb+1VHjFKh/ErFBOOEYrVCIkng/B3/HPcbNioySC7qdT1ztfYqs6YjQia4krEic+LV3ew86B/hTg+hw==",
"dependencies": { "dependencies": {
"HarmonyX": "2.10.0", "HarmonyX": "2.10.1",
"MonoMod.Utils": "22.5.1.1", "MonoMod.Utils": "22.5.1.1",
"SemanticVersioning": "2.0.2" "SemanticVersioning": "2.0.2"
} }
}, },
"BepInEx.Unity.Common": { "BepInEx.Unity.Common": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.0.0-be.662", "resolved": "6.0.0-be.670",
"contentHash": "BgETw6+snwY//3xjQxLiiEAFRmXaMTcSkg+1UQz6fVBG0YA5Usm/m4GflhTc3nwF61KO3Iznn1AORi5CwLJoUw==", "contentHash": "FSzWILgwepZ7CpA34ew1WyO75lNjxkfX86uwo2172lbhmLkgoAdQbNun8dxKJCDlIevmTDga76yr/WPrTXELvA==",
"dependencies": { "dependencies": {
"AssetRipper.VersionUtilities": "1.2.1", "AssetRipper.VersionUtilities": "1.2.1",
"MonoMod.Utils": "22.5.1.1" "MonoMod.Utils": "22.5.1.1"
} }
}, },
"Disarm": {
"type": "Transitive",
"resolved": "2022.1.0-master.26",
"contentHash": "YnZEbRGr0nG+N3G8WbRQ4Lkg8dTD3oso9iJlCVBmyhEyhLyqs+drBs1kWQbQqFPnb9mi/RJ++R9bPb+L3HF03Q=="
},
"HarmonyX": { "HarmonyX": {
"type": "Transitive", "type": "Transitive",
"resolved": "2.10.0", "resolved": "2.10.1",
"contentHash": "4ayiy/dlCiW86K2N7Jvbf+VpI5wvP7dncv/6oRmfwRi32UCmCRzCGzsxdMfzJZkp6/26oBW+DrD8vi4UejzVAg==", "contentHash": "9LodMC9Y0u1TW96eKJoWrFJFpmzbgojEO38/Q+e7c1mFPhmHt8xcR8qhI06iF1rf0Dnsk+hqENFVSgbtwl/bEw==",
"dependencies": { "dependencies": {
"MonoMod.RuntimeDetour": "22.3.23.4", "MonoMod.RuntimeDetour": "22.3.23.4",
"System.Reflection.Emit": "4.7.0" "System.Reflection.Emit": "4.7.0"
@@ -81,13 +116,13 @@
}, },
"Iced": { "Iced": {
"type": "Transitive", "type": "Transitive",
"resolved": "1.17.0", "resolved": "1.18.0",
"contentHash": "8x+HCVTl/HHTGpscH3vMBhV8sknN/muZFw9s3TsI8SA6+c43cOTCi2+jE4KsU8pNLbJ++iF2ZFcpcXHXtDglnw==" "contentHash": "G60lZOvbvqttA+SBSv/yY6/wUboXKJlkffhSNR9iOrx0M5gpcK1TRr6xrFR+qAhqIAhvrsPF1jkn9fYb4lEufQ=="
}, },
"Il2CppInterop.Common": { "Il2CppInterop.Common": {
"type": "Transitive", "type": "Transitive",
"resolved": "1.3.0", "resolved": "1.4.6-ci.354",
"contentHash": "IR3BrZXvL2nvJAn4pruPMgC78Y87hVa5xTYZCuHN67OzRD6WDl5dTO55vtvTl8dXFALKvlN+spja2tXhVuquOw==", "contentHash": "aCP3kr39YQw5GVqE9Q8c5y7f9CEKdFxpUhIqYgQBtrEz5Z/KCbHhjuOf/lSuFrjl6Vub/BKk6k+UbMRdoSvC1w==",
"dependencies": { "dependencies": {
"Iced": "1.17.0", "Iced": "1.17.0",
"Microsoft.Extensions.Logging.Abstractions": "6.0.1", "Microsoft.Extensions.Logging.Abstractions": "6.0.1",
@@ -96,36 +131,31 @@
}, },
"Il2CppInterop.Generator": { "Il2CppInterop.Generator": {
"type": "Transitive", "type": "Transitive",
"resolved": "1.3.0", "resolved": "1.4.6-ci.354",
"contentHash": "FuhPxbh/K4K94U3xac/ClMaaBp+MZ4aIaqi5dR0QihyGQoombT+OM/A22RwAIzbaCTbFbvabWaAuOSgB69ZwWQ==", "contentHash": "y30sxc9mMv0bUzCPDr73xiI6fiu7ksmnEm6XULTGU/5JEGv2aw++/71bLOEYCscNbZTa2JT4yYrLCXCj3GSekg==",
"dependencies": { "dependencies": {
"Il2CppInterop.Common": "1.3.0", "Il2CppInterop.Common": "1.4.6-ci.354",
"Mono.Cecil": "0.11.3" "Mono.Cecil": "0.11.3"
} }
}, },
"Il2CppInterop.HarmonySupport": { "Il2CppInterop.HarmonySupport": {
"type": "Transitive", "type": "Transitive",
"resolved": "1.3.0", "resolved": "1.4.6-ci.354",
"contentHash": "VppBnXtbMNGFhX8a1gg/85E883t2pW/+FZyV7eOaOXMNQyorg++u+kUFOIYwNpzTVqxWmMeoPS0DH0toVpjoKA==", "contentHash": "mQV5A+B/qtI6kSXEGx/UswiqjFKw13/yyviawnStfRKbLMW+XFsdMgGSkOVZd/TiDtF9ZG4Xt7DbkbFu26WjyA==",
"dependencies": { "dependencies": {
"HarmonyX": "2.10.0", "HarmonyX": "2.10.0",
"Il2CppInterop.Runtime": "1.3.0" "Il2CppInterop.Runtime": "1.4.6-ci.354"
} }
}, },
"Il2CppInterop.Runtime": { "Il2CppInterop.Runtime": {
"type": "Transitive", "type": "Transitive",
"resolved": "1.3.0", "resolved": "1.4.6-ci.354",
"contentHash": "8A+N2yvja960Ap+s2RpW7Nb6HSpyuXJy2ipIlU+1erYU9SWHMyU9JZzUZGOhwWXJChKGvRmDdTZAg12k1+72dg==", "contentHash": "Xe5md9z+KIthdEcjfUjmoOhvM3gTI3SPyocqvuzEHoov5jQ/HhIPv5hUZzTSm+2nzn3XplENNE8vlBPvQ1o6OA==",
"dependencies": { "dependencies": {
"Iced": "1.17.0", "Iced": "1.17.0",
"Il2CppInterop.Common": "1.3.0" "Il2CppInterop.Common": "1.4.6-ci.354"
} }
}, },
"IndexRange": {
"type": "Transitive",
"resolved": "1.0.0",
"contentHash": "6TgS1JLSUkpmPLfXBPaAgB39ZUix8E4soXWk2XSDcscVe84i1JKzIAtA7jHbRHSkOOrcr6YA0MpLCeq98y9mYQ=="
},
"js6pak.Gee.External.Capstone": { "js6pak.Gee.External.Capstone": {
"type": "Transitive", "type": "Transitive",
"resolved": "2.1.0", "resolved": "2.1.0",
@@ -280,38 +310,41 @@
}, },
"Samboy063.Cpp2IL.Core": { "Samboy063.Cpp2IL.Core": {
"type": "Transitive", "type": "Transitive",
"resolved": "2022.0.7.2", "resolved": "2022.1.0-development.866",
"contentHash": "e17CAhKSxdAp7vFcYEVxjSc7t7rcvVGBipGhgE9tAjRXY85wZXLlHEVO0AEvMRkLmf9U+if4wK/nZEC1AX6VqQ==", "contentHash": "QPMuix/3jRngWBdNSLhAbm9BHYf95Ln1Ph1eCK/cDZdVibxFDFP3a6Yczyx1p7GbN7bRQwrhs2skPJSS/z3m2w==",
"dependencies": { "dependencies": {
"HarmonyX": "2.5.5", "AsmResolver.DotNet": "5.1.0",
"Iced": "1.11.1", "Disarm": "2022.1.0-master.26",
"IndexRange": "1.0.0", "Iced": "1.18.0",
"Mono.Cecil": "0.11.4", "Samboy063.LibCpp2IL": "2022.1.0-development.866",
"Samboy063.LibCpp2IL": "2022.0.7.2", "StableNameDotNet": "0.1.0-development.866",
"System.Runtime.InteropServices": "4.3.0",
"System.ValueTuple": "4.5.0",
"js6pak.Gee.External.Capstone": "2.1.0" "js6pak.Gee.External.Capstone": "2.1.0"
} }
}, },
"Samboy063.LibCpp2IL": { "Samboy063.LibCpp2IL": {
"type": "Transitive", "type": "Transitive",
"resolved": "2022.0.7.2", "resolved": "2022.1.0-development.866",
"contentHash": "DpVeU0dQkUJCpbw0f1xKOG8vimdK2oYhrVABC7HDE3/ikGjhnMZd3i5b1joKDHZ+AiL90TWOaEXPcy24rCZ0dA==", "contentHash": "EcJSWTfQko8SQozozoUT+aQJVWC8wj8C0YUiPBF4rNRId19yTKp2IXcXnI747v+8/aal222QR6WHfoBK2WlVLg==",
"dependencies": { "dependencies": {
"IndexRange": "1.0.0", "AssetRipper.VersionUtilities": "1.3.1",
"Samboy063.WasmDisassembler": "2022.0.2" "Samboy063.WasmDisassembler": "2022.1.0-development.866"
} }
}, },
"Samboy063.WasmDisassembler": { "Samboy063.WasmDisassembler": {
"type": "Transitive", "type": "Transitive",
"resolved": "2022.0.2", "resolved": "2022.1.0-development.866",
"contentHash": "2uu+xBb7M3HKfBx9tAY6jiDieAf0hRnQjSmGX+7IdE6i24dYsx6TYgtrLvRx5lOuF2M8DijZ5H8yQ1pcuCs2SA==" "contentHash": "2QK8F3eISkLcoW/Nt7wtxyQh31EXAqEMBVXXjEnuxyvXpBXxOIGpjmE3pWhGwxQwDCbe4zBsLF1zUiqq3/pXRA=="
}, },
"SemanticVersioning": { "SemanticVersioning": {
"type": "Transitive", "type": "Transitive",
"resolved": "2.0.2", "resolved": "2.0.2",
"contentHash": "4EQgYdNZ92SyaO7YFk6olVnebF5V+jrHyMUjvPq89tLeMo8NSfgDF+6Zwq/lgh9j/0yfQp9Lkm0ZA0rUATCZFA==" "contentHash": "4EQgYdNZ92SyaO7YFk6olVnebF5V+jrHyMUjvPq89tLeMo8NSfgDF+6Zwq/lgh9j/0yfQp9Lkm0ZA0rUATCZFA=="
}, },
"StableNameDotNet": {
"type": "Transitive",
"resolved": "0.1.0-development.866",
"contentHash": "DJb8x4dV3ucDgM12sU28HxCdeqY/JudJbeJG6mgXWDJzpFZw2Jd7JF1pKFRNLzh/0gpo8bCGLQS9gOWZmBjdtg=="
},
"StyleCop.Analyzers.Unstable": { "StyleCop.Analyzers.Unstable": {
"type": "Transitive", "type": "Transitive",
"resolved": "1.2.0.435", "resolved": "1.2.0.435",
@@ -642,6 +675,11 @@
"Microsoft.NETCore.Targets": "1.1.0" "Microsoft.NETCore.Targets": "1.1.0"
} }
}, },
"System.Runtime.CompilerServices.Unsafe": {
"type": "Transitive",
"resolved": "6.0.0",
"contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg=="
},
"System.Runtime.Extensions": { "System.Runtime.Extensions": {
"type": "Transitive", "type": "Transitive",
"resolved": "4.3.0", "resolved": "4.3.0",
@@ -840,6 +878,23 @@
"System.Runtime": "4.3.0" "System.Runtime": "4.3.0"
} }
}, },
"System.Text.Encodings.Web": {
"type": "Transitive",
"resolved": "6.0.0",
"contentHash": "Vg8eB5Tawm1IFqj4TVK1czJX89rhFxJo9ELqc/Eiq0eXy13RK00eubyU6TJE6y+GQXjyV5gSfiewDUZjQgSE0w==",
"dependencies": {
"System.Runtime.CompilerServices.Unsafe": "6.0.0"
}
},
"System.Text.Json": {
"type": "Transitive",
"resolved": "6.0.7",
"contentHash": "/Tf/9XjprpHolbcDOrxsKVYy/mUG/FS7aGd9YUgBVEiHeQH4kAE0T1sMbde7q6B5xcrNUsJ5iW7D1RvHudQNqA==",
"dependencies": {
"System.Runtime.CompilerServices.Unsafe": "6.0.0",
"System.Text.Encodings.Web": "6.0.0"
}
},
"System.Threading": { "System.Threading": {
"type": "Transitive", "type": "Transitive",
"resolved": "4.3.0", "resolved": "4.3.0",
@@ -859,17 +914,12 @@
"System.Runtime": "4.3.0" "System.Runtime": "4.3.0"
} }
}, },
"System.ValueTuple": {
"type": "Transitive",
"resolved": "4.5.0",
"contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ=="
},
"reactor": { "reactor": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"BepInEx.Unity.IL2CPP": "[6.0.0-be.662, )" "BepInEx.Unity.IL2CPP": "[6.0.0-be.670, )"
} }
} }
} }
} }
} }
Reactor.Example/packages.lock.json
+113 -63
View File
@@ -4,9 +4,9 @@
"net6.0": { "net6.0": {
"AmongUs.GameLibs.Steam": { "AmongUs.GameLibs.Steam": {
"type": "Direct", "type": "Direct",
"requested": "[2022.10.25, )", "requested": "[2023.7.11, )",
"resolved": "2022.10.25", "resolved": "2023.7.11",
"contentHash": "PWgkH/VvMlShVhZB8G432q0tnMaNVZrbIdbEMCZN/fETUlT/ch+qQj4PdTcZhPHREbnJHH3ijHxlca1d7QMBcQ==" "contentHash": "e5zbU+4AYnp1zAQDizO5GRIh1kemkgCa8rFVAcr9bxeupkBu5dwwdHxArWv/pUybIJTZfOPjkOnicZ2qKWLX7g=="
}, },
"BepInEx.AutoPlugin": { "BepInEx.AutoPlugin": {
"type": "Direct", "type": "Direct",
@@ -22,19 +22,19 @@
}, },
"BepInEx.Unity.IL2CPP": { "BepInEx.Unity.IL2CPP": {
"type": "Direct", "type": "Direct",
"requested": "[6.0.0-be.662, )", "requested": "[6.0.0-be.670, )",
"resolved": "6.0.0-be.662", "resolved": "6.0.0-be.670",
"contentHash": "fn7jQ88IBmjssoY9XjGBTg3cULkS+N/le/eUijYf2VV8raWok/6cU/GbU9bejkJS8g+2MvzIwnROAhAxvrGI2Q==", "contentHash": "dhzCrem44oFxhOICCJ9eoSUbaKSsGGyBUfUQW9WFljCwIK8o4Cx5BiuXAkYoRjr2DhpzLpPDyPZDRImUqH0bwA==",
"dependencies": { "dependencies": {
"BepInEx.Core": "6.0.0-be.662", "BepInEx.Core": "6.0.0-be.670",
"BepInEx.Unity.Common": "6.0.0-be.662", "BepInEx.Unity.Common": "6.0.0-be.670",
"HarmonyX": "2.10.0", "HarmonyX": "2.10.1",
"Iced": "1.17.0", "Iced": "1.18.0",
"Il2CppInterop.Generator": "1.3.0", "Il2CppInterop.Generator": "1.4.6-ci.354",
"Il2CppInterop.HarmonySupport": "1.3.0", "Il2CppInterop.HarmonySupport": "1.4.6-ci.354",
"Il2CppInterop.Runtime": "1.3.0", "Il2CppInterop.Runtime": "1.4.6-ci.354",
"MonoMod.RuntimeDetour": "22.5.1.1", "MonoMod.RuntimeDetour": "22.5.1.1",
"Samboy063.Cpp2IL.Core": "2022.0.7.2" "Samboy063.Cpp2IL.Core": "2022.1.0-development.866"
} }
}, },
"StyleCop.Analyzers": { "StyleCop.Analyzers": {
@@ -46,34 +46,69 @@
"StyleCop.Analyzers.Unstable": "1.2.0.435" "StyleCop.Analyzers.Unstable": "1.2.0.435"
} }
}, },
"AsmResolver": {
"type": "Transitive",
"resolved": "5.1.0",
"contentHash": "7PjujQzgQ3wjzqZYT4CY8SV6zx7FY6swIwj3Yk4QLolLqo9sBPb7FLF3W30QFvCsCkNfiVWXlSbeZKs4xGgQOQ=="
},
"AsmResolver.DotNet": {
"type": "Transitive",
"resolved": "5.1.0",
"contentHash": "oKrBU94OaSrbbTwydvpLRFalYxozrNXGkl13nIkm823ZFQtPNYOiOMJb5DQLvkCJlWyis7q865tg803T5zg9IA==",
"dependencies": {
"AsmResolver.PE": "5.1.0",
"System.Text.Json": "6.0.7"
}
},
"AsmResolver.PE": {
"type": "Transitive",
"resolved": "5.1.0",
"contentHash": "XD3iAgLSInJIODKUUlpHWXf8MR9H1SFMb1lsmabb4GxxxnDQRPjMxjglv2NOCjQQuNB2Oh0bvjHE7ewf82UqyQ==",
"dependencies": {
"AsmResolver.PE.File": "5.1.0"
}
},
"AsmResolver.PE.File": {
"type": "Transitive",
"resolved": "5.1.0",
"contentHash": "YituBYe0Fh471sXQMfu+f4tWKX/JZvRwrX6g/SVsr4XkUIUzYi/aGT3/QvjHoYx19fE1KYOB6zBKqPkkOK7HPw==",
"dependencies": {
"AsmResolver": "5.1.0"
}
},
"AssetRipper.VersionUtilities": { "AssetRipper.VersionUtilities": {
"type": "Transitive", "type": "Transitive",
"resolved": "1.2.1", "resolved": "1.3.1",
"contentHash": "knQ/W1YwTZS2AbdaZh+nhyyBEZQPQDcahhSOnh88i+cdg4/FEoFJiCwaavgFvCMNuUeHTbcZc4qttF8WQ8xLIA==" "contentHash": "/1D18NOpqm7rS7+qVUbAReVMNWwgDuYpsnf0RkX1Aah/I0a0irqldoFJ+Kku7YdbSm0zqD+Z6iYUGKoP3GwTNQ=="
}, },
"BepInEx.Core": { "BepInEx.Core": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.0.0-be.662", "resolved": "6.0.0-be.670",
"contentHash": "VVBeCD/KQVy0/TK3V6SD8QZ/es35Xb1mEz/+PbBs3ST1yUC1r7k2JOymhSnmghVqf6UsvlMglOO9pljqhuE/Pw==", "contentHash": "7CbbMNZfb+1VHjFKh/ErFBOOEYrVCIkng/B3/HPcbNioySC7qdT1ztfYqs6YjQia4krEic+LV3ew86B/hTg+hw==",
"dependencies": { "dependencies": {
"HarmonyX": "2.10.0", "HarmonyX": "2.10.1",
"MonoMod.Utils": "22.5.1.1", "MonoMod.Utils": "22.5.1.1",
"SemanticVersioning": "2.0.2" "SemanticVersioning": "2.0.2"
} }
}, },
"BepInEx.Unity.Common": { "BepInEx.Unity.Common": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.0.0-be.662", "resolved": "6.0.0-be.670",
"contentHash": "BgETw6+snwY//3xjQxLiiEAFRmXaMTcSkg+1UQz6fVBG0YA5Usm/m4GflhTc3nwF61KO3Iznn1AORi5CwLJoUw==", "contentHash": "FSzWILgwepZ7CpA34ew1WyO75lNjxkfX86uwo2172lbhmLkgoAdQbNun8dxKJCDlIevmTDga76yr/WPrTXELvA==",
"dependencies": { "dependencies": {
"AssetRipper.VersionUtilities": "1.2.1", "AssetRipper.VersionUtilities": "1.2.1",
"MonoMod.Utils": "22.5.1.1" "MonoMod.Utils": "22.5.1.1"
} }
}, },
"Disarm": {
"type": "Transitive",
"resolved": "2022.1.0-master.26",
"contentHash": "YnZEbRGr0nG+N3G8WbRQ4Lkg8dTD3oso9iJlCVBmyhEyhLyqs+drBs1kWQbQqFPnb9mi/RJ++R9bPb+L3HF03Q=="
},
"HarmonyX": { "HarmonyX": {
"type": "Transitive", "type": "Transitive",
"resolved": "2.10.0", "resolved": "2.10.1",
"contentHash": "4ayiy/dlCiW86K2N7Jvbf+VpI5wvP7dncv/6oRmfwRi32UCmCRzCGzsxdMfzJZkp6/26oBW+DrD8vi4UejzVAg==", "contentHash": "9LodMC9Y0u1TW96eKJoWrFJFpmzbgojEO38/Q+e7c1mFPhmHt8xcR8qhI06iF1rf0Dnsk+hqENFVSgbtwl/bEw==",
"dependencies": { "dependencies": {
"MonoMod.RuntimeDetour": "22.3.23.4", "MonoMod.RuntimeDetour": "22.3.23.4",
"System.Reflection.Emit": "4.7.0" "System.Reflection.Emit": "4.7.0"
@@ -81,13 +116,13 @@
}, },
"Iced": { "Iced": {
"type": "Transitive", "type": "Transitive",
"resolved": "1.17.0", "resolved": "1.18.0",
"contentHash": "8x+HCVTl/HHTGpscH3vMBhV8sknN/muZFw9s3TsI8SA6+c43cOTCi2+jE4KsU8pNLbJ++iF2ZFcpcXHXtDglnw==" "contentHash": "G60lZOvbvqttA+SBSv/yY6/wUboXKJlkffhSNR9iOrx0M5gpcK1TRr6xrFR+qAhqIAhvrsPF1jkn9fYb4lEufQ=="
}, },
"Il2CppInterop.Common": { "Il2CppInterop.Common": {
"type": "Transitive", "type": "Transitive",
"resolved": "1.3.0", "resolved": "1.4.6-ci.354",
"contentHash": "IR3BrZXvL2nvJAn4pruPMgC78Y87hVa5xTYZCuHN67OzRD6WDl5dTO55vtvTl8dXFALKvlN+spja2tXhVuquOw==", "contentHash": "aCP3kr39YQw5GVqE9Q8c5y7f9CEKdFxpUhIqYgQBtrEz5Z/KCbHhjuOf/lSuFrjl6Vub/BKk6k+UbMRdoSvC1w==",
"dependencies": { "dependencies": {
"Iced": "1.17.0", "Iced": "1.17.0",
"Microsoft.Extensions.Logging.Abstractions": "6.0.1", "Microsoft.Extensions.Logging.Abstractions": "6.0.1",
@@ -96,36 +131,31 @@
}, },
"Il2CppInterop.Generator": { "Il2CppInterop.Generator": {
"type": "Transitive", "type": "Transitive",
"resolved": "1.3.0", "resolved": "1.4.6-ci.354",
"contentHash": "FuhPxbh/K4K94U3xac/ClMaaBp+MZ4aIaqi5dR0QihyGQoombT+OM/A22RwAIzbaCTbFbvabWaAuOSgB69ZwWQ==", "contentHash": "y30sxc9mMv0bUzCPDr73xiI6fiu7ksmnEm6XULTGU/5JEGv2aw++/71bLOEYCscNbZTa2JT4yYrLCXCj3GSekg==",
"dependencies": { "dependencies": {
"Il2CppInterop.Common": "1.3.0", "Il2CppInterop.Common": "1.4.6-ci.354",
"Mono.Cecil": "0.11.3" "Mono.Cecil": "0.11.3"
} }
}, },
"Il2CppInterop.HarmonySupport": { "Il2CppInterop.HarmonySupport": {
"type": "Transitive", "type": "Transitive",
"resolved": "1.3.0", "resolved": "1.4.6-ci.354",
"contentHash": "VppBnXtbMNGFhX8a1gg/85E883t2pW/+FZyV7eOaOXMNQyorg++u+kUFOIYwNpzTVqxWmMeoPS0DH0toVpjoKA==", "contentHash": "mQV5A+B/qtI6kSXEGx/UswiqjFKw13/yyviawnStfRKbLMW+XFsdMgGSkOVZd/TiDtF9ZG4Xt7DbkbFu26WjyA==",
"dependencies": { "dependencies": {
"HarmonyX": "2.10.0", "HarmonyX": "2.10.0",
"Il2CppInterop.Runtime": "1.3.0" "Il2CppInterop.Runtime": "1.4.6-ci.354"
} }
}, },
"Il2CppInterop.Runtime": { "Il2CppInterop.Runtime": {
"type": "Transitive", "type": "Transitive",
"resolved": "1.3.0", "resolved": "1.4.6-ci.354",
"contentHash": "8A+N2yvja960Ap+s2RpW7Nb6HSpyuXJy2ipIlU+1erYU9SWHMyU9JZzUZGOhwWXJChKGvRmDdTZAg12k1+72dg==", "contentHash": "Xe5md9z+KIthdEcjfUjmoOhvM3gTI3SPyocqvuzEHoov5jQ/HhIPv5hUZzTSm+2nzn3XplENNE8vlBPvQ1o6OA==",
"dependencies": { "dependencies": {
"Iced": "1.17.0", "Iced": "1.17.0",
"Il2CppInterop.Common": "1.3.0" "Il2CppInterop.Common": "1.4.6-ci.354"
} }
}, },
"IndexRange": {
"type": "Transitive",
"resolved": "1.0.0",
"contentHash": "6TgS1JLSUkpmPLfXBPaAgB39ZUix8E4soXWk2XSDcscVe84i1JKzIAtA7jHbRHSkOOrcr6YA0MpLCeq98y9mYQ=="
},
"js6pak.Gee.External.Capstone": { "js6pak.Gee.External.Capstone": {
"type": "Transitive", "type": "Transitive",
"resolved": "2.1.0", "resolved": "2.1.0",
@@ -280,38 +310,41 @@
}, },
"Samboy063.Cpp2IL.Core": { "Samboy063.Cpp2IL.Core": {
"type": "Transitive", "type": "Transitive",
"resolved": "2022.0.7.2", "resolved": "2022.1.0-development.866",
"contentHash": "e17CAhKSxdAp7vFcYEVxjSc7t7rcvVGBipGhgE9tAjRXY85wZXLlHEVO0AEvMRkLmf9U+if4wK/nZEC1AX6VqQ==", "contentHash": "QPMuix/3jRngWBdNSLhAbm9BHYf95Ln1Ph1eCK/cDZdVibxFDFP3a6Yczyx1p7GbN7bRQwrhs2skPJSS/z3m2w==",
"dependencies": { "dependencies": {
"HarmonyX": "2.5.5", "AsmResolver.DotNet": "5.1.0",
"Iced": "1.11.1", "Disarm": "2022.1.0-master.26",
"IndexRange": "1.0.0", "Iced": "1.18.0",
"Mono.Cecil": "0.11.4", "Samboy063.LibCpp2IL": "2022.1.0-development.866",
"Samboy063.LibCpp2IL": "2022.0.7.2", "StableNameDotNet": "0.1.0-development.866",
"System.Runtime.InteropServices": "4.3.0",
"System.ValueTuple": "4.5.0",
"js6pak.Gee.External.Capstone": "2.1.0" "js6pak.Gee.External.Capstone": "2.1.0"
} }
}, },
"Samboy063.LibCpp2IL": { "Samboy063.LibCpp2IL": {
"type": "Transitive", "type": "Transitive",
"resolved": "2022.0.7.2", "resolved": "2022.1.0-development.866",
"contentHash": "DpVeU0dQkUJCpbw0f1xKOG8vimdK2oYhrVABC7HDE3/ikGjhnMZd3i5b1joKDHZ+AiL90TWOaEXPcy24rCZ0dA==", "contentHash": "EcJSWTfQko8SQozozoUT+aQJVWC8wj8C0YUiPBF4rNRId19yTKp2IXcXnI747v+8/aal222QR6WHfoBK2WlVLg==",
"dependencies": { "dependencies": {
"IndexRange": "1.0.0", "AssetRipper.VersionUtilities": "1.3.1",
"Samboy063.WasmDisassembler": "2022.0.2" "Samboy063.WasmDisassembler": "2022.1.0-development.866"
} }
}, },
"Samboy063.WasmDisassembler": { "Samboy063.WasmDisassembler": {
"type": "Transitive", "type": "Transitive",
"resolved": "2022.0.2", "resolved": "2022.1.0-development.866",
"contentHash": "2uu+xBb7M3HKfBx9tAY6jiDieAf0hRnQjSmGX+7IdE6i24dYsx6TYgtrLvRx5lOuF2M8DijZ5H8yQ1pcuCs2SA==" "contentHash": "2QK8F3eISkLcoW/Nt7wtxyQh31EXAqEMBVXXjEnuxyvXpBXxOIGpjmE3pWhGwxQwDCbe4zBsLF1zUiqq3/pXRA=="
}, },
"SemanticVersioning": { "SemanticVersioning": {
"type": "Transitive", "type": "Transitive",
"resolved": "2.0.2", "resolved": "2.0.2",
"contentHash": "4EQgYdNZ92SyaO7YFk6olVnebF5V+jrHyMUjvPq89tLeMo8NSfgDF+6Zwq/lgh9j/0yfQp9Lkm0ZA0rUATCZFA==" "contentHash": "4EQgYdNZ92SyaO7YFk6olVnebF5V+jrHyMUjvPq89tLeMo8NSfgDF+6Zwq/lgh9j/0yfQp9Lkm0ZA0rUATCZFA=="
}, },
"StableNameDotNet": {
"type": "Transitive",
"resolved": "0.1.0-development.866",
"contentHash": "DJb8x4dV3ucDgM12sU28HxCdeqY/JudJbeJG6mgXWDJzpFZw2Jd7JF1pKFRNLzh/0gpo8bCGLQS9gOWZmBjdtg=="
},
"StyleCop.Analyzers.Unstable": { "StyleCop.Analyzers.Unstable": {
"type": "Transitive", "type": "Transitive",
"resolved": "1.2.0.435", "resolved": "1.2.0.435",
@@ -642,6 +675,11 @@
"Microsoft.NETCore.Targets": "1.1.0" "Microsoft.NETCore.Targets": "1.1.0"
} }
}, },
"System.Runtime.CompilerServices.Unsafe": {
"type": "Transitive",
"resolved": "6.0.0",
"contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg=="
},
"System.Runtime.Extensions": { "System.Runtime.Extensions": {
"type": "Transitive", "type": "Transitive",
"resolved": "4.3.0", "resolved": "4.3.0",
@@ -840,6 +878,23 @@
"System.Runtime": "4.3.0" "System.Runtime": "4.3.0"
} }
}, },
"System.Text.Encodings.Web": {
"type": "Transitive",
"resolved": "6.0.0",
"contentHash": "Vg8eB5Tawm1IFqj4TVK1czJX89rhFxJo9ELqc/Eiq0eXy13RK00eubyU6TJE6y+GQXjyV5gSfiewDUZjQgSE0w==",
"dependencies": {
"System.Runtime.CompilerServices.Unsafe": "6.0.0"
}
},
"System.Text.Json": {
"type": "Transitive",
"resolved": "6.0.7",
"contentHash": "/Tf/9XjprpHolbcDOrxsKVYy/mUG/FS7aGd9YUgBVEiHeQH4kAE0T1sMbde7q6B5xcrNUsJ5iW7D1RvHudQNqA==",
"dependencies": {
"System.Runtime.CompilerServices.Unsafe": "6.0.0",
"System.Text.Encodings.Web": "6.0.0"
}
},
"System.Threading": { "System.Threading": {
"type": "Transitive", "type": "Transitive",
"resolved": "4.3.0", "resolved": "4.3.0",
@@ -859,17 +914,12 @@
"System.Runtime": "4.3.0" "System.Runtime": "4.3.0"
} }
}, },
"System.ValueTuple": {
"type": "Transitive",
"resolved": "4.5.0",
"contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ=="
},
"reactor": { "reactor": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"BepInEx.Unity.IL2CPP": "[6.0.0-be.662, )" "BepInEx.Unity.IL2CPP": "[6.0.0-be.670, )"
} }
} }
} }
} }
} }
Reactor/Networking/ModList.cs
+4
View File
@@ -39,6 +39,8 @@ public static class ModList
return _modByPluginType[pluginType]; return _modByPluginType[pluginType];
} }
internal static bool IsAnyModIsRequiredOnAllClients { get; private set; }
private static readonly Dictionary<uint, Mod> _modByNetId = new(); private static readonly Dictionary<uint, Mod> _modByNetId = new();
private static readonly Dictionary<Mod, uint> _netIdByMod = new(); private static readonly Dictionary<Mod, uint> _netIdByMod = new();
@@ -113,6 +115,8 @@ public static class ModList
netId++; netId++;
} }
IsAnyModIsRequiredOnAllClients = Current.Any(m => m.IsRequiredOnAllClients);
var debug = new StringBuilder("Mod list:"); var debug = new StringBuilder("Mod list:");
foreach (var mod in Current) foreach (var mod in Current)
{ {
Reactor/Networking/Patches/ClientPatches.cs
+12 -5
View File
@@ -1,4 +1,5 @@
using System; using System;
using AmongUs.Data;
using HarmonyLib; using HarmonyLib;
using Hazel; using Hazel;
using Il2CppInterop.Runtime; using Il2CppInterop.Runtime;
@@ -59,7 +60,7 @@ internal static class ClientPatches
return false; return false;
} }
if (ReactorConnection.Instance!.Syncer == Syncer.Host && reader.Tag == InnerNetClient.SceneChangeFlag) if (reader.Tag == InnerNetClient.SceneChangeFlag && ReactorConnection.Instance?.Syncer == Syncer.Host)
{ {
var clientId = reader.ReadPackedInt32(); var clientId = reader.ReadPackedInt32();
var clientData = innerNetClient.FindClientById(clientId); var clientData = innerNetClient.FindClientById(clientId);
@@ -83,17 +84,23 @@ internal static class ClientPatches
if (innerNetClient.AmHost) if (innerNetClient.AmHost)
{ {
if (reactorClientData == null) if (reactorClientData == null && ModList.IsAnyModIsRequiredOnAllClients)
{ {
Warning("Kicking " + clientData.PlayerName + " for not having Reactor installed"); Warning("Kicking " + clientData.PlayerName + " for not having Reactor installed");
PlayerControl.LocalPlayer.RpcSendChat(clientData.PlayerName + " tried joining without Reactor installed");
var chatText = clientData.PlayerName + " tried joining without Reactor installed";
if (DataManager.Settings.Multiplayer.ChatMode == QuickChatModes.FreeChatOrQuickChat)
PlayerControl.LocalPlayer.RpcSendChat(chatText);
else
HudManager.Instance.Chat.AddChat(PlayerControl.LocalPlayer, chatText);
innerNetClient.KickPlayer(clientData.Id, false); innerNetClient.KickPlayer(clientData.Id, false);
__result = false; __result = false;
return false; return false;
} }
if (!Mod.Validate(reactorClientData.Mods, ModList.Current, out var reason)) if (!Mod.Validate(reactorClientData?.Mods ?? Array.Empty<Mod>(), ModList.Current, out var reason))
{ {
innerNetClient.KickWithReason(clientData.Id, reason); innerNetClient.KickWithReason(clientData.Id, reason);
__result = false; __result = false;
@@ -234,7 +241,7 @@ internal static class ClientPatches
{ {
public static bool Prefix(InnerNetClient __instance, [HarmonyArgument(0)] MessageReader reader) public static bool Prefix(InnerNetClient __instance, [HarmonyArgument(0)] MessageReader reader)
{ {
if (__instance.GameMode == GameModes.FreePlay) return true; if (__instance.NetworkMode == NetworkModes.FreePlay) return true;
var isFirst = false; var isFirst = false;
Reactor/Networking/Patches/HttpPatches.cs
+2 -2
View File
@@ -102,8 +102,8 @@ internal static class HttpPatches
{ {
public static void Postfix(GameStartManager __instance) public static void Postfix(GameStartManager __instance)
{ {
if (AmongUsClient.Instance.GameMode != GameModes.OnlineGame) return; if (AmongUsClient.Instance.NetworkMode != NetworkModes.OnlineGame) return;
if (ModList.Current.Any(m => m.IsRequiredOnAllClients) && !IsCurrentRegionModded()) if (ModList.IsAnyModIsRequiredOnAllClients && !IsCurrentRegionModded())
{ {
Warning("Vanilla region, locking public toggle"); Warning("Vanilla region, locking public toggle");
Reactor/Networking/Patches/ReactorClientData.cs
+1 -1
View File
@@ -4,7 +4,7 @@ using InnerNet;
namespace Reactor.Networking.Patches; namespace Reactor.Networking.Patches;
internal class ReactorClientData internal sealed class ReactorClientData
{ {
public ClientData ClientData { get; } public ClientData ClientData { get; }
Reactor/Patches/Fixes/CoFindGamePatch.cs
+18
View File
@@ -0,0 +1,18 @@
using HarmonyLib;
namespace Reactor.Patches.Fixes;
/// <summary>
/// Fixes Game Lists not working on servers using legacy matchmaking.
/// </summary>
[HarmonyPatch(typeof(AmongUsClient._CoFindGame_d__3), nameof(AmongUsClient._CoFindGame_d__3.MoveNext))]
internal static class CoFindGamePatch
{
public static void Prefix()
{
if (AmongUsClient.Instance.LastDisconnectReason == DisconnectReasons.Unknown)
{
AmongUsClient.Instance.LastDisconnectReason = DisconnectReasons.ExitGame;
}
}
}
Reactor/Patches/Miscellaneous/CustomServersPatch.cs
+17 -1
View File
@@ -1,3 +1,5 @@
using System;
using System.Linq;
using HarmonyLib; using HarmonyLib;
namespace Reactor.Patches.Miscellaneous; namespace Reactor.Patches.Miscellaneous;
@@ -5,11 +7,25 @@ namespace Reactor.Patches.Miscellaneous;
[HarmonyPatch] [HarmonyPatch]
internal static class CustomServersPatch internal static class CustomServersPatch
{ {
private static bool IsCurrentServerOfficial()
{
const string Domain = "among.us";
return ServerManager.Instance.CurrentRegion?.TryCast<StaticHttpRegionInfo>() is { } regionInfo &&
regionInfo.PingServer.EndsWith(Domain, StringComparison.Ordinal) &&
regionInfo.Servers.All(serverInfo => serverInfo.Ip.EndsWith(Domain, StringComparison.Ordinal));
}
[HarmonyPatch(typeof(AuthManager._CoConnect_d__4), nameof(AuthManager._CoConnect_d__4.MoveNext))] [HarmonyPatch(typeof(AuthManager._CoConnect_d__4), nameof(AuthManager._CoConnect_d__4.MoveNext))]
[HarmonyPatch(typeof(AuthManager._CoWaitForNonce_d__6), nameof(AuthManager._CoWaitForNonce_d__6.MoveNext))] [HarmonyPatch(typeof(AuthManager._CoWaitForNonce_d__6), nameof(AuthManager._CoWaitForNonce_d__6.MoveNext))]
[HarmonyPrefix] [HarmonyPrefix]
public static bool DisableAuthServer(out bool __result) public static bool DisableAuthServer(ref bool __result)
{ {
if (IsCurrentServerOfficial())
{
return true;
}
__result = false; __result = false;
return false; return false;
} }
Reactor/Patches/Miscellaneous/FreeNamePatch.cs
+3 -3
View File
@@ -30,7 +30,7 @@ internal static class FreeNamePatch
var editName = DestroyableSingleton<AccountManager>.Instance.accountTab.editNameScreen; var editName = DestroyableSingleton<AccountManager>.Instance.accountTab.editNameScreen;
var nameText = Object.Instantiate(editName.nameText.gameObject); var nameText = Object.Instantiate(editName.nameText.gameObject);
nameText.transform.localPosition += Vector3.up * 2.2f; nameText.transform.localPosition += Vector3.up * (AccountManager.Instance.isActiveAndEnabled ? 1.85f : 2.2f);
var textBox = nameText.GetComponent<TextBoxTMP>(); var textBox = nameText.GetComponent<TextBoxTMP>();
textBox.outputText.alignment = TextAlignmentOptions.CenterGeoAligned; textBox.outputText.alignment = TextAlignmentOptions.CenterGeoAligned;
@@ -56,10 +56,10 @@ internal static class FreeNamePatch
"JoinGameButton", "JoinGameButton",
}; };
var yStart = Vector3.up; var yStart = Vector3.up * (AccountManager.Instance.isActiveAndEnabled ? 0.9f : 1.1f);
var yOffset = Vector3.down * 1.5f; var yOffset = Vector3.down * 1.5f;
var gameObjects = toMove.Select(x => GameObject.Find("NormalMenu/" + x)).ToList(); var gameObjects = toMove.Select(x => GameObject.Find("NormalMenu/Buttons/" + x)).ToList();
if (gameObjects.Any(x => x == null)) return false; if (gameObjects.Any(x => x == null)) return false;
for (var i = 0; i < gameObjects.Count; i++) for (var i = 0; i < gameObjects.Count; i++)
Reactor/Patches/ReactorVersionShower.cs
+47 -19
View File
@@ -25,37 +25,65 @@ public static class ReactorVersionShower
/// </summary> /// </summary>
public static event Action<TextMeshPro>? TextUpdated; public static event Action<TextMeshPro>? TextUpdated;
private static void SetMainMenuPositionFromAspect(float aspectRatio)
{
if (Text == null) return;
var pos = new Vector3(-1.2287f * aspectRatio + 10.9f, -0.57f, 4.5f);
Text.transform.position = pos;
}
private static readonly ResolutionManager.ResolutionChangedHandler _resolutionChangedHandler = (Action<float, int, int, bool>) ((aspectRatio, _, _, _) =>
{
SetMainMenuPositionFromAspect(aspectRatio);
});
internal static void Initialize() internal static void Initialize()
{ {
SceneManager.add_sceneLoaded((Action<Scene, LoadSceneMode>) ((_, _) => SceneManager.add_sceneLoaded((Action<Scene, LoadSceneMode>) ((scene, _) =>
{ {
var original = UnityEngine.Object.FindObjectOfType<VersionShower>(); var original = UnityEngine.Object.FindObjectOfType<VersionShower>();
if (!original) if (!original)
return; return;
var gameObject = new GameObject("ReactorVersion " + Guid.NewGuid());
gameObject.transform.parent = original.transform.parent;
var aspectPosition = gameObject.AddComponent<AspectPosition>();
aspectPosition.Alignment = AspectPosition.EdgeAlignments.LeftTop;
var originalAspectPosition = original.GetComponent<AspectPosition>(); var originalAspectPosition = original.GetComponent<AspectPosition>();
var originalPosition = originalAspectPosition.DistanceFromEdge; var originalText = original.GetComponentInChildren<TextMeshPro>();
originalPosition.y = 0.15f;
originalAspectPosition.DistanceFromEdge = originalPosition;
originalAspectPosition.AdjustPosition();
var position = originalPosition; var gameObject = new GameObject("ReactorVersion");
position.x += 10.075f - 0.1f;
position.y += 2.75f - 0.15f;
position.z -= 1;
aspectPosition.DistanceFromEdge = position;
aspectPosition.AdjustPosition();
Text = gameObject.AddComponent<TextMeshPro>(); Text = gameObject.AddComponent<TextMeshPro>();
Text.font = originalText.font;
Text.fontMaterial = originalText.fontMaterial;
Text.UpdateFontAsset();
Text.overflowMode = TextOverflowModes.Overflow;
Text.fontSize = 2; Text.fontSize = 2;
Text.outlineWidth = 0.1f;
Text.enableWordWrapping = false;
Text.alignment = TextAlignmentOptions.TopLeft;
if (scene.name == "MainMenu")
{
ResolutionManager.add_ResolutionChanged(_resolutionChangedHandler);
SetMainMenuPositionFromAspect(Screen.width / (float) Screen.height);
}
else
{
ResolutionManager.remove_ResolutionChanged(_resolutionChangedHandler);
var aspectPosition = gameObject.AddComponent<AspectPosition>();
var distanceFromEdge = new Vector3(10.13f, 2.55f, -1);
if (originalAspectPosition.Alignment == AspectPosition.EdgeAlignments.LeftTop)
{
distanceFromEdge.y += 0.2f;
}
else if (AccountManager.Instance.isActiveAndEnabled)
{
distanceFromEdge.x += 0.2f;
distanceFromEdge.y += 0.575f;
}
aspectPosition.Alignment = AspectPosition.EdgeAlignments.LeftTop;
aspectPosition.DistanceFromEdge = distanceFromEdge;
aspectPosition.AdjustPosition();
}
UpdateText(); UpdateText();
})); }));
Reactor/ReactorPlugin.cs
+3 -1
View File
@@ -44,6 +44,8 @@ public partial class ReactorPlugin : BasePlugin
/// <inheritdoc /> /// <inheritdoc />
public ReactorPlugin() public ReactorPlugin()
{ {
Log.LogMessage($"Among Us {Application.version} {Constants.GetCurrentPlatformName()}");
PluginSingleton<ReactorPlugin>.Instance = this; PluginSingleton<ReactorPlugin>.Instance = this;
PluginSingleton<BasePlugin>.Initialize(); PluginSingleton<BasePlugin>.Initialize();
@@ -91,7 +93,7 @@ public partial class ReactorPlugin : BasePlugin
} }
[RegisterInIl2Cpp] [RegisterInIl2Cpp]
private class ReactorComponent : MonoBehaviour private sealed class ReactorComponent : MonoBehaviour
{ {
[HideFromIl2Cpp] [HideFromIl2Cpp]
public ReactorPlugin? Plugin { get; internal set; } public ReactorPlugin? Plugin { get; internal set; }
Reactor/Utilities/Coroutines.cs
+1 -1
View File
@@ -14,7 +14,7 @@ namespace Reactor.Utilities;
public static class Coroutines public static class Coroutines
{ {
[RegisterInIl2Cpp] [RegisterInIl2Cpp]
internal class Component : MonoBehaviour internal sealed class Component : MonoBehaviour
{ {
internal static Component? Instance { get; set; } internal static Component? Instance { get; set; }
Reactor/Utilities/ImGui/Window.cs
+2 -1
View File
@@ -75,7 +75,8 @@ public class Window
Rect = Rect.ResetSize(); Rect = Rect.ResetSize();
} }
Rect = GUILayout.Window(Id, Rect, Func, Title); GUI.skin.label.wordWrap = false;
Rect = GUILayout.Window(Id, Rect, Func, Title, GUILayout.MinWidth(GUI.skin.label.CalcSize(new GUIContent(Title)).x * 2));
if ((Input.GetMouseButtonDown(0) || Input.GetMouseButtonDown(1)) && Rect.Contains(new Vector2(Input.mousePosition.x, Screen.height - Input.mousePosition.y))) if ((Input.GetMouseButtonDown(0) || Input.GetMouseButtonDown(1)) && Rect.Contains(new Vector2(Input.mousePosition.x, Screen.height - Input.mousePosition.y)))
{ {
Reactor/Utilities/RegionInfoWatcher.cs
+1 -1
View File
@@ -7,7 +7,7 @@ using Object = UnityEngine.Object;
namespace Reactor.Utilities; namespace Reactor.Utilities;
internal class RegionInfoWatcher : IDisposable internal sealed class RegionInfoWatcher : IDisposable
{ {
private FileSystemWatcher Watcher { get; } private FileSystemWatcher Watcher { get; }
Reactor/packages.lock.json
+112 -62
View File
@@ -4,9 +4,9 @@
"net6.0": { "net6.0": {
"AmongUs.GameLibs.Steam": { "AmongUs.GameLibs.Steam": {
"type": "Direct", "type": "Direct",
"requested": "[2022.10.25, )", "requested": "[2023.7.11, )",
"resolved": "2022.10.25", "resolved": "2023.7.11",
"contentHash": "PWgkH/VvMlShVhZB8G432q0tnMaNVZrbIdbEMCZN/fETUlT/ch+qQj4PdTcZhPHREbnJHH3ijHxlca1d7QMBcQ==" "contentHash": "e5zbU+4AYnp1zAQDizO5GRIh1kemkgCa8rFVAcr9bxeupkBu5dwwdHxArWv/pUybIJTZfOPjkOnicZ2qKWLX7g=="
}, },
"BepInEx.AutoPlugin": { "BepInEx.AutoPlugin": {
"type": "Direct", "type": "Direct",
@@ -22,19 +22,19 @@
}, },
"BepInEx.Unity.IL2CPP": { "BepInEx.Unity.IL2CPP": {
"type": "Direct", "type": "Direct",
"requested": "[6.0.0-be.662, )", "requested": "[6.0.0-be.670, )",
"resolved": "6.0.0-be.662", "resolved": "6.0.0-be.670",
"contentHash": "fn7jQ88IBmjssoY9XjGBTg3cULkS+N/le/eUijYf2VV8raWok/6cU/GbU9bejkJS8g+2MvzIwnROAhAxvrGI2Q==", "contentHash": "dhzCrem44oFxhOICCJ9eoSUbaKSsGGyBUfUQW9WFljCwIK8o4Cx5BiuXAkYoRjr2DhpzLpPDyPZDRImUqH0bwA==",
"dependencies": { "dependencies": {
"BepInEx.Core": "6.0.0-be.662", "BepInEx.Core": "6.0.0-be.670",
"BepInEx.Unity.Common": "6.0.0-be.662", "BepInEx.Unity.Common": "6.0.0-be.670",
"HarmonyX": "2.10.0", "HarmonyX": "2.10.1",
"Iced": "1.17.0", "Iced": "1.18.0",
"Il2CppInterop.Generator": "1.3.0", "Il2CppInterop.Generator": "1.4.6-ci.354",
"Il2CppInterop.HarmonySupport": "1.3.0", "Il2CppInterop.HarmonySupport": "1.4.6-ci.354",
"Il2CppInterop.Runtime": "1.3.0", "Il2CppInterop.Runtime": "1.4.6-ci.354",
"MonoMod.RuntimeDetour": "22.5.1.1", "MonoMod.RuntimeDetour": "22.5.1.1",
"Samboy063.Cpp2IL.Core": "2022.0.7.2" "Samboy063.Cpp2IL.Core": "2022.1.0-development.866"
} }
}, },
"Microsoft.SourceLink.GitHub": { "Microsoft.SourceLink.GitHub": {
@@ -56,34 +56,69 @@
"StyleCop.Analyzers.Unstable": "1.2.0.435" "StyleCop.Analyzers.Unstable": "1.2.0.435"
} }
}, },
"AsmResolver": {
"type": "Transitive",
"resolved": "5.1.0",
"contentHash": "7PjujQzgQ3wjzqZYT4CY8SV6zx7FY6swIwj3Yk4QLolLqo9sBPb7FLF3W30QFvCsCkNfiVWXlSbeZKs4xGgQOQ=="
},
"AsmResolver.DotNet": {
"type": "Transitive",
"resolved": "5.1.0",
"contentHash": "oKrBU94OaSrbbTwydvpLRFalYxozrNXGkl13nIkm823ZFQtPNYOiOMJb5DQLvkCJlWyis7q865tg803T5zg9IA==",
"dependencies": {
"AsmResolver.PE": "5.1.0",
"System.Text.Json": "6.0.7"
}
},
"AsmResolver.PE": {
"type": "Transitive",
"resolved": "5.1.0",
"contentHash": "XD3iAgLSInJIODKUUlpHWXf8MR9H1SFMb1lsmabb4GxxxnDQRPjMxjglv2NOCjQQuNB2Oh0bvjHE7ewf82UqyQ==",
"dependencies": {
"AsmResolver.PE.File": "5.1.0"
}
},
"AsmResolver.PE.File": {
"type": "Transitive",
"resolved": "5.1.0",
"contentHash": "YituBYe0Fh471sXQMfu+f4tWKX/JZvRwrX6g/SVsr4XkUIUzYi/aGT3/QvjHoYx19fE1KYOB6zBKqPkkOK7HPw==",
"dependencies": {
"AsmResolver": "5.1.0"
}
},
"AssetRipper.VersionUtilities": { "AssetRipper.VersionUtilities": {
"type": "Transitive", "type": "Transitive",
"resolved": "1.2.1", "resolved": "1.3.1",
"contentHash": "knQ/W1YwTZS2AbdaZh+nhyyBEZQPQDcahhSOnh88i+cdg4/FEoFJiCwaavgFvCMNuUeHTbcZc4qttF8WQ8xLIA==" "contentHash": "/1D18NOpqm7rS7+qVUbAReVMNWwgDuYpsnf0RkX1Aah/I0a0irqldoFJ+Kku7YdbSm0zqD+Z6iYUGKoP3GwTNQ=="
}, },
"BepInEx.Core": { "BepInEx.Core": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.0.0-be.662", "resolved": "6.0.0-be.670",
"contentHash": "VVBeCD/KQVy0/TK3V6SD8QZ/es35Xb1mEz/+PbBs3ST1yUC1r7k2JOymhSnmghVqf6UsvlMglOO9pljqhuE/Pw==", "contentHash": "7CbbMNZfb+1VHjFKh/ErFBOOEYrVCIkng/B3/HPcbNioySC7qdT1ztfYqs6YjQia4krEic+LV3ew86B/hTg+hw==",
"dependencies": { "dependencies": {
"HarmonyX": "2.10.0", "HarmonyX": "2.10.1",
"MonoMod.Utils": "22.5.1.1", "MonoMod.Utils": "22.5.1.1",
"SemanticVersioning": "2.0.2" "SemanticVersioning": "2.0.2"
} }
}, },
"BepInEx.Unity.Common": { "BepInEx.Unity.Common": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.0.0-be.662", "resolved": "6.0.0-be.670",
"contentHash": "BgETw6+snwY//3xjQxLiiEAFRmXaMTcSkg+1UQz6fVBG0YA5Usm/m4GflhTc3nwF61KO3Iznn1AORi5CwLJoUw==", "contentHash": "FSzWILgwepZ7CpA34ew1WyO75lNjxkfX86uwo2172lbhmLkgoAdQbNun8dxKJCDlIevmTDga76yr/WPrTXELvA==",
"dependencies": { "dependencies": {
"AssetRipper.VersionUtilities": "1.2.1", "AssetRipper.VersionUtilities": "1.2.1",
"MonoMod.Utils": "22.5.1.1" "MonoMod.Utils": "22.5.1.1"
} }
}, },
"Disarm": {
"type": "Transitive",
"resolved": "2022.1.0-master.26",
"contentHash": "YnZEbRGr0nG+N3G8WbRQ4Lkg8dTD3oso9iJlCVBmyhEyhLyqs+drBs1kWQbQqFPnb9mi/RJ++R9bPb+L3HF03Q=="
},
"HarmonyX": { "HarmonyX": {
"type": "Transitive", "type": "Transitive",
"resolved": "2.10.0", "resolved": "2.10.1",
"contentHash": "4ayiy/dlCiW86K2N7Jvbf+VpI5wvP7dncv/6oRmfwRi32UCmCRzCGzsxdMfzJZkp6/26oBW+DrD8vi4UejzVAg==", "contentHash": "9LodMC9Y0u1TW96eKJoWrFJFpmzbgojEO38/Q+e7c1mFPhmHt8xcR8qhI06iF1rf0Dnsk+hqENFVSgbtwl/bEw==",
"dependencies": { "dependencies": {
"MonoMod.RuntimeDetour": "22.3.23.4", "MonoMod.RuntimeDetour": "22.3.23.4",
"System.Reflection.Emit": "4.7.0" "System.Reflection.Emit": "4.7.0"
@@ -91,13 +126,13 @@
}, },
"Iced": { "Iced": {
"type": "Transitive", "type": "Transitive",
"resolved": "1.17.0", "resolved": "1.18.0",
"contentHash": "8x+HCVTl/HHTGpscH3vMBhV8sknN/muZFw9s3TsI8SA6+c43cOTCi2+jE4KsU8pNLbJ++iF2ZFcpcXHXtDglnw==" "contentHash": "G60lZOvbvqttA+SBSv/yY6/wUboXKJlkffhSNR9iOrx0M5gpcK1TRr6xrFR+qAhqIAhvrsPF1jkn9fYb4lEufQ=="
}, },
"Il2CppInterop.Common": { "Il2CppInterop.Common": {
"type": "Transitive", "type": "Transitive",
"resolved": "1.3.0", "resolved": "1.4.6-ci.354",
"contentHash": "IR3BrZXvL2nvJAn4pruPMgC78Y87hVa5xTYZCuHN67OzRD6WDl5dTO55vtvTl8dXFALKvlN+spja2tXhVuquOw==", "contentHash": "aCP3kr39YQw5GVqE9Q8c5y7f9CEKdFxpUhIqYgQBtrEz5Z/KCbHhjuOf/lSuFrjl6Vub/BKk6k+UbMRdoSvC1w==",
"dependencies": { "dependencies": {
"Iced": "1.17.0", "Iced": "1.17.0",
"Microsoft.Extensions.Logging.Abstractions": "6.0.1", "Microsoft.Extensions.Logging.Abstractions": "6.0.1",
@@ -106,36 +141,31 @@
}, },
"Il2CppInterop.Generator": { "Il2CppInterop.Generator": {
"type": "Transitive", "type": "Transitive",
"resolved": "1.3.0", "resolved": "1.4.6-ci.354",
"contentHash": "FuhPxbh/K4K94U3xac/ClMaaBp+MZ4aIaqi5dR0QihyGQoombT+OM/A22RwAIzbaCTbFbvabWaAuOSgB69ZwWQ==", "contentHash": "y30sxc9mMv0bUzCPDr73xiI6fiu7ksmnEm6XULTGU/5JEGv2aw++/71bLOEYCscNbZTa2JT4yYrLCXCj3GSekg==",
"dependencies": { "dependencies": {
"Il2CppInterop.Common": "1.3.0", "Il2CppInterop.Common": "1.4.6-ci.354",
"Mono.Cecil": "0.11.3" "Mono.Cecil": "0.11.3"
} }
}, },
"Il2CppInterop.HarmonySupport": { "Il2CppInterop.HarmonySupport": {
"type": "Transitive", "type": "Transitive",
"resolved": "1.3.0", "resolved": "1.4.6-ci.354",
"contentHash": "VppBnXtbMNGFhX8a1gg/85E883t2pW/+FZyV7eOaOXMNQyorg++u+kUFOIYwNpzTVqxWmMeoPS0DH0toVpjoKA==", "contentHash": "mQV5A+B/qtI6kSXEGx/UswiqjFKw13/yyviawnStfRKbLMW+XFsdMgGSkOVZd/TiDtF9ZG4Xt7DbkbFu26WjyA==",
"dependencies": { "dependencies": {
"HarmonyX": "2.10.0", "HarmonyX": "2.10.0",
"Il2CppInterop.Runtime": "1.3.0" "Il2CppInterop.Runtime": "1.4.6-ci.354"
} }
}, },
"Il2CppInterop.Runtime": { "Il2CppInterop.Runtime": {
"type": "Transitive", "type": "Transitive",
"resolved": "1.3.0", "resolved": "1.4.6-ci.354",
"contentHash": "8A+N2yvja960Ap+s2RpW7Nb6HSpyuXJy2ipIlU+1erYU9SWHMyU9JZzUZGOhwWXJChKGvRmDdTZAg12k1+72dg==", "contentHash": "Xe5md9z+KIthdEcjfUjmoOhvM3gTI3SPyocqvuzEHoov5jQ/HhIPv5hUZzTSm+2nzn3XplENNE8vlBPvQ1o6OA==",
"dependencies": { "dependencies": {
"Iced": "1.17.0", "Iced": "1.17.0",
"Il2CppInterop.Common": "1.3.0" "Il2CppInterop.Common": "1.4.6-ci.354"
} }
}, },
"IndexRange": {
"type": "Transitive",
"resolved": "1.0.0",
"contentHash": "6TgS1JLSUkpmPLfXBPaAgB39ZUix8E4soXWk2XSDcscVe84i1JKzIAtA7jHbRHSkOOrcr6YA0MpLCeq98y9mYQ=="
},
"js6pak.Gee.External.Capstone": { "js6pak.Gee.External.Capstone": {
"type": "Transitive", "type": "Transitive",
"resolved": "2.1.0", "resolved": "2.1.0",
@@ -300,38 +330,41 @@
}, },
"Samboy063.Cpp2IL.Core": { "Samboy063.Cpp2IL.Core": {
"type": "Transitive", "type": "Transitive",
"resolved": "2022.0.7.2", "resolved": "2022.1.0-development.866",
"contentHash": "e17CAhKSxdAp7vFcYEVxjSc7t7rcvVGBipGhgE9tAjRXY85wZXLlHEVO0AEvMRkLmf9U+if4wK/nZEC1AX6VqQ==", "contentHash": "QPMuix/3jRngWBdNSLhAbm9BHYf95Ln1Ph1eCK/cDZdVibxFDFP3a6Yczyx1p7GbN7bRQwrhs2skPJSS/z3m2w==",
"dependencies": { "dependencies": {
"HarmonyX": "2.5.5", "AsmResolver.DotNet": "5.1.0",
"Iced": "1.11.1", "Disarm": "2022.1.0-master.26",
"IndexRange": "1.0.0", "Iced": "1.18.0",
"Mono.Cecil": "0.11.4", "Samboy063.LibCpp2IL": "2022.1.0-development.866",
"Samboy063.LibCpp2IL": "2022.0.7.2", "StableNameDotNet": "0.1.0-development.866",
"System.Runtime.InteropServices": "4.3.0",
"System.ValueTuple": "4.5.0",
"js6pak.Gee.External.Capstone": "2.1.0" "js6pak.Gee.External.Capstone": "2.1.0"
} }
}, },
"Samboy063.LibCpp2IL": { "Samboy063.LibCpp2IL": {
"type": "Transitive", "type": "Transitive",
"resolved": "2022.0.7.2", "resolved": "2022.1.0-development.866",
"contentHash": "DpVeU0dQkUJCpbw0f1xKOG8vimdK2oYhrVABC7HDE3/ikGjhnMZd3i5b1joKDHZ+AiL90TWOaEXPcy24rCZ0dA==", "contentHash": "EcJSWTfQko8SQozozoUT+aQJVWC8wj8C0YUiPBF4rNRId19yTKp2IXcXnI747v+8/aal222QR6WHfoBK2WlVLg==",
"dependencies": { "dependencies": {
"IndexRange": "1.0.0", "AssetRipper.VersionUtilities": "1.3.1",
"Samboy063.WasmDisassembler": "2022.0.2" "Samboy063.WasmDisassembler": "2022.1.0-development.866"
} }
}, },
"Samboy063.WasmDisassembler": { "Samboy063.WasmDisassembler": {
"type": "Transitive", "type": "Transitive",
"resolved": "2022.0.2", "resolved": "2022.1.0-development.866",
"contentHash": "2uu+xBb7M3HKfBx9tAY6jiDieAf0hRnQjSmGX+7IdE6i24dYsx6TYgtrLvRx5lOuF2M8DijZ5H8yQ1pcuCs2SA==" "contentHash": "2QK8F3eISkLcoW/Nt7wtxyQh31EXAqEMBVXXjEnuxyvXpBXxOIGpjmE3pWhGwxQwDCbe4zBsLF1zUiqq3/pXRA=="
}, },
"SemanticVersioning": { "SemanticVersioning": {
"type": "Transitive", "type": "Transitive",
"resolved": "2.0.2", "resolved": "2.0.2",
"contentHash": "4EQgYdNZ92SyaO7YFk6olVnebF5V+jrHyMUjvPq89tLeMo8NSfgDF+6Zwq/lgh9j/0yfQp9Lkm0ZA0rUATCZFA==" "contentHash": "4EQgYdNZ92SyaO7YFk6olVnebF5V+jrHyMUjvPq89tLeMo8NSfgDF+6Zwq/lgh9j/0yfQp9Lkm0ZA0rUATCZFA=="
}, },
"StableNameDotNet": {
"type": "Transitive",
"resolved": "0.1.0-development.866",
"contentHash": "DJb8x4dV3ucDgM12sU28HxCdeqY/JudJbeJG6mgXWDJzpFZw2Jd7JF1pKFRNLzh/0gpo8bCGLQS9gOWZmBjdtg=="
},
"StyleCop.Analyzers.Unstable": { "StyleCop.Analyzers.Unstable": {
"type": "Transitive", "type": "Transitive",
"resolved": "1.2.0.435", "resolved": "1.2.0.435",
@@ -662,6 +695,11 @@
"Microsoft.NETCore.Targets": "1.1.0" "Microsoft.NETCore.Targets": "1.1.0"
} }
}, },
"System.Runtime.CompilerServices.Unsafe": {
"type": "Transitive",
"resolved": "6.0.0",
"contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg=="
},
"System.Runtime.Extensions": { "System.Runtime.Extensions": {
"type": "Transitive", "type": "Transitive",
"resolved": "4.3.0", "resolved": "4.3.0",
@@ -860,6 +898,23 @@
"System.Runtime": "4.3.0" "System.Runtime": "4.3.0"
} }
}, },
"System.Text.Encodings.Web": {
"type": "Transitive",
"resolved": "6.0.0",
"contentHash": "Vg8eB5Tawm1IFqj4TVK1czJX89rhFxJo9ELqc/Eiq0eXy13RK00eubyU6TJE6y+GQXjyV5gSfiewDUZjQgSE0w==",
"dependencies": {
"System.Runtime.CompilerServices.Unsafe": "6.0.0"
}
},
"System.Text.Json": {
"type": "Transitive",
"resolved": "6.0.7",
"contentHash": "/Tf/9XjprpHolbcDOrxsKVYy/mUG/FS7aGd9YUgBVEiHeQH4kAE0T1sMbde7q6B5xcrNUsJ5iW7D1RvHudQNqA==",
"dependencies": {
"System.Runtime.CompilerServices.Unsafe": "6.0.0",
"System.Text.Encodings.Web": "6.0.0"
}
},
"System.Threading": { "System.Threading": {
"type": "Transitive", "type": "Transitive",
"resolved": "4.3.0", "resolved": "4.3.0",
@@ -878,12 +933,7 @@
"Microsoft.NETCore.Targets": "1.1.0", "Microsoft.NETCore.Targets": "1.1.0",
"System.Runtime": "4.3.0" "System.Runtime": "4.3.0"
} }
},
"System.ValueTuple": {
"type": "Transitive",
"resolved": "4.5.0",
"contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ=="
} }
} }
} }
} }
nuget.config
+1
View File
@@ -3,5 +3,6 @@
<configuration> <configuration>
<packageSources> <packageSources>
<add key="BepInEx" value="https://nuget.bepinex.dev/v3/index.json" /> <add key="BepInEx" value="https://nuget.bepinex.dev/v3/index.json" />
<add key="Samboy" value="https://nuget.samboy.dev/v3/index.json" />
</packageSources> </packageSources>
</configuration> </configuration>