Updated N4E namespace usages

Author: michalChrobot

com.unity.netcode.gameobjects/Editor/NetworkObjectEditor.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 #if UNIFIED_NETCODE
 using Unity.NetCode;
-using Unity.NetCode.Editor;
+using Unity.Netcode.Editor;
 #endif
 using UnityEditor;
 using UnityEngine;

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

@@ -7,7 +7,7 @@
 // Netcode for Entities' namespace differs from this one only by the casing of a single letter, so a
 // blanket import of it competes with Unity.Netcode on every name the two happen to share. Importing
 // only the types used here keeps that surface to exactly those names.
-using NetCodeConfig = Unity.NetCode.NetCodeConfig;
+using NetCodeConfig = Unity.Netcode.NetcodeConfig;
 using NetcodeWorld = Unity.Netcode.NetcodeWorld;
 #endif
 using Unity.Netcode.Components;
@@ -1375,13 +1375,13 @@ internal void InitializeNetcodeWorld()
 
             if (this == Singleton)
             {
-                if (NetCode.Netcode.IsActive)
+                if (Netcode.IsActive)
                 {
                     Log.Info(new Context(LogLevel.Normal, "Netcode is not active but has an instance at this point."));
                 }
                 /// !! Important !!
                 /// Clear out any pre-existing configuration in the event this applicatioin instance has already been connected to a session.
-                NetCode.Netcode.Reset();
+                Netcode.Reset();
             }
 
             /// !! Initialize worlds here !!

com.unity.netcode.gameobjects/Runtime/Transports/Unified/UnifiedNetcodeTransport.cs

@@ -273,7 +273,7 @@ public override NetworkEvent PollEvent(out ulong clientId, out ArraySegment<byte
             return NetworkEvent.Nothing;
         }
 
-        private void OnClientConnectedToServer(Connection connection, NetcodeConnectionEvent connectionEvent)
+        private void OnClientConnectedToServer(Connection connection, Unity.Netcode.NetcodeConnectionEvent connectionEvent)
         {
             m_Connections[connectionEvent.Id.Value] = new ConnectionInfo
             {
@@ -287,7 +287,7 @@ private void OnClientConnectedToServer(Connection connection, NetcodeConnectionE
             updateSystem.EntityManager.AddBuffer<TransportRpcData>(connection.ConnectionEntity);
         }
 
-        private void OnServerNewClientConnection(Connection connection, NetcodeConnectionEvent connectionEvent)
+        private void OnServerNewClientConnection(Connection connection, Unity.Netcode.NetcodeConnectionEvent connectionEvent)
         {
             m_Connections[connectionEvent.Id.Value] = new ConnectionInfo
             {
@@ -365,7 +365,7 @@ private DisconnectEvents GetDisconnectEventFromNetworkStreamDisconnectReason(Net
             return DisconnectEvents.Disconnected;
         }
 
-        private void OnClientDisconnectFromServer(Connection connection, NetcodeConnectionEvent connectionEvent)
+        private void OnClientDisconnectFromServer(Connection connection, Unity.Netcode.NetcodeConnectionEvent connectionEvent)
         {
             SetDisconnectEvent(
                 GetDisconnectEventFromNetworkStreamDisconnectReason(connectionEvent.DisconnectReason),
@@ -374,12 +374,12 @@ private void OnClientDisconnectFromServer(Connection connection, NetcodeConnecti
             InvokeOnTransportEvent(NetworkEvent.Disconnect, (ulong)connectionEvent.Id.Value, default, m_RealTimeProvider.RealTimeSinceStartup);
         }
 
-        private void OnServerClientDisconnected(Connection connection, NetcodeConnectionEvent connectionEvent)
+        private void OnServerClientDisconnected(Connection connection, Unity.Netcode.NetcodeConnectionEvent connectionEvent)
         {
             InvokeOnTransportEvent(NetworkEvent.Disconnect, (ulong)connectionEvent.Id.Value, default, m_RealTimeProvider.RealTimeSinceStartup);
         }
 
-        private void OnClientConnectionEvent(Connection connection, NetcodeConnectionEvent connectionEvent)
+        private void OnClientConnectionEvent(Connection connection, Unity.Netcode.NetcodeConnectionEvent connectionEvent)
         {
             switch (connectionEvent.State)
             {
@@ -392,7 +392,7 @@ private void OnClientConnectionEvent(Connection connection, NetcodeConnectionEve
             }
         }
 
-        private void OnServerConnectionEvent(Connection connection, NetcodeConnectionEvent connectionEvent)
+        private void OnServerConnectionEvent(Connection connection, Unity.Netcode.NetcodeConnectionEvent connectionEvent)
         {
             switch (connectionEvent.State)
             {

com.unity.netcode.gameobjects/Tests/Editor/Transports/UnityTransportTests.cs

@@ -231,7 +231,7 @@ public void UnityTransport_HostnameValidation((string, bool) testCase)
         }
 #endif
 
-        private class IPCDriverConstructor : INetworkStreamDriverConstructor
+        private class IPCDriverConstructor : Unity.Netcode.Transports.UTP.INetworkStreamDriverConstructor
         {
             public void CreateDriver(
                 UnityTransport transport,

com.unity.netcode.gameobjects/Tests/Editor/Unity.Netcode.Editor.Tests.asmdef

@@ -5,6 +5,7 @@
         "Unity.Collections",
         "Unity.Netcode.Runtime",
         "Unity.Netcode.GameObjects.Editor",
+        "GUID:953adc2a6b8b4e3c8df5b728bcd546e9",
         "Unity.Multiplayer.MetricTypes",
         "Unity.Multiplayer.NetStats",
         "Unity.Multiplayer.Tools.MetricTypes",

com.unity.netcode.gameobjects/Tests/Runtime/TestHelpers/NetcodeIntegrationTest.cs

@@ -7,7 +7,7 @@
 using System.Text;
 using NUnit.Framework;
 #if UNIFIED_NETCODE
-using Unity.NetCode;
+
 #endif
 using Unity.Netcode.GameObjects.Timing;
 using Unity.Netcode.RuntimeTests;
@@ -2655,7 +2655,7 @@ internal void SpawnInstanceWithOwnership(NetworkObject networkObjectToSpawn, Net
                 // assigning this.
                 if (networkObjectToSpawn.HasGhost)
                 {
-                    NetCode.Netcode.Instance.m_ActiveWorld = m_ServerNetworkManager.NetcodeWorld;
+                    Netcode.Instance.m_ActiveWorld = m_ServerNetworkManager.NetcodeWorld;
                 }
 #endif
                 networkObjectToSpawn.NetworkManagerOwner = m_ServerNetworkManager; // Required to assure the server does the spawning
@@ -2726,7 +2726,7 @@ private GameObject SpawnObject(NetworkObject prefabNetworkObject, NetworkManager
             // TODO-UNIFIED: NetCode.Netcode.Instance is a singleton and might cause issues assigning this.
             if (prefabNetworkObject.HasGhost)
             {
-                NetCode.Netcode.Instance.m_ActiveWorld = m_ServerNetworkManager.NetcodeWorld;
+                Netcode.Instance.m_ActiveWorld = m_ServerNetworkManager.NetcodeWorld;
             }
 #endif
             var newInstance = Object.Instantiate(prefabNetworkObject.gameObject);