瀏覽代碼

Remove Harmony shim config

ghorsington 4 年之前
父節點
當前提交
90bb22c878
共有 1 個文件被更改,包括 4 次插入20 次删除
  1. 4 20
      BepInEx.Preloader/Preloader.cs

+ 4 - 20
BepInEx.Preloader/Preloader.cs

@@ -35,19 +35,11 @@ namespace BepInEx.Preloader
 				ConsoleManager.Initialize(false);
 				AllocateConsole();
 
-				bool bridgeInitialized = Utility.TryDo(() =>
+				Utility.TryDo(() =>
 				{
-					if (ConfigShimHarmony.Value)
-						HarmonyDetourBridge.Init();
-				}, out var harmonyBridgeException);
-
-				Exception runtimePatchException = null;
-				if (bridgeInitialized)
-					Utility.TryDo(() =>
-					{
-						if (ConfigApplyRuntimePatches.Value)
-							UnityPatches.Apply();
-					}, out runtimePatchException);
+					if (ConfigApplyRuntimePatches.Value)
+						UnityPatches.Apply();
+				}, out var runtimePatchException);
 
 				Logger.Sources.Add(TraceLogSource.CreateSource());
 
@@ -76,9 +68,6 @@ namespace BepInEx.Preloader
 				Logger.LogInfo($"CLR runtime version: {Environment.Version}");
 				Logger.LogInfo($"Supports SRE: {Utility.CLRSupportsDynamicAssemblies}");
 
-				if (harmonyBridgeException != null)
-					Logger.LogWarning($"Failed to enable fix for Harmony for .NET Standard API. Error message: {harmonyBridgeException.Message}");
-
 				if (runtimePatchException != null)
 					Logger.LogWarning($"Failed to apply runtime patches for Mono. See more info in the output log. Error message: {runtimePatchException.Message}");
 
@@ -276,11 +265,6 @@ namespace BepInEx.Preloader
 			true,
 			"Enables or disables runtime patches.\nThis should always be true, unless you cannot start the game due to a Harmony related issue (such as running .NET Standard runtime) or you know what you're doing.");
 
-		private static readonly ConfigEntry<bool> ConfigShimHarmony = ConfigFile.CoreConfig.Bind(
-			"Preloader", "ShimHarmonySupport",
-			!Utility.CLRSupportsDynamicAssemblies,
-			"If enabled, basic Harmony functionality is patched to use MonoMod's RuntimeDetour instead.\nTry using this if Harmony does not work in a game.");
-
 		private static readonly ConfigEntry<bool> ConfigPreloaderCOutLogging = ConfigFile.CoreConfig.Bind(
 			"Logging", "PreloaderConsoleOutRedirection",
 			true,