CreatePortal fixed, mod is actually working now

Author: Jdbye

AdvancedInvites/BuildInfo.cs

@@ -44,7 +44,8 @@ public static class BuildInfo
         // 1.6.9 Updated for VRC build 1151
         // 1.6.10 Hopefully fixed NRE
         // 1.7.0 Updated for VRC build 1171
-        public const string Version = "1.7.0";
+        // 1.7.1 CreatePortal fixed, mod actually working
+        public const string Version = "1.7.1";
 
     }
 

AdvancedInvites/InviteHandler.cs

@@ -89,7 +89,7 @@ private static void DropPortal()
 
                 // CreatePortal (before il2cpp)
                 bool created = Utilities.CreatePortal(apiWorld, apiWorldInstance, playerTransform.position, playerTransform.forward,
-                    GetFunctionPointer(nameof(ShowErrorReason)));
+                    Utilities.ShowErrorReason);
                         if (created && DeleteNotifications)
                             Utilities.DeleteNotification(currentNotification);
                     }),
@@ -98,16 +98,6 @@ private static void DropPortal()
                 new Action<ApiContainer>(container => Utilities.ShowAlert("Error Fetching World", container.Error)));
         }
 
-        public static void ShowErrorReason(string error)
-        {
-            Utilities.ShowAlert("Error Creating Portal", error);
-        }
-
-        private static IntPtr GetFunctionPointer(string methodName)
-        {
-            return typeof(Utilities).GetMethod(methodName, System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.DeclaredOnly | System.Reflection.BindingFlags.Static)!.MethodHandle.GetFunctionPointer();
-        }
-
         private static void JoinYourself()
         {
             Utilities.HideCurrentPopup();

AdvancedInvites/Utilities.cs

@@ -352,11 +352,21 @@ public static bool AllowedToInvite()
                 };
         }
 
-        public static bool CreatePortal(ApiWorld apiWorld, ApiWorldInstance apiWorldInstance, Vector3 position, Vector3 forward, IntPtr errorReasonCallback)
+        public static bool CreatePortal(ApiWorld apiWorld, ApiWorldInstance apiWorldInstance, Vector3 position, Vector3 forward, Action<string> errorReasonCallback)
         {
             return GetCreatePortalDelegate(apiWorld, apiWorldInstance, position, forward, errorReasonCallback);
         }
 
+        public static void ShowErrorReason(string error)
+        {
+            Utilities.ShowAlert("Error Creating Portal", error);
+        }
+
+        internal static IntPtr GetFunctionPointer(string methodName)
+        {
+            return typeof(Utilities).GetMethod(methodName, System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.DeclaredOnly | System.Reflection.BindingFlags.Static)!.MethodHandle.GetFunctionPointer();
+        }
+
         public static void DeleteNotification(Notification notification)
         {
             try
@@ -515,7 +525,7 @@ private delegate void SendNotificationDelegate(
             NotificationDetails notificationDetails,
             Il2CppStructArray<byte> picDataIGuess = null);
 
-        private delegate bool CreatePortalDelegate(ApiWorld apiWorld, ApiWorldInstance apiWorldInstance, Vector3 position, Vector3 forward, IntPtr errorReasonCallback);
+        private delegate bool CreatePortalDelegate(ApiWorld apiWorld, ApiWorldInstance apiWorldInstance, Vector3 position, Vector3 forward, Il2CppSystem.Action<string> errorReasonCallback = null);
 
         private delegate void DeleteNotificationDelegate(Notification notification);