Skip to content

chore!: replace MLAPI namespace with Unity.Multiplayer.Netcode #1007

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 3, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ indent_size = 4
# formatting rules
dotnet_diagnostic.IDE0001.severity = error # Simplify name
dotnet_diagnostic.IDE0002.severity = error # Simplify member access
dotnet_diagnostic.IDE0005.severity = error # Remove unnecessary import
dotnet_style_qualification_for_field = false:error
dotnet_style_qualification_for_property = false:error
dotnet_style_qualification_for_method = false:error
Expand All @@ -26,7 +27,7 @@ csharp_prefer_braces = true:error
csharp_using_directive_placement = outside_namespace:error

# naming rules
# namespace MLAPI { ... }
# namespace Unity.Multiplayer.Netcode { ... }
# public class NetworkObject { ... }
# public void Spawn(...) { ... }
dotnet_naming_symbols.usertypes_naming_symbols.applicable_kinds = namespace, class, struct, enum, property, method, field, event, delegate, local_function
Expand Down Expand Up @@ -101,4 +102,4 @@ dotnet_naming_style.memberfield_naming_style.required_prefix = m_
dotnet_naming_style.memberfield_naming_style.capitalization = pascal_case
dotnet_naming_rule.memberfield_naming_rule.symbols = memberfield_naming_symbols
dotnet_naming_rule.memberfield_naming_rule.style = memberfield_naming_style
dotnet_naming_rule.memberfield_naming_rule.severity = error
dotnet_naming_rule.memberfield_naming_rule.severity = error
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
using System.IO;
using System.Linq;
using System.Text;
using MLAPI.Hashing;
using MLAPI.Messaging;
using MLAPI.Serialization;
using Unity.Multiplayer.Netcode.Hashing;
using Unity.Multiplayer.Netcode.Messaging;
using Unity.Multiplayer.Netcode.Serialization;
using Mono.Cecil;
using Mono.Cecil.Cil;
using Mono.Cecil.Rocks;
using Unity.CompilationPipeline.Common.Diagnostics;
using Unity.CompilationPipeline.Common.ILPostProcessing;
using UnityEngine;

