Adjust to new airship component

Author: Sleitnick

Runtime/Code/Luau/AirshipBehaviourRoot.cs

@@ -6,87 +6,6 @@
 #endif
 
 namespace Luau {
-    public static class AirshipBehaviourRootV3 {
-        private static int _idGen = 10000000;
-
-        private static readonly Dictionary<GameObject, int> Ids = new();
-        private static readonly Dictionary<int, GameObject> IdToGameObject = new();
-        private static readonly Dictionary<int, HashSet<int>> GameObjectComponentIds = new();
-
-        [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.SubsystemRegistration)]
-        private static void ResetOnLoad() {
-            _idGen = 10000000;
-            Ids.Clear();
-            IdToGameObject.Clear();
-        }
-
-        public static int GetId(GameObject gameObject) {
-            if (Ids.TryGetValue(gameObject, out var id)) return id;
-
-            id = ++_idGen;
-            Ids.Add(gameObject, id);
-            IdToGameObject.Add(id, gameObject);
-
-            return id;
-        }
-
-        public static int GetId(Component component) {
-            return GetId(component.gameObject);
-        }
-
-        /// <summary>
-        /// This will ensure that the parent GameObject has a reference to the AirshipComponent
-        /// </summary>
-        internal static void LinkComponentToGameObject(AirshipComponentV2 component, out int gameObjectId) {
-            gameObjectId = GetId(component.gameObject);
-            var componentId = component.GetAirshipComponentId();
-
-            if (!GameObjectComponentIds.TryGetValue(gameObjectId, out var componentIds)) {
-                componentIds = new HashSet<int>();
-                GameObjectComponentIds.Add(gameObjectId, componentIds);
-            }
-
-            componentIds.Add(componentId);
-        }
-
-        internal static void CleanIdOnDestroy(GameObject gameObject, AirshipComponentV2 component) {
-            if (!Ids.TryGetValue(gameObject, out var id)) return;
-            
-            var components = gameObject.GetComponents<AirshipComponentV2>().Where(c => c != component);
-            if (components.Any() && gameObject.activeInHierarchy) return;
-
-            var componentIds =  GameObjectComponentIds[id];
-            
-            componentIds.Remove(component.GetAirshipComponentId());
-
-            if (componentIds.Count != 0) return;
-            
-            // If no more components, we'll remove Id <-> GameObject mappings, tyvm
-            Ids.Remove(gameObject);
-            IdToGameObject.Remove(id);
-            GameObjectComponentIds.Remove(id);
-        }
-
-        public static bool HasId(GameObject gameObject) {
-            return Ids.ContainsKey(gameObject);
-        }
-
-        public static GameObject GetGameObject(int objectId) {
-            return IdToGameObject.GetValueOrDefault(objectId);
-        }
-
-        public static AirshipComponentV2 GetComponent(GameObject gameObject, int componentId) {
-            return gameObject != null
-                ? gameObject.GetComponents<AirshipComponentV2>()
-                    .FirstOrDefault(f => f.GetAirshipComponentId() == componentId)
-                : null;
-        }
-
-        public static AirshipComponentV2 GetComponent(int unityInstanceId, int componentId) {
-            return GetComponent(GetGameObject(unityInstanceId), componentId);
-        }
-    }
-    
     public static class AirshipBehaviourRootV2 {
         private static int _idGen;
 

Runtime/Code/Luau/AirshipComponent.cs

@@ -22,6 +22,7 @@ public class AirshipComponent : MonoBehaviour {
 	private const bool ElevateToProtectedWithinCoreScene = true;
 
 	public static LuauScript.AwakeData QueuedAwakeData = null;
+	public static Dictionary<int, string> ComponentIdToScriptName = new();
 	private static int _airshipComponentIdGen = 10000000;
 	private static bool _validatedSceneInGameConfig = false;
 
@@ -40,8 +41,9 @@ public class AirshipComponent : MonoBehaviour {
 	[RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.SubsystemRegistration)]
 	private static void OnReload() {
 		_airshipComponentIdGen = 10000000;
-		QueuedAwakeData = null;
 		_validatedSceneInGameConfig = false;
+		QueuedAwakeData = null;
+		ComponentIdToScriptName.Clear();
 	}
 
 	private void Awake() {
@@ -50,6 +52,8 @@ private void Awake() {
 			context = QueuedAwakeData.Context;
 			QueuedAwakeData = null;
 		}
+
+		ComponentIdToScriptName[_airshipComponentId] = string.Intern(script.name);
 
 		ScriptingEntryPoint.InvokeOnLuauStartup();
 
@@ -144,6 +148,8 @@ private void OnDisable() {
 	}
 
 	private void OnDestroy() {
+		ComponentIdToScriptName.Remove(_airshipComponentId);
+		
 		if (thread == IntPtr.Zero || !LuauCore.IsReady) return;
 
 		print("C# OnDestroy");

Runtime/Code/Luau/AirshipComponentUpdater.cs

@@ -14,7 +14,6 @@
 #endif
 
 //Singleton
-[RequireComponent(typeof(AirshipComponentUpdater))]
 public partial class LuauCore : MonoBehaviour {
 #if UNITY_EDITOR
     [InitializeOnLoad]
@@ -98,8 +97,6 @@ public enum PODTYPE : int {
 
     private Dictionary<Type, Dictionary<ulong, PropertyInfo>> unityPropertyAlias = new();
     private Dictionary<Type, Dictionary<ulong, FieldInfo>> unityFieldAlias = new();
-    
-    private AirshipComponentUpdater _airshipComponentUpdater;
 
     private class CallbackRecord {
         public IntPtr callback;
@@ -128,22 +125,6 @@ public static LuauState GetInstance(LuauContext context) {
         return LuauState.FromContext(context);
     }
 
-    public static void RegisterAirshipComponent(AirshipComponent component) {
-        var instance = CoreInstance;
-        if (ReferenceEquals(instance, null)) return;
-        
-        instance._airshipComponentUpdater ??= instance.GetComponent<AirshipComponentUpdater>();
-        instance._airshipComponentUpdater.Register(component);
-    }
-
-    public static void UnregisterAirshipComponent(AirshipComponent component) {
-        var instance = CoreInstance;
-        if (ReferenceEquals(instance, null)) return;
-        
-        instance._airshipComponentUpdater ??= instance.GetComponent<AirshipComponentUpdater>();
-        instance._airshipComponentUpdater.Unregister(component);
-    }
-
     public bool CheckSetup() {
         if (initialized) return false;
 
@@ -336,8 +317,6 @@ private void Start() {
         LuauPlugin.unityMainThreadId = Thread.CurrentThread.ManagedThreadId;
         StartCoroutine(PrintReferenceAssemblies());
         endOfFrameCoroutine = StartCoroutine(RunAtVeryEndOfFrame());
-
-        _airshipComponentUpdater = GetComponent<AirshipComponentUpdater>();
 
 #if UNITY_EDITOR
         EditorApplication.pauseStateChanged += OnPauseStateChanged;