From f2da251ae582caba63748b4f881b73b6950c17e1 Mon Sep 17 00:00:00 2001 From: js6pak Date: Sun, 23 Oct 2022 15:14:36 +0200 Subject: [PATCH] Update to 2022.10.25 --- AmongUs.props | 4 +- Reactor.Benchmarks/packages.lock.json | 56 +++++++++---------- Reactor.Debugger/DebuggerPlugin.cs | 3 +- Reactor.Debugger/packages.lock.json | 56 +++++++++---------- Reactor.Example/packages.lock.json | 56 +++++++++---------- .../Patches/Miscellaneous/FreeNamePatch.cs | 3 +- .../Patches/Miscellaneous/SplashSkipPatch.cs | 13 +++-- Reactor/packages.lock.json | 54 +++++++++--------- 8 files changed, 124 insertions(+), 121 deletions(-) diff --git a/AmongUs.props b/AmongUs.props index 9195cff..f816726 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 bd82a5d..0d861b5 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.18, )", - "resolved": "2022.10.18", - "contentHash": "oDdsWQH7mIKB3+qceA9o7nLwJbchn6GUHiIhLhhWxQWcGwFKanOHibLxFbV5JYgGxhwBdY+Kr9NMfzWRDPdQ/w==" + "requested": "[2022.10.25, )", + "resolved": "2022.10.25", + "contentHash": "PWgkH/VvMlShVhZB8G432q0tnMaNVZrbIdbEMCZN/fETUlT/ch+qQj4PdTcZhPHREbnJHH3ijHxlca1d7QMBcQ==" }, "BenchmarkDotNet": { "type": "Direct", @@ -42,17 +42,17 @@ }, "BepInEx.Unity.IL2CPP": { "type": "Direct", - "requested": "[6.0.0-be.660, )", - "resolved": "6.0.0-be.660", - "contentHash": "jYBL1hNrEKmS7FKnUIKqxU026nvvy0s5TJufkoAiLVq19ficXL/Edy72wHNKXS2GcWY1JwdTLWx44SGStyiNQw==", + "requested": "[6.0.0-be.662, )", + "resolved": "6.0.0-be.662", + "contentHash": "fn7jQ88IBmjssoY9XjGBTg3cULkS+N/le/eUijYf2VV8raWok/6cU/GbU9bejkJS8g+2MvzIwnROAhAxvrGI2Q==", "dependencies": { - "BepInEx.Core": "6.0.0-be.660", - "BepInEx.Unity.Common": "6.0.0-be.660", + "BepInEx.Core": "6.0.0-be.662", + "BepInEx.Unity.Common": "6.0.0-be.662", "HarmonyX": "2.10.0", "Iced": "1.17.0", - "Il2CppInterop.Generator": "1.2.0", - "Il2CppInterop.HarmonySupport": "1.2.0", - "Il2CppInterop.Runtime": "1.2.0", + "Il2CppInterop.Generator": "1.3.0", + "Il2CppInterop.HarmonySupport": "1.3.0", + "Il2CppInterop.Runtime": "1.3.0", "MonoMod.RuntimeDetour": "22.5.1.1", "Samboy063.Cpp2IL.Core": "2022.0.7.2" } @@ -78,8 +78,8 @@ }, "BepInEx.Core": { "type": "Transitive", - "resolved": "6.0.0-be.660", - "contentHash": "6Dbje92nIRcLALn8aqqLEuZbD3Ob/V8A7m2jHB7PhTA6HmIVZ1jJTkMRAKVRKrzAIDZITKZ1j8cGsx2HcMVPEg==", + "resolved": "6.0.0-be.662", + "contentHash": "VVBeCD/KQVy0/TK3V6SD8QZ/es35Xb1mEz/+PbBs3ST1yUC1r7k2JOymhSnmghVqf6UsvlMglOO9pljqhuE/Pw==", "dependencies": { "HarmonyX": "2.10.0", "MonoMod.Utils": "22.5.1.1", @@ -88,8 +88,8 @@ }, "BepInEx.Unity.Common": { "type": "Transitive", - "resolved": "6.0.0-be.660", - "contentHash": "FS1JbYusO407yB0FgBJfgUoCLhCa2iZBL7bLBWeafjupVPU8fkpxoV6jhPDMncbrISqA4SE21wfrHMBLv/EdjQ==", + "resolved": "6.0.0-be.662", + "contentHash": "BgETw6+snwY//3xjQxLiiEAFRmXaMTcSkg+1UQz6fVBG0YA5Usm/m4GflhTc3nwF61KO3Iznn1AORi5CwLJoUw==", "dependencies": { "AssetRipper.VersionUtilities": "1.2.1", "MonoMod.Utils": "22.5.1.1" @@ -116,8 +116,8 @@ }, "Il2CppInterop.Common": { "type": "Transitive", - "resolved": "1.2.0", - "contentHash": "igx3+2h5cdquSFn7yfZenxBnoSnczZlwhCEInil/ioULMOVeVoxTXaB07qI5I1fwDhSa37nugTx1eNqp+YP0fA==", + "resolved": "1.3.0", + "contentHash": "IR3BrZXvL2nvJAn4pruPMgC78Y87hVa5xTYZCuHN67OzRD6WDl5dTO55vtvTl8dXFALKvlN+spja2tXhVuquOw==", "dependencies": { "Iced": "1.17.0", "Microsoft.Extensions.Logging.Abstractions": "6.0.1", @@ -126,29 +126,29 @@ }, "Il2CppInterop.Generator": { "type": "Transitive", - "resolved": "1.2.0", - "contentHash": "g/CB12CCGgCUf/ykgP0LyFXPQpAy4M5kYqy43m2P0+R3htwnKs+0tF7HDCHXlOMclk/40SOThjnf7NlSXJnw+Q==", + "resolved": "1.3.0", + "contentHash": "FuhPxbh/K4K94U3xac/ClMaaBp+MZ4aIaqi5dR0QihyGQoombT+OM/A22RwAIzbaCTbFbvabWaAuOSgB69ZwWQ==", "dependencies": { - "Il2CppInterop.Common": "1.2.0", + "Il2CppInterop.Common": "1.3.0", "Mono.Cecil": "0.11.3" } }, "Il2CppInterop.HarmonySupport": { "type": "Transitive", - "resolved": "1.2.0", - "contentHash": "scyvkvZA4/vSIwaSn8G31+i1969Grve/si+V6HrVudMVsR9IsAJVhEae9KDFJGrmTdTVAFfWZvIqeS3qjDxdrA==", + "resolved": "1.3.0", + "contentHash": "VppBnXtbMNGFhX8a1gg/85E883t2pW/+FZyV7eOaOXMNQyorg++u+kUFOIYwNpzTVqxWmMeoPS0DH0toVpjoKA==", "dependencies": { "HarmonyX": "2.10.0", - "Il2CppInterop.Runtime": "1.2.0" + "Il2CppInterop.Runtime": "1.3.0" } }, "Il2CppInterop.Runtime": { "type": "Transitive", - "resolved": "1.2.0", - "contentHash": "8nv5Jb9cqqIqVgbFCW2vsEcNYrSGFPgEE7XXePR3HhIl3CMbbHJxEAYDatJY4GfNQeeE4avLpXiV6XVkFnWGQg==", + "resolved": "1.3.0", + "contentHash": "8A+N2yvja960Ap+s2RpW7Nb6HSpyuXJy2ipIlU+1erYU9SWHMyU9JZzUZGOhwWXJChKGvRmDdTZAg12k1+72dg==", "dependencies": { "Iced": "1.17.0", - "Il2CppInterop.Common": "1.2.0" + "Il2CppInterop.Common": "1.3.0" } }, "IndexRange": { @@ -1074,9 +1074,9 @@ "reactor": { "type": "Project", "dependencies": { - "BepInEx.Unity.IL2CPP": "[6.0.0-be.660, )" + "BepInEx.Unity.IL2CPP": "[6.0.0-be.662, )" } } } } -} \ No newline at end of file +} diff --git a/Reactor.Debugger/DebuggerPlugin.cs b/Reactor.Debugger/DebuggerPlugin.cs index a0a401a..7a6923a 100644 --- a/Reactor.Debugger/DebuggerPlugin.cs +++ b/Reactor.Debugger/DebuggerPlugin.cs @@ -1,5 +1,6 @@ using System; using System.Linq; +using AmongUs.Data; using BepInEx; using BepInEx.Unity.IL2CPP; using HarmonyLib; @@ -43,7 +44,7 @@ public partial class DebuggerPlugin : BasePlugin { TestWindow = new DragWindow(new Rect(20, 20, 0, 0), "Debugger", () => { - GUILayout.Label("Name: " + SaveManager.PlayerName); + GUILayout.Label("Name: " + DataManager.Player.Customization.Name); DisableGameEnd = GUILayout.Toggle(DisableGameEnd, "Disable game end"); if (ShipStatus.Instance && AmongUsClient.Instance.AmHost) diff --git a/Reactor.Debugger/packages.lock.json b/Reactor.Debugger/packages.lock.json index a472df4..e723b5f 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.18, )", - "resolved": "2022.10.18", - "contentHash": "oDdsWQH7mIKB3+qceA9o7nLwJbchn6GUHiIhLhhWxQWcGwFKanOHibLxFbV5JYgGxhwBdY+Kr9NMfzWRDPdQ/w==" + "requested": "[2022.10.25, )", + "resolved": "2022.10.25", + "contentHash": "PWgkH/VvMlShVhZB8G432q0tnMaNVZrbIdbEMCZN/fETUlT/ch+qQj4PdTcZhPHREbnJHH3ijHxlca1d7QMBcQ==" }, "BepInEx.AutoPlugin": { "type": "Direct", @@ -22,17 +22,17 @@ }, "BepInEx.Unity.IL2CPP": { "type": "Direct", - "requested": "[6.0.0-be.660, )", - "resolved": "6.0.0-be.660", - "contentHash": "jYBL1hNrEKmS7FKnUIKqxU026nvvy0s5TJufkoAiLVq19ficXL/Edy72wHNKXS2GcWY1JwdTLWx44SGStyiNQw==", + "requested": "[6.0.0-be.662, )", + "resolved": "6.0.0-be.662", + "contentHash": "fn7jQ88IBmjssoY9XjGBTg3cULkS+N/le/eUijYf2VV8raWok/6cU/GbU9bejkJS8g+2MvzIwnROAhAxvrGI2Q==", "dependencies": { - "BepInEx.Core": "6.0.0-be.660", - "BepInEx.Unity.Common": "6.0.0-be.660", + "BepInEx.Core": "6.0.0-be.662", + "BepInEx.Unity.Common": "6.0.0-be.662", "HarmonyX": "2.10.0", "Iced": "1.17.0", - "Il2CppInterop.Generator": "1.2.0", - "Il2CppInterop.HarmonySupport": "1.2.0", - "Il2CppInterop.Runtime": "1.2.0", + "Il2CppInterop.Generator": "1.3.0", + "Il2CppInterop.HarmonySupport": "1.3.0", + "Il2CppInterop.Runtime": "1.3.0", "MonoMod.RuntimeDetour": "22.5.1.1", "Samboy063.Cpp2IL.Core": "2022.0.7.2" } @@ -53,8 +53,8 @@ }, "BepInEx.Core": { "type": "Transitive", - "resolved": "6.0.0-be.660", - "contentHash": "6Dbje92nIRcLALn8aqqLEuZbD3Ob/V8A7m2jHB7PhTA6HmIVZ1jJTkMRAKVRKrzAIDZITKZ1j8cGsx2HcMVPEg==", + "resolved": "6.0.0-be.662", + "contentHash": "VVBeCD/KQVy0/TK3V6SD8QZ/es35Xb1mEz/+PbBs3ST1yUC1r7k2JOymhSnmghVqf6UsvlMglOO9pljqhuE/Pw==", "dependencies": { "HarmonyX": "2.10.0", "MonoMod.Utils": "22.5.1.1", @@ -63,8 +63,8 @@ }, "BepInEx.Unity.Common": { "type": "Transitive", - "resolved": "6.0.0-be.660", - "contentHash": "FS1JbYusO407yB0FgBJfgUoCLhCa2iZBL7bLBWeafjupVPU8fkpxoV6jhPDMncbrISqA4SE21wfrHMBLv/EdjQ==", + "resolved": "6.0.0-be.662", + "contentHash": "BgETw6+snwY//3xjQxLiiEAFRmXaMTcSkg+1UQz6fVBG0YA5Usm/m4GflhTc3nwF61KO3Iznn1AORi5CwLJoUw==", "dependencies": { "AssetRipper.VersionUtilities": "1.2.1", "MonoMod.Utils": "22.5.1.1" @@ -86,8 +86,8 @@ }, "Il2CppInterop.Common": { "type": "Transitive", - "resolved": "1.2.0", - "contentHash": "igx3+2h5cdquSFn7yfZenxBnoSnczZlwhCEInil/ioULMOVeVoxTXaB07qI5I1fwDhSa37nugTx1eNqp+YP0fA==", + "resolved": "1.3.0", + "contentHash": "IR3BrZXvL2nvJAn4pruPMgC78Y87hVa5xTYZCuHN67OzRD6WDl5dTO55vtvTl8dXFALKvlN+spja2tXhVuquOw==", "dependencies": { "Iced": "1.17.0", "Microsoft.Extensions.Logging.Abstractions": "6.0.1", @@ -96,29 +96,29 @@ }, "Il2CppInterop.Generator": { "type": "Transitive", - "resolved": "1.2.0", - "contentHash": "g/CB12CCGgCUf/ykgP0LyFXPQpAy4M5kYqy43m2P0+R3htwnKs+0tF7HDCHXlOMclk/40SOThjnf7NlSXJnw+Q==", + "resolved": "1.3.0", + "contentHash": "FuhPxbh/K4K94U3xac/ClMaaBp+MZ4aIaqi5dR0QihyGQoombT+OM/A22RwAIzbaCTbFbvabWaAuOSgB69ZwWQ==", "dependencies": { - "Il2CppInterop.Common": "1.2.0", + "Il2CppInterop.Common": "1.3.0", "Mono.Cecil": "0.11.3" } }, "Il2CppInterop.HarmonySupport": { "type": "Transitive", - "resolved": "1.2.0", - "contentHash": "scyvkvZA4/vSIwaSn8G31+i1969Grve/si+V6HrVudMVsR9IsAJVhEae9KDFJGrmTdTVAFfWZvIqeS3qjDxdrA==", + "resolved": "1.3.0", + "contentHash": "VppBnXtbMNGFhX8a1gg/85E883t2pW/+FZyV7eOaOXMNQyorg++u+kUFOIYwNpzTVqxWmMeoPS0DH0toVpjoKA==", "dependencies": { "HarmonyX": "2.10.0", - "Il2CppInterop.Runtime": "1.2.0" + "Il2CppInterop.Runtime": "1.3.0" } }, "Il2CppInterop.Runtime": { "type": "Transitive", - "resolved": "1.2.0", - "contentHash": "8nv5Jb9cqqIqVgbFCW2vsEcNYrSGFPgEE7XXePR3HhIl3CMbbHJxEAYDatJY4GfNQeeE4avLpXiV6XVkFnWGQg==", + "resolved": "1.3.0", + "contentHash": "8A+N2yvja960Ap+s2RpW7Nb6HSpyuXJy2ipIlU+1erYU9SWHMyU9JZzUZGOhwWXJChKGvRmDdTZAg12k1+72dg==", "dependencies": { "Iced": "1.17.0", - "Il2CppInterop.Common": "1.2.0" + "Il2CppInterop.Common": "1.3.0" } }, "IndexRange": { @@ -867,9 +867,9 @@ "reactor": { "type": "Project", "dependencies": { - "BepInEx.Unity.IL2CPP": "[6.0.0-be.660, )" + "BepInEx.Unity.IL2CPP": "[6.0.0-be.662, )" } } } } -} \ No newline at end of file +} diff --git a/Reactor.Example/packages.lock.json b/Reactor.Example/packages.lock.json index a472df4..e723b5f 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.18, )", - "resolved": "2022.10.18", - "contentHash": "oDdsWQH7mIKB3+qceA9o7nLwJbchn6GUHiIhLhhWxQWcGwFKanOHibLxFbV5JYgGxhwBdY+Kr9NMfzWRDPdQ/w==" + "requested": "[2022.10.25, )", + "resolved": "2022.10.25", + "contentHash": "PWgkH/VvMlShVhZB8G432q0tnMaNVZrbIdbEMCZN/fETUlT/ch+qQj4PdTcZhPHREbnJHH3ijHxlca1d7QMBcQ==" }, "BepInEx.AutoPlugin": { "type": "Direct", @@ -22,17 +22,17 @@ }, "BepInEx.Unity.IL2CPP": { "type": "Direct", - "requested": "[6.0.0-be.660, )", - "resolved": "6.0.0-be.660", - "contentHash": "jYBL1hNrEKmS7FKnUIKqxU026nvvy0s5TJufkoAiLVq19ficXL/Edy72wHNKXS2GcWY1JwdTLWx44SGStyiNQw==", + "requested": "[6.0.0-be.662, )", + "resolved": "6.0.0-be.662", + "contentHash": "fn7jQ88IBmjssoY9XjGBTg3cULkS+N/le/eUijYf2VV8raWok/6cU/GbU9bejkJS8g+2MvzIwnROAhAxvrGI2Q==", "dependencies": { - "BepInEx.Core": "6.0.0-be.660", - "BepInEx.Unity.Common": "6.0.0-be.660", + "BepInEx.Core": "6.0.0-be.662", + "BepInEx.Unity.Common": "6.0.0-be.662", "HarmonyX": "2.10.0", "Iced": "1.17.0", - "Il2CppInterop.Generator": "1.2.0", - "Il2CppInterop.HarmonySupport": "1.2.0", - "Il2CppInterop.Runtime": "1.2.0", + "Il2CppInterop.Generator": "1.3.0", + "Il2CppInterop.HarmonySupport": "1.3.0", + "Il2CppInterop.Runtime": "1.3.0", "MonoMod.RuntimeDetour": "22.5.1.1", "Samboy063.Cpp2IL.Core": "2022.0.7.2" } @@ -53,8 +53,8 @@ }, "BepInEx.Core": { "type": "Transitive", - "resolved": "6.0.0-be.660", - "contentHash": "6Dbje92nIRcLALn8aqqLEuZbD3Ob/V8A7m2jHB7PhTA6HmIVZ1jJTkMRAKVRKrzAIDZITKZ1j8cGsx2HcMVPEg==", + "resolved": "6.0.0-be.662", + "contentHash": "VVBeCD/KQVy0/TK3V6SD8QZ/es35Xb1mEz/+PbBs3ST1yUC1r7k2JOymhSnmghVqf6UsvlMglOO9pljqhuE/Pw==", "dependencies": { "HarmonyX": "2.10.0", "MonoMod.Utils": "22.5.1.1", @@ -63,8 +63,8 @@ }, "BepInEx.Unity.Common": { "type": "Transitive", - "resolved": "6.0.0-be.660", - "contentHash": "FS1JbYusO407yB0FgBJfgUoCLhCa2iZBL7bLBWeafjupVPU8fkpxoV6jhPDMncbrISqA4SE21wfrHMBLv/EdjQ==", + "resolved": "6.0.0-be.662", + "contentHash": "BgETw6+snwY//3xjQxLiiEAFRmXaMTcSkg+1UQz6fVBG0YA5Usm/m4GflhTc3nwF61KO3Iznn1AORi5CwLJoUw==", "dependencies": { "AssetRipper.VersionUtilities": "1.2.1", "MonoMod.Utils": "22.5.1.1" @@ -86,8 +86,8 @@ }, "Il2CppInterop.Common": { "type": "Transitive", - "resolved": "1.2.0", - "contentHash": "igx3+2h5cdquSFn7yfZenxBnoSnczZlwhCEInil/ioULMOVeVoxTXaB07qI5I1fwDhSa37nugTx1eNqp+YP0fA==", + "resolved": "1.3.0", + "contentHash": "IR3BrZXvL2nvJAn4pruPMgC78Y87hVa5xTYZCuHN67OzRD6WDl5dTO55vtvTl8dXFALKvlN+spja2tXhVuquOw==", "dependencies": { "Iced": "1.17.0", "Microsoft.Extensions.Logging.Abstractions": "6.0.1", @@ -96,29 +96,29 @@ }, "Il2CppInterop.Generator": { "type": "Transitive", - "resolved": "1.2.0", - "contentHash": "g/CB12CCGgCUf/ykgP0LyFXPQpAy4M5kYqy43m2P0+R3htwnKs+0tF7HDCHXlOMclk/40SOThjnf7NlSXJnw+Q==", + "resolved": "1.3.0", + "contentHash": "FuhPxbh/K4K94U3xac/ClMaaBp+MZ4aIaqi5dR0QihyGQoombT+OM/A22RwAIzbaCTbFbvabWaAuOSgB69ZwWQ==", "dependencies": { - "Il2CppInterop.Common": "1.2.0", + "Il2CppInterop.Common": "1.3.0", "Mono.Cecil": "0.11.3" } }, "Il2CppInterop.HarmonySupport": { "type": "Transitive", - "resolved": "1.2.0", - "contentHash": "scyvkvZA4/vSIwaSn8G31+i1969Grve/si+V6HrVudMVsR9IsAJVhEae9KDFJGrmTdTVAFfWZvIqeS3qjDxdrA==", + "resolved": "1.3.0", + "contentHash": "VppBnXtbMNGFhX8a1gg/85E883t2pW/+FZyV7eOaOXMNQyorg++u+kUFOIYwNpzTVqxWmMeoPS0DH0toVpjoKA==", "dependencies": { "HarmonyX": "2.10.0", - "Il2CppInterop.Runtime": "1.2.0" + "Il2CppInterop.Runtime": "1.3.0" } }, "Il2CppInterop.Runtime": { "type": "Transitive", - "resolved": "1.2.0", - "contentHash": "8nv5Jb9cqqIqVgbFCW2vsEcNYrSGFPgEE7XXePR3HhIl3CMbbHJxEAYDatJY4GfNQeeE4avLpXiV6XVkFnWGQg==", + "resolved": "1.3.0", + "contentHash": "8A+N2yvja960Ap+s2RpW7Nb6HSpyuXJy2ipIlU+1erYU9SWHMyU9JZzUZGOhwWXJChKGvRmDdTZAg12k1+72dg==", "dependencies": { "Iced": "1.17.0", - "Il2CppInterop.Common": "1.2.0" + "Il2CppInterop.Common": "1.3.0" } }, "IndexRange": { @@ -867,9 +867,9 @@ "reactor": { "type": "Project", "dependencies": { - "BepInEx.Unity.IL2CPP": "[6.0.0-be.660, )" + "BepInEx.Unity.IL2CPP": "[6.0.0-be.662, )" } } } } -} \ No newline at end of file +} diff --git a/Reactor/Patches/Miscellaneous/FreeNamePatch.cs b/Reactor/Patches/Miscellaneous/FreeNamePatch.cs index bdd900e..ed663d9 100644 --- a/Reactor/Patches/Miscellaneous/FreeNamePatch.cs +++ b/Reactor/Patches/Miscellaneous/FreeNamePatch.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; +using AmongUs.Data; using HarmonyLib; using TMPro; using UnityEngine; @@ -38,7 +39,7 @@ internal static class FreeNamePatch textBox.OnChange.AddListener((Action) (() => { - SaveManager.PlayerName = textBox.text; + DataManager.Player.Customization.Name = textBox.text; })); textBox.OnEnter = textBox.OnFocusLost = textBox.OnChange; diff --git a/Reactor/Patches/Miscellaneous/SplashSkipPatch.cs b/Reactor/Patches/Miscellaneous/SplashSkipPatch.cs index 290af4b..56a823f 100644 --- a/Reactor/Patches/Miscellaneous/SplashSkipPatch.cs +++ b/Reactor/Patches/Miscellaneous/SplashSkipPatch.cs @@ -30,11 +30,12 @@ internal static class SplashSkipPatch return true; } + // TODO add back when new epic version releases // EpicManager calls SaveManager.LoadPlayerPrefs(true) both on successful and unsuccessful EOS login - [HarmonyPatch(typeof(SaveManager), nameof(SaveManager.LoadPlayerPrefs))] - [HarmonyPostfix] - private static void WaitForEpicAuth(bool overrideLoad) - { - if (overrideLoad) _loginFinished = true; - } + // [HarmonyPatch(typeof(SaveManager), nameof(SaveManager.LoadPlayerPrefs))] + // [HarmonyPostfix] + // private static void WaitForEpicAuth(bool overrideLoad) + // { + // if (overrideLoad) _loginFinished = true; + // } } diff --git a/Reactor/packages.lock.json b/Reactor/packages.lock.json index 061a174..5271e2c 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.18, )", - "resolved": "2022.10.18", - "contentHash": "oDdsWQH7mIKB3+qceA9o7nLwJbchn6GUHiIhLhhWxQWcGwFKanOHibLxFbV5JYgGxhwBdY+Kr9NMfzWRDPdQ/w==" + "requested": "[2022.10.25, )", + "resolved": "2022.10.25", + "contentHash": "PWgkH/VvMlShVhZB8G432q0tnMaNVZrbIdbEMCZN/fETUlT/ch+qQj4PdTcZhPHREbnJHH3ijHxlca1d7QMBcQ==" }, "BepInEx.AutoPlugin": { "type": "Direct", @@ -22,17 +22,17 @@ }, "BepInEx.Unity.IL2CPP": { "type": "Direct", - "requested": "[6.0.0-be.660, )", - "resolved": "6.0.0-be.660", - "contentHash": "jYBL1hNrEKmS7FKnUIKqxU026nvvy0s5TJufkoAiLVq19ficXL/Edy72wHNKXS2GcWY1JwdTLWx44SGStyiNQw==", + "requested": "[6.0.0-be.662, )", + "resolved": "6.0.0-be.662", + "contentHash": "fn7jQ88IBmjssoY9XjGBTg3cULkS+N/le/eUijYf2VV8raWok/6cU/GbU9bejkJS8g+2MvzIwnROAhAxvrGI2Q==", "dependencies": { - "BepInEx.Core": "6.0.0-be.660", - "BepInEx.Unity.Common": "6.0.0-be.660", + "BepInEx.Core": "6.0.0-be.662", + "BepInEx.Unity.Common": "6.0.0-be.662", "HarmonyX": "2.10.0", "Iced": "1.17.0", - "Il2CppInterop.Generator": "1.2.0", - "Il2CppInterop.HarmonySupport": "1.2.0", - "Il2CppInterop.Runtime": "1.2.0", + "Il2CppInterop.Generator": "1.3.0", + "Il2CppInterop.HarmonySupport": "1.3.0", + "Il2CppInterop.Runtime": "1.3.0", "MonoMod.RuntimeDetour": "22.5.1.1", "Samboy063.Cpp2IL.Core": "2022.0.7.2" } @@ -63,8 +63,8 @@ }, "BepInEx.Core": { "type": "Transitive", - "resolved": "6.0.0-be.660", - "contentHash": "6Dbje92nIRcLALn8aqqLEuZbD3Ob/V8A7m2jHB7PhTA6HmIVZ1jJTkMRAKVRKrzAIDZITKZ1j8cGsx2HcMVPEg==", + "resolved": "6.0.0-be.662", + "contentHash": "VVBeCD/KQVy0/TK3V6SD8QZ/es35Xb1mEz/+PbBs3ST1yUC1r7k2JOymhSnmghVqf6UsvlMglOO9pljqhuE/Pw==", "dependencies": { "HarmonyX": "2.10.0", "MonoMod.Utils": "22.5.1.1", @@ -73,8 +73,8 @@ }, "BepInEx.Unity.Common": { "type": "Transitive", - "resolved": "6.0.0-be.660", - "contentHash": "FS1JbYusO407yB0FgBJfgUoCLhCa2iZBL7bLBWeafjupVPU8fkpxoV6jhPDMncbrISqA4SE21wfrHMBLv/EdjQ==", + "resolved": "6.0.0-be.662", + "contentHash": "BgETw6+snwY//3xjQxLiiEAFRmXaMTcSkg+1UQz6fVBG0YA5Usm/m4GflhTc3nwF61KO3Iznn1AORi5CwLJoUw==", "dependencies": { "AssetRipper.VersionUtilities": "1.2.1", "MonoMod.Utils": "22.5.1.1" @@ -96,8 +96,8 @@ }, "Il2CppInterop.Common": { "type": "Transitive", - "resolved": "1.2.0", - "contentHash": "igx3+2h5cdquSFn7yfZenxBnoSnczZlwhCEInil/ioULMOVeVoxTXaB07qI5I1fwDhSa37nugTx1eNqp+YP0fA==", + "resolved": "1.3.0", + "contentHash": "IR3BrZXvL2nvJAn4pruPMgC78Y87hVa5xTYZCuHN67OzRD6WDl5dTO55vtvTl8dXFALKvlN+spja2tXhVuquOw==", "dependencies": { "Iced": "1.17.0", "Microsoft.Extensions.Logging.Abstractions": "6.0.1", @@ -106,29 +106,29 @@ }, "Il2CppInterop.Generator": { "type": "Transitive", - "resolved": "1.2.0", - "contentHash": "g/CB12CCGgCUf/ykgP0LyFXPQpAy4M5kYqy43m2P0+R3htwnKs+0tF7HDCHXlOMclk/40SOThjnf7NlSXJnw+Q==", + "resolved": "1.3.0", + "contentHash": "FuhPxbh/K4K94U3xac/ClMaaBp+MZ4aIaqi5dR0QihyGQoombT+OM/A22RwAIzbaCTbFbvabWaAuOSgB69ZwWQ==", "dependencies": { - "Il2CppInterop.Common": "1.2.0", + "Il2CppInterop.Common": "1.3.0", "Mono.Cecil": "0.11.3" } }, "Il2CppInterop.HarmonySupport": { "type": "Transitive", - "resolved": "1.2.0", - "contentHash": "scyvkvZA4/vSIwaSn8G31+i1969Grve/si+V6HrVudMVsR9IsAJVhEae9KDFJGrmTdTVAFfWZvIqeS3qjDxdrA==", + "resolved": "1.3.0", + "contentHash": "VppBnXtbMNGFhX8a1gg/85E883t2pW/+FZyV7eOaOXMNQyorg++u+kUFOIYwNpzTVqxWmMeoPS0DH0toVpjoKA==", "dependencies": { "HarmonyX": "2.10.0", - "Il2CppInterop.Runtime": "1.2.0" + "Il2CppInterop.Runtime": "1.3.0" } }, "Il2CppInterop.Runtime": { "type": "Transitive", - "resolved": "1.2.0", - "contentHash": "8nv5Jb9cqqIqVgbFCW2vsEcNYrSGFPgEE7XXePR3HhIl3CMbbHJxEAYDatJY4GfNQeeE4avLpXiV6XVkFnWGQg==", + "resolved": "1.3.0", + "contentHash": "8A+N2yvja960Ap+s2RpW7Nb6HSpyuXJy2ipIlU+1erYU9SWHMyU9JZzUZGOhwWXJChKGvRmDdTZAg12k1+72dg==", "dependencies": { "Iced": "1.17.0", - "Il2CppInterop.Common": "1.2.0" + "Il2CppInterop.Common": "1.3.0" } }, "IndexRange": { @@ -886,4 +886,4 @@ } } } -} \ No newline at end of file +}