Merge Master to Melons Dev

GuiModifications.cs

@@ -49,7 +49,7 @@ internal static void RunMainMenuModifications()
             textComponent.font = LocalizedText.localizationTable.GetFont(Settings.Get().Language, false);
             textComponent.color = Color.Lerp(Color.blue, Color.black, 0.6f);
 
-            // not sure what this is I stole it from WackyModer lol
+            // not sure what this is I stole it from WackyModer lol  -- Melon, It stops the text from being clickced and blocking the buttons I think
             textComponent.raycastTarget = false;
 
             textComponent.fontSize = 13;
@@ -91,4 +91,4 @@ internal static string GetBepInExInfo()
             return text;
         }
     }
-}
+}

HarmonyLoader.cs

@@ -7,7 +7,70 @@ namespace Splotch.Loader
     /// </summary>
     internal static class Patcher
     {
-        public static Harmony harmony = new Harmony("com.codemob.splotch");
+        public static Harmony harmony = new Harmony("com.splotch.splotchfixes");
+        /// <summary>
+        /// Runs all of Splotch's patches.
+        /// </summary>
+		public static void DoPatching()
+        {
+			harmony.PatchAll(typeof(Patches));
+		}
+
+        [HarmonyPatch]
+        internal static class Patches
+        {
+		/* im not done with this yet
+		[HarmonyPatch(typeof(Client)]
+		public static bool UpdateInputHistoryReplacement(Client __instance, InputPacketUpdate update)
+	            {
+	                uint num = this.inputHistoryHeadSeqNum;
+	            int num2 = (int)(update.seqNumber - num);
+	            if (num2 > 32)
+	            {
+	                Debug.LogError("Discarded a packet because it was too new");
+	                return true;
+	            }
+	            for (int i = num2 - 1; i >= 0; i--)
+	            {
+	                uint num = this.inputHistoryHeadSeqNum;
+	            int num2 = (int)(update.seqNumber - num);
+	            if (num2 > 32)
+	            {
+	                Debug.LogError("Discarded a packet because it was too new");
+	                return true;
+	            }
+	            for (int i = num2 - 1; i >= 0; i--)
+	            {
+	                uint num3 = 1U << i;
+	                InputPacket inputPacket = default(InputPacket);
+	                inputPacket.jump = ((update.jump & num3) > 0U);
+	                inputPacket.ab1 = ((update.ab1 & num3) > 0U);
+	                inputPacket.ab2 = ((update.ab2 & num3) > 0U);
+	                inputPacket.ab3 = ((update.ab3 & num3) > 0U);
+	                inputPacket.select = ((update.select & num3) > 0U);
+	                inputPacket.start = ((update.start & num3) > 0U);
+	                inputPacket.w = ((update.w & num3) > 0U);
+	                inputPacket.a = ((update.a & num3) > 0U);
+	                inputPacket.s = ((update.s & num3) > 0U);
+	                inputPacket.d = ((update.d & num3) > 0U);
+	                inputPacket.joystickAngle = update.joystickAngle[i];
+	                inputPacket.targetDelayBufferSize = update.targetDelayBufferSize;
+	                inputPacket.seqNumber = num + 1U;
+	                num += 1U;
+	                this.inputHistory.Enqueue(inputPacket);
+	                this.inputHistoryHeadSeqNum = inputPacket.seqNumber;
+	            }
+	            return false;
+	            }
+	     */
+	// put your patch here
+        }
+
+	[HarmonyPatch]
+        internal static class Patches
+        {
+	// second one for ease
+        }
     }
 
 }

LICENSE

@@ -1,21 +1,13 @@
-MIT License
+            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+                    Version 2, December 2004
 
-Copyright (c) 2024 codemob
+ Copyright (C) 2004 Sam Hocevar <[email protected]>
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+ Everyone is permitted to copy and distribute verbatim or modified
+ copies of this license document, and changing it is allowed as long
+ as the name is changed.
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+  0. You just DO WHAT THE FUCK YOU WANT TO.

Loader.cs

@@ -10,8 +10,6 @@
 using System.Collections;
 using HarmonyLib;
 using MonoMod.Utils;
-using Splotch.Network;
-using Splotch.UserInterface;
 
 namespace Splotch.Loader
 {
@@ -21,6 +19,7 @@ namespace Splotch.Loader
     public static class Loader
     {
         public static bool BepInExPresent { get { return Directory.Exists(@"BepInEx\core\"); } }
+        public static string ModPath = null;
 
         struct SplotchConfigContainer
         {
@@ -42,11 +41,17 @@ public static void OnEnterScene(Scene scene, LoadSceneMode loadSceneMode)
 
             Logger.Log($"Entering main menu on version {VersionChecker.currentVersionString}");
 
+            string[] commandLineArgs = Environment.GetCommandLineArgs();
+
+            foreach (string arg in commandLineArgs)
+            {
+                Console.WriteLine(arg);
+            }
+
             enteredScene = true;
+            Patcher.DoPatching();
             ModLoader.ModLoader.LoadMods();
             EventManager.Load();
-            Networker.Load();
-            UserInterface.SplotchGUI.Load();
 
             GameObject obj = new GameObject("Unloader", new Type[] { typeof(UnLoader) });
             Logger.Debug("Finished main menu loading!");
@@ -80,6 +85,31 @@ public static void LoadBepInEx()
         /// </summary>
         public static void Main()
         {
+            // Test for the "--begone-splotch" command line arg so we can run vanilla
+
+            string[] commandLineArgs = Environment.GetCommandLineArgs();
+
+            bool CustomPath = false;
+            foreach (string arg in commandLineArgs)
+            {
+                if (CustomPath)
+                {
+                    ModPath = arg;
+                }
+
+                CustomPath = false;
+
+                // I have no clue why, it just breaks randomly and inoften when this is not .Contains()
+                if (arg.Contains("--begone-splotch"))
+                {
+                    return;
+                }
+
+                if (arg.Contains("--splotch-mods-dir"))
+                {
+                    CustomPath = true;
+                }
+            }
             if (BepInExPresent)
                 LoadBepInEx();
 
@@ -144,4 +174,4 @@ public static void LoadBepInExUnstable()
             SceneManager.sceneLoaded += Loader.SceneLoaded;
         }
     }
-}
+}