option to revert settings

Dependencies/Il2CppAssemblyGenerator/Core.cs

@@ -71,7 +71,7 @@ private static int Run()
             Logger.Msg("Assembly Generation Needed!");
 
             //if (!LaunchOptions.Il2CppAssemblyGenerator.OfflineMode)
-                RemoteAPI.Contact();
+                //RemoteAPI.Contact();
 
             dumper = new Cpp2IL();
             il2cppinterop = new Packages.Il2CppInterop();

RedLoader/Core.cs

@@ -116,7 +116,7 @@ internal static int Initialize()
             bHapticsManager.Connect(BuildInfo.Name, UnityInformationHandler.GameName);
 
             StatusWindow.StatusText = "Loading Plugins...";
-            MelonHandler.LoadMelonsFromDirectory<MelonPlugin>(LoaderEnvironment.PluginsDirectory);
+            MelonHandler.LoadMelonsFromDirectory<LoaderPlugin>(LoaderEnvironment.PluginsDirectory);
             GlobalEvents.MelonHarmonyEarlyInit.Invoke();
             GlobalEvents.OnPreInitialization.Invoke();
 

RedLoader/Harmony/Extras/ConfiguredPatcher.cs → RedLoader/Harmony/ConfiguredPatcher.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Reflection;
 using HarmonyLib;
+using RedLoader;
 
 namespace Harmony;
 
@@ -28,6 +29,20 @@ public ConfiguredPatcher(HarmonyLib.Harmony harmony)
     {
         _harmony = harmony;
     }
+
+    public void Patch(string methodName, bool shouldPatch = true)
+    {
+        if (!shouldPatch)
+            return;
+
+        var targetMethod = AccessTools.Method(typeof(T), methodName);
+        if (targetMethod == null)
+            throw new Exception($"Could not find method {methodName} in type {typeof(T).FullName}");
+
+        var isPrefix = targetMethod.Name.EndsWith("Prefix");
+        var sourceMethod = GetMethodFromAttribute(targetMethod);
+        _harmony.Patch(sourceMethod, isPrefix ? targetMethod.ToNewHarmonyMethod() : null, isPrefix ? null : targetMethod.ToNewHarmonyMethod());
+    }
 
     public void Prefix<T2>(string sourceMethodName, string targetMethodName, bool shouldPatch = true, params Type[] parameters)
     {
@@ -89,4 +104,30 @@ private HarmonyLib.HarmonyMethod GetTargetMethod(string methodName)
         _harmonyMethods.Add(methodName, harmonyMethod);
         return harmonyMethod;
     }
+
+    private MethodBase GetMethodFromAttribute(MethodBase method)
+    {
+        var attr = method.GetCustomAttribute<HarmonyPatch>();
+        if (attr == null)
+            throw new Exception($"Method {method.Name} in type {typeof(T).FullName} is not a Harmony patch");
+        var info = attr.info;
+
+        MethodBase sourceMethod = null;
+
+        if (!info.methodType.HasValue)
+            sourceMethod = AccessTools.Method(info.declaringType, info.methodName, info.argumentTypes);
+        else if(info.methodType.Value == MethodType.Setter)
+            sourceMethod = AccessTools.PropertySetter(info.declaringType, info.methodName);
+        else if(info.methodType.Value == MethodType.Getter)
+            sourceMethod = AccessTools.PropertyGetter(info.declaringType, info.methodName);
+        else if(info.methodType.Value == MethodType.Constructor)
+            sourceMethod = AccessTools.Constructor(info.declaringType, info.argumentTypes);
+        else if(info.methodType.Value == MethodType.StaticConstructor)
+            sourceMethod = AccessTools.Constructor(info.declaringType, info.argumentTypes);
+
+        if (sourceMethod == null)
+            throw new MissingMethodException(info.declaringType.FullName, info.methodName);
+
+        return sourceMethod;
+    }
 }

RedLoader/LoaderUtils.cs

@@ -162,7 +162,7 @@ private static ModBase GetMelonFromAssembly(Assembly asm)
             =>
                 asm == null
                     ? null
-                    : MelonPlugin.RegisteredMods.Cast<ModBase>()
+                    : LoaderPlugin.RegisteredMods.Cast<ModBase>()
                           .FirstOrDefault(x => x.ModAssembly.Assembly == asm) ??
                       ModBase.RegisteredMelons.FirstOrDefault(x => x.ModAssembly.Assembly == asm);
 

RedLoader/Melons/MelonPlugin.cs → RedLoader/Melons/LoaderPlugin.cs

