diff --git a/CringeBootstrap/GameDirectoryAssemblyLoadContext.cs b/CringeBootstrap/GameDirectoryAssemblyLoadContext.cs index 79d1548..4285072 100644 --- a/CringeBootstrap/GameDirectoryAssemblyLoadContext.cs +++ b/CringeBootstrap/GameDirectoryAssemblyLoadContext.cs @@ -25,10 +25,6 @@ public class GameDirectoryAssemblyLoadContext : AssemblyLoadContext, ICoreLoadCo AddOverride(name, file); } - catch (InvalidOperationException) - { - // fucking microsoft broke the standard in net9 - } catch (BadImageFormatException) { // if we are trying to load native image diff --git a/CringeBootstrap/packages.lock.json b/CringeBootstrap/packages.lock.json index 0f8879b..4af8f17 100644 --- a/CringeBootstrap/packages.lock.json +++ b/CringeBootstrap/packages.lock.json @@ -51,11 +51,11 @@ }, "Lib.Harmony.Thin": { "type": "Transitive", - "resolved": "2.3.3", - "contentHash": "jsaFv7XnWJnyfyvFbkgIkZtV6tWMteNUcDK3idq+3LwPqpTFNxsOv2eKmj4qqP8QR8UynG1Y9AUaC/+dVruMHg==", + "resolved": "2.3.4-torch", + "contentHash": "UnLUnLLiXfHZdKa1zhi6w8cl8tJTrpVixLtvjFEVtlDA6Rkf06OcZ2gSidcbcgKjTcR+fk5Qsdos3mU5oohzfg==", "dependencies": { - "MonoMod.Core": "1.1.0", - "System.Text.Json": "8.0.1" + "MonoMod.Core": "1.2.2", + "System.Text.Json": "9.0.0" } }, "Microsoft.Bcl.AsyncInterfaces": { @@ -114,36 +114,36 @@ }, "MonoMod.Backports": { "type": "Transitive", - "resolved": "1.1.2-daily.24.11.24.120.1", - "contentHash": "LUH6Zvx+1M/WxLYv38i/CrWtIYbBg7bOSA2FRTLpilKOaaC4RdeUi060oTQRjrpZ+ZEIbRMBx0c799Uoryugrw==", + "resolved": "1.1.2", + "contentHash": "baYlNy8n8kmaNhNvqmZ/dIPOeO1r9//dG1i2WbunMWtWZ2EKtIgmXaS+ZzphzTsikkGnoD4Jwr5g0TVdpDjgpw==", "dependencies": { - "MonoMod.ILHelpers": "1.1.0-daily.24.11.24.120.1" + "MonoMod.ILHelpers": "1.1.0" } }, "MonoMod.Core": { "type": "Transitive", - "resolved": "1.2.1-daily.24.11.24.120.1", - "contentHash": "290eD12uM89ITcQ/7QuRUCpOdofG7E04mBk6CIIcSxnV/cuBLatTZoF8/YvI8o+ESljhD8Vx6Giji/5eZeMYoA==", + "resolved": "1.2.2", + "contentHash": "3R9mQ7TxeQQBFLtGTR2VIDSBGx/I7d8RYpxvW1Mot0/PB6+UOnHr+lkw7dj8cus8YSnLdCFT+CG4JW89daEvjg==", "dependencies": { "Mono.Cecil": "0.11.5", - "MonoMod.Backports": "1.1.2-daily.24.11.24.120.1", - "MonoMod.ILHelpers": "1.1.0-daily.24.11.24.120.1", - "MonoMod.Utils": "25.0.7-daily.24.11.24.120.1" + "MonoMod.Backports": "1.1.2", + "MonoMod.ILHelpers": "1.1.0", + "MonoMod.Utils": "25.0.8" } }, "MonoMod.ILHelpers": { "type": "Transitive", - "resolved": "1.1.0-daily.24.11.24.120.1", - "contentHash": "81kWbDUDiE/xA9WbYF/5U5RjLDemhnjQULIMm/7UDNQontJVFcGUFKHOtr7KOCXw+MkZK832pOC7cX3YBTKyKw==" + "resolved": "1.1.0", + "contentHash": "L2FWjhTrv7tcIxshfZ+M3OcaNr4cNw0IwiVZEgwqRnZ5QAN3+RrNJ8ZwCzwXUWyPDqooJxMcjjg8PsSYUiNBjQ==" }, "MonoMod.Utils": { "type": "Transitive", - "resolved": "25.0.7-daily.24.11.24.120.1", - "contentHash": "K36oN5h57PQJJsTcqvVEQah3HNU5RbhF+M9Ln3zTkYcsRq9t8i3UlFfA1qIl7LFxxDHWl8LNytb6QV0VJ27Ggw==", + "resolved": "25.0.8", + "contentHash": "8wfyawgvGqUvfchAj7/gPazAjXO8CWNyXH+C0az+hgJH/80zVL5LxDhQMz0NQTyoCEJWU6gNBGc7CL+G7vCbaQ==", "dependencies": { "Mono.Cecil": "0.11.5", - "MonoMod.Backports": "1.1.2-daily.24.11.24.120.1", - "MonoMod.ILHelpers": "1.1.0-daily.24.11.24.120.1" + "MonoMod.Backports": "1.1.2", + "MonoMod.ILHelpers": "1.1.0" } }, "NLog": { @@ -319,18 +319,10 @@ "resolved": "5.0.0", "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" }, - "System.Text.Encodings.Web": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "yev/k9GHAEGx2Rg3/tU6MQh4HGBXJs70y7j1LaM1i/ER9po+6nnQ6RRqTJn1E7Xu0fbIFK80Nh5EoODxrbxwBQ==" - }, "System.Text.Json": { "type": "Transitive", - "resolved": "8.0.1", - "contentHash": "7AWk2za1hSEJBppe/Lg+uDcam2TrDqwIKa9XcPssSwyjC2xa39EKEGul3CO5RWNF+hMuZG4zlBDrvhBdDTg4lg==", - "dependencies": { - "System.Text.Encodings.Web": "8.0.0" - } + "resolved": "9.0.0", + "contentHash": "js7+qAu/9mQvnhA4EfGMZNEzXtJCDxgkgj8ohuxq/Qxv+R56G+ljefhiJHOxTNiw54q8vmABCWUwkMulNdlZ4A==" }, "Torch.SixLabors.ImageSharp": { "type": "Transitive", @@ -367,8 +359,7 @@ "type": "Project", "dependencies": { "ImGui.NET.DirectX": "[1.91.0.1, )", - "Lib.Harmony.Thin": "[2.3.3, )", - "MonoMod.Core": "[1.2.1-daily.24.11.24.120.1, )", + "Lib.Harmony.Thin": "[2.3.4-torch, )", "NLog": "[5.3.4, )", "NuGet": "[1.0.0, )", "SharedCringe": "[1.0.0, )", @@ -447,11 +438,6 @@ "type": "Transitive", "resolved": "5.0.0", "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" - }, - "System.Text.Encodings.Web": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "yev/k9GHAEGx2Rg3/tU6MQh4HGBXJs70y7j1LaM1i/ER9po+6nnQ6RRqTJn1E7Xu0fbIFK80Nh5EoODxrbxwBQ==" } } } diff --git a/CringeLauncher/Patches/PluginTypePatch.cs b/CringeLauncher/Patches/PluginTypePatch.cs index 85fd092..f7aea71 100644 --- a/CringeLauncher/Patches/PluginTypePatch.cs +++ b/CringeLauncher/Patches/PluginTypePatch.cs @@ -24,22 +24,22 @@ internal static class PluginTypePatch .DefineLabel(out var continueLabel) .Insert(new(OpCodes.Ldloc_2), new(OpCodes.Isinst, typeof(PluginWrapper)), new(OpCodes.Stloc, wrapper), - new(OpCodes.Ldloc, wrapper), - new(OpCodes.Brfalse, regularPluginLabel), + new(OpCodes.Ldloc_S, wrapper), + new(OpCodes.Brfalse_S, regularPluginLabel), new(OpCodes.Ldloc_0), - new(OpCodes.Ldloc, wrapper), + new(OpCodes.Ldloc_S, wrapper), new(OpCodes.Call, AccessTools.PropertyGetter(typeof(PluginWrapper), nameof(PluginWrapper.InstanceType))), new(OpCodes.Callvirt, AccessTools.PropertyGetter(typeof(Type), nameof(Type.Assembly))), CodeInstruction.Call(typeof(MyGlobalTypeMetadata), nameof(MyGlobalTypeMetadata.RegisterAssembly), [typeof(Assembly)]), - new(OpCodes.Br, continueLabel)) + new(OpCodes.Br_S, continueLabel)) .SearchForward(b => b.opcode == OpCodes.Ldloca_S) .AddLabels([continueLabel]) .InstructionEnumeration(); } - [HarmonyPatch(typeof(MySession), "RegisterComponentsFromAssemblies", typeof(Assembly), typeof(bool), typeof(MyModContext))] + [HarmonyPatch(typeof(MySession), "RegisterComponentsFromAssemblies")] [HarmonyPrefix] private static bool RegisterComponentsPrefix(MySession __instance) { diff --git a/CringeLauncher/packages.lock.json b/CringeLauncher/packages.lock.json index 415cce8..e19b32b 100644 --- a/CringeLauncher/packages.lock.json +++ b/CringeLauncher/packages.lock.json @@ -141,11 +141,11 @@ }, "Lib.Harmony.Thin": { "type": "Transitive", - "resolved": "2.3.3", - "contentHash": "jsaFv7XnWJnyfyvFbkgIkZtV6tWMteNUcDK3idq+3LwPqpTFNxsOv2eKmj4qqP8QR8UynG1Y9AUaC/+dVruMHg==", + "resolved": "2.3.4-torch", + "contentHash": "UnLUnLLiXfHZdKa1zhi6w8cl8tJTrpVixLtvjFEVtlDA6Rkf06OcZ2gSidcbcgKjTcR+fk5Qsdos3mU5oohzfg==", "dependencies": { - "MonoMod.Core": "1.1.0", - "System.Text.Json": "8.0.1" + "MonoMod.Core": "1.2.2", + "System.Text.Json": "9.0.0" } }, "Microsoft.Bcl.AsyncInterfaces": { @@ -211,36 +211,36 @@ }, "MonoMod.Backports": { "type": "Transitive", - "resolved": "1.1.2-daily.24.11.24.120.1", - "contentHash": "LUH6Zvx+1M/WxLYv38i/CrWtIYbBg7bOSA2FRTLpilKOaaC4RdeUi060oTQRjrpZ+ZEIbRMBx0c799Uoryugrw==", + "resolved": "1.1.2", + "contentHash": "baYlNy8n8kmaNhNvqmZ/dIPOeO1r9//dG1i2WbunMWtWZ2EKtIgmXaS+ZzphzTsikkGnoD4Jwr5g0TVdpDjgpw==", "dependencies": { - "MonoMod.ILHelpers": "1.1.0-daily.24.11.24.120.1" + "MonoMod.ILHelpers": "1.1.0" } }, "MonoMod.Core": { "type": "Transitive", - "resolved": "1.2.1-daily.24.11.24.120.1", - "contentHash": "290eD12uM89ITcQ/7QuRUCpOdofG7E04mBk6CIIcSxnV/cuBLatTZoF8/YvI8o+ESljhD8Vx6Giji/5eZeMYoA==", + "resolved": "1.2.2", + "contentHash": "3R9mQ7TxeQQBFLtGTR2VIDSBGx/I7d8RYpxvW1Mot0/PB6+UOnHr+lkw7dj8cus8YSnLdCFT+CG4JW89daEvjg==", "dependencies": { "Mono.Cecil": "0.11.5", - "MonoMod.Backports": "1.1.2-daily.24.11.24.120.1", - "MonoMod.ILHelpers": "1.1.0-daily.24.11.24.120.1", - "MonoMod.Utils": "25.0.7-daily.24.11.24.120.1" + "MonoMod.Backports": "1.1.2", + "MonoMod.ILHelpers": "1.1.0", + "MonoMod.Utils": "25.0.8" } }, "MonoMod.ILHelpers": { "type": "Transitive", - "resolved": "1.1.0-daily.24.11.24.120.1", - "contentHash": "81kWbDUDiE/xA9WbYF/5U5RjLDemhnjQULIMm/7UDNQontJVFcGUFKHOtr7KOCXw+MkZK832pOC7cX3YBTKyKw==" + "resolved": "1.1.0", + "contentHash": "L2FWjhTrv7tcIxshfZ+M3OcaNr4cNw0IwiVZEgwqRnZ5QAN3+RrNJ8ZwCzwXUWyPDqooJxMcjjg8PsSYUiNBjQ==" }, "MonoMod.Utils": { "type": "Transitive", - "resolved": "25.0.7-daily.24.11.24.120.1", - "contentHash": "K36oN5h57PQJJsTcqvVEQah3HNU5RbhF+M9Ln3zTkYcsRq9t8i3UlFfA1qIl7LFxxDHWl8LNytb6QV0VJ27Ggw==", + "resolved": "25.0.8", + "contentHash": "8wfyawgvGqUvfchAj7/gPazAjXO8CWNyXH+C0az+hgJH/80zVL5LxDhQMz0NQTyoCEJWU6gNBGc7CL+G7vCbaQ==", "dependencies": { "Mono.Cecil": "0.11.5", - "MonoMod.Backports": "1.1.2-daily.24.11.24.120.1", - "MonoMod.ILHelpers": "1.1.0-daily.24.11.24.120.1" + "MonoMod.Backports": "1.1.2", + "MonoMod.ILHelpers": "1.1.0" } }, "NuGet.Frameworks": { @@ -368,18 +368,10 @@ "resolved": "5.0.0", "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" }, - "System.Text.Encodings.Web": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "yev/k9GHAEGx2Rg3/tU6MQh4HGBXJs70y7j1LaM1i/ER9po+6nnQ6RRqTJn1E7Xu0fbIFK80Nh5EoODxrbxwBQ==" - }, "System.Text.Json": { "type": "Transitive", - "resolved": "8.0.1", - "contentHash": "7AWk2za1hSEJBppe/Lg+uDcam2TrDqwIKa9XcPssSwyjC2xa39EKEGul3CO5RWNF+hMuZG4zlBDrvhBdDTg4lg==", - "dependencies": { - "System.Text.Encodings.Web": "8.0.0" - } + "resolved": "9.0.0", + "contentHash": "js7+qAu/9mQvnhA4EfGMZNEzXtJCDxgkgj8ohuxq/Qxv+R56G+ljefhiJHOxTNiw54q8vmABCWUwkMulNdlZ4A==" }, "cringebootstrap.abstractions": { "type": "Project" @@ -388,8 +380,7 @@ "type": "Project", "dependencies": { "ImGui.NET.DirectX": "[1.91.0.1, )", - "Lib.Harmony.Thin": "[2.3.3, )", - "MonoMod.Core": "[1.2.1-daily.24.11.24.120.1, )", + "Lib.Harmony.Thin": "[2.3.4-torch, )", "NLog": "[5.3.4, )", "NuGet": "[1.0.0, )", "SharedCringe": "[1.0.0, )", @@ -471,11 +462,6 @@ "type": "Transitive", "resolved": "5.0.0", "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" - }, - "System.Text.Encodings.Web": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "yev/k9GHAEGx2Rg3/tU6MQh4HGBXJs70y7j1LaM1i/ER9po+6nnQ6RRqTJn1E7Xu0fbIFK80Nh5EoODxrbxwBQ==" } } } diff --git a/CringePlugins/CringePlugins.csproj b/CringePlugins/CringePlugins.csproj index 6ff6f1d..22dd5ba 100644 --- a/CringePlugins/CringePlugins.csproj +++ b/CringePlugins/CringePlugins.csproj @@ -24,9 +24,8 @@ - - + diff --git a/CringePlugins/packages.lock.json b/CringePlugins/packages.lock.json index 2094984..77c8da7 100644 --- a/CringePlugins/packages.lock.json +++ b/CringePlugins/packages.lock.json @@ -45,24 +45,12 @@ }, "Lib.Harmony.Thin": { "type": "Direct", - "requested": "[2.3.3, )", - "resolved": "2.3.3", - "contentHash": "jsaFv7XnWJnyfyvFbkgIkZtV6tWMteNUcDK3idq+3LwPqpTFNxsOv2eKmj4qqP8QR8UynG1Y9AUaC/+dVruMHg==", + "requested": "[2.3.4-torch, )", + "resolved": "2.3.4-torch", + "contentHash": "UnLUnLLiXfHZdKa1zhi6w8cl8tJTrpVixLtvjFEVtlDA6Rkf06OcZ2gSidcbcgKjTcR+fk5Qsdos3mU5oohzfg==", "dependencies": { - "MonoMod.Core": "1.1.0", - "System.Text.Json": "8.0.1" - } - }, - "MonoMod.Core": { - "type": "Direct", - "requested": "[1.2.1-daily.24.11.24.120.1, )", - "resolved": "1.2.1-daily.24.11.24.120.1", - "contentHash": "290eD12uM89ITcQ/7QuRUCpOdofG7E04mBk6CIIcSxnV/cuBLatTZoF8/YvI8o+ESljhD8Vx6Giji/5eZeMYoA==", - "dependencies": { - "Mono.Cecil": "0.11.5", - "MonoMod.Backports": "1.1.2-daily.24.11.24.120.1", - "MonoMod.ILHelpers": "1.1.0-daily.24.11.24.120.1", - "MonoMod.Utils": "25.0.7-daily.24.11.24.120.1" + "MonoMod.Core": "1.2.2", + "System.Text.Json": "9.0.0" } }, "NLog": { @@ -108,25 +96,36 @@ }, "MonoMod.Backports": { "type": "Transitive", - "resolved": "1.1.2-daily.24.11.24.120.1", - "contentHash": "LUH6Zvx+1M/WxLYv38i/CrWtIYbBg7bOSA2FRTLpilKOaaC4RdeUi060oTQRjrpZ+ZEIbRMBx0c799Uoryugrw==", + "resolved": "1.1.2", + "contentHash": "baYlNy8n8kmaNhNvqmZ/dIPOeO1r9//dG1i2WbunMWtWZ2EKtIgmXaS+ZzphzTsikkGnoD4Jwr5g0TVdpDjgpw==", "dependencies": { - "MonoMod.ILHelpers": "1.1.0-daily.24.11.24.120.1" + "MonoMod.ILHelpers": "1.1.0" + } + }, + "MonoMod.Core": { + "type": "Transitive", + "resolved": "1.2.2", + "contentHash": "3R9mQ7TxeQQBFLtGTR2VIDSBGx/I7d8RYpxvW1Mot0/PB6+UOnHr+lkw7dj8cus8YSnLdCFT+CG4JW89daEvjg==", + "dependencies": { + "Mono.Cecil": "0.11.5", + "MonoMod.Backports": "1.1.2", + "MonoMod.ILHelpers": "1.1.0", + "MonoMod.Utils": "25.0.8" } }, "MonoMod.ILHelpers": { "type": "Transitive", - "resolved": "1.1.0-daily.24.11.24.120.1", - "contentHash": "81kWbDUDiE/xA9WbYF/5U5RjLDemhnjQULIMm/7UDNQontJVFcGUFKHOtr7KOCXw+MkZK832pOC7cX3YBTKyKw==" + "resolved": "1.1.0", + "contentHash": "L2FWjhTrv7tcIxshfZ+M3OcaNr4cNw0IwiVZEgwqRnZ5QAN3+RrNJ8ZwCzwXUWyPDqooJxMcjjg8PsSYUiNBjQ==" }, "MonoMod.Utils": { "type": "Transitive", - "resolved": "25.0.7-daily.24.11.24.120.1", - "contentHash": "K36oN5h57PQJJsTcqvVEQah3HNU5RbhF+M9Ln3zTkYcsRq9t8i3UlFfA1qIl7LFxxDHWl8LNytb6QV0VJ27Ggw==", + "resolved": "25.0.8", + "contentHash": "8wfyawgvGqUvfchAj7/gPazAjXO8CWNyXH+C0az+hgJH/80zVL5LxDhQMz0NQTyoCEJWU6gNBGc7CL+G7vCbaQ==", "dependencies": { "Mono.Cecil": "0.11.5", - "MonoMod.Backports": "1.1.2-daily.24.11.24.120.1", - "MonoMod.ILHelpers": "1.1.0-daily.24.11.24.120.1" + "MonoMod.Backports": "1.1.2", + "MonoMod.ILHelpers": "1.1.0" } }, "NuGet.Frameworks": { @@ -185,18 +184,10 @@ "resolved": "6.0.0", "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" }, - "System.Text.Encodings.Web": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "yev/k9GHAEGx2Rg3/tU6MQh4HGBXJs70y7j1LaM1i/ER9po+6nnQ6RRqTJn1E7Xu0fbIFK80Nh5EoODxrbxwBQ==" - }, "System.Text.Json": { "type": "Transitive", - "resolved": "8.0.1", - "contentHash": "7AWk2za1hSEJBppe/Lg+uDcam2TrDqwIKa9XcPssSwyjC2xa39EKEGul3CO5RWNF+hMuZG4zlBDrvhBdDTg4lg==", - "dependencies": { - "System.Text.Encodings.Web": "8.0.0" - } + "resolved": "9.0.0", + "contentHash": "js7+qAu/9mQvnhA4EfGMZNEzXtJCDxgkgj8ohuxq/Qxv+R56G+ljefhiJHOxTNiw54q8vmABCWUwkMulNdlZ4A==" }, "cringebootstrap.abstractions": { "type": "Project" @@ -229,11 +220,6 @@ "System.Numerics.Vectors": "4.5.0", "System.Runtime.CompilerServices.Unsafe": "6.0.0" } - }, - "System.Text.Encodings.Web": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "yev/k9GHAEGx2Rg3/tU6MQh4HGBXJs70y7j1LaM1i/ER9po+6nnQ6RRqTJn1E7Xu0fbIFK80Nh5EoODxrbxwBQ==" } } } diff --git a/NuGet.config b/NuGet.config index 016a8a8..64fa657 100644 --- a/NuGet.config +++ b/NuGet.config @@ -2,6 +2,5 @@ - \ No newline at end of file