From 89146cea4fffbac35b1042f7ba44c5aa8406dba2 Mon Sep 17 00:00:00 2001 From: js6pak Date: Thu, 15 Jun 2023 19:17:16 +0200 Subject: [PATCH] Update to 2023.6.13 --- AmongUs.props | 4 +- Directory.Build.props | 2 +- Reactor.Benchmarks/packages.lock.json | 165 ++++++++++------- Reactor.Debugger/packages.lock.json | 166 ++++++++++++------ Reactor.Example/packages.lock.json | 166 ++++++++++++------ .../Patches/Miscellaneous/FreeNamePatch.cs | 6 +- Reactor/Patches/ReactorVersionShower.cs | 45 +++-- Reactor/packages.lock.json | 164 +++++++++++------ nuget.config | 1 + 9 files changed, 465 insertions(+), 254 deletions(-) diff --git a/AmongUs.props b/AmongUs.props index fec8650..16ac51a 100644 --- a/AmongUs.props +++ b/AmongUs.props @@ -1,7 +1,7 @@ - - + + diff --git a/Directory.Build.props b/Directory.Build.props index a6738ca..9d7d94f 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -8,7 +8,7 @@ true - 2.1.0 + 2.2.0 dev NuclearPowered diff --git a/Reactor.Benchmarks/packages.lock.json b/Reactor.Benchmarks/packages.lock.json index 7d3bdbe..bce5d4f 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.12.8, )", - "resolved": "2022.12.8", - "contentHash": "IJsIi89xUYRvA54YtNVEJjf25hhF3LWzkNBslKCNDUpL1aQ/PhNyO4j18pO71DCgW/qr1P1j8+CwByuBLsInNA==" + "requested": "[2023.6.13, )", + "resolved": "2023.6.13", + "contentHash": "460jLKEZoVY33SlIYEgnV5zE/wEAb5fTxY32ddAV5JI03YmoK+/6D3A6yjpu1HlU/I99Y9s21aKXZY0xan2eSQ==" }, "BenchmarkDotNet": { "type": "Direct", @@ -42,19 +42,19 @@ }, "BepInEx.Unity.IL2CPP": { "type": "Direct", - "requested": "[6.0.0-be.663, )", - "resolved": "6.0.0-be.663", - "contentHash": "J+mZ4svyTt4ZYbUoPwpVtF5QCGfzC42VuYJ7z1K6Qt8YlBEZx3rnmUmaEnoJIqN5wN7BSnQgzEmrRfdbrgtTnA==", + "requested": "[6.0.0-be.670, )", + "resolved": "6.0.0-be.670", + "contentHash": "dhzCrem44oFxhOICCJ9eoSUbaKSsGGyBUfUQW9WFljCwIK8o4Cx5BiuXAkYoRjr2DhpzLpPDyPZDRImUqH0bwA==", "dependencies": { - "BepInEx.Core": "6.0.0-be.663", - "BepInEx.Unity.Common": "6.0.0-be.663", + "BepInEx.Core": "6.0.0-be.670", + "BepInEx.Unity.Common": "6.0.0-be.670", "HarmonyX": "2.10.1", - "Iced": "1.17.0", - "Il2CppInterop.Generator": "1.4.0", - "Il2CppInterop.HarmonySupport": "1.4.0", - "Il2CppInterop.Runtime": "1.4.0", + "Iced": "1.18.0", + "Il2CppInterop.Generator": "1.4.6-ci.354", + "Il2CppInterop.HarmonySupport": "1.4.6-ci.354", + "Il2CppInterop.Runtime": "1.4.6-ci.354", "MonoMod.RuntimeDetour": "22.5.1.1", - "Samboy063.Cpp2IL.Core": "2022.0.7.2" + "Samboy063.Cpp2IL.Core": "2022.1.0-development.866" } }, "StyleCop.Analyzers": { @@ -66,10 +66,40 @@ "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": { "type": "Transitive", - "resolved": "1.2.1", - "contentHash": "knQ/W1YwTZS2AbdaZh+nhyyBEZQPQDcahhSOnh88i+cdg4/FEoFJiCwaavgFvCMNuUeHTbcZc4qttF8WQ8xLIA==" + "resolved": "1.3.1", + "contentHash": "/1D18NOpqm7rS7+qVUbAReVMNWwgDuYpsnf0RkX1Aah/I0a0irqldoFJ+Kku7YdbSm0zqD+Z6iYUGKoP3GwTNQ==" }, "BenchmarkDotNet.Annotations": { "type": "Transitive", @@ -78,8 +108,8 @@ }, "BepInEx.Core": { "type": "Transitive", - "resolved": "6.0.0-be.663", - "contentHash": "yTlqwieyV3FCzSo4tfiIlS7pTqVtEZwrwHnograkWO4loECeYpShcpoCoxnhQ0vkWsnWGThMK7NodHhjZ+jQDA==", + "resolved": "6.0.0-be.670", + "contentHash": "7CbbMNZfb+1VHjFKh/ErFBOOEYrVCIkng/B3/HPcbNioySC7qdT1ztfYqs6YjQia4krEic+LV3ew86B/hTg+hw==", "dependencies": { "HarmonyX": "2.10.1", "MonoMod.Utils": "22.5.1.1", @@ -88,8 +118,8 @@ }, "BepInEx.Unity.Common": { "type": "Transitive", - "resolved": "6.0.0-be.663", - "contentHash": "kxv0yXJQ7YPzUQzlwkpVzmTkdd87kVcQhMjkrwqpowJ0Yx5vEwPUrRyG/pwMH5/cK+2WHCn/2akGWrW0C4vUAQ==", + "resolved": "6.0.0-be.670", + "contentHash": "FSzWILgwepZ7CpA34ew1WyO75lNjxkfX86uwo2172lbhmLkgoAdQbNun8dxKJCDlIevmTDga76yr/WPrTXELvA==", "dependencies": { "AssetRipper.VersionUtilities": "1.2.1", "MonoMod.Utils": "22.5.1.1" @@ -100,6 +130,11 @@ "resolved": "2.4.3", "contentHash": "U2FC9Y8NyIxxU6MpFFdWWu1xwiqz/61v/Doou7kmVjpeIEMLWyiNNkzNlSE84kyJ0O1LKApuEj5z48Ow0Hi4OQ==" }, + "Disarm": { + "type": "Transitive", + "resolved": "2022.1.0-master.26", + "contentHash": "YnZEbRGr0nG+N3G8WbRQ4Lkg8dTD3oso9iJlCVBmyhEyhLyqs+drBs1kWQbQqFPnb9mi/RJ++R9bPb+L3HF03Q==" + }, "HarmonyX": { "type": "Transitive", "resolved": "2.10.1", @@ -111,13 +146,13 @@ }, "Iced": { "type": "Transitive", - "resolved": "1.17.0", - "contentHash": "8x+HCVTl/HHTGpscH3vMBhV8sknN/muZFw9s3TsI8SA6+c43cOTCi2+jE4KsU8pNLbJ++iF2ZFcpcXHXtDglnw==" + "resolved": "1.18.0", + "contentHash": "G60lZOvbvqttA+SBSv/yY6/wUboXKJlkffhSNR9iOrx0M5gpcK1TRr6xrFR+qAhqIAhvrsPF1jkn9fYb4lEufQ==" }, "Il2CppInterop.Common": { "type": "Transitive", - "resolved": "1.4.0", - "contentHash": "xl60qoa1nImG6qgOQcjSDW46nLQHoRvSWE7QTDQz7XeMsGwOxAbgDtOvJ4gOvoLijTU79gFZYe8H1CM7TcTQ5g==", + "resolved": "1.4.6-ci.354", + "contentHash": "aCP3kr39YQw5GVqE9Q8c5y7f9CEKdFxpUhIqYgQBtrEz5Z/KCbHhjuOf/lSuFrjl6Vub/BKk6k+UbMRdoSvC1w==", "dependencies": { "Iced": "1.17.0", "Microsoft.Extensions.Logging.Abstractions": "6.0.1", @@ -126,36 +161,31 @@ }, "Il2CppInterop.Generator": { "type": "Transitive", - "resolved": "1.4.0", - "contentHash": "Q4QqkwQroDwwqB17/DRF6hbHQRIuyLksgxVUEDvXZ3T+ogkrZB9h0Ev36alN0f6e7fcZPRkMrpXOAYwZzPiZag==", + "resolved": "1.4.6-ci.354", + "contentHash": "y30sxc9mMv0bUzCPDr73xiI6fiu7ksmnEm6XULTGU/5JEGv2aw++/71bLOEYCscNbZTa2JT4yYrLCXCj3GSekg==", "dependencies": { - "Il2CppInterop.Common": "1.4.0", + "Il2CppInterop.Common": "1.4.6-ci.354", "Mono.Cecil": "0.11.3" } }, "Il2CppInterop.HarmonySupport": { "type": "Transitive", - "resolved": "1.4.0", - "contentHash": "Uz4w5PbQ3kLXqUrsQxR35f7xMpfnxLiXthVtNaT3fvHXC8B7arjuBZXeCbcozr6dXFJBDa5W0EElBmH0fWoASg==", + "resolved": "1.4.6-ci.354", + "contentHash": "mQV5A+B/qtI6kSXEGx/UswiqjFKw13/yyviawnStfRKbLMW+XFsdMgGSkOVZd/TiDtF9ZG4Xt7DbkbFu26WjyA==", "dependencies": { "HarmonyX": "2.10.0", - "Il2CppInterop.Runtime": "1.4.0" + "Il2CppInterop.Runtime": "1.4.6-ci.354" } }, "Il2CppInterop.Runtime": { "type": "Transitive", - "resolved": "1.4.0", - "contentHash": "ScgsFlbJ3gj5f69As/GT8pSO2WlS7cOeS/n3h4gBqJ01Eq/Lm+s3FBrGpEiuIWALOgmtQYimhjWVpxRt7LYtGw==", + "resolved": "1.4.6-ci.354", + "contentHash": "Xe5md9z+KIthdEcjfUjmoOhvM3gTI3SPyocqvuzEHoov5jQ/HhIPv5hUZzTSm+2nzn3XplENNE8vlBPvQ1o6OA==", "dependencies": { "Iced": "1.17.0", - "Il2CppInterop.Common": "1.4.0" + "Il2CppInterop.Common": "1.4.6-ci.354" } }, - "IndexRange": { - "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "6TgS1JLSUkpmPLfXBPaAgB39ZUix8E4soXWk2XSDcscVe84i1JKzIAtA7jHbRHSkOOrcr6YA0MpLCeq98y9mYQ==" - }, "js6pak.Gee.External.Capstone": { "type": "Transitive", "resolved": "2.1.0", @@ -440,38 +470,41 @@ }, "Samboy063.Cpp2IL.Core": { "type": "Transitive", - "resolved": "2022.0.7.2", - "contentHash": "e17CAhKSxdAp7vFcYEVxjSc7t7rcvVGBipGhgE9tAjRXY85wZXLlHEVO0AEvMRkLmf9U+if4wK/nZEC1AX6VqQ==", + "resolved": "2022.1.0-development.866", + "contentHash": "QPMuix/3jRngWBdNSLhAbm9BHYf95Ln1Ph1eCK/cDZdVibxFDFP3a6Yczyx1p7GbN7bRQwrhs2skPJSS/z3m2w==", "dependencies": { - "HarmonyX": "2.5.5", - "Iced": "1.11.1", - "IndexRange": "1.0.0", - "Mono.Cecil": "0.11.4", - "Samboy063.LibCpp2IL": "2022.0.7.2", - "System.Runtime.InteropServices": "4.3.0", - "System.ValueTuple": "4.5.0", + "AsmResolver.DotNet": "5.1.0", + "Disarm": "2022.1.0-master.26", + "Iced": "1.18.0", + "Samboy063.LibCpp2IL": "2022.1.0-development.866", + "StableNameDotNet": "0.1.0-development.866", "js6pak.Gee.External.Capstone": "2.1.0" } }, "Samboy063.LibCpp2IL": { "type": "Transitive", - "resolved": "2022.0.7.2", - "contentHash": "DpVeU0dQkUJCpbw0f1xKOG8vimdK2oYhrVABC7HDE3/ikGjhnMZd3i5b1joKDHZ+AiL90TWOaEXPcy24rCZ0dA==", + "resolved": "2022.1.0-development.866", + "contentHash": "EcJSWTfQko8SQozozoUT+aQJVWC8wj8C0YUiPBF4rNRId19yTKp2IXcXnI747v+8/aal222QR6WHfoBK2WlVLg==", "dependencies": { - "IndexRange": "1.0.0", - "Samboy063.WasmDisassembler": "2022.0.2" + "AssetRipper.VersionUtilities": "1.3.1", + "Samboy063.WasmDisassembler": "2022.1.0-development.866" } }, "Samboy063.WasmDisassembler": { "type": "Transitive", - "resolved": "2022.0.2", - "contentHash": "2uu+xBb7M3HKfBx9tAY6jiDieAf0hRnQjSmGX+7IdE6i24dYsx6TYgtrLvRx5lOuF2M8DijZ5H8yQ1pcuCs2SA==" + "resolved": "2022.1.0-development.866", + "contentHash": "2QK8F3eISkLcoW/Nt7wtxyQh31EXAqEMBVXXjEnuxyvXpBXxOIGpjmE3pWhGwxQwDCbe4zBsLF1zUiqq3/pXRA==" }, "SemanticVersioning": { "type": "Transitive", "resolved": "2.0.2", "contentHash": "4EQgYdNZ92SyaO7YFk6olVnebF5V+jrHyMUjvPq89tLeMo8NSfgDF+6Zwq/lgh9j/0yfQp9Lkm0ZA0rUATCZFA==" }, + "StableNameDotNet": { + "type": "Transitive", + "resolved": "0.1.0-development.866", + "contentHash": "DJb8x4dV3ucDgM12sU28HxCdeqY/JudJbeJG6mgXWDJzpFZw2Jd7JF1pKFRNLzh/0gpo8bCGLQS9gOWZmBjdtg==" + }, "StyleCop.Analyzers.Unstable": { "type": "Transitive", "resolved": "1.2.0.435", @@ -832,8 +865,8 @@ }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "ZD9TMpsmYJLrxbbmdvhwt9YEgG5WntEnZ/d1eH8JBX9LBp+Ju8BSBhUGbZMNVHHomWo2KVImJhTDl2hIgw/6MA==" + "resolved": "6.0.0", + "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" }, "System.Runtime.Extensions": { "type": "Transitive", @@ -1042,6 +1075,23 @@ "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": { "type": "Transitive", "resolved": "4.3.0", @@ -1066,15 +1116,10 @@ "resolved": "4.5.4", "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": { "type": "Project", "dependencies": { - "BepInEx.Unity.IL2CPP": "[6.0.0-be.663, )" + "BepInEx.Unity.IL2CPP": "[6.0.0-be.670, )" } } } diff --git a/Reactor.Debugger/packages.lock.json b/Reactor.Debugger/packages.lock.json index 09d9e9c..1a9b7ec 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.12.8, )", - "resolved": "2022.12.8", - "contentHash": "IJsIi89xUYRvA54YtNVEJjf25hhF3LWzkNBslKCNDUpL1aQ/PhNyO4j18pO71DCgW/qr1P1j8+CwByuBLsInNA==" + "requested": "[2023.6.13, )", + "resolved": "2023.6.13", + "contentHash": "460jLKEZoVY33SlIYEgnV5zE/wEAb5fTxY32ddAV5JI03YmoK+/6D3A6yjpu1HlU/I99Y9s21aKXZY0xan2eSQ==" }, "BepInEx.AutoPlugin": { "type": "Direct", @@ -22,19 +22,19 @@ }, "BepInEx.Unity.IL2CPP": { "type": "Direct", - "requested": "[6.0.0-be.663, )", - "resolved": "6.0.0-be.663", - "contentHash": "J+mZ4svyTt4ZYbUoPwpVtF5QCGfzC42VuYJ7z1K6Qt8YlBEZx3rnmUmaEnoJIqN5wN7BSnQgzEmrRfdbrgtTnA==", + "requested": "[6.0.0-be.670, )", + "resolved": "6.0.0-be.670", + "contentHash": "dhzCrem44oFxhOICCJ9eoSUbaKSsGGyBUfUQW9WFljCwIK8o4Cx5BiuXAkYoRjr2DhpzLpPDyPZDRImUqH0bwA==", "dependencies": { - "BepInEx.Core": "6.0.0-be.663", - "BepInEx.Unity.Common": "6.0.0-be.663", + "BepInEx.Core": "6.0.0-be.670", + "BepInEx.Unity.Common": "6.0.0-be.670", "HarmonyX": "2.10.1", - "Iced": "1.17.0", - "Il2CppInterop.Generator": "1.4.0", - "Il2CppInterop.HarmonySupport": "1.4.0", - "Il2CppInterop.Runtime": "1.4.0", + "Iced": "1.18.0", + "Il2CppInterop.Generator": "1.4.6-ci.354", + "Il2CppInterop.HarmonySupport": "1.4.6-ci.354", + "Il2CppInterop.Runtime": "1.4.6-ci.354", "MonoMod.RuntimeDetour": "22.5.1.1", - "Samboy063.Cpp2IL.Core": "2022.0.7.2" + "Samboy063.Cpp2IL.Core": "2022.1.0-development.866" } }, "StyleCop.Analyzers": { @@ -46,15 +46,45 @@ "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": { "type": "Transitive", - "resolved": "1.2.1", - "contentHash": "knQ/W1YwTZS2AbdaZh+nhyyBEZQPQDcahhSOnh88i+cdg4/FEoFJiCwaavgFvCMNuUeHTbcZc4qttF8WQ8xLIA==" + "resolved": "1.3.1", + "contentHash": "/1D18NOpqm7rS7+qVUbAReVMNWwgDuYpsnf0RkX1Aah/I0a0irqldoFJ+Kku7YdbSm0zqD+Z6iYUGKoP3GwTNQ==" }, "BepInEx.Core": { "type": "Transitive", - "resolved": "6.0.0-be.663", - "contentHash": "yTlqwieyV3FCzSo4tfiIlS7pTqVtEZwrwHnograkWO4loECeYpShcpoCoxnhQ0vkWsnWGThMK7NodHhjZ+jQDA==", + "resolved": "6.0.0-be.670", + "contentHash": "7CbbMNZfb+1VHjFKh/ErFBOOEYrVCIkng/B3/HPcbNioySC7qdT1ztfYqs6YjQia4krEic+LV3ew86B/hTg+hw==", "dependencies": { "HarmonyX": "2.10.1", "MonoMod.Utils": "22.5.1.1", @@ -63,13 +93,18 @@ }, "BepInEx.Unity.Common": { "type": "Transitive", - "resolved": "6.0.0-be.663", - "contentHash": "kxv0yXJQ7YPzUQzlwkpVzmTkdd87kVcQhMjkrwqpowJ0Yx5vEwPUrRyG/pwMH5/cK+2WHCn/2akGWrW0C4vUAQ==", + "resolved": "6.0.0-be.670", + "contentHash": "FSzWILgwepZ7CpA34ew1WyO75lNjxkfX86uwo2172lbhmLkgoAdQbNun8dxKJCDlIevmTDga76yr/WPrTXELvA==", "dependencies": { "AssetRipper.VersionUtilities": "1.2.1", "MonoMod.Utils": "22.5.1.1" } }, + "Disarm": { + "type": "Transitive", + "resolved": "2022.1.0-master.26", + "contentHash": "YnZEbRGr0nG+N3G8WbRQ4Lkg8dTD3oso9iJlCVBmyhEyhLyqs+drBs1kWQbQqFPnb9mi/RJ++R9bPb+L3HF03Q==" + }, "HarmonyX": { "type": "Transitive", "resolved": "2.10.1", @@ -81,13 +116,13 @@ }, "Iced": { "type": "Transitive", - "resolved": "1.17.0", - "contentHash": "8x+HCVTl/HHTGpscH3vMBhV8sknN/muZFw9s3TsI8SA6+c43cOTCi2+jE4KsU8pNLbJ++iF2ZFcpcXHXtDglnw==" + "resolved": "1.18.0", + "contentHash": "G60lZOvbvqttA+SBSv/yY6/wUboXKJlkffhSNR9iOrx0M5gpcK1TRr6xrFR+qAhqIAhvrsPF1jkn9fYb4lEufQ==" }, "Il2CppInterop.Common": { "type": "Transitive", - "resolved": "1.4.0", - "contentHash": "xl60qoa1nImG6qgOQcjSDW46nLQHoRvSWE7QTDQz7XeMsGwOxAbgDtOvJ4gOvoLijTU79gFZYe8H1CM7TcTQ5g==", + "resolved": "1.4.6-ci.354", + "contentHash": "aCP3kr39YQw5GVqE9Q8c5y7f9CEKdFxpUhIqYgQBtrEz5Z/KCbHhjuOf/lSuFrjl6Vub/BKk6k+UbMRdoSvC1w==", "dependencies": { "Iced": "1.17.0", "Microsoft.Extensions.Logging.Abstractions": "6.0.1", @@ -96,36 +131,31 @@ }, "Il2CppInterop.Generator": { "type": "Transitive", - "resolved": "1.4.0", - "contentHash": "Q4QqkwQroDwwqB17/DRF6hbHQRIuyLksgxVUEDvXZ3T+ogkrZB9h0Ev36alN0f6e7fcZPRkMrpXOAYwZzPiZag==", + "resolved": "1.4.6-ci.354", + "contentHash": "y30sxc9mMv0bUzCPDr73xiI6fiu7ksmnEm6XULTGU/5JEGv2aw++/71bLOEYCscNbZTa2JT4yYrLCXCj3GSekg==", "dependencies": { - "Il2CppInterop.Common": "1.4.0", + "Il2CppInterop.Common": "1.4.6-ci.354", "Mono.Cecil": "0.11.3" } }, "Il2CppInterop.HarmonySupport": { "type": "Transitive", - "resolved": "1.4.0", - "contentHash": "Uz4w5PbQ3kLXqUrsQxR35f7xMpfnxLiXthVtNaT3fvHXC8B7arjuBZXeCbcozr6dXFJBDa5W0EElBmH0fWoASg==", + "resolved": "1.4.6-ci.354", + "contentHash": "mQV5A+B/qtI6kSXEGx/UswiqjFKw13/yyviawnStfRKbLMW+XFsdMgGSkOVZd/TiDtF9ZG4Xt7DbkbFu26WjyA==", "dependencies": { "HarmonyX": "2.10.0", - "Il2CppInterop.Runtime": "1.4.0" + "Il2CppInterop.Runtime": "1.4.6-ci.354" } }, "Il2CppInterop.Runtime": { "type": "Transitive", - "resolved": "1.4.0", - "contentHash": "ScgsFlbJ3gj5f69As/GT8pSO2WlS7cOeS/n3h4gBqJ01Eq/Lm+s3FBrGpEiuIWALOgmtQYimhjWVpxRt7LYtGw==", + "resolved": "1.4.6-ci.354", + "contentHash": "Xe5md9z+KIthdEcjfUjmoOhvM3gTI3SPyocqvuzEHoov5jQ/HhIPv5hUZzTSm+2nzn3XplENNE8vlBPvQ1o6OA==", "dependencies": { "Iced": "1.17.0", - "Il2CppInterop.Common": "1.4.0" + "Il2CppInterop.Common": "1.4.6-ci.354" } }, - "IndexRange": { - "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "6TgS1JLSUkpmPLfXBPaAgB39ZUix8E4soXWk2XSDcscVe84i1JKzIAtA7jHbRHSkOOrcr6YA0MpLCeq98y9mYQ==" - }, "js6pak.Gee.External.Capstone": { "type": "Transitive", "resolved": "2.1.0", @@ -280,38 +310,41 @@ }, "Samboy063.Cpp2IL.Core": { "type": "Transitive", - "resolved": "2022.0.7.2", - "contentHash": "e17CAhKSxdAp7vFcYEVxjSc7t7rcvVGBipGhgE9tAjRXY85wZXLlHEVO0AEvMRkLmf9U+if4wK/nZEC1AX6VqQ==", + "resolved": "2022.1.0-development.866", + "contentHash": "QPMuix/3jRngWBdNSLhAbm9BHYf95Ln1Ph1eCK/cDZdVibxFDFP3a6Yczyx1p7GbN7bRQwrhs2skPJSS/z3m2w==", "dependencies": { - "HarmonyX": "2.5.5", - "Iced": "1.11.1", - "IndexRange": "1.0.0", - "Mono.Cecil": "0.11.4", - "Samboy063.LibCpp2IL": "2022.0.7.2", - "System.Runtime.InteropServices": "4.3.0", - "System.ValueTuple": "4.5.0", + "AsmResolver.DotNet": "5.1.0", + "Disarm": "2022.1.0-master.26", + "Iced": "1.18.0", + "Samboy063.LibCpp2IL": "2022.1.0-development.866", + "StableNameDotNet": "0.1.0-development.866", "js6pak.Gee.External.Capstone": "2.1.0" } }, "Samboy063.LibCpp2IL": { "type": "Transitive", - "resolved": "2022.0.7.2", - "contentHash": "DpVeU0dQkUJCpbw0f1xKOG8vimdK2oYhrVABC7HDE3/ikGjhnMZd3i5b1joKDHZ+AiL90TWOaEXPcy24rCZ0dA==", + "resolved": "2022.1.0-development.866", + "contentHash": "EcJSWTfQko8SQozozoUT+aQJVWC8wj8C0YUiPBF4rNRId19yTKp2IXcXnI747v+8/aal222QR6WHfoBK2WlVLg==", "dependencies": { - "IndexRange": "1.0.0", - "Samboy063.WasmDisassembler": "2022.0.2" + "AssetRipper.VersionUtilities": "1.3.1", + "Samboy063.WasmDisassembler": "2022.1.0-development.866" } }, "Samboy063.WasmDisassembler": { "type": "Transitive", - "resolved": "2022.0.2", - "contentHash": "2uu+xBb7M3HKfBx9tAY6jiDieAf0hRnQjSmGX+7IdE6i24dYsx6TYgtrLvRx5lOuF2M8DijZ5H8yQ1pcuCs2SA==" + "resolved": "2022.1.0-development.866", + "contentHash": "2QK8F3eISkLcoW/Nt7wtxyQh31EXAqEMBVXXjEnuxyvXpBXxOIGpjmE3pWhGwxQwDCbe4zBsLF1zUiqq3/pXRA==" }, "SemanticVersioning": { "type": "Transitive", "resolved": "2.0.2", "contentHash": "4EQgYdNZ92SyaO7YFk6olVnebF5V+jrHyMUjvPq89tLeMo8NSfgDF+6Zwq/lgh9j/0yfQp9Lkm0ZA0rUATCZFA==" }, + "StableNameDotNet": { + "type": "Transitive", + "resolved": "0.1.0-development.866", + "contentHash": "DJb8x4dV3ucDgM12sU28HxCdeqY/JudJbeJG6mgXWDJzpFZw2Jd7JF1pKFRNLzh/0gpo8bCGLQS9gOWZmBjdtg==" + }, "StyleCop.Analyzers.Unstable": { "type": "Transitive", "resolved": "1.2.0.435", @@ -642,6 +675,11 @@ "Microsoft.NETCore.Targets": "1.1.0" } }, + "System.Runtime.CompilerServices.Unsafe": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" + }, "System.Runtime.Extensions": { "type": "Transitive", "resolved": "4.3.0", @@ -840,6 +878,23 @@ "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": { "type": "Transitive", "resolved": "4.3.0", @@ -859,15 +914,10 @@ "System.Runtime": "4.3.0" } }, - "System.ValueTuple": { - "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" - }, "reactor": { "type": "Project", "dependencies": { - "BepInEx.Unity.IL2CPP": "[6.0.0-be.663, )" + "BepInEx.Unity.IL2CPP": "[6.0.0-be.670, )" } } } diff --git a/Reactor.Example/packages.lock.json b/Reactor.Example/packages.lock.json index 09d9e9c..1a9b7ec 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.12.8, )", - "resolved": "2022.12.8", - "contentHash": "IJsIi89xUYRvA54YtNVEJjf25hhF3LWzkNBslKCNDUpL1aQ/PhNyO4j18pO71DCgW/qr1P1j8+CwByuBLsInNA==" + "requested": "[2023.6.13, )", + "resolved": "2023.6.13", + "contentHash": "460jLKEZoVY33SlIYEgnV5zE/wEAb5fTxY32ddAV5JI03YmoK+/6D3A6yjpu1HlU/I99Y9s21aKXZY0xan2eSQ==" }, "BepInEx.AutoPlugin": { "type": "Direct", @@ -22,19 +22,19 @@ }, "BepInEx.Unity.IL2CPP": { "type": "Direct", - "requested": "[6.0.0-be.663, )", - "resolved": "6.0.0-be.663", - "contentHash": "J+mZ4svyTt4ZYbUoPwpVtF5QCGfzC42VuYJ7z1K6Qt8YlBEZx3rnmUmaEnoJIqN5wN7BSnQgzEmrRfdbrgtTnA==", + "requested": "[6.0.0-be.670, )", + "resolved": "6.0.0-be.670", + "contentHash": "dhzCrem44oFxhOICCJ9eoSUbaKSsGGyBUfUQW9WFljCwIK8o4Cx5BiuXAkYoRjr2DhpzLpPDyPZDRImUqH0bwA==", "dependencies": { - "BepInEx.Core": "6.0.0-be.663", - "BepInEx.Unity.Common": "6.0.0-be.663", + "BepInEx.Core": "6.0.0-be.670", + "BepInEx.Unity.Common": "6.0.0-be.670", "HarmonyX": "2.10.1", - "Iced": "1.17.0", - "Il2CppInterop.Generator": "1.4.0", - "Il2CppInterop.HarmonySupport": "1.4.0", - "Il2CppInterop.Runtime": "1.4.0", + "Iced": "1.18.0", + "Il2CppInterop.Generator": "1.4.6-ci.354", + "Il2CppInterop.HarmonySupport": "1.4.6-ci.354", + "Il2CppInterop.Runtime": "1.4.6-ci.354", "MonoMod.RuntimeDetour": "22.5.1.1", - "Samboy063.Cpp2IL.Core": "2022.0.7.2" + "Samboy063.Cpp2IL.Core": "2022.1.0-development.866" } }, "StyleCop.Analyzers": { @@ -46,15 +46,45 @@ "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": { "type": "Transitive", - "resolved": "1.2.1", - "contentHash": "knQ/W1YwTZS2AbdaZh+nhyyBEZQPQDcahhSOnh88i+cdg4/FEoFJiCwaavgFvCMNuUeHTbcZc4qttF8WQ8xLIA==" + "resolved": "1.3.1", + "contentHash": "/1D18NOpqm7rS7+qVUbAReVMNWwgDuYpsnf0RkX1Aah/I0a0irqldoFJ+Kku7YdbSm0zqD+Z6iYUGKoP3GwTNQ==" }, "BepInEx.Core": { "type": "Transitive", - "resolved": "6.0.0-be.663", - "contentHash": "yTlqwieyV3FCzSo4tfiIlS7pTqVtEZwrwHnograkWO4loECeYpShcpoCoxnhQ0vkWsnWGThMK7NodHhjZ+jQDA==", + "resolved": "6.0.0-be.670", + "contentHash": "7CbbMNZfb+1VHjFKh/ErFBOOEYrVCIkng/B3/HPcbNioySC7qdT1ztfYqs6YjQia4krEic+LV3ew86B/hTg+hw==", "dependencies": { "HarmonyX": "2.10.1", "MonoMod.Utils": "22.5.1.1", @@ -63,13 +93,18 @@ }, "BepInEx.Unity.Common": { "type": "Transitive", - "resolved": "6.0.0-be.663", - "contentHash": "kxv0yXJQ7YPzUQzlwkpVzmTkdd87kVcQhMjkrwqpowJ0Yx5vEwPUrRyG/pwMH5/cK+2WHCn/2akGWrW0C4vUAQ==", + "resolved": "6.0.0-be.670", + "contentHash": "FSzWILgwepZ7CpA34ew1WyO75lNjxkfX86uwo2172lbhmLkgoAdQbNun8dxKJCDlIevmTDga76yr/WPrTXELvA==", "dependencies": { "AssetRipper.VersionUtilities": "1.2.1", "MonoMod.Utils": "22.5.1.1" } }, + "Disarm": { + "type": "Transitive", + "resolved": "2022.1.0-master.26", + "contentHash": "YnZEbRGr0nG+N3G8WbRQ4Lkg8dTD3oso9iJlCVBmyhEyhLyqs+drBs1kWQbQqFPnb9mi/RJ++R9bPb+L3HF03Q==" + }, "HarmonyX": { "type": "Transitive", "resolved": "2.10.1", @@ -81,13 +116,13 @@ }, "Iced": { "type": "Transitive", - "resolved": "1.17.0", - "contentHash": "8x+HCVTl/HHTGpscH3vMBhV8sknN/muZFw9s3TsI8SA6+c43cOTCi2+jE4KsU8pNLbJ++iF2ZFcpcXHXtDglnw==" + "resolved": "1.18.0", + "contentHash": "G60lZOvbvqttA+SBSv/yY6/wUboXKJlkffhSNR9iOrx0M5gpcK1TRr6xrFR+qAhqIAhvrsPF1jkn9fYb4lEufQ==" }, "Il2CppInterop.Common": { "type": "Transitive", - "resolved": "1.4.0", - "contentHash": "xl60qoa1nImG6qgOQcjSDW46nLQHoRvSWE7QTDQz7XeMsGwOxAbgDtOvJ4gOvoLijTU79gFZYe8H1CM7TcTQ5g==", + "resolved": "1.4.6-ci.354", + "contentHash": "aCP3kr39YQw5GVqE9Q8c5y7f9CEKdFxpUhIqYgQBtrEz5Z/KCbHhjuOf/lSuFrjl6Vub/BKk6k+UbMRdoSvC1w==", "dependencies": { "Iced": "1.17.0", "Microsoft.Extensions.Logging.Abstractions": "6.0.1", @@ -96,36 +131,31 @@ }, "Il2CppInterop.Generator": { "type": "Transitive", - "resolved": "1.4.0", - "contentHash": "Q4QqkwQroDwwqB17/DRF6hbHQRIuyLksgxVUEDvXZ3T+ogkrZB9h0Ev36alN0f6e7fcZPRkMrpXOAYwZzPiZag==", + "resolved": "1.4.6-ci.354", + "contentHash": "y30sxc9mMv0bUzCPDr73xiI6fiu7ksmnEm6XULTGU/5JEGv2aw++/71bLOEYCscNbZTa2JT4yYrLCXCj3GSekg==", "dependencies": { - "Il2CppInterop.Common": "1.4.0", + "Il2CppInterop.Common": "1.4.6-ci.354", "Mono.Cecil": "0.11.3" } }, "Il2CppInterop.HarmonySupport": { "type": "Transitive", - "resolved": "1.4.0", - "contentHash": "Uz4w5PbQ3kLXqUrsQxR35f7xMpfnxLiXthVtNaT3fvHXC8B7arjuBZXeCbcozr6dXFJBDa5W0EElBmH0fWoASg==", + "resolved": "1.4.6-ci.354", + "contentHash": "mQV5A+B/qtI6kSXEGx/UswiqjFKw13/yyviawnStfRKbLMW+XFsdMgGSkOVZd/TiDtF9ZG4Xt7DbkbFu26WjyA==", "dependencies": { "HarmonyX": "2.10.0", - "Il2CppInterop.Runtime": "1.4.0" + "Il2CppInterop.Runtime": "1.4.6-ci.354" } }, "Il2CppInterop.Runtime": { "type": "Transitive", - "resolved": "1.4.0", - "contentHash": "ScgsFlbJ3gj5f69As/GT8pSO2WlS7cOeS/n3h4gBqJ01Eq/Lm+s3FBrGpEiuIWALOgmtQYimhjWVpxRt7LYtGw==", + "resolved": "1.4.6-ci.354", + "contentHash": "Xe5md9z+KIthdEcjfUjmoOhvM3gTI3SPyocqvuzEHoov5jQ/HhIPv5hUZzTSm+2nzn3XplENNE8vlBPvQ1o6OA==", "dependencies": { "Iced": "1.17.0", - "Il2CppInterop.Common": "1.4.0" + "Il2CppInterop.Common": "1.4.6-ci.354" } }, - "IndexRange": { - "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "6TgS1JLSUkpmPLfXBPaAgB39ZUix8E4soXWk2XSDcscVe84i1JKzIAtA7jHbRHSkOOrcr6YA0MpLCeq98y9mYQ==" - }, "js6pak.Gee.External.Capstone": { "type": "Transitive", "resolved": "2.1.0", @@ -280,38 +310,41 @@ }, "Samboy063.Cpp2IL.Core": { "type": "Transitive", - "resolved": "2022.0.7.2", - "contentHash": "e17CAhKSxdAp7vFcYEVxjSc7t7rcvVGBipGhgE9tAjRXY85wZXLlHEVO0AEvMRkLmf9U+if4wK/nZEC1AX6VqQ==", + "resolved": "2022.1.0-development.866", + "contentHash": "QPMuix/3jRngWBdNSLhAbm9BHYf95Ln1Ph1eCK/cDZdVibxFDFP3a6Yczyx1p7GbN7bRQwrhs2skPJSS/z3m2w==", "dependencies": { - "HarmonyX": "2.5.5", - "Iced": "1.11.1", - "IndexRange": "1.0.0", - "Mono.Cecil": "0.11.4", - "Samboy063.LibCpp2IL": "2022.0.7.2", - "System.Runtime.InteropServices": "4.3.0", - "System.ValueTuple": "4.5.0", + "AsmResolver.DotNet": "5.1.0", + "Disarm": "2022.1.0-master.26", + "Iced": "1.18.0", + "Samboy063.LibCpp2IL": "2022.1.0-development.866", + "StableNameDotNet": "0.1.0-development.866", "js6pak.Gee.External.Capstone": "2.1.0" } }, "Samboy063.LibCpp2IL": { "type": "Transitive", - "resolved": "2022.0.7.2", - "contentHash": "DpVeU0dQkUJCpbw0f1xKOG8vimdK2oYhrVABC7HDE3/ikGjhnMZd3i5b1joKDHZ+AiL90TWOaEXPcy24rCZ0dA==", + "resolved": "2022.1.0-development.866", + "contentHash": "EcJSWTfQko8SQozozoUT+aQJVWC8wj8C0YUiPBF4rNRId19yTKp2IXcXnI747v+8/aal222QR6WHfoBK2WlVLg==", "dependencies": { - "IndexRange": "1.0.0", - "Samboy063.WasmDisassembler": "2022.0.2" + "AssetRipper.VersionUtilities": "1.3.1", + "Samboy063.WasmDisassembler": "2022.1.0-development.866" } }, "Samboy063.WasmDisassembler": { "type": "Transitive", - "resolved": "2022.0.2", - "contentHash": "2uu+xBb7M3HKfBx9tAY6jiDieAf0hRnQjSmGX+7IdE6i24dYsx6TYgtrLvRx5lOuF2M8DijZ5H8yQ1pcuCs2SA==" + "resolved": "2022.1.0-development.866", + "contentHash": "2QK8F3eISkLcoW/Nt7wtxyQh31EXAqEMBVXXjEnuxyvXpBXxOIGpjmE3pWhGwxQwDCbe4zBsLF1zUiqq3/pXRA==" }, "SemanticVersioning": { "type": "Transitive", "resolved": "2.0.2", "contentHash": "4EQgYdNZ92SyaO7YFk6olVnebF5V+jrHyMUjvPq89tLeMo8NSfgDF+6Zwq/lgh9j/0yfQp9Lkm0ZA0rUATCZFA==" }, + "StableNameDotNet": { + "type": "Transitive", + "resolved": "0.1.0-development.866", + "contentHash": "DJb8x4dV3ucDgM12sU28HxCdeqY/JudJbeJG6mgXWDJzpFZw2Jd7JF1pKFRNLzh/0gpo8bCGLQS9gOWZmBjdtg==" + }, "StyleCop.Analyzers.Unstable": { "type": "Transitive", "resolved": "1.2.0.435", @@ -642,6 +675,11 @@ "Microsoft.NETCore.Targets": "1.1.0" } }, + "System.Runtime.CompilerServices.Unsafe": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" + }, "System.Runtime.Extensions": { "type": "Transitive", "resolved": "4.3.0", @@ -840,6 +878,23 @@ "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": { "type": "Transitive", "resolved": "4.3.0", @@ -859,15 +914,10 @@ "System.Runtime": "4.3.0" } }, - "System.ValueTuple": { - "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" - }, "reactor": { "type": "Project", "dependencies": { - "BepInEx.Unity.IL2CPP": "[6.0.0-be.663, )" + "BepInEx.Unity.IL2CPP": "[6.0.0-be.670, )" } } } diff --git a/Reactor/Patches/Miscellaneous/FreeNamePatch.cs b/Reactor/Patches/Miscellaneous/FreeNamePatch.cs index ed663d9..32070a9 100644 --- a/Reactor/Patches/Miscellaneous/FreeNamePatch.cs +++ b/Reactor/Patches/Miscellaneous/FreeNamePatch.cs @@ -30,7 +30,7 @@ internal static class FreeNamePatch var editName = DestroyableSingleton.Instance.accountTab.editNameScreen; 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(); textBox.outputText.alignment = TextAlignmentOptions.CenterGeoAligned; @@ -56,10 +56,10 @@ internal static class FreeNamePatch "JoinGameButton", }; - var yStart = Vector3.up; + var yStart = Vector3.up * (AccountManager.Instance.isActiveAndEnabled ? 0.9f : 1.1f); 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; for (var i = 0; i < gameObjects.Count; i++) diff --git a/Reactor/Patches/ReactorVersionShower.cs b/Reactor/Patches/ReactorVersionShower.cs index d381e8f..0eed15b 100644 --- a/Reactor/Patches/ReactorVersionShower.cs +++ b/Reactor/Patches/ReactorVersionShower.cs @@ -27,35 +27,50 @@ public static class ReactorVersionShower internal static void Initialize() { - SceneManager.add_sceneLoaded((Action) ((_, _) => + SceneManager.add_sceneLoaded((Action) ((scene, _) => { var original = UnityEngine.Object.FindObjectOfType(); if (!original) return; - var gameObject = new GameObject("ReactorVersion " + Guid.NewGuid()); - gameObject.transform.parent = original.transform.parent; + var originalAspectPosition = original.GetComponent(); + var originalText = original.GetComponentInChildren(); + + var gameObject = new GameObject("ReactorVersion"); var aspectPosition = gameObject.AddComponent(); - aspectPosition.Alignment = AspectPosition.EdgeAlignments.LeftTop; + if (scene.name == "MainMenu") + { + aspectPosition.Alignment = AspectPosition.EdgeAlignments.Left; + aspectPosition.DistanceFromEdge = new Vector3(5f, 1.55f, 2f); + } + else + { + var distanceFromEdge = new Vector3(1, 0.4f, -1); + if (originalAspectPosition.Alignment == AspectPosition.EdgeAlignments.LeftTop) + { + distanceFromEdge += new Vector3(0.05f, 0.15f, 0); + } + else if (AccountManager.Instance.isActiveAndEnabled) + { + distanceFromEdge += new Vector3(0.2f, 0.6f, 0); + } - var originalAspectPosition = original.GetComponent(); - var originalPosition = originalAspectPosition.DistanceFromEdge; - originalPosition.y = 0.15f; - originalAspectPosition.DistanceFromEdge = originalPosition; - originalAspectPosition.AdjustPosition(); - - var position = originalPosition; - position.x += 10.075f - 0.1f; - position.y += 2.75f - 0.15f; - position.z -= 1; - aspectPosition.DistanceFromEdge = position; + aspectPosition.Alignment = AspectPosition.EdgeAlignments.LeftTop; + aspectPosition.DistanceFromEdge = distanceFromEdge; + } aspectPosition.AdjustPosition(); Text = gameObject.AddComponent(); + Text.font = originalText.font; + Text.fontMaterial = originalText.fontMaterial; + Text.UpdateFontAsset(); + Text.alignment = TextAlignmentOptions.TopLeft; + Text.autoSizeTextContainer = true; Text.fontSize = 2; + Text.outlineWidth = 0.1f; UpdateText(); })); diff --git a/Reactor/packages.lock.json b/Reactor/packages.lock.json index 3da836d..2a949d4 100644 --- a/Reactor/packages.lock.json +++ b/Reactor/packages.lock.json @@ -4,9 +4,9 @@ "net6.0": { "AmongUs.GameLibs.Steam": { "type": "Direct", - "requested": "[2022.12.8, )", - "resolved": "2022.12.8", - "contentHash": "IJsIi89xUYRvA54YtNVEJjf25hhF3LWzkNBslKCNDUpL1aQ/PhNyO4j18pO71DCgW/qr1P1j8+CwByuBLsInNA==" + "requested": "[2023.6.13, )", + "resolved": "2023.6.13", + "contentHash": "460jLKEZoVY33SlIYEgnV5zE/wEAb5fTxY32ddAV5JI03YmoK+/6D3A6yjpu1HlU/I99Y9s21aKXZY0xan2eSQ==" }, "BepInEx.AutoPlugin": { "type": "Direct", @@ -22,19 +22,19 @@ }, "BepInEx.Unity.IL2CPP": { "type": "Direct", - "requested": "[6.0.0-be.663, )", - "resolved": "6.0.0-be.663", - "contentHash": "J+mZ4svyTt4ZYbUoPwpVtF5QCGfzC42VuYJ7z1K6Qt8YlBEZx3rnmUmaEnoJIqN5wN7BSnQgzEmrRfdbrgtTnA==", + "requested": "[6.0.0-be.670, )", + "resolved": "6.0.0-be.670", + "contentHash": "dhzCrem44oFxhOICCJ9eoSUbaKSsGGyBUfUQW9WFljCwIK8o4Cx5BiuXAkYoRjr2DhpzLpPDyPZDRImUqH0bwA==", "dependencies": { - "BepInEx.Core": "6.0.0-be.663", - "BepInEx.Unity.Common": "6.0.0-be.663", + "BepInEx.Core": "6.0.0-be.670", + "BepInEx.Unity.Common": "6.0.0-be.670", "HarmonyX": "2.10.1", - "Iced": "1.17.0", - "Il2CppInterop.Generator": "1.4.0", - "Il2CppInterop.HarmonySupport": "1.4.0", - "Il2CppInterop.Runtime": "1.4.0", + "Iced": "1.18.0", + "Il2CppInterop.Generator": "1.4.6-ci.354", + "Il2CppInterop.HarmonySupport": "1.4.6-ci.354", + "Il2CppInterop.Runtime": "1.4.6-ci.354", "MonoMod.RuntimeDetour": "22.5.1.1", - "Samboy063.Cpp2IL.Core": "2022.0.7.2" + "Samboy063.Cpp2IL.Core": "2022.1.0-development.866" } }, "Microsoft.SourceLink.GitHub": { @@ -56,15 +56,45 @@ "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": { "type": "Transitive", - "resolved": "1.2.1", - "contentHash": "knQ/W1YwTZS2AbdaZh+nhyyBEZQPQDcahhSOnh88i+cdg4/FEoFJiCwaavgFvCMNuUeHTbcZc4qttF8WQ8xLIA==" + "resolved": "1.3.1", + "contentHash": "/1D18NOpqm7rS7+qVUbAReVMNWwgDuYpsnf0RkX1Aah/I0a0irqldoFJ+Kku7YdbSm0zqD+Z6iYUGKoP3GwTNQ==" }, "BepInEx.Core": { "type": "Transitive", - "resolved": "6.0.0-be.663", - "contentHash": "yTlqwieyV3FCzSo4tfiIlS7pTqVtEZwrwHnograkWO4loECeYpShcpoCoxnhQ0vkWsnWGThMK7NodHhjZ+jQDA==", + "resolved": "6.0.0-be.670", + "contentHash": "7CbbMNZfb+1VHjFKh/ErFBOOEYrVCIkng/B3/HPcbNioySC7qdT1ztfYqs6YjQia4krEic+LV3ew86B/hTg+hw==", "dependencies": { "HarmonyX": "2.10.1", "MonoMod.Utils": "22.5.1.1", @@ -73,13 +103,18 @@ }, "BepInEx.Unity.Common": { "type": "Transitive", - "resolved": "6.0.0-be.663", - "contentHash": "kxv0yXJQ7YPzUQzlwkpVzmTkdd87kVcQhMjkrwqpowJ0Yx5vEwPUrRyG/pwMH5/cK+2WHCn/2akGWrW0C4vUAQ==", + "resolved": "6.0.0-be.670", + "contentHash": "FSzWILgwepZ7CpA34ew1WyO75lNjxkfX86uwo2172lbhmLkgoAdQbNun8dxKJCDlIevmTDga76yr/WPrTXELvA==", "dependencies": { "AssetRipper.VersionUtilities": "1.2.1", "MonoMod.Utils": "22.5.1.1" } }, + "Disarm": { + "type": "Transitive", + "resolved": "2022.1.0-master.26", + "contentHash": "YnZEbRGr0nG+N3G8WbRQ4Lkg8dTD3oso9iJlCVBmyhEyhLyqs+drBs1kWQbQqFPnb9mi/RJ++R9bPb+L3HF03Q==" + }, "HarmonyX": { "type": "Transitive", "resolved": "2.10.1", @@ -91,13 +126,13 @@ }, "Iced": { "type": "Transitive", - "resolved": "1.17.0", - "contentHash": "8x+HCVTl/HHTGpscH3vMBhV8sknN/muZFw9s3TsI8SA6+c43cOTCi2+jE4KsU8pNLbJ++iF2ZFcpcXHXtDglnw==" + "resolved": "1.18.0", + "contentHash": "G60lZOvbvqttA+SBSv/yY6/wUboXKJlkffhSNR9iOrx0M5gpcK1TRr6xrFR+qAhqIAhvrsPF1jkn9fYb4lEufQ==" }, "Il2CppInterop.Common": { "type": "Transitive", - "resolved": "1.4.0", - "contentHash": "xl60qoa1nImG6qgOQcjSDW46nLQHoRvSWE7QTDQz7XeMsGwOxAbgDtOvJ4gOvoLijTU79gFZYe8H1CM7TcTQ5g==", + "resolved": "1.4.6-ci.354", + "contentHash": "aCP3kr39YQw5GVqE9Q8c5y7f9CEKdFxpUhIqYgQBtrEz5Z/KCbHhjuOf/lSuFrjl6Vub/BKk6k+UbMRdoSvC1w==", "dependencies": { "Iced": "1.17.0", "Microsoft.Extensions.Logging.Abstractions": "6.0.1", @@ -106,36 +141,31 @@ }, "Il2CppInterop.Generator": { "type": "Transitive", - "resolved": "1.4.0", - "contentHash": "Q4QqkwQroDwwqB17/DRF6hbHQRIuyLksgxVUEDvXZ3T+ogkrZB9h0Ev36alN0f6e7fcZPRkMrpXOAYwZzPiZag==", + "resolved": "1.4.6-ci.354", + "contentHash": "y30sxc9mMv0bUzCPDr73xiI6fiu7ksmnEm6XULTGU/5JEGv2aw++/71bLOEYCscNbZTa2JT4yYrLCXCj3GSekg==", "dependencies": { - "Il2CppInterop.Common": "1.4.0", + "Il2CppInterop.Common": "1.4.6-ci.354", "Mono.Cecil": "0.11.3" } }, "Il2CppInterop.HarmonySupport": { "type": "Transitive", - "resolved": "1.4.0", - "contentHash": "Uz4w5PbQ3kLXqUrsQxR35f7xMpfnxLiXthVtNaT3fvHXC8B7arjuBZXeCbcozr6dXFJBDa5W0EElBmH0fWoASg==", + "resolved": "1.4.6-ci.354", + "contentHash": "mQV5A+B/qtI6kSXEGx/UswiqjFKw13/yyviawnStfRKbLMW+XFsdMgGSkOVZd/TiDtF9ZG4Xt7DbkbFu26WjyA==", "dependencies": { "HarmonyX": "2.10.0", - "Il2CppInterop.Runtime": "1.4.0" + "Il2CppInterop.Runtime": "1.4.6-ci.354" } }, "Il2CppInterop.Runtime": { "type": "Transitive", - "resolved": "1.4.0", - "contentHash": "ScgsFlbJ3gj5f69As/GT8pSO2WlS7cOeS/n3h4gBqJ01Eq/Lm+s3FBrGpEiuIWALOgmtQYimhjWVpxRt7LYtGw==", + "resolved": "1.4.6-ci.354", + "contentHash": "Xe5md9z+KIthdEcjfUjmoOhvM3gTI3SPyocqvuzEHoov5jQ/HhIPv5hUZzTSm+2nzn3XplENNE8vlBPvQ1o6OA==", "dependencies": { "Iced": "1.17.0", - "Il2CppInterop.Common": "1.4.0" + "Il2CppInterop.Common": "1.4.6-ci.354" } }, - "IndexRange": { - "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "6TgS1JLSUkpmPLfXBPaAgB39ZUix8E4soXWk2XSDcscVe84i1JKzIAtA7jHbRHSkOOrcr6YA0MpLCeq98y9mYQ==" - }, "js6pak.Gee.External.Capstone": { "type": "Transitive", "resolved": "2.1.0", @@ -300,38 +330,41 @@ }, "Samboy063.Cpp2IL.Core": { "type": "Transitive", - "resolved": "2022.0.7.2", - "contentHash": "e17CAhKSxdAp7vFcYEVxjSc7t7rcvVGBipGhgE9tAjRXY85wZXLlHEVO0AEvMRkLmf9U+if4wK/nZEC1AX6VqQ==", + "resolved": "2022.1.0-development.866", + "contentHash": "QPMuix/3jRngWBdNSLhAbm9BHYf95Ln1Ph1eCK/cDZdVibxFDFP3a6Yczyx1p7GbN7bRQwrhs2skPJSS/z3m2w==", "dependencies": { - "HarmonyX": "2.5.5", - "Iced": "1.11.1", - "IndexRange": "1.0.0", - "Mono.Cecil": "0.11.4", - "Samboy063.LibCpp2IL": "2022.0.7.2", - "System.Runtime.InteropServices": "4.3.0", - "System.ValueTuple": "4.5.0", + "AsmResolver.DotNet": "5.1.0", + "Disarm": "2022.1.0-master.26", + "Iced": "1.18.0", + "Samboy063.LibCpp2IL": "2022.1.0-development.866", + "StableNameDotNet": "0.1.0-development.866", "js6pak.Gee.External.Capstone": "2.1.0" } }, "Samboy063.LibCpp2IL": { "type": "Transitive", - "resolved": "2022.0.7.2", - "contentHash": "DpVeU0dQkUJCpbw0f1xKOG8vimdK2oYhrVABC7HDE3/ikGjhnMZd3i5b1joKDHZ+AiL90TWOaEXPcy24rCZ0dA==", + "resolved": "2022.1.0-development.866", + "contentHash": "EcJSWTfQko8SQozozoUT+aQJVWC8wj8C0YUiPBF4rNRId19yTKp2IXcXnI747v+8/aal222QR6WHfoBK2WlVLg==", "dependencies": { - "IndexRange": "1.0.0", - "Samboy063.WasmDisassembler": "2022.0.2" + "AssetRipper.VersionUtilities": "1.3.1", + "Samboy063.WasmDisassembler": "2022.1.0-development.866" } }, "Samboy063.WasmDisassembler": { "type": "Transitive", - "resolved": "2022.0.2", - "contentHash": "2uu+xBb7M3HKfBx9tAY6jiDieAf0hRnQjSmGX+7IdE6i24dYsx6TYgtrLvRx5lOuF2M8DijZ5H8yQ1pcuCs2SA==" + "resolved": "2022.1.0-development.866", + "contentHash": "2QK8F3eISkLcoW/Nt7wtxyQh31EXAqEMBVXXjEnuxyvXpBXxOIGpjmE3pWhGwxQwDCbe4zBsLF1zUiqq3/pXRA==" }, "SemanticVersioning": { "type": "Transitive", "resolved": "2.0.2", "contentHash": "4EQgYdNZ92SyaO7YFk6olVnebF5V+jrHyMUjvPq89tLeMo8NSfgDF+6Zwq/lgh9j/0yfQp9Lkm0ZA0rUATCZFA==" }, + "StableNameDotNet": { + "type": "Transitive", + "resolved": "0.1.0-development.866", + "contentHash": "DJb8x4dV3ucDgM12sU28HxCdeqY/JudJbeJG6mgXWDJzpFZw2Jd7JF1pKFRNLzh/0gpo8bCGLQS9gOWZmBjdtg==" + }, "StyleCop.Analyzers.Unstable": { "type": "Transitive", "resolved": "1.2.0.435", @@ -662,6 +695,11 @@ "Microsoft.NETCore.Targets": "1.1.0" } }, + "System.Runtime.CompilerServices.Unsafe": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" + }, "System.Runtime.Extensions": { "type": "Transitive", "resolved": "4.3.0", @@ -860,6 +898,23 @@ "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": { "type": "Transitive", "resolved": "4.3.0", @@ -878,11 +933,6 @@ "Microsoft.NETCore.Targets": "1.1.0", "System.Runtime": "4.3.0" } - }, - "System.ValueTuple": { - "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" } } } diff --git a/nuget.config b/nuget.config index 3ee52a2..fd4c482 100644 --- a/nuget.config +++ b/nuget.config @@ -3,5 +3,6 @@ +