@@ -3,9 +3,9 @@
 
 namespace RedLoader
 {
-    public abstract class MelonPlugin : ModTypeBase<MelonPlugin>
+    public abstract class LoaderPlugin : ModTypeBase<LoaderPlugin>
     {
-        static MelonPlugin()
+        static LoaderPlugin()
         {
             TypeName = "Plugin";
         }
@@ -35,7 +35,7 @@ protected private override bool RegisterInternal()
         }
         private void HarmonyInit()
         {
-            if (!ModAssembly.HarmonyDontPatchAll)
+            if (HarmonyPatchAll)
                 HarmonyInstance.PatchAll(ModAssembly.Assembly);
         }
 

RedLoader/Melons/MelonAssembly.cs

@@ -171,8 +171,6 @@ public static MelonAssembly LoadMelonAssembly(string path, Assembly assembly, bo
 
         public readonly MelonEvent OnUnregister = new();
 
-        public bool HarmonyDontPatchAll { get; internal set; } = true;
-
         /// <summary>
         /// A SHA256 Hash of the Assembly.
         /// </summary>
@@ -241,7 +239,7 @@ public void LoadMelons()
             var info = LoaderUtils.PullAttributeFromAssembly<MelonInfoAttribute>(Assembly);
             if (info != null && info.SystemType != null && info.SystemType.IsSubclassOf(typeof(ModBase)))
             {
-                if (info.SystemType.IsSubclassOf(typeof(MelonPlugin)))
+                if (info.SystemType.IsSubclassOf(typeof(LoaderPlugin)))
                 {
                     ModBase mod;
                     try
@@ -269,7 +267,6 @@ public void LoadMelons()
                         var domainAttr = LoaderUtils.PullAttributeFromAssembly<MelonPlatformDomainAttribute>(Assembly);
                         var mlVersionAttr = LoaderUtils.PullAttributeFromAssembly<VerifyLoaderVersionAttribute>(Assembly);
                         var mlBuildAttr = LoaderUtils.PullAttributeFromAssembly<VerifyLoaderBuildAttribute>(Assembly);
-                        var harmonyDPAAttr = LoaderUtils.PullAttributeFromAssembly<HarmonyDontPatchAllAttribute>(Assembly);
 
                         mod.Info = info;
                         mod.AdditionalCredits = additionalCreditsAttr;
@@ -287,7 +284,6 @@ public void LoadMelons()
                         //melon.OptionalDependencies = optionalDependenciesAttr.AssemblyNames;
                         //melon.OptionalDependencies = Array.Empty<string>();
                         mod.ID = idAttr?.ID;
-                        HarmonyDontPatchAll = harmonyDPAAttr != null;
 
                         loadedMelons.Add(mod);
 

RedLoader/Melons/MelonHandler.cs

@@ -80,8 +80,8 @@ public static void LoadMelonsFromDirectory<T>(string path) where T : ModTypeBase
 
             var count = ModTypeBase<T>._registeredMelons.Count;
             RLog.Msg($"{count} {ModTypeBase<T>.TypeName.MakePlural(count)} loaded.");
-            if (firstSpacer || (typeof(T) ==  typeof(MelonMod)))
-                RLog.WriteSpacer();
+            // if (firstSpacer || (typeof(T) ==  typeof(MelonMod)))
+            //     RLog.WriteSpacer();
             firstSpacer = true;
         }
 
@@ -120,7 +120,7 @@ public static void LoadModsFromDirectory(string path, string name)
                 asm.LoadMelons();
                 foreach (var m in asm.LoadedMelons)
                 {
-                    if (m is not MelonPlugin && melons.All(x => x.ID != m.ID))
+                    if (m is not LoaderPlugin && melons.All(x => x.ID != m.ID))
                     {
                         melons.Add(m);
                     }

RedLoader/Melons/ModBase.cs

@@ -159,6 +159,11 @@ private static void SortMelons<T>(ref List<T> melons) where T : ModBase
         /// </summary>
         protected bool NoUpdate;
 
+        /// <summary>
+        /// If true the loader will automatically apply all harmony patches in the assembly.
+        /// </summary>
+        protected bool HarmonyPatchAll;
+
         /// <summary>
         /// Name of the current Melon Type.
         /// </summary>
@@ -370,7 +375,7 @@ public bool Register()
 
         private void HarmonyInit()
         {
-            if (!ModAssembly.HarmonyDontPatchAll)
+            if (HarmonyPatchAll)
                 HarmonyInstance.PatchAll(ModAssembly.Assembly);
         }
 

SonsGameManager/DebugCommands.cs

@@ -1,4 +1,5 @@
 using AdvancedTerrainGrass;
+using Sons.Construction.GRABS;
 using Sons.Lodding;
 using Sons.PostProcessing;
 using SonsSdk;
@@ -112,18 +113,7 @@ private void NoForestCommand(string args)
         PathologicalGames.PoolManager.Pools["Bushes"].gameObject.SetActive(!isActive);
         PathologicalGames.PoolManager.Pools["SmallTree"].gameObject.SetActive(!isActive);
     }
-
-    /// <summary>
-    /// Equip the laser pointer that let's you use the procedural building system
-    /// </summary>
-    /// <param name="args"></param>
-    /// <command>laserpointer</command>
-    [DebugCommand("laserpointer")]
-    private void LaserPointerCommand(string args)
-    {
-        DebugConsole.Instance._equipitem("505");
-    }
-
+
     /// <summary>
     /// Toggles the shadow rendering (Shadows, Contact Shadows, Micro Shadowing)
     /// </summary>

SonsGameManager/GamePatches.cs

@@ -31,7 +31,7 @@ public static void Init()
     {
         _patcher = new(Core.HarmonyInst);
 
-        _patcher.Prefix<SonsLaunch>("Start", nameof(LaunchStartPatch));
+        _patcher.Prefix<SonsLaunch>(nameof(SonsLaunch.Start), nameof(LaunchStartPatch));
         _patcher.Prefix<SonsFMODEventEmitter>(nameof(SonsFMODEventEmitter.Play), nameof(SonsEmitterPlayPatch));
         _patcher.Prefix<FMOD_StudioEventEmitter>(nameof(FMOD_StudioEventEmitter.StartEvent), nameof(FModEmitterPlayPatch));