gg.easy.airship 0.1.2181 → 0.1.2183

package/Runtime/Code/AirshipConst.cs

@@ -1,8 +1,9 @@
 // ReSharper disable InconsistentNaming
 
 namespace Code {
+    [LuauAPI]
     public static class AirshipConst {
-        public const int playerVersion = 16;
+        public const int playerVersion = 17;
 
         /// <summary>
         /// The server will kick clients that have a playerVersion lower than this value.

package/Runtime/Code/Luau/LuauCoreCallbacks.cs

@@ -760,7 +760,7 @@ public partial class LuauCore : MonoBehaviour {
         try {
             ret = GetProperty(context, thread, instanceId, classNamePtr, classNameSize, propertyName, propertyNameLength, propertyNameAtom);
         } catch (Exception e) {
-            ret = LuauError(thread, e.Message);
+            ret = LuauError(thread, $"{e.GetType()}: {e.Message}");
         }
 
         return ret;
@@ -789,8 +789,17 @@ public partial class LuauCore : MonoBehaviour {
             // Get PropertyInfo from cache if possible -- otherwise put it in cache
             PropertyGetReflectionCache? cacheData;
             if (!(cacheData = LuauCore.GetPropertyCacheValue(classType, propName)).HasValue) {
-                var propertyInfo = classType.GetProperty(propName,
-                    BindingFlags.Public | BindingFlags.Static | BindingFlags.FlattenHierarchy);
+                PropertyInfo propertyInfo = null;
+                try {
+                    propertyInfo = classType.GetProperty(propName,
+                        BindingFlags.Public | BindingFlags.Static | BindingFlags.FlattenHierarchy);
+                } catch (AmbiguousMatchException) {
+                    // If we get an ambiguous match we should use the type declared explicitly in this static class
+                    // (rather than whatever inherited static is causing the ambiguity)
+                    propertyInfo = classType.GetProperty(propName,
+                        BindingFlags.Public | BindingFlags.Static | BindingFlags.DeclaredOnly);
+                }
+
                 cacheData = LuauCore.SetPropertyCacheValue(classType, propName, propertyInfo);
             }
 
@@ -1055,33 +1064,47 @@ public partial class LuauCore : MonoBehaviour {
     /// <returns>True if successful, otherwise false if nothing was written.</returns>
     private static bool FastGetAndWriteValueProperty(IntPtr thread, object objectReference, PropertyGetReflectionCache cacheData) {
         var propType = cacheData.propertyInfo.PropertyType;
-        if (propType == intType) {
+        if (IsOfType(propType, intType)) {
             var intValue = GetValue<int>(objectReference, cacheData);
             WritePropertyToThreadInt32(thread, intValue);
             return true;
         }
-        if (propType == doubleType) {
+        if (IsOfType(propType, doubleType)) {
             var doubleVal = GetValue<double>(objectReference, cacheData);
             WritePropertyToThreadDouble(thread, doubleVal);
             return true;
         }
-        if (propType == floatType) {
+        if (IsOfType(propType, floatType)) {
             var shortVal = GetValue<float>(objectReference, cacheData);
             WritePropertyToThreadSingle(thread, shortVal);
             return true;
         }
-        if (propType == vector3Type) {
+        if (IsOfType(propType, vector3Type)) {
             var vecValue = GetValue<Vector3>(objectReference, cacheData);
             WritePropertyToThreadVector3(thread, vecValue);
             return true;
         }
-        if (propType == quaternionType) {
+        if (IsOfType(propType, vector2Type)) {
+            var vecValue = GetValue<Vector2>(objectReference, cacheData);
+            WritePropertyToThreadVector2(thread, vecValue);
+            return true;
+        }
+        if (IsOfType(propType, quaternionType)) {
             var quatValue = GetValue<Quaternion>(objectReference, cacheData);
             WritePropertyToThreadQuaternion(thread, quatValue);
             return true;
         }
         return false;
     }
+
+    /// <summary>
+    /// Checks if type is of specified ofType including if it is a reference of the ofType. 
+    /// </summary>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    private static bool IsOfType(Type type, Type ofType) {
+        if (type.IsByRef) return type == ofType.MakeByRefType();
+        return type == ofType;
+    }
     
     public static string GetRequirePath(string originalScriptPath, string fileNameStr) {
         Profiler.BeginSample("GetRequirePath");

package/Runtime/Code/Luau/ReflectionList.cs

@@ -242,6 +242,7 @@ namespace Luau {
             ["AudioMixerGroupController"] = LuauContextAll,
             #endif
             ["Toggle"] = LuauContextAll, // "no idea why this needs to be a string...
+            ["UnityEngine.InputSystem.FastTouchscreen"] = LuauContextAll,
         };
 
         private static readonly HashSet<string> SkipNamespaces = new() {

package/Runtime/Code/LuauAPI/InputControlAPI.cs

@@ -0,0 +1,31 @@
+using System;
+using UnityEngine.InputSystem;
+using UnityEngine.InputSystem.Controls;
+
+[LuauAPI]
+public class InputControlAPI : BaseLuaAPIClass {
+    public override Type GetAPIType() {
+        return typeof(InputControl);
+    }
+
+    public override Type[] GetDescendantTypes() {
+        return new Type[] {
+            typeof(UnityEngine.InputSystem.Controls.AxisControl),
+            typeof(UnityEngine.InputSystem.Controls.ButtonControl),
+            typeof(UnityEngine.InputSystem.Controls.DeltaControl),
+            typeof(UnityEngine.InputSystem.Controls.DoubleControl),
+            typeof(UnityEngine.InputSystem.Controls.IntegerControl),
+            typeof(UnityEngine.InputSystem.Controls.DpadControl),
+            typeof(UnityEngine.InputSystem.Controls.KeyControl),
+            typeof(UnityEngine.InputSystem.Controls.QuaternionControl),
+            typeof(UnityEngine.InputSystem.Controls.StickControl),
+            typeof(UnityEngine.InputSystem.Controls.TouchControl),
+            typeof(UnityEngine.InputSystem.Controls.Vector2Control),
+            typeof(UnityEngine.InputSystem.Controls.Vector3Control),
+            typeof(UnityEngine.InputSystem.Controls.AnyKeyControl),
+            typeof(UnityEngine.InputSystem.Controls.DiscreteButtonControl),
+            typeof(UnityEngine.InputSystem.Controls.TouchPhaseControl),
+            typeof(UnityEngine.InputSystem.Controls.TouchPressControl),
+        };
+    }
+}

package/Runtime/Code/LuauAPI/InputControlAPI.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 4af1c2dcd75643c19c006d14009b287f
+timeCreated: 1759165572

package/Runtime/Code/LuauHelper/LuauHelper.cs

@@ -82,6 +82,14 @@ public class LuauHelper : Singleton<LuauHelper> {
                     var instance = (BaseLuaAPIClass)Activator.CreateInstance(type);
                     var apiType = instance.GetAPIType();
                     ReflectionList.AddToReflectionList(apiType, typeAttribute.AllowedContextsMask);
+                    
+                    var descendantTypes = instance.GetDescendantTypes();
+                    if (descendantTypes != null) {
+                        foreach (var descendant in descendantTypes) {
+                            ReflectionList.AddToReflectionList(descendant, typeAttribute.AllowedContextsMask);
+                        }
+                    }
+
                     LuauCore.CoreInstance.RegisterBaseAPI(instance);
 
                     // Override context of individual methods / members

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gg.easy.airship",
-  "version": "0.1.2181",
+  "version": "0.1.2183",
   "displayName": "Airship",
   "unity": "2021.3",
   "unityRelease": "12f1",