namespace MLAPI.Editor.CodeGen
namespace Unity.Multiplayer.Netcode.Editor.CodeGen
{
internal static class CodeGenHelpers
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
using System.Linq;
using System.Collections.Generic;
using System.Reflection;
using MLAPI.Logging;
using MLAPI.Messaging;
using MLAPI.Serialization;
using Unity.Multiplayer.Netcode.Logging;
using Unity.Multiplayer.Netcode.Messaging;
using Unity.Multiplayer.Netcode.Serialization;
using Mono.Cecil;
using Mono.Cecil.Cil;
using Mono.Cecil.Rocks;
Expand All @@ -16,7 +16,7 @@
using ParameterAttributes = Mono.Cecil.ParameterAttributes;
using ILPPInterface = Unity.CompilationPipeline.Common.ILPostProcessing.ILPostProcessor;

namespace MLAPI.Editor.CodeGen
namespace Unity.Multiplayer.Netcode.Editor.CodeGen
{
internal sealed class NetworkBehaviourILPP : ILPPInterface
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
using Mono.Cecil;
using Unity.CompilationPipeline.Common.ILPostProcessing;

namespace MLAPI.Editor.CodeGen
namespace Unity.Multiplayer.Netcode.Editor.CodeGen
{
internal class PostProcessorAssemblyResolver : IAssemblyResolver
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using System.Reflection;
using Mono.Cecil;

namespace MLAPI.Editor.CodeGen
namespace Unity.Multiplayer.Netcode.Editor.CodeGen
{
internal class PostProcessorReflectionImporter : DefaultReflectionImporter
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Mono.Cecil;

namespace MLAPI.Editor.CodeGen
namespace Unity.Multiplayer.Netcode.Editor.CodeGen
{
internal class PostProcessorReflectionImporterProvider : IReflectionImporterProvider
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
using Unity.CompilationPipeline.Common.ILPostProcessing;
using ILPPInterface = Unity.CompilationPipeline.Common.ILPostProcessing.ILPostProcessor;

namespace MLAPI.Editor.CodeGen
namespace Unity.Multiplayer.Netcode.Editor.CodeGen
{
internal sealed class RuntimeAccessModifiersILPP : ILPPInterface
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
using System;

namespace MLAPI.Editor
namespace Unity.Multiplayer.Netcode.Editor
{
public class DontShowInTransportDropdownAttribute : Attribute
{

}
}
4 changes: 2 additions & 2 deletions com.unity.multiplayer.mlapi/Editor/MLAPIProfiler.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System.Collections.Generic;
using System.IO;
using MLAPI.Profiling;
using MLAPI.Serialization;
using Unity.Multiplayer.Netcode.Profiling;
using Unity.Multiplayer.Netcode.Serialization;
using UnityEngine;

namespace UnityEditor
Expand Down
4 changes: 2 additions & 2 deletions com.unity.multiplayer.mlapi/Editor/MLAPIProfilerModule.cs
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
using System;
using System.Collections.Generic;
using MLAPI.Profiling;
using Unity.Multiplayer.Netcode.Profiling;
using Unity.Profiling;
using UnityEditor;
using UnityEngine;

namespace MLAPI
namespace Unity.Multiplayer.Netcode
{
[InitializeOnLoad]
internal static class MLAPIProfilerModule
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
using System;
using System.Collections.Generic;
using System.Reflection;
using MLAPI;
using MLAPI.NetworkVariable;
using Unity.Multiplayer.Netcode;
using Unity.Multiplayer.Netcode.NetworkVariable;
using UnityEngine;

namespace UnityEditor
Expand Down
6 changes: 3 additions & 3 deletions com.unity.multiplayer.mlapi/Editor/NetworkManagerEditor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
using UnityEditor;
using UnityEngine;
using UnityEditorInternal;
using MLAPI.Configuration;
using MLAPI.Transports;
using Unity.Multiplayer.Netcode.Configuration;
using Unity.Multiplayer.Netcode.Transports;

namespace MLAPI.Editor
namespace Unity.Multiplayer.Netcode.Editor
{
[CustomEditor(typeof(NetworkManager), true)]
[CanEditMultipleObjects]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using UnityEngine;
using UnityEditor;

namespace MLAPI.Editor
namespace Unity.Multiplayer.Netcode.Editor
{
[CustomEditor(typeof(NetworkObject), true)]
[CanEditMultipleObjects]
Expand Down
6 changes: 3 additions & 3 deletions com.unity.multiplayer.mlapi/Prototyping/NetworkAnimator.cs
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
using System.Linq;
using System.Collections.Generic;
using MLAPI.Messaging;
using MLAPI.Serialization;
using Unity.Multiplayer.Netcode.Messaging;
using Unity.Multiplayer.Netcode.Serialization;
using UnityEngine;

namespace MLAPI.Prototyping
namespace Unity.Multiplayer.Netcode.Prototyping
{
/// <summary>
/// A prototype component for syncing animations
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.AI;
using MLAPI.Connection;
using MLAPI.Messaging;
using Unity.Multiplayer.Netcode.Connection;
using Unity.Multiplayer.Netcode.Messaging;

namespace MLAPI.Prototyping
namespace Unity.Multiplayer.Netcode.Prototyping
{
/// <summary>
/// A prototype component for syncing NavMeshAgents
Expand Down
8 changes: 4 additions & 4 deletions com.unity.multiplayer.mlapi/Prototyping/NetworkTransform.cs
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
using System;
using MLAPI.NetworkVariable;
using MLAPI.Serialization;
using MLAPI.Transports;
using Unity.Multiplayer.Netcode.NetworkVariable;
using Unity.Multiplayer.Netcode.Serialization;
using Unity.Multiplayer.Netcode.Transports;
using UnityEngine;

namespace MLAPI.Prototyping
namespace Unity.Multiplayer.Netcode.Prototyping
{
/// <summary>
/// A prototype component for syncing transforms
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System;

namespace MLAPI.Collections
namespace Unity.Multiplayer.Netcode.Collections
{
/// <summary>
/// Queue with a fixed size
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace MLAPI.Configuration
namespace Unity.Multiplayer.Netcode.Configuration
{
/// <summary>
/// Represents the length of a var int encoded hash
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
using System.Collections.Generic;
using UnityEngine;
using System.Linq;
using MLAPI.Transports;
using MLAPI.Hashing;
using MLAPI.Serialization;
using MLAPI.Serialization.Pooled;
using Unity.Multiplayer.Netcode.Transports;
using Unity.Multiplayer.Netcode.Hashing;
using Unity.Multiplayer.Netcode.Serialization;
using Unity.Multiplayer.Netcode.Serialization.Pooled;

namespace MLAPI.Configuration
namespace Unity.Multiplayer.Netcode.Configuration
{
/// <summary>
/// The configuration object used to start server, client and hosts
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace MLAPI.Configuration
namespace Unity.Multiplayer.Netcode.Configuration
{
/// <summary>
/// A static class containing MLAPI constants
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
using System;
using MLAPI.Logging;
using UnityEngine;

namespace MLAPI.Configuration
namespace Unity.Multiplayer.Netcode.Configuration
{
internal enum NetworkPrefabOverride
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System.Collections.Generic;

namespace MLAPI.Connection
namespace Unity.Multiplayer.Netcode.Connection
{
/// <summary>
/// A NetworkClient
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace MLAPI.Connection
namespace Unity.Multiplayer.Netcode.Connection
{
/// <summary>
/// A class representing a client that is currently in the process of connecting
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using UnityEngine;

namespace MLAPI
namespace Unity.Multiplayer.Netcode
{
internal struct IndexAllocatorEntry
{
Expand Down
26 changes: 12 additions & 14 deletions com.unity.multiplayer.mlapi/Runtime/Core/NetworkBehaviour.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,16 @@
using System.Reflection;
using System.Linq;
using System.IO;
using MLAPI.Configuration;
using MLAPI.Logging;
using MLAPI.Messaging;
using MLAPI.Timing;
using MLAPI.NetworkVariable;
using MLAPI.Profiling;
using MLAPI.Reflection;
using MLAPI.Serialization;
using MLAPI.Serialization.Pooled;
using MLAPI.Transports;

namespace MLAPI
using Unity.Multiplayer.Netcode.Logging;
using Unity.Multiplayer.Netcode.Messaging;
using Unity.Multiplayer.Netcode.NetworkVariable;
using Unity.Multiplayer.Netcode.Profiling;
using Unity.Multiplayer.Netcode.Reflection;
using Unity.Multiplayer.Netcode.Serialization;
using Unity.Multiplayer.Netcode.Serialization.Pooled;
using Unity.Multiplayer.Netcode.Transports;

namespace Unity.Multiplayer.Netcode
{
/// <summary>
/// The base class to override to write network code. Inherits MonoBehaviour
Expand Down Expand Up @@ -316,12 +314,12 @@ protected NetworkBehaviour GetNetworkBehaviour(ushort behaviourId)
public ulong OwnerClientId => NetworkObject.OwnerClientId;

/// <summary>
/// Gets called when the <see cref="MLAPI.NetworkObject"/> gets spawned, message handlers are ready to be registered and the network is setup.
/// Gets called when the <see cref="NetworkObject"/> gets spawned, message handlers are ready to be registered and the network is setup.
/// </summary>
public virtual void OnNetworkSpawn() { }

/// <summary>
/// Gets called when the <see cref="MLAPI.NetworkObject"/> gets despawned. Is called both on the server and clients.
/// Gets called when the <see cref="NetworkObject"/> gets despawned. Is called both on the server and clients.
/// </summary>
public virtual void OnNetworkDespawn() { }

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System.Collections.Generic;
using Unity.Profiling;

namespace MLAPI
namespace Unity.Multiplayer.Netcode
{
public class NetworkBehaviourUpdater
{
Expand Down
30 changes: 14 additions & 16 deletions com.unity.multiplayer.mlapi/Runtime/Core/NetworkManager.cs
Original file line number Diff line number Diff line change
@@ -1,27 +1,25 @@
using System;
using System.Collections;
using System.Collections.Generic;
using System.ComponentModel;
using System.Diagnostics;
using System.Linq;
using UnityEngine;
using MLAPI.Logging;
using MLAPI.Configuration;
using MLAPI.Profiling;
using MLAPI.Serialization;
using MLAPI.Transports;
using MLAPI.Connection;
using MLAPI.Messaging;
using MLAPI.SceneManagement;
using MLAPI.Spawning;
using MLAPI.Exceptions;
using MLAPI.Serialization.Pooled;
using MLAPI.Transports.Tasks;
using MLAPI.Timing;
using Unity.Multiplayer.Netcode.Logging;
using Unity.Multiplayer.Netcode.Configuration;
using Unity.Multiplayer.Netcode.Profiling;
using Unity.Multiplayer.Netcode.Serialization;
using Unity.Multiplayer.Netcode.Transports;
using Unity.Multiplayer.Netcode.Connection;
using Unity.Multiplayer.Netcode.Messaging;
using Unity.Multiplayer.Netcode.SceneManagement;
using Unity.Multiplayer.Netcode.Spawning;
using Unity.Multiplayer.Netcode.Exceptions;
using Unity.Multiplayer.Netcode.Serialization.Pooled;
using Unity.Multiplayer.Netcode.Transports.Tasks;
using Unity.Multiplayer.Netcode.Timing;
using Unity.Profiling;
using Debug = UnityEngine.Debug;

namespace MLAPI
namespace Unity.Multiplayer.Netcode
{
/// <summary>
/// The main component of the library
Expand Down
Loading