AmongUsMods/Reactor
1
0 Fork 0
mirror of https://github.com/NuclearPowered/Reactor.git synced 2026-10-19 15:51:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #96 from XtraCube/master-2

Browse Source 
Update to 2025.5.20
This commit is contained in:
miniduikboot authored and GitHub committed 2025-05-28 23:19:54 +02:00
2 parents c91706bd67 b1fa5410c9
commit 8505eb5974
14 files changed
+219 -214
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

AmongUs.props
+3 -3
View File
@@ -1,10 +1,10 @@
<Project> <Project>
<ItemGroup> <ItemGroup>
<PackageReference Include="BepInEx.Unity.IL2CPP" Version="6.0.0-be.733" Private="false" ExcludeAssets="runtime;native" /> <PackageReference Include="BepInEx.Unity.IL2CPP" Version="6.0.0-be.735" Private="false" ExcludeAssets="runtime;native" />
<PackageReference Include="AmongUs.GameLibs.Steam" Version="2025.3.25" PrivateAssets="all" /> <PackageReference Include="AmongUs.GameLibs.Steam" Version="2025.4.15" 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.1.0-rc.1" PrivateAssets="all" ExcludeAssets="runtime" />
</ItemGroup> </ItemGroup>
<Target Name="Copy" AfterTargets="Build" Condition="'$(AmongUs)' != ''"> <Target Name="Copy" AfterTargets="Build" Condition="'$(AmongUs)' != ''">
Reactor.Benchmarks/packages.lock.json
+35 -35
View File
@@ -4,9 +4,9 @@
"net6.0": { "net6.0": {
"AmongUs.GameLibs.Steam": { "AmongUs.GameLibs.Steam": {
"type": "Direct", "type": "Direct",
"requested": "[2025.3.25, )", "requested": "[2025.4.15, )",
"resolved": "2025.3.25", "resolved": "2025.4.15",
"contentHash": "2QxQXgZDcQOdAIDXrNLrQ7veEzD6EBzuaRjzSbHptWUPUsuVc3I5Ur3xMkPPwmSGsDHjLuAGE84yRjV6oJxGxw==" "contentHash": "R3RxzHGZOGUJ9nMwrP0cjS6g+sh60QUU506Mo47lh17155enUjH6PtErijihSoU7t3aQpzCIyC67W3XrrHhH4g=="
}, },
"BenchmarkDotNet": { "BenchmarkDotNet": {
"type": "Direct", "type": "Direct",
@@ -34,25 +34,25 @@
}, },
"BepInEx.IL2CPP.MSBuild": { "BepInEx.IL2CPP.MSBuild": {
"type": "Direct", "type": "Direct",
"requested": "[2.0.1, )", "requested": "[2.1.0-rc.1, )",
"resolved": "2.0.1", "resolved": "2.1.0-rc.1",
"contentHash": "hUZjCV0t8dkw/Z/zq4Zl405QP7frBk/LVfMdUmUz+7XOhGd7lYPKrR48A5vbGl2QeHudMxlkXzAr9WM3Duq2SQ==" "contentHash": "WI/7TbJwWl5P4B6UXGtKI1VMe6fA6h3fcbp3ZjJKqOBQ5MJfDMmeVB4fb+RW1tUQdxnlSWV3Ul62PHFyTqp4PA=="
}, },
"BepInEx.Unity.IL2CPP": { "BepInEx.Unity.IL2CPP": {
"type": "Direct", "type": "Direct",
"requested": "[6.0.0-be.733, )", "requested": "[6.0.0-be.735, )",
"resolved": "6.0.0-be.733", "resolved": "6.0.0-be.735",
"contentHash": "lnoGaPHjIdGfEiKtf89knaTdLXe4IUqVLdoYqW8NYhhNqgxa3oNwScjTmuYQpa4Leew3937+slq2WIjvX/DUwQ==", "contentHash": "2+eFJGKMR1GFPeU9wuF+TVrMANIaWIc/6N9e8x4b7b/fNiY9B6vicYNiMDb2deYQpWZtOei+2btnar5dDE5BPg==",
"dependencies": { "dependencies": {
"BepInEx.Core": "6.0.0-be.733", "BepInEx.Core": "6.0.0-be.735",
"BepInEx.Unity.Common": "6.0.0-be.733", "BepInEx.Unity.Common": "6.0.0-be.735",
"HarmonyX": "2.10.2", "HarmonyX": "2.10.2",
"Iced": "1.21.0", "Iced": "1.21.0",
"Il2CppInterop.Generator": "1.4.6-ci.426", "Il2CppInterop.Generator": "1.4.6-ci.426",
"Il2CppInterop.HarmonySupport": "1.4.6-ci.426", "Il2CppInterop.HarmonySupport": "1.4.6-ci.426",
"Il2CppInterop.Runtime": "1.4.6-ci.426", "Il2CppInterop.Runtime": "1.4.6-ci.426",
"MonoMod.RuntimeDetour": "22.7.31.1", "MonoMod.RuntimeDetour": "22.7.31.1",
"Samboy063.Cpp2IL.Core": "2022.1.0-pre-release.18" "Samboy063.Cpp2IL.Core": "2022.1.0-pre-release.19"
} }
}, },
"StyleCop.Analyzers": { "StyleCop.Analyzers": {
@@ -95,8 +95,8 @@
}, },
"AssetRipper.CIL": { "AssetRipper.CIL": {
"type": "Transitive", "type": "Transitive",
"resolved": "1.1.0", "resolved": "1.1.2",
"contentHash": "nSz1cBjgVeKv+esfDtyQGC1mY9b4C4NFStytdoa9DMozDC8uth6930kAsuWZEivj9GqWSqENnaQUGnl23WpmnQ==", "contentHash": "BRPcHORadIzSFkrVOvGkSs54j19mQdXH8dmRTVM51mS8MZLSbTpi9CDPpnWN2IdDsILUrAqbPUFo3zJodYxErw==",
"dependencies": { "dependencies": {
"AsmResolver.DotNet": "6.0.0-beta.1" "AsmResolver.DotNet": "6.0.0-beta.1"
} }
@@ -118,8 +118,8 @@
}, },
"BepInEx.Core": { "BepInEx.Core": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.0.0-be.733", "resolved": "6.0.0-be.735",
"contentHash": "uRzpyUdU3L8Y4ZW+ZnF73orq0E40MjGK6XcPzm24CrrWB5bUshwdrtFQfrwZB6jcZVNVV6PXE92hScEI+Jaoqw==", "contentHash": "FuHm9UCzjSKeiZJc3IF70Fiuqi+FynRn62PwBoOeZcHK3/qm+vl1YwbZyFlmUyf45g+UKxg2Td40iZGx88LVAQ==",
"dependencies": { "dependencies": {
"HarmonyX": "2.10.2", "HarmonyX": "2.10.2",
"MonoMod.Utils": "22.7.31.1", "MonoMod.Utils": "22.7.31.1",
@@ -128,8 +128,8 @@
}, },
"BepInEx.Unity.Common": { "BepInEx.Unity.Common": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.0.0-be.733", "resolved": "6.0.0-be.735",
"contentHash": "KfdiHVSOPnIbDEF7zLPTSXDjKqIEq7SgffqFFKIxOBkCws7LdtSRQsamUcxdD0H8yopcgdlqobIp6t8e4M/k9Q==", "contentHash": "vmK//OBSr+jotqTk//HSdvHtMFTKu+NlQkiEsvr0dZApTVmQM2AgpVMhEAakQPmrSsM6LRJIHCBcLFO1ypfMPQ==",
"dependencies": { "dependencies": {
"AssetRipper.Primitives": "3.1.3", "AssetRipper.Primitives": "3.1.3",
"MonoMod.Utils": "22.7.31.1" "MonoMod.Utils": "22.7.31.1"
@@ -142,8 +142,8 @@
}, },
"Disarm": { "Disarm": {
"type": "Transitive", "type": "Transitive",
"resolved": "2022.1.0-master.34", "resolved": "2022.1.0-master.57",
"contentHash": "sxzTci5eSdl+sFoaGsMZIp7X/eB5ZzplM3CppvD1CWoiZ8rSa43XGLC19G5e8n6mjutNBfN9yL+RER5PCspHFg==" "contentHash": "/dkg7hg8iPBQN4bTV1lMQacarH6fMpgUXhJuo6iI7Wv7YpH7g5F9hJfje7dSMhqG0YlDacLuyWvcph5GzKUXog=="
}, },
"Gee.External.Capstone": { "Gee.External.Capstone": {
"type": "Transitive", "type": "Transitive",
@@ -489,31 +489,31 @@
}, },
"Samboy063.Cpp2IL.Core": { "Samboy063.Cpp2IL.Core": {
"type": "Transitive", "type": "Transitive",
"resolved": "2022.1.0-pre-release.18", "resolved": "2022.1.0-pre-release.19",
"contentHash": "eX9d1IK05jWaEaeuMAE0L5WYHT7thtxz+aWLL/CAaCzZ0TzRPD+WFTjJ0KQO0YWBVO300CX3GwmPmf7TNO+wUg==", "contentHash": "mAYIrMo0VdOZzh1NS5bZeflg80gtYNY7kZo9q/blEYheUPyLXu5ozQOjX+Bq2yDh40pA+yiE2MXTnN2Is2hjgw==",
"dependencies": { "dependencies": {
"AsmResolver.DotNet": "6.0.0-beta.1", "AsmResolver.DotNet": "6.0.0-beta.1",
"AssetRipper.CIL": "1.1.0", "AssetRipper.CIL": "1.1.2",
"AssetRipper.Gee.External.Capstone": "2.3.2", "AssetRipper.Gee.External.Capstone": "2.3.2",
"Disarm": "2022.1.0-master.34", "Disarm": "2022.1.0-master.57",
"Iced": "1.21.0", "Iced": "1.21.0",
"Samboy063.LibCpp2IL": "2022.1.0-pre-release.18", "Samboy063.LibCpp2IL": "2022.1.0-pre-release.19",
"StableNameDotNet": "0.1.0-pre-release.15" "StableNameDotNet": "0.1.0-pre-release.19"
} }
}, },
"Samboy063.LibCpp2IL": { "Samboy063.LibCpp2IL": {
"type": "Transitive", "type": "Transitive",
"resolved": "2022.1.0-pre-release.18", "resolved": "2022.1.0-pre-release.19",
"contentHash": "9zJdTAeErpwJpYDHYwwI0MAC1OyBEfC1ce7dpAOYRUUYCfeaKVWxnSCcyaoY6HDzIoxPkhbfllbwOe49ZmUYuQ==", "contentHash": "/n8p81ltd38BeNNS2xUNPGMSzxk/UGXr9cRNqG1MaLogzANNNrvCAXqWmNMM3tZctjp7vqTxEA+e4J4ngul8Fg==",
"dependencies": { "dependencies": {
"AssetRipper.Primitives": "3.1.2", "AssetRipper.Primitives": "3.1.3",
"Samboy063.WasmDisassembler": "2022.1.0-pre-release.15" "Samboy063.WasmDisassembler": "2022.1.0-pre-release.19"
} }
}, },
"Samboy063.WasmDisassembler": { "Samboy063.WasmDisassembler": {
"type": "Transitive", "type": "Transitive",
"resolved": "2022.1.0-pre-release.15", "resolved": "2022.1.0-pre-release.19",
"contentHash": "e6qw81SHS+fS7iZ3qfqZBavVarYbkPElNgDCANF6dNFTYq5+hc80am+4FqQDl+ZVNS47bZDZobxIzHhmriCXGg==" "contentHash": "uVQdYm/J6+jJ1xt6GJ3hNhXhciwlX+LmHTPITu9jjZ75T33YJuuTD7pLVYuMymr+4gSVisg7f1wterFSyqJBWA=="
}, },
"SemanticVersioning": { "SemanticVersioning": {
"type": "Transitive", "type": "Transitive",
@@ -522,8 +522,8 @@
}, },
"StableNameDotNet": { "StableNameDotNet": {
"type": "Transitive", "type": "Transitive",
"resolved": "0.1.0-pre-release.15", "resolved": "0.1.0-pre-release.19",
"contentHash": "aIkEOo8V76vE+9CppHpTFLGXalBw6TAl4/tb6vadmS+gHJMshTVehzQv9cJXy4xZDdANV1uGMRaUFZERcDA2xQ==" "contentHash": "5BPWtntv3PXeFIg9CuGW6OM3f5GnwvdQJbzRpufPsistFwFyt1xYW1wSDr+QIdDO7vLndr7iNpWD3FyYp9LL4g=="
}, },
"StyleCop.Analyzers.Unstable": { "StyleCop.Analyzers.Unstable": {
"type": "Transitive", "type": "Transitive",
@@ -1138,7 +1138,7 @@
"reactor": { "reactor": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"BepInEx.Unity.IL2CPP": "[6.0.0-be.733, )" "BepInEx.Unity.IL2CPP": "[6.0.0-be.735, )"
} }
} }
} }
Reactor.Debugger/packages.lock.json
+35 -35
View File
@@ -4,9 +4,9 @@
"net6.0": { "net6.0": {
"AmongUs.GameLibs.Steam": { "AmongUs.GameLibs.Steam": {
"type": "Direct", "type": "Direct",
"requested": "[2025.3.25, )", "requested": "[2025.4.15, )",
"resolved": "2025.3.25", "resolved": "2025.4.15",
"contentHash": "2QxQXgZDcQOdAIDXrNLrQ7veEzD6EBzuaRjzSbHptWUPUsuVc3I5Ur3xMkPPwmSGsDHjLuAGE84yRjV6oJxGxw==" "contentHash": "R3RxzHGZOGUJ9nMwrP0cjS6g+sh60QUU506Mo47lh17155enUjH6PtErijihSoU7t3aQpzCIyC67W3XrrHhH4g=="
}, },
"BepInEx.AutoPlugin": { "BepInEx.AutoPlugin": {
"type": "Direct", "type": "Direct",
@@ -16,25 +16,25 @@
}, },
"BepInEx.IL2CPP.MSBuild": { "BepInEx.IL2CPP.MSBuild": {
"type": "Direct", "type": "Direct",
"requested": "[2.0.1, )", "requested": "[2.1.0-rc.1, )",
"resolved": "2.0.1", "resolved": "2.1.0-rc.1",
"contentHash": "hUZjCV0t8dkw/Z/zq4Zl405QP7frBk/LVfMdUmUz+7XOhGd7lYPKrR48A5vbGl2QeHudMxlkXzAr9WM3Duq2SQ==" "contentHash": "WI/7TbJwWl5P4B6UXGtKI1VMe6fA6h3fcbp3ZjJKqOBQ5MJfDMmeVB4fb+RW1tUQdxnlSWV3Ul62PHFyTqp4PA=="
}, },
"BepInEx.Unity.IL2CPP": { "BepInEx.Unity.IL2CPP": {
"type": "Direct", "type": "Direct",
"requested": "[6.0.0-be.733, )", "requested": "[6.0.0-be.735, )",
"resolved": "6.0.0-be.733", "resolved": "6.0.0-be.735",
"contentHash": "lnoGaPHjIdGfEiKtf89knaTdLXe4IUqVLdoYqW8NYhhNqgxa3oNwScjTmuYQpa4Leew3937+slq2WIjvX/DUwQ==", "contentHash": "2+eFJGKMR1GFPeU9wuF+TVrMANIaWIc/6N9e8x4b7b/fNiY9B6vicYNiMDb2deYQpWZtOei+2btnar5dDE5BPg==",
"dependencies": { "dependencies": {
"BepInEx.Core": "6.0.0-be.733", "BepInEx.Core": "6.0.0-be.735",
"BepInEx.Unity.Common": "6.0.0-be.733", "BepInEx.Unity.Common": "6.0.0-be.735",
"HarmonyX": "2.10.2", "HarmonyX": "2.10.2",
"Iced": "1.21.0", "Iced": "1.21.0",
"Il2CppInterop.Generator": "1.4.6-ci.426", "Il2CppInterop.Generator": "1.4.6-ci.426",
"Il2CppInterop.HarmonySupport": "1.4.6-ci.426", "Il2CppInterop.HarmonySupport": "1.4.6-ci.426",
"Il2CppInterop.Runtime": "1.4.6-ci.426", "Il2CppInterop.Runtime": "1.4.6-ci.426",
"MonoMod.RuntimeDetour": "22.7.31.1", "MonoMod.RuntimeDetour": "22.7.31.1",
"Samboy063.Cpp2IL.Core": "2022.1.0-pre-release.18" "Samboy063.Cpp2IL.Core": "2022.1.0-pre-release.19"
} }
}, },
"StyleCop.Analyzers": { "StyleCop.Analyzers": {
@@ -77,8 +77,8 @@
}, },
"AssetRipper.CIL": { "AssetRipper.CIL": {
"type": "Transitive", "type": "Transitive",
"resolved": "1.1.0", "resolved": "1.1.2",
"contentHash": "nSz1cBjgVeKv+esfDtyQGC1mY9b4C4NFStytdoa9DMozDC8uth6930kAsuWZEivj9GqWSqENnaQUGnl23WpmnQ==", "contentHash": "BRPcHORadIzSFkrVOvGkSs54j19mQdXH8dmRTVM51mS8MZLSbTpi9CDPpnWN2IdDsILUrAqbPUFo3zJodYxErw==",
"dependencies": { "dependencies": {
"AsmResolver.DotNet": "6.0.0-beta.1" "AsmResolver.DotNet": "6.0.0-beta.1"
} }
@@ -95,8 +95,8 @@
}, },
"BepInEx.Core": { "BepInEx.Core": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.0.0-be.733", "resolved": "6.0.0-be.735",
"contentHash": "uRzpyUdU3L8Y4ZW+ZnF73orq0E40MjGK6XcPzm24CrrWB5bUshwdrtFQfrwZB6jcZVNVV6PXE92hScEI+Jaoqw==", "contentHash": "FuHm9UCzjSKeiZJc3IF70Fiuqi+FynRn62PwBoOeZcHK3/qm+vl1YwbZyFlmUyf45g+UKxg2Td40iZGx88LVAQ==",
"dependencies": { "dependencies": {
"HarmonyX": "2.10.2", "HarmonyX": "2.10.2",
"MonoMod.Utils": "22.7.31.1", "MonoMod.Utils": "22.7.31.1",
@@ -105,8 +105,8 @@
}, },
"BepInEx.Unity.Common": { "BepInEx.Unity.Common": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.0.0-be.733", "resolved": "6.0.0-be.735",
"contentHash": "KfdiHVSOPnIbDEF7zLPTSXDjKqIEq7SgffqFFKIxOBkCws7LdtSRQsamUcxdD0H8yopcgdlqobIp6t8e4M/k9Q==", "contentHash": "vmK//OBSr+jotqTk//HSdvHtMFTKu+NlQkiEsvr0dZApTVmQM2AgpVMhEAakQPmrSsM6LRJIHCBcLFO1ypfMPQ==",
"dependencies": { "dependencies": {
"AssetRipper.Primitives": "3.1.3", "AssetRipper.Primitives": "3.1.3",
"MonoMod.Utils": "22.7.31.1" "MonoMod.Utils": "22.7.31.1"
@@ -114,8 +114,8 @@
}, },
"Disarm": { "Disarm": {
"type": "Transitive", "type": "Transitive",
"resolved": "2022.1.0-master.34", "resolved": "2022.1.0-master.57",
"contentHash": "sxzTci5eSdl+sFoaGsMZIp7X/eB5ZzplM3CppvD1CWoiZ8rSa43XGLC19G5e8n6mjutNBfN9yL+RER5PCspHFg==" "contentHash": "/dkg7hg8iPBQN4bTV1lMQacarH6fMpgUXhJuo6iI7Wv7YpH7g5F9hJfje7dSMhqG0YlDacLuyWvcph5GzKUXog=="
}, },
"HarmonyX": { "HarmonyX": {
"type": "Transitive", "type": "Transitive",
@@ -317,31 +317,31 @@
}, },
"Samboy063.Cpp2IL.Core": { "Samboy063.Cpp2IL.Core": {
"type": "Transitive", "type": "Transitive",
"resolved": "2022.1.0-pre-release.18", "resolved": "2022.1.0-pre-release.19",
"contentHash": "eX9d1IK05jWaEaeuMAE0L5WYHT7thtxz+aWLL/CAaCzZ0TzRPD+WFTjJ0KQO0YWBVO300CX3GwmPmf7TNO+wUg==", "contentHash": "mAYIrMo0VdOZzh1NS5bZeflg80gtYNY7kZo9q/blEYheUPyLXu5ozQOjX+Bq2yDh40pA+yiE2MXTnN2Is2hjgw==",
"dependencies": { "dependencies": {
"AsmResolver.DotNet": "6.0.0-beta.1", "AsmResolver.DotNet": "6.0.0-beta.1",
"AssetRipper.CIL": "1.1.0", "AssetRipper.CIL": "1.1.2",
"AssetRipper.Gee.External.Capstone": "2.3.2", "AssetRipper.Gee.External.Capstone": "2.3.2",
"Disarm": "2022.1.0-master.34", "Disarm": "2022.1.0-master.57",
"Iced": "1.21.0", "Iced": "1.21.0",
"Samboy063.LibCpp2IL": "2022.1.0-pre-release.18", "Samboy063.LibCpp2IL": "2022.1.0-pre-release.19",
"StableNameDotNet": "0.1.0-pre-release.15" "StableNameDotNet": "0.1.0-pre-release.19"
} }
}, },
"Samboy063.LibCpp2IL": { "Samboy063.LibCpp2IL": {
"type": "Transitive", "type": "Transitive",
"resolved": "2022.1.0-pre-release.18", "resolved": "2022.1.0-pre-release.19",
"contentHash": "9zJdTAeErpwJpYDHYwwI0MAC1OyBEfC1ce7dpAOYRUUYCfeaKVWxnSCcyaoY6HDzIoxPkhbfllbwOe49ZmUYuQ==", "contentHash": "/n8p81ltd38BeNNS2xUNPGMSzxk/UGXr9cRNqG1MaLogzANNNrvCAXqWmNMM3tZctjp7vqTxEA+e4J4ngul8Fg==",
"dependencies": { "dependencies": {
"AssetRipper.Primitives": "3.1.2", "AssetRipper.Primitives": "3.1.3",
"Samboy063.WasmDisassembler": "2022.1.0-pre-release.15" "Samboy063.WasmDisassembler": "2022.1.0-pre-release.19"
} }
}, },
"Samboy063.WasmDisassembler": { "Samboy063.WasmDisassembler": {
"type": "Transitive", "type": "Transitive",
"resolved": "2022.1.0-pre-release.15", "resolved": "2022.1.0-pre-release.19",
"contentHash": "e6qw81SHS+fS7iZ3qfqZBavVarYbkPElNgDCANF6dNFTYq5+hc80am+4FqQDl+ZVNS47bZDZobxIzHhmriCXGg==" "contentHash": "uVQdYm/J6+jJ1xt6GJ3hNhXhciwlX+LmHTPITu9jjZ75T33YJuuTD7pLVYuMymr+4gSVisg7f1wterFSyqJBWA=="
}, },
"SemanticVersioning": { "SemanticVersioning": {
"type": "Transitive", "type": "Transitive",
@@ -350,8 +350,8 @@
}, },
"StableNameDotNet": { "StableNameDotNet": {
"type": "Transitive", "type": "Transitive",
"resolved": "0.1.0-pre-release.15", "resolved": "0.1.0-pre-release.19",
"contentHash": "aIkEOo8V76vE+9CppHpTFLGXalBw6TAl4/tb6vadmS+gHJMshTVehzQv9cJXy4xZDdANV1uGMRaUFZERcDA2xQ==" "contentHash": "5BPWtntv3PXeFIg9CuGW6OM3f5GnwvdQJbzRpufPsistFwFyt1xYW1wSDr+QIdDO7vLndr7iNpWD3FyYp9LL4g=="
}, },
"StyleCop.Analyzers.Unstable": { "StyleCop.Analyzers.Unstable": {
"type": "Transitive", "type": "Transitive",
@@ -903,7 +903,7 @@
"reactor": { "reactor": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"BepInEx.Unity.IL2CPP": "[6.0.0-be.733, )" "BepInEx.Unity.IL2CPP": "[6.0.0-be.735, )"
} }
} }
} }
Reactor.Example/packages.lock.json
+35 -35
View File
@@ -4,9 +4,9 @@
"net6.0": { "net6.0": {
"AmongUs.GameLibs.Steam": { "AmongUs.GameLibs.Steam": {
"type": "Direct", "type": "Direct",
"requested": "[2025.3.25, )", "requested": "[2025.4.15, )",
"resolved": "2025.3.25", "resolved": "2025.4.15",
"contentHash": "2QxQXgZDcQOdAIDXrNLrQ7veEzD6EBzuaRjzSbHptWUPUsuVc3I5Ur3xMkPPwmSGsDHjLuAGE84yRjV6oJxGxw==" "contentHash": "R3RxzHGZOGUJ9nMwrP0cjS6g+sh60QUU506Mo47lh17155enUjH6PtErijihSoU7t3aQpzCIyC67W3XrrHhH4g=="
}, },
"BepInEx.AutoPlugin": { "BepInEx.AutoPlugin": {
"type": "Direct", "type": "Direct",
@@ -16,25 +16,25 @@
}, },
"BepInEx.IL2CPP.MSBuild": { "BepInEx.IL2CPP.MSBuild": {
"type": "Direct", "type": "Direct",
"requested": "[2.0.1, )", "requested": "[2.1.0-rc.1, )",
"resolved": "2.0.1", "resolved": "2.1.0-rc.1",
"contentHash": "hUZjCV0t8dkw/Z/zq4Zl405QP7frBk/LVfMdUmUz+7XOhGd7lYPKrR48A5vbGl2QeHudMxlkXzAr9WM3Duq2SQ==" "contentHash": "WI/7TbJwWl5P4B6UXGtKI1VMe6fA6h3fcbp3ZjJKqOBQ5MJfDMmeVB4fb+RW1tUQdxnlSWV3Ul62PHFyTqp4PA=="
}, },
"BepInEx.Unity.IL2CPP": { "BepInEx.Unity.IL2CPP": {
"type": "Direct", "type": "Direct",
"requested": "[6.0.0-be.733, )", "requested": "[6.0.0-be.735, )",
"resolved": "6.0.0-be.733", "resolved": "6.0.0-be.735",
"contentHash": "lnoGaPHjIdGfEiKtf89knaTdLXe4IUqVLdoYqW8NYhhNqgxa3oNwScjTmuYQpa4Leew3937+slq2WIjvX/DUwQ==", "contentHash": "2+eFJGKMR1GFPeU9wuF+TVrMANIaWIc/6N9e8x4b7b/fNiY9B6vicYNiMDb2deYQpWZtOei+2btnar5dDE5BPg==",
"dependencies": { "dependencies": {
"BepInEx.Core": "6.0.0-be.733", "BepInEx.Core": "6.0.0-be.735",
"BepInEx.Unity.Common": "6.0.0-be.733", "BepInEx.Unity.Common": "6.0.0-be.735",
"HarmonyX": "2.10.2", "HarmonyX": "2.10.2",
"Iced": "1.21.0", "Iced": "1.21.0",
"Il2CppInterop.Generator": "1.4.6-ci.426", "Il2CppInterop.Generator": "1.4.6-ci.426",
"Il2CppInterop.HarmonySupport": "1.4.6-ci.426", "Il2CppInterop.HarmonySupport": "1.4.6-ci.426",
"Il2CppInterop.Runtime": "1.4.6-ci.426", "Il2CppInterop.Runtime": "1.4.6-ci.426",
"MonoMod.RuntimeDetour": "22.7.31.1", "MonoMod.RuntimeDetour": "22.7.31.1",
"Samboy063.Cpp2IL.Core": "2022.1.0-pre-release.18" "Samboy063.Cpp2IL.Core": "2022.1.0-pre-release.19"
} }
}, },
"StyleCop.Analyzers": { "StyleCop.Analyzers": {
@@ -77,8 +77,8 @@
}, },
"AssetRipper.CIL": { "AssetRipper.CIL": {
"type": "Transitive", "type": "Transitive",
"resolved": "1.1.0", "resolved": "1.1.2",
"contentHash": "nSz1cBjgVeKv+esfDtyQGC1mY9b4C4NFStytdoa9DMozDC8uth6930kAsuWZEivj9GqWSqENnaQUGnl23WpmnQ==", "contentHash": "BRPcHORadIzSFkrVOvGkSs54j19mQdXH8dmRTVM51mS8MZLSbTpi9CDPpnWN2IdDsILUrAqbPUFo3zJodYxErw==",
"dependencies": { "dependencies": {
"AsmResolver.DotNet": "6.0.0-beta.1" "AsmResolver.DotNet": "6.0.0-beta.1"
} }
@@ -95,8 +95,8 @@
}, },
"BepInEx.Core": { "BepInEx.Core": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.0.0-be.733", "resolved": "6.0.0-be.735",
"contentHash": "uRzpyUdU3L8Y4ZW+ZnF73orq0E40MjGK6XcPzm24CrrWB5bUshwdrtFQfrwZB6jcZVNVV6PXE92hScEI+Jaoqw==", "contentHash": "FuHm9UCzjSKeiZJc3IF70Fiuqi+FynRn62PwBoOeZcHK3/qm+vl1YwbZyFlmUyf45g+UKxg2Td40iZGx88LVAQ==",
"dependencies": { "dependencies": {
"HarmonyX": "2.10.2", "HarmonyX": "2.10.2",
"MonoMod.Utils": "22.7.31.1", "MonoMod.Utils": "22.7.31.1",
@@ -105,8 +105,8 @@
}, },
"BepInEx.Unity.Common": { "BepInEx.Unity.Common": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.0.0-be.733", "resolved": "6.0.0-be.735",
"contentHash": "KfdiHVSOPnIbDEF7zLPTSXDjKqIEq7SgffqFFKIxOBkCws7LdtSRQsamUcxdD0H8yopcgdlqobIp6t8e4M/k9Q==", "contentHash": "vmK//OBSr+jotqTk//HSdvHtMFTKu+NlQkiEsvr0dZApTVmQM2AgpVMhEAakQPmrSsM6LRJIHCBcLFO1ypfMPQ==",
"dependencies": { "dependencies": {
"AssetRipper.Primitives": "3.1.3", "AssetRipper.Primitives": "3.1.3",
"MonoMod.Utils": "22.7.31.1" "MonoMod.Utils": "22.7.31.1"
@@ -114,8 +114,8 @@
}, },
"Disarm": { "Disarm": {
"type": "Transitive", "type": "Transitive",
"resolved": "2022.1.0-master.34", "resolved": "2022.1.0-master.57",
"contentHash": "sxzTci5eSdl+sFoaGsMZIp7X/eB5ZzplM3CppvD1CWoiZ8rSa43XGLC19G5e8n6mjutNBfN9yL+RER5PCspHFg==" "contentHash": "/dkg7hg8iPBQN4bTV1lMQacarH6fMpgUXhJuo6iI7Wv7YpH7g5F9hJfje7dSMhqG0YlDacLuyWvcph5GzKUXog=="
}, },
"HarmonyX": { "HarmonyX": {
"type": "Transitive", "type": "Transitive",
@@ -317,31 +317,31 @@
}, },
"Samboy063.Cpp2IL.Core": { "Samboy063.Cpp2IL.Core": {
"type": "Transitive", "type": "Transitive",
"resolved": "2022.1.0-pre-release.18", "resolved": "2022.1.0-pre-release.19",
"contentHash": "eX9d1IK05jWaEaeuMAE0L5WYHT7thtxz+aWLL/CAaCzZ0TzRPD+WFTjJ0KQO0YWBVO300CX3GwmPmf7TNO+wUg==", "contentHash": "mAYIrMo0VdOZzh1NS5bZeflg80gtYNY7kZo9q/blEYheUPyLXu5ozQOjX+Bq2yDh40pA+yiE2MXTnN2Is2hjgw==",
"dependencies": { "dependencies": {
"AsmResolver.DotNet": "6.0.0-beta.1", "AsmResolver.DotNet": "6.0.0-beta.1",
"AssetRipper.CIL": "1.1.0", "AssetRipper.CIL": "1.1.2",
"AssetRipper.Gee.External.Capstone": "2.3.2", "AssetRipper.Gee.External.Capstone": "2.3.2",
"Disarm": "2022.1.0-master.34", "Disarm": "2022.1.0-master.57",
"Iced": "1.21.0", "Iced": "1.21.0",
"Samboy063.LibCpp2IL": "2022.1.0-pre-release.18", "Samboy063.LibCpp2IL": "2022.1.0-pre-release.19",
"StableNameDotNet": "0.1.0-pre-release.15" "StableNameDotNet": "0.1.0-pre-release.19"
} }
}, },
"Samboy063.LibCpp2IL": { "Samboy063.LibCpp2IL": {
"type": "Transitive", "type": "Transitive",
"resolved": "2022.1.0-pre-release.18", "resolved": "2022.1.0-pre-release.19",
"contentHash": "9zJdTAeErpwJpYDHYwwI0MAC1OyBEfC1ce7dpAOYRUUYCfeaKVWxnSCcyaoY6HDzIoxPkhbfllbwOe49ZmUYuQ==", "contentHash": "/n8p81ltd38BeNNS2xUNPGMSzxk/UGXr9cRNqG1MaLogzANNNrvCAXqWmNMM3tZctjp7vqTxEA+e4J4ngul8Fg==",
"dependencies": { "dependencies": {
"AssetRipper.Primitives": "3.1.2", "AssetRipper.Primitives": "3.1.3",
"Samboy063.WasmDisassembler": "2022.1.0-pre-release.15" "Samboy063.WasmDisassembler": "2022.1.0-pre-release.19"
} }
}, },
"Samboy063.WasmDisassembler": { "Samboy063.WasmDisassembler": {
"type": "Transitive", "type": "Transitive",
"resolved": "2022.1.0-pre-release.15", "resolved": "2022.1.0-pre-release.19",
"contentHash": "e6qw81SHS+fS7iZ3qfqZBavVarYbkPElNgDCANF6dNFTYq5+hc80am+4FqQDl+ZVNS47bZDZobxIzHhmriCXGg==" "contentHash": "uVQdYm/J6+jJ1xt6GJ3hNhXhciwlX+LmHTPITu9jjZ75T33YJuuTD7pLVYuMymr+4gSVisg7f1wterFSyqJBWA=="
}, },
"SemanticVersioning": { "SemanticVersioning": {
"type": "Transitive", "type": "Transitive",
@@ -350,8 +350,8 @@
}, },
"StableNameDotNet": { "StableNameDotNet": {
"type": "Transitive", "type": "Transitive",
"resolved": "0.1.0-pre-release.15", "resolved": "0.1.0-pre-release.19",
"contentHash": "aIkEOo8V76vE+9CppHpTFLGXalBw6TAl4/tb6vadmS+gHJMshTVehzQv9cJXy4xZDdANV1uGMRaUFZERcDA2xQ==" "contentHash": "5BPWtntv3PXeFIg9CuGW6OM3f5GnwvdQJbzRpufPsistFwFyt1xYW1wSDr+QIdDO7vLndr7iNpWD3FyYp9LL4g=="
}, },
"StyleCop.Analyzers.Unstable": { "StyleCop.Analyzers.Unstable": {
"type": "Transitive", "type": "Transitive",
@@ -903,7 +903,7 @@
"reactor": { "reactor": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"BepInEx.Unity.IL2CPP": "[6.0.0-be.733, )" "BepInEx.Unity.IL2CPP": "[6.0.0-be.735, )"
} }
} }
} }
Reactor/GlobalUsings.cs
+1 -1
View File
@@ -1 +1 @@
global using AmongUsClient_CoFindGame = AmongUsClient._CoFindGame_d__6; global using AmongUsClient_CoFindGame = AmongUsClient._CoFindGame_d__54;
Reactor/Networking/Attributes/MethodRpcAttribute.cs
+3 -2
View File
@@ -36,7 +36,8 @@ public sealed class MethodRpcAttribute : Attribute
/// <summary> /// <summary>
/// Gets or sets a value indicating whether the rpc should be sent immediately. /// Gets or sets a value indicating whether the rpc should be sent immediately.
/// </summary> /// </summary>
public bool SendImmediately { get; set; } [Obsolete("Non-immediate RPCs were removed in 2025.5.20. All RPCs are immediate. This property will be removed in a future version.")]
public bool SendImmediately { get; set; } = true;
/// <summary> /// <summary>
/// Initializes a new instance of the <see cref="MethodRpcAttribute"/> class. /// Initializes a new instance of the <see cref="MethodRpcAttribute"/> class.
@@ -71,7 +72,7 @@ public sealed class MethodRpcAttribute : Attribute
try try
{ {
var customRpc = new MethodRpc(plugin, method, attribute.Id, attribute.SendOption, attribute.LocalHandling, attribute.SendImmediately); var customRpc = new MethodRpc(plugin, method, attribute.Id, attribute.SendOption, attribute.LocalHandling);
PluginSingleton<ReactorPlugin>.Instance.CustomRpcManager.Register(customRpc); PluginSingleton<ReactorPlugin>.Instance.CustomRpcManager.Register(customRpc);
} }
catch (Exception e) catch (Exception e)
Reactor/Networking/Patches/ClientPatches.cs
+20 -40
View File
@@ -1,6 +1,7 @@
using System; using System;
using System.Linq; using System.Linq;
using AmongUs.Data; using AmongUs.Data;
using AmongUs.InnerNet.GameDataMessages;
using BepInEx.Unity.IL2CPP.Utils; using BepInEx.Unity.IL2CPP.Utils;
using HarmonyLib; using HarmonyLib;
using Hazel; using Hazel;
@@ -29,10 +30,10 @@ internal static class ClientPatches
} }
} }
[HarmonyPatch(typeof(InnerNetClient._HandleGameDataInner_d__41), nameof(InnerNetClient._HandleGameDataInner_d__41.MoveNext))] [HarmonyPatch(typeof(InnerNetClient._HandleGameDataInner_d__165), nameof(InnerNetClient._HandleGameDataInner_d__165.MoveNext))]
public static class HandleGameDataInnerPatch public static class HandleGameDataInnerPatch
{ {
public static bool Prefix(InnerNetClient._HandleGameDataInner_d__41 __instance, ref bool __result) public static bool Prefix(InnerNetClient._HandleGameDataInner_d__165 __instance, ref bool __result)
{ {
var innerNetClient = __instance.__4__this; var innerNetClient = __instance.__4__this;
var reader = __instance.reader; var reader = __instance.reader;
@@ -63,7 +64,7 @@ internal static class ClientPatches
return false; return false;
} }
if (reader.Tag == InnerNetClient.SceneChangeFlag && ReactorConnection.Instance?.Syncer == Syncer.Host) if (reader.Tag == (byte) GameDataTypes.SceneChangeFlag && ReactorConnection.Instance?.Syncer == Syncer.Host)
{ {
var clientId = reader.ReadPackedInt32(); var clientId = reader.ReadPackedInt32();
var clientData = innerNetClient.FindClientById(clientId); var clientData = innerNetClient.FindClientById(clientId);
@@ -126,7 +127,7 @@ internal static class ClientPatches
: chatText; : chatText;
// Write SendChat directly instead of using RpcSendChat so we can call AddChat ourselves // Write SendChat directly instead of using RpcSendChat so we can call AddChat ourselves
var messageWriter = AmongUsClient.Instance.StartRpc(PlayerControl.LocalPlayer.NetId, (byte) RpcCalls.SendChat); var messageWriter = AmongUsClient.Instance.StartRpcImmediately(PlayerControl.LocalPlayer.NetId, (byte) RpcCalls.SendChat, SendOption.Reliable);
messageWriter.Write(truncatedChatText); messageWriter.Write(truncatedChatText);
messageWriter.EndMessage(); messageWriter.EndMessage();
} }
@@ -161,10 +162,10 @@ internal static class ClientPatches
} }
} }
[HarmonyPatch(typeof(InnerNetClient._CoSendSceneChange_d__32), nameof(InnerNetClient._CoSendSceneChange_d__32.MoveNext))] [HarmonyPatch(typeof(InnerNetClient._CoSendSceneChange_d__156), nameof(InnerNetClient._CoSendSceneChange_d__156.MoveNext))]
public static class CoSendSceneChangePatch public static class CoSendSceneChangePatch
{ {
public static bool Prefix(InnerNetClient._CoSendSceneChange_d__32 __instance, ref bool __result) public static bool Prefix(InnerNetClient._CoSendSceneChange_d__156 __instance, ref bool __result)
{ {
if (ReactorConnection.Instance!.Syncer != Syncer.Host) return true; if (ReactorConnection.Instance!.Syncer != Syncer.Host) return true;
@@ -181,7 +182,7 @@ internal static class ClientPatches
var writer = MessageWriter.Get(SendOption.Reliable); var writer = MessageWriter.Get(SendOption.Reliable);
writer.StartMessage(Tags.GameData); writer.StartMessage(Tags.GameData);
writer.Write(innerNetClient.GameId); writer.Write(innerNetClient.GameId);
writer.StartMessage(InnerNetClient.SceneChangeFlag); writer.StartMessage((byte) GameDataTypes.SceneChangeFlag);
writer.WritePacked(innerNetClient.ClientId); writer.WritePacked(innerNetClient.ClientId);
writer.Write(__instance.sceneName); writer.Write(__instance.sceneName);
@@ -209,10 +210,10 @@ internal static class ClientPatches
} }
} }
[HarmonyPatch(typeof(InnerNetClient._CoHandleSpawn_d__42), nameof(InnerNetClient._CoHandleSpawn_d__42.MoveNext))] [HarmonyPatch(typeof(InnerNetClient._CoHandleSpawn_d__166), nameof(InnerNetClient._CoHandleSpawn_d__166.MoveNext))]
public static class CoHandleSpawnPatch public static class CoHandleSpawnPatch
{ {
public static void Postfix(InnerNetClient._CoHandleSpawn_d__42 __instance, bool __result) public static void Postfix(InnerNetClient._CoHandleSpawn_d__166 __instance, bool __result)
{ {
if (ReactorConnection.Instance!.Syncer != Syncer.Host) return; if (ReactorConnection.Instance!.Syncer != Syncer.Host) return;
@@ -236,47 +237,23 @@ internal static class ClientPatches
} }
} }
[HarmonyPatch(typeof(InnerNetClient), nameof(InnerNetClient.WriteSpawnMessage))] [HarmonyPatch(typeof(SpawnGameDataMessage), nameof(SpawnGameDataMessage.SerializeValues))]
public static class WriteSpawnMessagePatch public static class SpawnGameDataMessagePatch
{ {
public static bool Prefix(InnerNetClient __instance, InnerNetObject netObjParent, int ownerId, SpawnFlags flags, MessageWriter msg) public static void Postfix(SpawnGameDataMessage __instance, MessageWriter msg)
{ {
if (ReactorConnection.Instance!.Syncer != Syncer.Host) return true; if (ReactorConnection.Instance!.Syncer != Syncer.Host)
msg.StartMessage(4);
msg.WritePacked(netObjParent.SpawnId);
msg.WritePacked(ownerId);
msg.Write((byte) flags);
InnerNetObject[] componentsInChildren = netObjParent.GetComponentsInChildren<InnerNetObject>();
msg.WritePacked(componentsInChildren.Length);
foreach (var innerNetObject in componentsInChildren)
{ {
innerNetObject.OwnerId = ownerId; return;
innerNetObject.SpawnFlags = flags;
if (innerNetObject.NetId == 0)
{
innerNetObject.NetId = __instance.NetIdCnt++;
__instance.allObjects.Add(innerNetObject);
__instance.allObjectsFast.Add(innerNetObject.NetId, innerNetObject);
}
msg.WritePacked(innerNetObject.NetId);
msg.StartMessage(1);
innerNetObject.Serialize(msg, initialState: true);
msg.EndMessage();
} }
// PATCH - Inject ReactorHandshakeS2C // PATCH - Inject ReactorHandshakeS2C
if (__instance.ClientId != ownerId && IL2CPP.il2cpp_object_get_class(netObjParent.Pointer) == Il2CppClassPointerStore<PlayerControl>.NativeClassPtr) if (AmongUsClient.Instance.ClientId != __instance.ownerId && __instance.NetObjectType == Il2CppType.Of<PlayerControl>())
{ {
Debug("Injecting ReactorHandshakeS2C to WriteSpawnMessage"); Debug("Injecting ReactorHandshakeS2C to WriteSpawnMessage");
ReactorHeader.Write(msg); ReactorHeader.Write(msg);
ModdedHandshakeS2C.Serialize(msg, "Among Us", Application.version, 0); // TODO ModdedHandshakeS2C.Serialize(msg, "Among Us", Application.version, 0); // TODO
} }
msg.EndMessage();
return false;
} }
} }
@@ -285,7 +262,10 @@ 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.NetworkMode == NetworkModes.FreePlay) return true; if (__instance.NetworkMode == NetworkModes.FreePlay)
{
return true;
}
var isFirst = false; var isFirst = false;
Reactor/Networking/Patches/HttpPatches.cs
+12 -4
View File
@@ -54,8 +54,12 @@ internal static class HttpPatches
public static void Prefix(UnityWebRequest __instance) public static void Prefix(UnityWebRequest __instance)
{ {
var path = __instance.uri.AbsolutePath; // new Uri() is necessary because uri property got stripped.
if (path == "/api/games") var path = new Uri(__instance.url).AbsolutePath;
// Public lobby menu uses /api/games/filtered, code requests use /api/games/code,
// creating a game uses /api/games.
// So we need to match everything that contains /api/games
if (path.Contains("/api/games"))
{ {
Debug($"{__instance.method} {path}"); Debug($"{__instance.method} {path}");
__instance.SetRequestHeader("Client-Mods", BuildHeader()); __instance.SetRequestHeader("Client-Mods", BuildHeader());
@@ -64,8 +68,12 @@ internal static class HttpPatches
public static void Postfix(UnityWebRequest __instance, UnityWebRequestAsyncOperation __result) public static void Postfix(UnityWebRequest __instance, UnityWebRequestAsyncOperation __result)
{ {
var path = __instance.uri.AbsolutePath; // new Uri() is necessary because uri property got stripped.
if (path == "/api/games") var path = new Uri(__instance.url).AbsolutePath;
// Public lobby menu uses /api/games/filtered, code requests use /api/games/code,
// creating a game uses /api/games.
// So we need to match everything that contains /api/games
if (path.Contains("/api/games"))
{ {
__result.add_completed((Action<AsyncOperation>) (_ => __result.add_completed((Action<AsyncOperation>) (_ =>
{ {
Reactor/Networking/Patches/ReactorConnection.cs
+7 -3
View File
@@ -23,12 +23,16 @@ public class ReactorConnection
[HarmonyPatch] [HarmonyPatch]
private static class Patches private static class Patches
{ {
[HarmonyPatch(typeof(InnerNetClient), nameof(InnerNetClient.CoConnect), typeof(string))] // CoConnect(string) was inlined, so we patch the MoveNext method instead.
[HarmonyPatch(typeof(InnerNetClient._CoConnect_d__65), nameof(InnerNetClient._CoConnect_d__65.MoveNext))]
[HarmonyPrefix] [HarmonyPrefix]
public static void CoConnect() public static void CoConnect()
{ {
Debug("New ReactorConnection created"); if (Instance == null)
Instance = new ReactorConnection(); {
Debug("New ReactorConnection created");
Instance = new ReactorConnection();
}
} }
[HarmonyPatch(typeof(InnerNetClient), nameof(InnerNetClient.DisconnectInternal))] [HarmonyPatch(typeof(InnerNetClient), nameof(InnerNetClient.DisconnectInternal))]
Reactor/Networking/Rpc/MethodRpc.cs
+20 -5
View File
@@ -32,13 +32,11 @@ public class MethodRpc : UnsafeCustomRpc
/// <param name="id">The id of the rpc.</param> /// <param name="id">The id of the rpc.</param>
/// <param name="option">The send option of the rpc.</param> /// <param name="option">The send option of the rpc.</param>
/// <param name="localHandling">The local handling method of the rpc.</param> /// <param name="localHandling">The local handling method of the rpc.</param>
/// <param name="sendImmediately">The value indicating whether the rpc should be sent immediately.</param> public MethodRpc(BasePlugin plugin, MethodInfo method, uint id, SendOption option, RpcLocalHandling localHandling) : base(plugin, id)
public MethodRpc(BasePlugin plugin, MethodInfo method, uint id, SendOption option, RpcLocalHandling localHandling, bool sendImmediately) : base(plugin, id)
{ {
Method = method; Method = method;
LocalHandling = localHandling; LocalHandling = localHandling;
SendOption = option; SendOption = option;
SendImmediately = sendImmediately;
var parameters = method.GetParameters(); var parameters = method.GetParameters();
@@ -71,6 +69,22 @@ public class MethodRpc : UnsafeCustomRpc
_handle = Hook(method, parameters, method.IsStatic); _handle = Hook(method, parameters, method.IsStatic);
} }
/// <summary>
/// Initializes a new instance of the <see cref="MethodRpc"/> class.
/// </summary>
/// <param name="plugin">The plugin that the rpc is attached to.</param>
/// <param name="method">The method of the method rpc.</param>
/// <param name="id">The id of the rpc.</param>
/// <param name="option">The send option of the rpc.</param>
/// <param name="localHandling">The local handling method of the rpc.</param>
/// <param name="sendImmediately">The value indicating whether the rpc should be sent immediately.</param>
[Obsolete("Non-immediate RPCs were removed in 2025.5.20. All RPCs are immediate. Remove sendImmediately from the parameter list.")]
public MethodRpc(BasePlugin plugin, MethodInfo method, uint id, SendOption option, RpcLocalHandling localHandling, bool sendImmediately)
: this(plugin, method, id, option, localHandling)
{
SendImmediately = sendImmediately;
}
/// <summary> /// <summary>
/// Gets the method of the method rpc. /// Gets the method of the method rpc.
/// </summary> /// </summary>
@@ -91,7 +105,8 @@ public class MethodRpc : UnsafeCustomRpc
/// <summary> /// <summary>
/// Gets a value indicating whether the method rpc should be sent immediately. /// Gets a value indicating whether the method rpc should be sent immediately.
/// </summary> /// </summary>
public bool SendImmediately { get; } [Obsolete("Non-immediate RPCs were removed in 2025.5.20. All RPCs are immediate. This property will be removed in a future version.")]
public bool SendImmediately { get; } = true;
/// <inheritdoc /> /// <inheritdoc />
public override void UnsafeWrite(MessageWriter writer, object? data) public override void UnsafeWrite(MessageWriter writer, object? data)
@@ -134,7 +149,7 @@ public class MethodRpc : UnsafeCustomRpc
/// <param name="args">The arguments to serialize and send.</param> /// <param name="args">The arguments to serialize and send.</param>
public void Send(InnerNetObject innerNetObject, object[] args) public void Send(InnerNetObject innerNetObject, object[] args)
{ {
UnsafeSend(innerNetObject, args, SendImmediately); UnsafeSend(innerNetObject, args);
} }
private static readonly MethodInfo _sendMethod = AccessTools.Method(typeof(MethodRpc), nameof(Send)); private static readonly MethodInfo _sendMethod = AccessTools.Method(typeof(MethodRpc), nameof(Send));
Reactor/Networking/Rpc/UnsafeCustomRpc.cs
+10 -12
View File
@@ -108,11 +108,16 @@ public abstract class UnsafeCustomRpc
UnsafeHandle(innerNetObject, data); UnsafeHandle(innerNetObject, data);
} }
var writer = immediately switch if (immediately == false)
{ {
false => AmongUsClient.Instance.StartRpc(innerNetObject.NetId, CustomRpcManager.CallId, SendOption), Warning("Non-immediate RPCs were removed in 2025.5.20! Reactor will now always send immediately!");
true => AmongUsClient.Instance.StartRpcImmediately(innerNetObject.NetId, CustomRpcManager.CallId, SendOption, targetClientId), }
};
var writer = AmongUsClient.Instance.StartRpcImmediately(
innerNetObject.NetId,
CustomRpcManager.CallId,
SendOption,
targetClientId);
writer.Write(Mod); writer.Write(Mod);
writer.WritePacked(Id); writer.WritePacked(Id);
@@ -127,14 +132,7 @@ public abstract class UnsafeCustomRpc
AckCallbacks.TryAdd(writer, ackCallback); AckCallbacks.TryAdd(writer, ackCallback);
} }
if (immediately) AmongUsClient.Instance.FinishRpcImmediately(writer);
{
AmongUsClient.Instance.FinishRpcImmediately(writer);
}
else
{
writer.EndMessage();
}
if (LocalHandling == RpcLocalHandling.After) if (LocalHandling == RpcLocalHandling.After)
{ {
Reactor/Patches/Miscellaneous/CustomServersPatch.cs
+3 -3
View File
@@ -30,15 +30,15 @@ internal static class CustomServersPatch
return false; return false;
} }
[HarmonyPatch(typeof(AmongUsClient._CoJoinOnlinePublicGame_d__1), nameof(AmongUsClient._CoJoinOnlinePublicGame_d__1.MoveNext))] [HarmonyPatch(typeof(AmongUsClient._CoJoinOnlinePublicGame_d__49), nameof(AmongUsClient._CoJoinOnlinePublicGame_d__49.MoveNext))]
[HarmonyPrefix] [HarmonyPrefix]
public static void EnableUdpMatchmaking(AmongUsClient._CoJoinOnlinePublicGame_d__1 __instance) public static void EnableUdpMatchmaking(AmongUsClient._CoJoinOnlinePublicGame_d__49 __instance)
{ {
// Skip to state 1 which just calls CoJoinOnlineGameDirect // Skip to state 1 which just calls CoJoinOnlineGameDirect
if (__instance.__1__state == 0 && !ServerManager.Instance.IsHttp) if (__instance.__1__state == 0 && !ServerManager.Instance.IsHttp)
{ {
__instance.__1__state = 1; __instance.__1__state = 1;
__instance.__8__1 = new AmongUsClient.__c__DisplayClass1_0 __instance.__8__1 = new AmongUsClient.__c__DisplayClass49_0
{ {
matchmakerToken = string.Empty, matchmakerToken = string.Empty,
}; };
Reactor/Utilities/CanvasUtilities.cs
+1 -2
View File
@@ -1,4 +1,3 @@
using System;
using UnityEngine; using UnityEngine;
using UnityEngine.EventSystems; using UnityEngine.EventSystems;
using UnityEngine.UI; using UnityEngine.UI;
@@ -52,6 +51,6 @@ public static class CanvasUtilities
/// <returns>An empty texture of specified size.</returns> /// <returns>An empty texture of specified size.</returns>
public static Texture2D CreateEmptyTexture(int width = 0, int height = 0) public static Texture2D CreateEmptyTexture(int width = 0, int height = 0)
{ {
return new Texture2D(width, height, TextureFormat.RGBA32, Texture.GenerateAllMips, false, IntPtr.Zero); return new Texture2D(width, height, TextureFormat.RGBA32, Texture.GenerateAllMips, false);
} }
} }
Reactor/packages.lock.json
+34 -34
View File
@@ -4,9 +4,9 @@
"net6.0": { "net6.0": {
"AmongUs.GameLibs.Steam": { "AmongUs.GameLibs.Steam": {
"type": "Direct", "type": "Direct",
"requested": "[2025.3.25, )", "requested": "[2025.4.15, )",
"resolved": "2025.3.25", "resolved": "2025.4.15",
"contentHash": "2QxQXgZDcQOdAIDXrNLrQ7veEzD6EBzuaRjzSbHptWUPUsuVc3I5Ur3xMkPPwmSGsDHjLuAGE84yRjV6oJxGxw==" "contentHash": "R3RxzHGZOGUJ9nMwrP0cjS6g+sh60QUU506Mo47lh17155enUjH6PtErijihSoU7t3aQpzCIyC67W3XrrHhH4g=="
}, },
"BepInEx.AutoPlugin": { "BepInEx.AutoPlugin": {
"type": "Direct", "type": "Direct",
@@ -16,25 +16,25 @@
}, },
"BepInEx.IL2CPP.MSBuild": { "BepInEx.IL2CPP.MSBuild": {
"type": "Direct", "type": "Direct",
"requested": "[2.0.1, )", "requested": "[2.1.0-rc.1, )",
"resolved": "2.0.1", "resolved": "2.1.0-rc.1",
"contentHash": "hUZjCV0t8dkw/Z/zq4Zl405QP7frBk/LVfMdUmUz+7XOhGd7lYPKrR48A5vbGl2QeHudMxlkXzAr9WM3Duq2SQ==" "contentHash": "WI/7TbJwWl5P4B6UXGtKI1VMe6fA6h3fcbp3ZjJKqOBQ5MJfDMmeVB4fb+RW1tUQdxnlSWV3Ul62PHFyTqp4PA=="
}, },
"BepInEx.Unity.IL2CPP": { "BepInEx.Unity.IL2CPP": {
"type": "Direct", "type": "Direct",
"requested": "[6.0.0-be.733, )", "requested": "[6.0.0-be.735, )",
"resolved": "6.0.0-be.733", "resolved": "6.0.0-be.735",
"contentHash": "lnoGaPHjIdGfEiKtf89knaTdLXe4IUqVLdoYqW8NYhhNqgxa3oNwScjTmuYQpa4Leew3937+slq2WIjvX/DUwQ==", "contentHash": "2+eFJGKMR1GFPeU9wuF+TVrMANIaWIc/6N9e8x4b7b/fNiY9B6vicYNiMDb2deYQpWZtOei+2btnar5dDE5BPg==",
"dependencies": { "dependencies": {
"BepInEx.Core": "6.0.0-be.733", "BepInEx.Core": "6.0.0-be.735",
"BepInEx.Unity.Common": "6.0.0-be.733", "BepInEx.Unity.Common": "6.0.0-be.735",
"HarmonyX": "2.10.2", "HarmonyX": "2.10.2",
"Iced": "1.21.0", "Iced": "1.21.0",
"Il2CppInterop.Generator": "1.4.6-ci.426", "Il2CppInterop.Generator": "1.4.6-ci.426",
"Il2CppInterop.HarmonySupport": "1.4.6-ci.426", "Il2CppInterop.HarmonySupport": "1.4.6-ci.426",
"Il2CppInterop.Runtime": "1.4.6-ci.426", "Il2CppInterop.Runtime": "1.4.6-ci.426",
"MonoMod.RuntimeDetour": "22.7.31.1", "MonoMod.RuntimeDetour": "22.7.31.1",
"Samboy063.Cpp2IL.Core": "2022.1.0-pre-release.18" "Samboy063.Cpp2IL.Core": "2022.1.0-pre-release.19"
} }
}, },
"StyleCop.Analyzers": { "StyleCop.Analyzers": {
@@ -77,8 +77,8 @@
}, },
"AssetRipper.CIL": { "AssetRipper.CIL": {
"type": "Transitive", "type": "Transitive",
"resolved": "1.1.0", "resolved": "1.1.2",
"contentHash": "nSz1cBjgVeKv+esfDtyQGC1mY9b4C4NFStytdoa9DMozDC8uth6930kAsuWZEivj9GqWSqENnaQUGnl23WpmnQ==", "contentHash": "BRPcHORadIzSFkrVOvGkSs54j19mQdXH8dmRTVM51mS8MZLSbTpi9CDPpnWN2IdDsILUrAqbPUFo3zJodYxErw==",
"dependencies": { "dependencies": {
"AsmResolver.DotNet": "6.0.0-beta.1" "AsmResolver.DotNet": "6.0.0-beta.1"
} }
@@ -95,8 +95,8 @@
}, },
"BepInEx.Core": { "BepInEx.Core": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.0.0-be.733", "resolved": "6.0.0-be.735",
"contentHash": "uRzpyUdU3L8Y4ZW+ZnF73orq0E40MjGK6XcPzm24CrrWB5bUshwdrtFQfrwZB6jcZVNVV6PXE92hScEI+Jaoqw==", "contentHash": "FuHm9UCzjSKeiZJc3IF70Fiuqi+FynRn62PwBoOeZcHK3/qm+vl1YwbZyFlmUyf45g+UKxg2Td40iZGx88LVAQ==",
"dependencies": { "dependencies": {
"HarmonyX": "2.10.2", "HarmonyX": "2.10.2",
"MonoMod.Utils": "22.7.31.1", "MonoMod.Utils": "22.7.31.1",
@@ -105,8 +105,8 @@
}, },
"BepInEx.Unity.Common": { "BepInEx.Unity.Common": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.0.0-be.733", "resolved": "6.0.0-be.735",
"contentHash": "KfdiHVSOPnIbDEF7zLPTSXDjKqIEq7SgffqFFKIxOBkCws7LdtSRQsamUcxdD0H8yopcgdlqobIp6t8e4M/k9Q==", "contentHash": "vmK//OBSr+jotqTk//HSdvHtMFTKu+NlQkiEsvr0dZApTVmQM2AgpVMhEAakQPmrSsM6LRJIHCBcLFO1ypfMPQ==",
"dependencies": { "dependencies": {
"AssetRipper.Primitives": "3.1.3", "AssetRipper.Primitives": "3.1.3",
"MonoMod.Utils": "22.7.31.1" "MonoMod.Utils": "22.7.31.1"
@@ -114,8 +114,8 @@
}, },
"Disarm": { "Disarm": {
"type": "Transitive", "type": "Transitive",
"resolved": "2022.1.0-master.34", "resolved": "2022.1.0-master.57",
"contentHash": "sxzTci5eSdl+sFoaGsMZIp7X/eB5ZzplM3CppvD1CWoiZ8rSa43XGLC19G5e8n6mjutNBfN9yL+RER5PCspHFg==" "contentHash": "/dkg7hg8iPBQN4bTV1lMQacarH6fMpgUXhJuo6iI7Wv7YpH7g5F9hJfje7dSMhqG0YlDacLuyWvcph5GzKUXog=="
}, },
"HarmonyX": { "HarmonyX": {
"type": "Transitive", "type": "Transitive",
@@ -317,31 +317,31 @@
}, },
"Samboy063.Cpp2IL.Core": { "Samboy063.Cpp2IL.Core": {
"type": "Transitive", "type": "Transitive",
"resolved": "2022.1.0-pre-release.18", "resolved": "2022.1.0-pre-release.19",
"contentHash": "eX9d1IK05jWaEaeuMAE0L5WYHT7thtxz+aWLL/CAaCzZ0TzRPD+WFTjJ0KQO0YWBVO300CX3GwmPmf7TNO+wUg==", "contentHash": "mAYIrMo0VdOZzh1NS5bZeflg80gtYNY7kZo9q/blEYheUPyLXu5ozQOjX+Bq2yDh40pA+yiE2MXTnN2Is2hjgw==",
"dependencies": { "dependencies": {
"AsmResolver.DotNet": "6.0.0-beta.1", "AsmResolver.DotNet": "6.0.0-beta.1",
"AssetRipper.CIL": "1.1.0", "AssetRipper.CIL": "1.1.2",
"AssetRipper.Gee.External.Capstone": "2.3.2", "AssetRipper.Gee.External.Capstone": "2.3.2",
"Disarm": "2022.1.0-master.34", "Disarm": "2022.1.0-master.57",
"Iced": "1.21.0", "Iced": "1.21.0",
"Samboy063.LibCpp2IL": "2022.1.0-pre-release.18", "Samboy063.LibCpp2IL": "2022.1.0-pre-release.19",
"StableNameDotNet": "0.1.0-pre-release.15" "StableNameDotNet": "0.1.0-pre-release.19"
} }
}, },
"Samboy063.LibCpp2IL": { "Samboy063.LibCpp2IL": {
"type": "Transitive", "type": "Transitive",
"resolved": "2022.1.0-pre-release.18", "resolved": "2022.1.0-pre-release.19",
"contentHash": "9zJdTAeErpwJpYDHYwwI0MAC1OyBEfC1ce7dpAOYRUUYCfeaKVWxnSCcyaoY6HDzIoxPkhbfllbwOe49ZmUYuQ==", "contentHash": "/n8p81ltd38BeNNS2xUNPGMSzxk/UGXr9cRNqG1MaLogzANNNrvCAXqWmNMM3tZctjp7vqTxEA+e4J4ngul8Fg==",
"dependencies": { "dependencies": {
"AssetRipper.Primitives": "3.1.2", "AssetRipper.Primitives": "3.1.3",
"Samboy063.WasmDisassembler": "2022.1.0-pre-release.15" "Samboy063.WasmDisassembler": "2022.1.0-pre-release.19"
} }
}, },
"Samboy063.WasmDisassembler": { "Samboy063.WasmDisassembler": {
"type": "Transitive", "type": "Transitive",
"resolved": "2022.1.0-pre-release.15", "resolved": "2022.1.0-pre-release.19",
"contentHash": "e6qw81SHS+fS7iZ3qfqZBavVarYbkPElNgDCANF6dNFTYq5+hc80am+4FqQDl+ZVNS47bZDZobxIzHhmriCXGg==" "contentHash": "uVQdYm/J6+jJ1xt6GJ3hNhXhciwlX+LmHTPITu9jjZ75T33YJuuTD7pLVYuMymr+4gSVisg7f1wterFSyqJBWA=="
}, },
"SemanticVersioning": { "SemanticVersioning": {
"type": "Transitive", "type": "Transitive",
@@ -350,8 +350,8 @@
}, },
"StableNameDotNet": { "StableNameDotNet": {
"type": "Transitive", "type": "Transitive",
"resolved": "0.1.0-pre-release.15", "resolved": "0.1.0-pre-release.19",
"contentHash": "aIkEOo8V76vE+9CppHpTFLGXalBw6TAl4/tb6vadmS+gHJMshTVehzQv9cJXy4xZDdANV1uGMRaUFZERcDA2xQ==" "contentHash": "5BPWtntv3PXeFIg9CuGW6OM3f5GnwvdQJbzRpufPsistFwFyt1xYW1wSDr+QIdDO7vLndr7iNpWD3FyYp9LL4g=="
}, },
"StyleCop.Analyzers.Unstable": { "StyleCop.Analyzers.Unstable": {
"type": "Transitive", "type": "Transitive",