diff --git a/AmongUs.props b/AmongUs.props index f816726..fec8650 100644 --- a/AmongUs.props +++ b/AmongUs.props @@ -1,7 +1,7 @@ - - + + diff --git a/Reactor.Benchmarks/packages.lock.json b/Reactor.Benchmarks/packages.lock.json index 0d861b5..7d3bdbe 100644 --- a/Reactor.Benchmarks/packages.lock.json +++ b/Reactor.Benchmarks/packages.lock.json @@ -4,9 +4,9 @@ "net6.0": { "AmongUs.GameLibs.Steam": { "type": "Direct", - "requested": "[2022.10.25, )", - "resolved": "2022.10.25", - "contentHash": "PWgkH/VvMlShVhZB8G432q0tnMaNVZrbIdbEMCZN/fETUlT/ch+qQj4PdTcZhPHREbnJHH3ijHxlca1d7QMBcQ==" + "requested": "[2022.12.8, )", + "resolved": "2022.12.8", + "contentHash": "IJsIi89xUYRvA54YtNVEJjf25hhF3LWzkNBslKCNDUpL1aQ/PhNyO4j18pO71DCgW/qr1P1j8+CwByuBLsInNA==" }, "BenchmarkDotNet": { "type": "Direct", @@ -42,17 +42,17 @@ }, "BepInEx.Unity.IL2CPP": { "type": "Direct", - "requested": "[6.0.0-be.662, )", - "resolved": "6.0.0-be.662", - "contentHash": "fn7jQ88IBmjssoY9XjGBTg3cULkS+N/le/eUijYf2VV8raWok/6cU/GbU9bejkJS8g+2MvzIwnROAhAxvrGI2Q==", + "requested": "[6.0.0-be.663, )", + "resolved": "6.0.0-be.663", + "contentHash": "J+mZ4svyTt4ZYbUoPwpVtF5QCGfzC42VuYJ7z1K6Qt8YlBEZx3rnmUmaEnoJIqN5wN7BSnQgzEmrRfdbrgtTnA==", "dependencies": { - "BepInEx.Core": "6.0.0-be.662", - "BepInEx.Unity.Common": "6.0.0-be.662", - "HarmonyX": "2.10.0", + "BepInEx.Core": "6.0.0-be.663", + "BepInEx.Unity.Common": "6.0.0-be.663", + "HarmonyX": "2.10.1", "Iced": "1.17.0", - "Il2CppInterop.Generator": "1.3.0", - "Il2CppInterop.HarmonySupport": "1.3.0", - "Il2CppInterop.Runtime": "1.3.0", + "Il2CppInterop.Generator": "1.4.0", + "Il2CppInterop.HarmonySupport": "1.4.0", + "Il2CppInterop.Runtime": "1.4.0", "MonoMod.RuntimeDetour": "22.5.1.1", "Samboy063.Cpp2IL.Core": "2022.0.7.2" } @@ -78,18 +78,18 @@ }, "BepInEx.Core": { "type": "Transitive", - "resolved": "6.0.0-be.662", - "contentHash": "VVBeCD/KQVy0/TK3V6SD8QZ/es35Xb1mEz/+PbBs3ST1yUC1r7k2JOymhSnmghVqf6UsvlMglOO9pljqhuE/Pw==", + "resolved": "6.0.0-be.663", + "contentHash": "yTlqwieyV3FCzSo4tfiIlS7pTqVtEZwrwHnograkWO4loECeYpShcpoCoxnhQ0vkWsnWGThMK7NodHhjZ+jQDA==", "dependencies": { - "HarmonyX": "2.10.0", + "HarmonyX": "2.10.1", "MonoMod.Utils": "22.5.1.1", "SemanticVersioning": "2.0.2" } }, "BepInEx.Unity.Common": { "type": "Transitive", - "resolved": "6.0.0-be.662", - "contentHash": "BgETw6+snwY//3xjQxLiiEAFRmXaMTcSkg+1UQz6fVBG0YA5Usm/m4GflhTc3nwF61KO3Iznn1AORi5CwLJoUw==", + "resolved": "6.0.0-be.663", + "contentHash": "kxv0yXJQ7YPzUQzlwkpVzmTkdd87kVcQhMjkrwqpowJ0Yx5vEwPUrRyG/pwMH5/cK+2WHCn/2akGWrW0C4vUAQ==", "dependencies": { "AssetRipper.VersionUtilities": "1.2.1", "MonoMod.Utils": "22.5.1.1" @@ -102,8 +102,8 @@ }, "HarmonyX": { "type": "Transitive", - "resolved": "2.10.0", - "contentHash": "4ayiy/dlCiW86K2N7Jvbf+VpI5wvP7dncv/6oRmfwRi32UCmCRzCGzsxdMfzJZkp6/26oBW+DrD8vi4UejzVAg==", + "resolved": "2.10.1", + "contentHash": "9LodMC9Y0u1TW96eKJoWrFJFpmzbgojEO38/Q+e7c1mFPhmHt8xcR8qhI06iF1rf0Dnsk+hqENFVSgbtwl/bEw==", "dependencies": { "MonoMod.RuntimeDetour": "22.3.23.4", "System.Reflection.Emit": "4.7.0" @@ -116,8 +116,8 @@ }, "Il2CppInterop.Common": { "type": "Transitive", - "resolved": "1.3.0", - "contentHash": "IR3BrZXvL2nvJAn4pruPMgC78Y87hVa5xTYZCuHN67OzRD6WDl5dTO55vtvTl8dXFALKvlN+spja2tXhVuquOw==", + "resolved": "1.4.0", + "contentHash": "xl60qoa1nImG6qgOQcjSDW46nLQHoRvSWE7QTDQz7XeMsGwOxAbgDtOvJ4gOvoLijTU79gFZYe8H1CM7TcTQ5g==", "dependencies": { "Iced": "1.17.0", "Microsoft.Extensions.Logging.Abstractions": "6.0.1", @@ -126,29 +126,29 @@ }, "Il2CppInterop.Generator": { "type": "Transitive", - "resolved": "1.3.0", - "contentHash": "FuhPxbh/K4K94U3xac/ClMaaBp+MZ4aIaqi5dR0QihyGQoombT+OM/A22RwAIzbaCTbFbvabWaAuOSgB69ZwWQ==", + "resolved": "1.4.0", + "contentHash": "Q4QqkwQroDwwqB17/DRF6hbHQRIuyLksgxVUEDvXZ3T+ogkrZB9h0Ev36alN0f6e7fcZPRkMrpXOAYwZzPiZag==", "dependencies": { - "Il2CppInterop.Common": "1.3.0", + "Il2CppInterop.Common": "1.4.0", "Mono.Cecil": "0.11.3" } }, "Il2CppInterop.HarmonySupport": { "type": "Transitive", - "resolved": "1.3.0", - "contentHash": "VppBnXtbMNGFhX8a1gg/85E883t2pW/+FZyV7eOaOXMNQyorg++u+kUFOIYwNpzTVqxWmMeoPS0DH0toVpjoKA==", + "resolved": "1.4.0", + "contentHash": "Uz4w5PbQ3kLXqUrsQxR35f7xMpfnxLiXthVtNaT3fvHXC8B7arjuBZXeCbcozr6dXFJBDa5W0EElBmH0fWoASg==", "dependencies": { "HarmonyX": "2.10.0", - "Il2CppInterop.Runtime": "1.3.0" + "Il2CppInterop.Runtime": "1.4.0" } }, "Il2CppInterop.Runtime": { "type": "Transitive", - "resolved": "1.3.0", - "contentHash": "8A+N2yvja960Ap+s2RpW7Nb6HSpyuXJy2ipIlU+1erYU9SWHMyU9JZzUZGOhwWXJChKGvRmDdTZAg12k1+72dg==", + "resolved": "1.4.0", + "contentHash": "ScgsFlbJ3gj5f69As/GT8pSO2WlS7cOeS/n3h4gBqJ01Eq/Lm+s3FBrGpEiuIWALOgmtQYimhjWVpxRt7LYtGw==", "dependencies": { "Iced": "1.17.0", - "Il2CppInterop.Common": "1.3.0" + "Il2CppInterop.Common": "1.4.0" } }, "IndexRange": { @@ -1074,9 +1074,9 @@ "reactor": { "type": "Project", "dependencies": { - "BepInEx.Unity.IL2CPP": "[6.0.0-be.662, )" + "BepInEx.Unity.IL2CPP": "[6.0.0-be.663, )" } } } } -} +} \ No newline at end of file diff --git a/Reactor.Debugger/DebuggerPlugin.cs b/Reactor.Debugger/DebuggerPlugin.cs index 7a6923a..f1f4691 100644 --- a/Reactor.Debugger/DebuggerPlugin.cs +++ b/Reactor.Debugger/DebuggerPlugin.cs @@ -1,6 +1,7 @@ using System; using System.Linq; using AmongUs.Data; +using AmongUs.GameOptions; using BepInEx; using BepInEx.Unity.IL2CPP; using HarmonyLib; @@ -52,7 +53,7 @@ public partial class DebuggerPlugin : BasePlugin if (GUILayout.Button("Force game end")) { ShipStatus.Instance.enabled = false; - ShipStatus.RpcEndGame(GameOverReason.ImpostorDisconnect, false); + GameManager.Instance.RpcEndGame(GameOverReason.ImpostorDisconnect, false); } if (GUILayout.Button("Call a meeting")) diff --git a/Reactor.Debugger/Patches.cs b/Reactor.Debugger/Patches.cs index 1dd62e9..3ce26a9 100644 --- a/Reactor.Debugger/Patches.cs +++ b/Reactor.Debugger/Patches.cs @@ -1,4 +1,5 @@ using System.Linq; +using AmongUs.GameOptions; using HarmonyLib; using Il2CppInterop.Runtime.InteropTypes.Arrays; using Reactor.Utilities; @@ -35,10 +36,13 @@ internal static class Patches } } - [HarmonyPatch(typeof(ShipStatus), nameof(ShipStatus.CheckEndCriteria))] + [HarmonyPatch] [HarmonyPriority(Priority.First)] 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() { return !PluginSingleton.Instance.Component.DisableGameEnd; @@ -61,6 +65,8 @@ internal static class Patches { public static void Postfix(GameOptionsMenu __instance) { + if (GameOptionsManager.Instance.CurrentGameOptions.GameMode != GameModes.Normal) return; + __instance.Children .Single(o => o.Title == StringNames.GameNumImpostors) .Cast() diff --git a/Reactor.Debugger/packages.lock.json b/Reactor.Debugger/packages.lock.json index e723b5f..09d9e9c 100644 --- a/Reactor.Debugger/packages.lock.json +++ b/Reactor.Debugger/packages.lock.json @@ -4,9 +4,9 @@ "net6.0": { "AmongUs.GameLibs.Steam": { "type": "Direct", - "requested": "[2022.10.25, )", - "resolved": "2022.10.25", - "contentHash": "PWgkH/VvMlShVhZB8G432q0tnMaNVZrbIdbEMCZN/fETUlT/ch+qQj4PdTcZhPHREbnJHH3ijHxlca1d7QMBcQ==" + "requested": "[2022.12.8, )", + "resolved": "2022.12.8", + "contentHash": "IJsIi89xUYRvA54YtNVEJjf25hhF3LWzkNBslKCNDUpL1aQ/PhNyO4j18pO71DCgW/qr1P1j8+CwByuBLsInNA==" }, "BepInEx.AutoPlugin": { "type": "Direct", @@ -22,17 +22,17 @@ }, "BepInEx.Unity.IL2CPP": { "type": "Direct", - "requested": "[6.0.0-be.662, )", - "resolved": "6.0.0-be.662", - "contentHash": "fn7jQ88IBmjssoY9XjGBTg3cULkS+N/le/eUijYf2VV8raWok/6cU/GbU9bejkJS8g+2MvzIwnROAhAxvrGI2Q==", + "requested": "[6.0.0-be.663, )", + "resolved": "6.0.0-be.663", + "contentHash": "J+mZ4svyTt4ZYbUoPwpVtF5QCGfzC42VuYJ7z1K6Qt8YlBEZx3rnmUmaEnoJIqN5wN7BSnQgzEmrRfdbrgtTnA==", "dependencies": { - "BepInEx.Core": "6.0.0-be.662", - "BepInEx.Unity.Common": "6.0.0-be.662", - "HarmonyX": "2.10.0", + "BepInEx.Core": "6.0.0-be.663", + "BepInEx.Unity.Common": "6.0.0-be.663", + "HarmonyX": "2.10.1", "Iced": "1.17.0", - "Il2CppInterop.Generator": "1.3.0", - "Il2CppInterop.HarmonySupport": "1.3.0", - "Il2CppInterop.Runtime": "1.3.0", + "Il2CppInterop.Generator": "1.4.0", + "Il2CppInterop.HarmonySupport": "1.4.0", + "Il2CppInterop.Runtime": "1.4.0", "MonoMod.RuntimeDetour": "22.5.1.1", "Samboy063.Cpp2IL.Core": "2022.0.7.2" } @@ -53,18 +53,18 @@ }, "BepInEx.Core": { "type": "Transitive", - "resolved": "6.0.0-be.662", - "contentHash": "VVBeCD/KQVy0/TK3V6SD8QZ/es35Xb1mEz/+PbBs3ST1yUC1r7k2JOymhSnmghVqf6UsvlMglOO9pljqhuE/Pw==", + "resolved": "6.0.0-be.663", + "contentHash": "yTlqwieyV3FCzSo4tfiIlS7pTqVtEZwrwHnograkWO4loECeYpShcpoCoxnhQ0vkWsnWGThMK7NodHhjZ+jQDA==", "dependencies": { - "HarmonyX": "2.10.0", + "HarmonyX": "2.10.1", "MonoMod.Utils": "22.5.1.1", "SemanticVersioning": "2.0.2" } }, "BepInEx.Unity.Common": { "type": "Transitive", - "resolved": "6.0.0-be.662", - "contentHash": "BgETw6+snwY//3xjQxLiiEAFRmXaMTcSkg+1UQz6fVBG0YA5Usm/m4GflhTc3nwF61KO3Iznn1AORi5CwLJoUw==", + "resolved": "6.0.0-be.663", + "contentHash": "kxv0yXJQ7YPzUQzlwkpVzmTkdd87kVcQhMjkrwqpowJ0Yx5vEwPUrRyG/pwMH5/cK+2WHCn/2akGWrW0C4vUAQ==", "dependencies": { "AssetRipper.VersionUtilities": "1.2.1", "MonoMod.Utils": "22.5.1.1" @@ -72,8 +72,8 @@ }, "HarmonyX": { "type": "Transitive", - "resolved": "2.10.0", - "contentHash": "4ayiy/dlCiW86K2N7Jvbf+VpI5wvP7dncv/6oRmfwRi32UCmCRzCGzsxdMfzJZkp6/26oBW+DrD8vi4UejzVAg==", + "resolved": "2.10.1", + "contentHash": "9LodMC9Y0u1TW96eKJoWrFJFpmzbgojEO38/Q+e7c1mFPhmHt8xcR8qhI06iF1rf0Dnsk+hqENFVSgbtwl/bEw==", "dependencies": { "MonoMod.RuntimeDetour": "22.3.23.4", "System.Reflection.Emit": "4.7.0" @@ -86,8 +86,8 @@ }, "Il2CppInterop.Common": { "type": "Transitive", - "resolved": "1.3.0", - "contentHash": "IR3BrZXvL2nvJAn4pruPMgC78Y87hVa5xTYZCuHN67OzRD6WDl5dTO55vtvTl8dXFALKvlN+spja2tXhVuquOw==", + "resolved": "1.4.0", + "contentHash": "xl60qoa1nImG6qgOQcjSDW46nLQHoRvSWE7QTDQz7XeMsGwOxAbgDtOvJ4gOvoLijTU79gFZYe8H1CM7TcTQ5g==", "dependencies": { "Iced": "1.17.0", "Microsoft.Extensions.Logging.Abstractions": "6.0.1", @@ -96,29 +96,29 @@ }, "Il2CppInterop.Generator": { "type": "Transitive", - "resolved": "1.3.0", - "contentHash": "FuhPxbh/K4K94U3xac/ClMaaBp+MZ4aIaqi5dR0QihyGQoombT+OM/A22RwAIzbaCTbFbvabWaAuOSgB69ZwWQ==", + "resolved": "1.4.0", + "contentHash": "Q4QqkwQroDwwqB17/DRF6hbHQRIuyLksgxVUEDvXZ3T+ogkrZB9h0Ev36alN0f6e7fcZPRkMrpXOAYwZzPiZag==", "dependencies": { - "Il2CppInterop.Common": "1.3.0", + "Il2CppInterop.Common": "1.4.0", "Mono.Cecil": "0.11.3" } }, "Il2CppInterop.HarmonySupport": { "type": "Transitive", - "resolved": "1.3.0", - "contentHash": "VppBnXtbMNGFhX8a1gg/85E883t2pW/+FZyV7eOaOXMNQyorg++u+kUFOIYwNpzTVqxWmMeoPS0DH0toVpjoKA==", + "resolved": "1.4.0", + "contentHash": "Uz4w5PbQ3kLXqUrsQxR35f7xMpfnxLiXthVtNaT3fvHXC8B7arjuBZXeCbcozr6dXFJBDa5W0EElBmH0fWoASg==", "dependencies": { "HarmonyX": "2.10.0", - "Il2CppInterop.Runtime": "1.3.0" + "Il2CppInterop.Runtime": "1.4.0" } }, "Il2CppInterop.Runtime": { "type": "Transitive", - "resolved": "1.3.0", - "contentHash": "8A+N2yvja960Ap+s2RpW7Nb6HSpyuXJy2ipIlU+1erYU9SWHMyU9JZzUZGOhwWXJChKGvRmDdTZAg12k1+72dg==", + "resolved": "1.4.0", + "contentHash": "ScgsFlbJ3gj5f69As/GT8pSO2WlS7cOeS/n3h4gBqJ01Eq/Lm+s3FBrGpEiuIWALOgmtQYimhjWVpxRt7LYtGw==", "dependencies": { "Iced": "1.17.0", - "Il2CppInterop.Common": "1.3.0" + "Il2CppInterop.Common": "1.4.0" } }, "IndexRange": { @@ -867,9 +867,9 @@ "reactor": { "type": "Project", "dependencies": { - "BepInEx.Unity.IL2CPP": "[6.0.0-be.662, )" + "BepInEx.Unity.IL2CPP": "[6.0.0-be.663, )" } } } } -} +} \ No newline at end of file diff --git a/Reactor.Example/packages.lock.json b/Reactor.Example/packages.lock.json index e723b5f..09d9e9c 100644 --- a/Reactor.Example/packages.lock.json +++ b/Reactor.Example/packages.lock.json @@ -4,9 +4,9 @@ "net6.0": { "AmongUs.GameLibs.Steam": { "type": "Direct", - "requested": "[2022.10.25, )", - "resolved": "2022.10.25", - "contentHash": "PWgkH/VvMlShVhZB8G432q0tnMaNVZrbIdbEMCZN/fETUlT/ch+qQj4PdTcZhPHREbnJHH3ijHxlca1d7QMBcQ==" + "requested": "[2022.12.8, )", + "resolved": "2022.12.8", + "contentHash": "IJsIi89xUYRvA54YtNVEJjf25hhF3LWzkNBslKCNDUpL1aQ/PhNyO4j18pO71DCgW/qr1P1j8+CwByuBLsInNA==" }, "BepInEx.AutoPlugin": { "type": "Direct", @@ -22,17 +22,17 @@ }, "BepInEx.Unity.IL2CPP": { "type": "Direct", - "requested": "[6.0.0-be.662, )", - "resolved": "6.0.0-be.662", - "contentHash": "fn7jQ88IBmjssoY9XjGBTg3cULkS+N/le/eUijYf2VV8raWok/6cU/GbU9bejkJS8g+2MvzIwnROAhAxvrGI2Q==", + "requested": "[6.0.0-be.663, )", + "resolved": "6.0.0-be.663", + "contentHash": "J+mZ4svyTt4ZYbUoPwpVtF5QCGfzC42VuYJ7z1K6Qt8YlBEZx3rnmUmaEnoJIqN5wN7BSnQgzEmrRfdbrgtTnA==", "dependencies": { - "BepInEx.Core": "6.0.0-be.662", - "BepInEx.Unity.Common": "6.0.0-be.662", - "HarmonyX": "2.10.0", + "BepInEx.Core": "6.0.0-be.663", + "BepInEx.Unity.Common": "6.0.0-be.663", + "HarmonyX": "2.10.1", "Iced": "1.17.0", - "Il2CppInterop.Generator": "1.3.0", - "Il2CppInterop.HarmonySupport": "1.3.0", - "Il2CppInterop.Runtime": "1.3.0", + "Il2CppInterop.Generator": "1.4.0", + "Il2CppInterop.HarmonySupport": "1.4.0", + "Il2CppInterop.Runtime": "1.4.0", "MonoMod.RuntimeDetour": "22.5.1.1", "Samboy063.Cpp2IL.Core": "2022.0.7.2" } @@ -53,18 +53,18 @@ }, "BepInEx.Core": { "type": "Transitive", - "resolved": "6.0.0-be.662", - "contentHash": "VVBeCD/KQVy0/TK3V6SD8QZ/es35Xb1mEz/+PbBs3ST1yUC1r7k2JOymhSnmghVqf6UsvlMglOO9pljqhuE/Pw==", + "resolved": "6.0.0-be.663", + "contentHash": "yTlqwieyV3FCzSo4tfiIlS7pTqVtEZwrwHnograkWO4loECeYpShcpoCoxnhQ0vkWsnWGThMK7NodHhjZ+jQDA==", "dependencies": { - "HarmonyX": "2.10.0", + "HarmonyX": "2.10.1", "MonoMod.Utils": "22.5.1.1", "SemanticVersioning": "2.0.2" } }, "BepInEx.Unity.Common": { "type": "Transitive", - "resolved": "6.0.0-be.662", - "contentHash": "BgETw6+snwY//3xjQxLiiEAFRmXaMTcSkg+1UQz6fVBG0YA5Usm/m4GflhTc3nwF61KO3Iznn1AORi5CwLJoUw==", + "resolved": "6.0.0-be.663", + "contentHash": "kxv0yXJQ7YPzUQzlwkpVzmTkdd87kVcQhMjkrwqpowJ0Yx5vEwPUrRyG/pwMH5/cK+2WHCn/2akGWrW0C4vUAQ==", "dependencies": { "AssetRipper.VersionUtilities": "1.2.1", "MonoMod.Utils": "22.5.1.1" @@ -72,8 +72,8 @@ }, "HarmonyX": { "type": "Transitive", - "resolved": "2.10.0", - "contentHash": "4ayiy/dlCiW86K2N7Jvbf+VpI5wvP7dncv/6oRmfwRi32UCmCRzCGzsxdMfzJZkp6/26oBW+DrD8vi4UejzVAg==", + "resolved": "2.10.1", + "contentHash": "9LodMC9Y0u1TW96eKJoWrFJFpmzbgojEO38/Q+e7c1mFPhmHt8xcR8qhI06iF1rf0Dnsk+hqENFVSgbtwl/bEw==", "dependencies": { "MonoMod.RuntimeDetour": "22.3.23.4", "System.Reflection.Emit": "4.7.0" @@ -86,8 +86,8 @@ }, "Il2CppInterop.Common": { "type": "Transitive", - "resolved": "1.3.0", - "contentHash": "IR3BrZXvL2nvJAn4pruPMgC78Y87hVa5xTYZCuHN67OzRD6WDl5dTO55vtvTl8dXFALKvlN+spja2tXhVuquOw==", + "resolved": "1.4.0", + "contentHash": "xl60qoa1nImG6qgOQcjSDW46nLQHoRvSWE7QTDQz7XeMsGwOxAbgDtOvJ4gOvoLijTU79gFZYe8H1CM7TcTQ5g==", "dependencies": { "Iced": "1.17.0", "Microsoft.Extensions.Logging.Abstractions": "6.0.1", @@ -96,29 +96,29 @@ }, "Il2CppInterop.Generator": { "type": "Transitive", - "resolved": "1.3.0", - "contentHash": "FuhPxbh/K4K94U3xac/ClMaaBp+MZ4aIaqi5dR0QihyGQoombT+OM/A22RwAIzbaCTbFbvabWaAuOSgB69ZwWQ==", + "resolved": "1.4.0", + "contentHash": "Q4QqkwQroDwwqB17/DRF6hbHQRIuyLksgxVUEDvXZ3T+ogkrZB9h0Ev36alN0f6e7fcZPRkMrpXOAYwZzPiZag==", "dependencies": { - "Il2CppInterop.Common": "1.3.0", + "Il2CppInterop.Common": "1.4.0", "Mono.Cecil": "0.11.3" } }, "Il2CppInterop.HarmonySupport": { "type": "Transitive", - "resolved": "1.3.0", - "contentHash": "VppBnXtbMNGFhX8a1gg/85E883t2pW/+FZyV7eOaOXMNQyorg++u+kUFOIYwNpzTVqxWmMeoPS0DH0toVpjoKA==", + "resolved": "1.4.0", + "contentHash": "Uz4w5PbQ3kLXqUrsQxR35f7xMpfnxLiXthVtNaT3fvHXC8B7arjuBZXeCbcozr6dXFJBDa5W0EElBmH0fWoASg==", "dependencies": { "HarmonyX": "2.10.0", - "Il2CppInterop.Runtime": "1.3.0" + "Il2CppInterop.Runtime": "1.4.0" } }, "Il2CppInterop.Runtime": { "type": "Transitive", - "resolved": "1.3.0", - "contentHash": "8A+N2yvja960Ap+s2RpW7Nb6HSpyuXJy2ipIlU+1erYU9SWHMyU9JZzUZGOhwWXJChKGvRmDdTZAg12k1+72dg==", + "resolved": "1.4.0", + "contentHash": "ScgsFlbJ3gj5f69As/GT8pSO2WlS7cOeS/n3h4gBqJ01Eq/Lm+s3FBrGpEiuIWALOgmtQYimhjWVpxRt7LYtGw==", "dependencies": { "Iced": "1.17.0", - "Il2CppInterop.Common": "1.3.0" + "Il2CppInterop.Common": "1.4.0" } }, "IndexRange": { @@ -867,9 +867,9 @@ "reactor": { "type": "Project", "dependencies": { - "BepInEx.Unity.IL2CPP": "[6.0.0-be.662, )" + "BepInEx.Unity.IL2CPP": "[6.0.0-be.663, )" } } } } -} +} \ No newline at end of file diff --git a/Reactor/Networking/Patches/ClientPatches.cs b/Reactor/Networking/Patches/ClientPatches.cs index 912411b..d145a1d 100644 --- a/Reactor/Networking/Patches/ClientPatches.cs +++ b/Reactor/Networking/Patches/ClientPatches.cs @@ -241,7 +241,7 @@ internal static class ClientPatches { 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; diff --git a/Reactor/Networking/Patches/HttpPatches.cs b/Reactor/Networking/Patches/HttpPatches.cs index 0900f1f..519962f 100644 --- a/Reactor/Networking/Patches/HttpPatches.cs +++ b/Reactor/Networking/Patches/HttpPatches.cs @@ -102,7 +102,7 @@ internal static class HttpPatches { public static void Postfix(GameStartManager __instance) { - if (AmongUsClient.Instance.GameMode != GameModes.OnlineGame) return; + if (AmongUsClient.Instance.NetworkMode != NetworkModes.OnlineGame) return; if (ModList.IsAnyModIsRequiredOnAllClients && !IsCurrentRegionModded()) { Warning("Vanilla region, locking public toggle"); diff --git a/Reactor/packages.lock.json b/Reactor/packages.lock.json index 5271e2c..3da836d 100644 --- a/Reactor/packages.lock.json +++ b/Reactor/packages.lock.json @@ -4,9 +4,9 @@ "net6.0": { "AmongUs.GameLibs.Steam": { "type": "Direct", - "requested": "[2022.10.25, )", - "resolved": "2022.10.25", - "contentHash": "PWgkH/VvMlShVhZB8G432q0tnMaNVZrbIdbEMCZN/fETUlT/ch+qQj4PdTcZhPHREbnJHH3ijHxlca1d7QMBcQ==" + "requested": "[2022.12.8, )", + "resolved": "2022.12.8", + "contentHash": "IJsIi89xUYRvA54YtNVEJjf25hhF3LWzkNBslKCNDUpL1aQ/PhNyO4j18pO71DCgW/qr1P1j8+CwByuBLsInNA==" }, "BepInEx.AutoPlugin": { "type": "Direct", @@ -22,17 +22,17 @@ }, "BepInEx.Unity.IL2CPP": { "type": "Direct", - "requested": "[6.0.0-be.662, )", - "resolved": "6.0.0-be.662", - "contentHash": "fn7jQ88IBmjssoY9XjGBTg3cULkS+N/le/eUijYf2VV8raWok/6cU/GbU9bejkJS8g+2MvzIwnROAhAxvrGI2Q==", + "requested": "[6.0.0-be.663, )", + "resolved": "6.0.0-be.663", + "contentHash": "J+mZ4svyTt4ZYbUoPwpVtF5QCGfzC42VuYJ7z1K6Qt8YlBEZx3rnmUmaEnoJIqN5wN7BSnQgzEmrRfdbrgtTnA==", "dependencies": { - "BepInEx.Core": "6.0.0-be.662", - "BepInEx.Unity.Common": "6.0.0-be.662", - "HarmonyX": "2.10.0", + "BepInEx.Core": "6.0.0-be.663", + "BepInEx.Unity.Common": "6.0.0-be.663", + "HarmonyX": "2.10.1", "Iced": "1.17.0", - "Il2CppInterop.Generator": "1.3.0", - "Il2CppInterop.HarmonySupport": "1.3.0", - "Il2CppInterop.Runtime": "1.3.0", + "Il2CppInterop.Generator": "1.4.0", + "Il2CppInterop.HarmonySupport": "1.4.0", + "Il2CppInterop.Runtime": "1.4.0", "MonoMod.RuntimeDetour": "22.5.1.1", "Samboy063.Cpp2IL.Core": "2022.0.7.2" } @@ -63,18 +63,18 @@ }, "BepInEx.Core": { "type": "Transitive", - "resolved": "6.0.0-be.662", - "contentHash": "VVBeCD/KQVy0/TK3V6SD8QZ/es35Xb1mEz/+PbBs3ST1yUC1r7k2JOymhSnmghVqf6UsvlMglOO9pljqhuE/Pw==", + "resolved": "6.0.0-be.663", + "contentHash": "yTlqwieyV3FCzSo4tfiIlS7pTqVtEZwrwHnograkWO4loECeYpShcpoCoxnhQ0vkWsnWGThMK7NodHhjZ+jQDA==", "dependencies": { - "HarmonyX": "2.10.0", + "HarmonyX": "2.10.1", "MonoMod.Utils": "22.5.1.1", "SemanticVersioning": "2.0.2" } }, "BepInEx.Unity.Common": { "type": "Transitive", - "resolved": "6.0.0-be.662", - "contentHash": "BgETw6+snwY//3xjQxLiiEAFRmXaMTcSkg+1UQz6fVBG0YA5Usm/m4GflhTc3nwF61KO3Iznn1AORi5CwLJoUw==", + "resolved": "6.0.0-be.663", + "contentHash": "kxv0yXJQ7YPzUQzlwkpVzmTkdd87kVcQhMjkrwqpowJ0Yx5vEwPUrRyG/pwMH5/cK+2WHCn/2akGWrW0C4vUAQ==", "dependencies": { "AssetRipper.VersionUtilities": "1.2.1", "MonoMod.Utils": "22.5.1.1" @@ -82,8 +82,8 @@ }, "HarmonyX": { "type": "Transitive", - "resolved": "2.10.0", - "contentHash": "4ayiy/dlCiW86K2N7Jvbf+VpI5wvP7dncv/6oRmfwRi32UCmCRzCGzsxdMfzJZkp6/26oBW+DrD8vi4UejzVAg==", + "resolved": "2.10.1", + "contentHash": "9LodMC9Y0u1TW96eKJoWrFJFpmzbgojEO38/Q+e7c1mFPhmHt8xcR8qhI06iF1rf0Dnsk+hqENFVSgbtwl/bEw==", "dependencies": { "MonoMod.RuntimeDetour": "22.3.23.4", "System.Reflection.Emit": "4.7.0" @@ -96,8 +96,8 @@ }, "Il2CppInterop.Common": { "type": "Transitive", - "resolved": "1.3.0", - "contentHash": "IR3BrZXvL2nvJAn4pruPMgC78Y87hVa5xTYZCuHN67OzRD6WDl5dTO55vtvTl8dXFALKvlN+spja2tXhVuquOw==", + "resolved": "1.4.0", + "contentHash": "xl60qoa1nImG6qgOQcjSDW46nLQHoRvSWE7QTDQz7XeMsGwOxAbgDtOvJ4gOvoLijTU79gFZYe8H1CM7TcTQ5g==", "dependencies": { "Iced": "1.17.0", "Microsoft.Extensions.Logging.Abstractions": "6.0.1", @@ -106,29 +106,29 @@ }, "Il2CppInterop.Generator": { "type": "Transitive", - "resolved": "1.3.0", - "contentHash": "FuhPxbh/K4K94U3xac/ClMaaBp+MZ4aIaqi5dR0QihyGQoombT+OM/A22RwAIzbaCTbFbvabWaAuOSgB69ZwWQ==", + "resolved": "1.4.0", + "contentHash": "Q4QqkwQroDwwqB17/DRF6hbHQRIuyLksgxVUEDvXZ3T+ogkrZB9h0Ev36alN0f6e7fcZPRkMrpXOAYwZzPiZag==", "dependencies": { - "Il2CppInterop.Common": "1.3.0", + "Il2CppInterop.Common": "1.4.0", "Mono.Cecil": "0.11.3" } }, "Il2CppInterop.HarmonySupport": { "type": "Transitive", - "resolved": "1.3.0", - "contentHash": "VppBnXtbMNGFhX8a1gg/85E883t2pW/+FZyV7eOaOXMNQyorg++u+kUFOIYwNpzTVqxWmMeoPS0DH0toVpjoKA==", + "resolved": "1.4.0", + "contentHash": "Uz4w5PbQ3kLXqUrsQxR35f7xMpfnxLiXthVtNaT3fvHXC8B7arjuBZXeCbcozr6dXFJBDa5W0EElBmH0fWoASg==", "dependencies": { "HarmonyX": "2.10.0", - "Il2CppInterop.Runtime": "1.3.0" + "Il2CppInterop.Runtime": "1.4.0" } }, "Il2CppInterop.Runtime": { "type": "Transitive", - "resolved": "1.3.0", - "contentHash": "8A+N2yvja960Ap+s2RpW7Nb6HSpyuXJy2ipIlU+1erYU9SWHMyU9JZzUZGOhwWXJChKGvRmDdTZAg12k1+72dg==", + "resolved": "1.4.0", + "contentHash": "ScgsFlbJ3gj5f69As/GT8pSO2WlS7cOeS/n3h4gBqJ01Eq/Lm+s3FBrGpEiuIWALOgmtQYimhjWVpxRt7LYtGw==", "dependencies": { "Iced": "1.17.0", - "Il2CppInterop.Common": "1.3.0" + "Il2CppInterop.Common": "1.4.0" } }, "IndexRange": { @@ -886,4 +886,4 @@ } } } -} +} \ No newline at end of file