Fix naming + if editor def on using UnityEngine

Author: noellie-velez

com.unity.netcode.gameobjects/Runtime/Core/ComponentFactory.cs

@@ -1,6 +1,8 @@
 using System;
 using System.Collections.Generic;
+#if UNITY_EDITOR
 using UnityEngine;
+#endif
 
 namespace Unity.Netcode
 {

com.unity.netcode.gameobjects/Runtime/Logging/NetworkLog.cs

@@ -60,7 +60,7 @@ public static class NetworkLog
         internal static NetworkManager NetworkManagerOverride;
 #if UNITY_EDITOR
         [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.SubsystemRegistration)]
-        private static void ResetStatics() => NetworkManagerOverride = null;
+        private static void ResetStaticsOnLoad() => NetworkManagerOverride = null;
 #endif
 
         private static void LogServer(string message, LogType logType)

com.unity.netcode.gameobjects/Runtime/Messaging/DeferredMessageManager.cs

@@ -1,6 +1,8 @@
 using System.Collections.Generic;
 using Unity.Collections;
+#if UNITY_EDITOR
 using UnityEngine;
+#endif
 
 namespace Unity.Netcode
 {
@@ -99,7 +101,7 @@ public virtual unsafe void CleanupStaleTriggers()
         internal static bool IncludeMessageType = true;
 #if UNITY_EDITOR
         [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.SubsystemRegistration)]
-        private static void ResetStatics() => IncludeMessageType = true;
+        private static void ResetStaticsOnLoad() => IncludeMessageType = true;
 #endif
 
         private string GetWarningMessage(IDeferredNetworkMessageManager.TriggerType triggerType, ulong key, TriggerInfo triggerInfo, float spawnTimeout)

com.unity.netcode.gameobjects/Runtime/Messaging/ILPPMessageProvider.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
-using UnityEngine;
 #if UNITY_EDITOR
+using UnityEngine;
 using UnityEditor;
 #endif
 
@@ -54,9 +54,10 @@ internal struct ILPPMessageProvider : INetworkMessageProvider
 
         // Enable this for integration tests that need no message types defined
         internal static bool IntegrationTestNoMessages;
-
+#if UNITY_EDITOR
         [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.SubsystemRegistration)]
-        private static void ResetStatics() => IntegrationTestNoMessages = false;
+        private static void ResetStaticsOnLoad() => IntegrationTestNoMessages = false;
+#endif
 
         /// <summary>
         /// Returns a table of message type to NetworkMessageTypes enum value

com.unity.netcode.gameobjects/Runtime/Messaging/MessageDelivery.cs

@@ -18,11 +18,12 @@ internal static class MessageDelivery
         NetworkMessageTypes.NamedMessage, NetworkMessageTypes.Unnamed};
 
     [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.SubsystemRegistration)]
-    private static void OnSubsystemRegistration()
+    private static void OnApplicationStart()
     {
+#if UNITY_EDITOR
         s_MessageToDelivery = new Dictionary<NetworkMessageTypes, NetworkDelivery>();
         s_MessageToMessageType = new Dictionary<Type, NetworkMessageTypes>();
-
+#endif
         UpdateMessageTypes();
     }
 

com.unity.netcode.gameobjects/Runtime/Metrics/NetworkMetrics.cs

@@ -1,7 +1,9 @@
 #if MULTIPLAYER_TOOLS
 using System;
 using System.Collections.Generic;
+#if UNITY_EDITOR
 using UnityEngine;
+#endif
 using Unity.Multiplayer.Tools;
 using Unity.Multiplayer.Tools.MetricTypes;
 using Unity.Multiplayer.Tools.NetStats;

com.unity.netcode.gameobjects/Runtime/SceneManagement/SceneEventData.cs

@@ -3,7 +3,9 @@
 using System.Linq;
 using System.Text;
 using Unity.Collections;
+#if UNITY_EDITOR
 using UnityEngine;
+#endif
 using UnityEngine.SceneManagement;
 
 namespace Unity.Netcode
@@ -319,7 +321,7 @@ private void SortParentedNetworkObjects()
         internal static bool LogSerializationOrder;
 #if UNITY_EDITOR
         [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.SubsystemRegistration)]
-        private static void ResetStatics() => LogSerializationOrder = false;
+        private static void ResetStaticsOnLoad() => LogSerializationOrder = false;
 #endif
 
         internal void AddSpawnedNetworkObjects()

com.unity.netcode.gameobjects/Runtime/Transports/UTP/UnityTransport.cs

@@ -369,7 +369,6 @@ private struct PacketLossCache
 #endif
         internal static event Action<int, NetworkDriver> TransportInitialized;
         internal static event Action<int> TransportDisposed;
-
 #if UNITY_EDITOR
         [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.SubsystemRegistration)]
         private static void ResetStaticsOnLoad()