[OSC]

- Changed log that was tripping lum's error detection [Instances] - Added DeepLink compatibility (Instances will no longer skip the deep link urls to start the game in a certain instance) - Fixed Obsolete Game code
kafeijao · Sep 15, 2024 · faa1530 · faa1530
1 parent 6cffb84
commit faa1530
Show file tree

Hide file tree

Showing 8 changed files with 51 additions and 16 deletions.
diff --git a/Instances/Integrations/ChatBox.cs b/Instances/Integrations/ChatBox.cs
@@ -61,8 +61,7 @@ private static void HandleRestart(ChatBox.API.ChatBoxMessage chatBoxMessage) {
 
     private static void HandleRejoin(ChatBox.API.ChatBoxMessage chatBoxMessage) {
         if (chatBoxMessage.Message.StartsWith(RejoinCommandPrefix) && !string.IsNullOrEmpty(MetaPort.Instance.CurrentInstanceId)) {
-            ABI_RC.Core.Networking.IO.Instancing.Instances.SetJoinTarget(MetaPort.Instance.CurrentInstanceId,
-                MetaPort.Instance.CurrentWorldId);
+            ABI_RC.Core.Networking.IO.Instancing.Instances.SetJoinTarget(MetaPort.Instance.CurrentInstanceId);
         }
     }
 

diff --git a/Instances/Main.cs b/Instances/Main.cs
@@ -12,6 +12,7 @@
 using ABI_RC.Core.Savior;
 using ABI_RC.Core.Savior.SceneManagers;
 using ABI_RC.Core.UI;
+using ABI_RC.Core.Util;
 using ABI_RC.Systems.GameEventSystem;
 using ABI_RC.Systems.Movement;
 using ABI_RC.Systems.UI;
@@ -49,6 +50,7 @@ public class Instances : MelonMod {
     public const int TeleportToLocationTimeout = 5;
 
     public const string InstanceRestartConfigArg = "--instances-owo-what-is-dis";
+    public const string InstanceSkipDeepLink = "--instances-skip-deep-link";
 
 
     // Config File Saving
@@ -494,7 +496,7 @@ private static IEnumerator LoadIntoLastInstance(string instanceId, bool isInitia
                 // User clicked on an instance that is no longer valid, or the initial instance we created borked
                 MelonLogger.Msg($"Instance {instanceId} has not been found.");
                 CohtmlHud.Instance.ViewDropTextImmediate("", "Instance not Available",
-                    "The instance you're trying to join doesn't was deleted or you don't have permission...");
+                    "The instance you're trying to join doesn't was deleted or you don't have permission...", "", false);
             }
             // Let's invalidate the attempted instance
             InvalidateInstance(instanceId);
@@ -505,7 +507,7 @@ private static IEnumerator LoadIntoLastInstance(string instanceId, bool isInitia
 
             // Load into the instance
             MelonLogger.Msg($"The previous instance {instanceDetails.Data.Name} is still up! Attempting to join...");
-            ABI_RC.Core.Networking.IO.Instancing.Instances.SetJoinTarget(instanceDetails.Data.Id, instanceDetails.Data.World.Id);
+            ABI_RC.Core.Networking.IO.Instancing.Instances.SetJoinTarget(instanceDetails.Data.Id);
         }
 
         _isChangingInstance = false;
@@ -592,7 +594,7 @@ private static IEnumerator CreateAndJoinOnlineInstance() {
 
                         // Load into the instance
                         MelonLogger.Msg($"The created {instanceDetails.Data.Name} is {(attemptNum > 1 ? "finally" : "")} up! Attempting to join...");
-                        ABI_RC.Core.Networking.IO.Instancing.Instances.SetJoinTarget(instanceDetails.Data.Id, instanceDetails.Data.World.Id);
+                        ABI_RC.Core.Networking.IO.Instancing.Instances.SetJoinTarget(instanceDetails.Data.Id);
 
                         // We succeeded so lets break the coroutine here
                         yield break;
@@ -674,16 +676,43 @@ private static void Initialize() {
         Content.LoadIntoWorld(MetaPort.Instance.homeWorldGuid);
     }
 
+    private static bool HasCommandLineArg(string arg)
+    {
+        foreach (string commandLineArg in Environment.GetCommandLineArgs()) {
+            if (commandLineArg.Contains(arg))
+            {
+                return true;
+            }
+        }
+        return false;
+    }
+
     [HarmonyPatch]
     internal class HarmonyPatches {
 
         [HarmonyPrefix]
         [HarmonyPatch(typeof(LoginRoom), nameof(LoginRoom.LoadPlayerChosenContent))]
-        public static bool Before_LoginRoom_LoadPlayerChosenContent() {
+        public static bool Before_LoginRoom_LoadPlayerChosenContent()
+        {
             // Prevent the initial joining to the offline home world
             try {
                 if (!_skipInitialLoad) {
                     _skipInitialLoad = true;
+
+                    // Prevent running our stuff if the game is starting with a DeepLink Url
+                    if (CheckVR.Instance.hasDeepLinkUrl && !DeepLinkHelper._consumedJoinInstanceLaunchArg)
+                    {
+                        if (HasCommandLineArg(InstanceSkipDeepLink))
+                        {
+                            MelonLogger.Msg("Skipping the DeepLink Url because the game is is starting from an Instances Restart");
+                        }
+                        else
+                        {
+                            MelonLogger.Msg("Skipping Instances initial join because the game is starting with a DeepLink Url");
+                            return true;
+                        }
+                    }
+
                     // Still load the avatar
                     AssetManagement.Instance.LoadLocalAvatar(MetaPort.Instance.currentAvatarGuid);
                     // We're assuming we already authenticated (we wouldn't be reaching here otherwise)
@@ -760,10 +789,9 @@ public static void After_RichPresence_ReadPresenceUpdateFromNetwork() {
         [HarmonyPatch(typeof(MetaPort), nameof(MetaPort.Start))]
         public static void After_MetaPort_Start() {
             // Look for arguments set by a previous restart of the game by the Instances Mod
-            foreach (var commandLineArg in Environment.GetCommandLineArgs()) {
-                if (!commandLineArg.Contains(InstanceRestartConfigArg)) continue;
+            if (HasCommandLineArg(InstanceRestartConfigArg))
+            {
                 MetaPort.Instance.matureContentAllowed = true;
-                break;
             }
         }
     }

diff --git a/Instances/ModConfig.cs b/Instances/ModConfig.cs
@@ -256,6 +256,8 @@ internal static IEnumerator RestartCVR(bool switchPlatform) {
                 envArguments.Add(Instances.InstanceRestartConfigArg);
             }
 
+            envArguments.Add(Instances.InstanceSkipDeepLink);
+
             // Handle platform switches
             if (switchPlatform) {
                 if (envArguments.Contains(VREnvArg)) {

diff --git a/Instances/Properties/AssemblyInfo.cs b/Instances/Properties/AssemblyInfo.cs
@@ -29,7 +29,7 @@
 
 namespace Kafe.Instances.Properties;
 internal static class AssemblyInfoParams {
-    public const string Version = "1.0.19";
+    public const string Version = "1.0.20";
     public const string Author = "kafeijao";
     public const string BTKUILibName = "BTKUILib";
     public const string ChatBoxName = "ChatBox";

diff --git a/Instances/Properties/CVRMG.json b/Instances/Properties/CVRMG.json
@@ -1,7 +1,7 @@
 {
   "_id": 133,
   "name": "Instances",
-  "modversion": "1.0.19",
+  "modversion": "1.0.20",
   "gameversion": "2024r176",
   "loaderversion": "v0.6.1",
   "modtype": "Mod",
@@ -16,6 +16,6 @@
   "requirements": ["[BTKUILib](https://api.cvrmg.com/v1/mods/download/113)"],
   "downloadlink": "https://github.com/kafeijao/Kafe_CVR_Mods/releases/download/r72/Instances.dll",
   "sourcelink": "https://github.com/kafeijao/Kafe_CVR_Mods/tree/master/Instances",
-  "changelog": "- Fixed for 2024r176",
+  "changelog": "- Added DeepLink compatibility (Instances will no longer skip the deep link urls to start the game in a certain instance)\n- Updated obsolete code",
   "embedcolor": "16C60C"
 }
diff --git a/OSC/Events/Avatar.cs b/OSC/Events/Avatar.cs
@@ -82,6 +82,12 @@ internal static async void OnAnimatorManagerUpdate(AvatarAnimatorManager animato
         var userGuid = MetaPort.Instance.ownerId;
         var avatarGuid = MetaPort.Instance.currentAvatarGuid;
 
+        if (!Guid.TryParse(avatarGuid, out Guid _))
+        {
+            MelonLogger.Msg($"Found an invalid avatar ID {avatarGuid}, ignoring the setup...");
+            return;
+        }
+
         string avatarName = null;
 
         // Look in cache for the avatar name
@@ -103,7 +109,7 @@ internal static async void OnAnimatorManagerUpdate(AvatarAnimatorManager animato
         // If the avatar name is still null, just give up
         if (avatarName == null) {
             JsonConfigOsc.ClearCurrentAvatarConfig();
-            MelonLogger.Msg($"[Error] The config for the avatar {avatarGuid} won't be generated.");
+            MelonLogger.Msg($"Failed to get the avatar name. The config for the Avatar ID {avatarGuid} won't be generated.");
         }
         // Otherwise create the config! (if needed)
         else {

diff --git a/OSC/Properties/AssemblyInfo.cs b/OSC/Properties/AssemblyInfo.cs
@@ -28,7 +28,7 @@
 
 namespace Kafe.OSC.Properties;
 internal static class AssemblyInfoParams {
-    public const string Version = "1.1.14";
+    public const string Version = "1.1.15";
     public const string Author = "kafeijao";
     public const string ChatBoxName = "ChatBox";
     public const string CVRParamLibName = "CVRParamLib";

diff --git a/OSC/Properties/CVRMG.json b/OSC/Properties/CVRMG.json
@@ -1,7 +1,7 @@
 {
   "_id": 79,
   "name": "OSC",
-  "modversion": "1.1.14",
+  "modversion": "1.1.15",
   "gameversion": "2024r176",
   "loaderversion": "v0.6.1",
   "modtype": "Mod",
@@ -17,6 +17,6 @@
   "requirements": [],
   "downloadlink": "https://github.com/kafeijao/Kafe_CVR_Mods/releases/download/r72/OSC.dll",
   "sourcelink": "https://github.com/kafeijao/Kafe_CVR_Mods/tree/master/OSC",
-  "changelog": "- Fixed for 2024r176",
+  "changelog": "- Changed a log to prevent being picked up by lum as an error when it's not",
   "embedcolor": "16C60C"
 }