Removed MULTIPLAYER_TOOLS_1_0_0_PRE_7 define usage

michalChrobot · michalChrobot · commit 664b122f4413 · 2025-10-22T22:52:55.000+02:00
diff --git a/com.unity.netcode.gameobjects/Runtime/Metrics/NetworkMetrics.cs b/com.unity.netcode.gameobjects/Runtime/Metrics/NetworkMetrics.cs
@@ -63,7 +63,6 @@ private static string GetSceneEventTypeName(uint typeCode)
         private readonly EventMetric<SceneEventMetric> m_SceneEventSentEvent = new EventMetric<SceneEventMetric>(NetworkMetricTypes.SceneEventSent.Id);
         private readonly EventMetric<SceneEventMetric> m_SceneEventReceivedEvent = new EventMetric<SceneEventMetric>(NetworkMetricTypes.SceneEventReceived.Id);
 
-#if MULTIPLAYER_TOOLS_1_0_0_PRE_7
         private readonly Counter m_PacketSentCounter = new Counter(NetworkMetricTypes.PacketsSent.Id)
         {
             ShouldResetOnDispatch = true,
@@ -85,7 +84,6 @@ private static string GetSceneEventTypeName(uint typeCode)
             ShouldResetOnDispatch = true,
         };
         private readonly Gauge m_PacketLossGauge = new Gauge(NetworkMetricTypes.PacketLoss.Id);
-#endif
 
         private ulong m_NumberOfMetricsThisFrame;
 
@@ -103,13 +101,11 @@ public NetworkMetrics()
                 .WithMetricEvents(m_RpcSentEvent, m_RpcReceivedEvent)
                 .WithMetricEvents(m_ServerLogSentEvent, m_ServerLogReceivedEvent)
                 .WithMetricEvents(m_SceneEventSentEvent, m_SceneEventReceivedEvent)
-#if MULTIPLAYER_TOOLS_1_0_0_PRE_7
                 .WithCounters(m_PacketSentCounter, m_PacketReceivedCounter)
                 .WithGauges(m_RttToServerGauge)
                 .WithGauges(m_NetworkObjectsGauge)
                 .WithGauges(m_ConnectionsGauge)
                 .WithGauges(m_PacketLossGauge)
-#endif
                 .Build();
 
             Dispatcher.RegisterObserver(NetcodeObserver.Observer);
@@ -437,76 +433,64 @@ public void TrackSceneEventReceived(ulong senderClientId, uint sceneEventType, s
 
         public void TrackPacketSent(uint packetCount)
         {
-#if MULTIPLAYER_TOOLS_1_0_0_PRE_7
             if (!CanSendMetrics)
             {
                 return;
             }
 
             m_PacketSentCounter.Increment(packetCount);
             IncrementMetricCount();
-#endif
         }
 
         public void TrackPacketReceived(uint packetCount)
         {
-#if MULTIPLAYER_TOOLS_1_0_0_PRE_7
             if (!CanSendMetrics)
             {
                 return;
             }
 
             m_PacketReceivedCounter.Increment(packetCount);
             IncrementMetricCount();
-#endif
         }
 
         public void UpdateRttToServer(int rttMilliseconds)
         {
-#if MULTIPLAYER_TOOLS_1_0_0_PRE_7
             if (!CanSendMetrics)
             {
                 return;
             }
             var rttSeconds = rttMilliseconds * 1e-3;
             m_RttToServerGauge.Set(rttSeconds);
-#endif
         }
 
         public void UpdateNetworkObjectsCount(int count)
         {
-#if MULTIPLAYER_TOOLS_1_0_0_PRE_7
             if (!CanSendMetrics)
             {
                 return;
             }
 
             m_NetworkObjectsGauge.Set(count);
-#endif
         }
 
         public void UpdateConnectionsCount(int count)
         {
-#if MULTIPLAYER_TOOLS_1_0_0_PRE_7
             if (!CanSendMetrics)
             {
                 return;
             }
 
             m_ConnectionsGauge.Set(count);
-#endif
         }
 
         public void UpdatePacketLoss(float packetLoss)
         {
-#if MULTIPLAYER_TOOLS_1_0_0_PRE_7
             if (!CanSendMetrics)
             {
                 return;
             }
 
             m_PacketLossGauge.Set(packetLoss);
-#endif
         }
 
         public void DispatchFrame()
diff --git a/com.unity.netcode.gameobjects/Runtime/Transports/UTP/NetworkMetricsPipelineStage.cs b/com.unity.netcode.gameobjects/Runtime/Transports/UTP/NetworkMetricsPipelineStage.cs
@@ -1,5 +1,4 @@
 #if MULTIPLAYER_TOOLS
-#if MULTIPLAYER_TOOLS_1_0_0_PRE_7
 using AOT;
 using Unity.Burst;
 using Unity.Collections.LowLevel.Unsafe;
@@ -66,4 +65,3 @@ private static void InitializeConnection(byte* staticInstanceBuffer, int staticI
     }
 }
 #endif
-#endif
diff --git a/com.unity.netcode.gameobjects/Runtime/Transports/UTP/UnityTransport.cs b/com.unity.netcode.gameobjects/Runtime/Transports/UTP/UnityTransport.cs
@@ -597,9 +597,7 @@ public void GetDefaultPipelineConfigurations(
 #if UNITY_MP_TOOLS_NETSIM_IMPLEMENTATION_ENABLED
                 NetworkPipelineStageId.Get<SimulatorPipelineStage>(),
 #endif
-#if MULTIPLAYER_TOOLS_1_0_0_PRE_7
                 NetworkPipelineStageId.Get<NetworkMetricsPipelineStage>(),
-#endif
             };
 
             var unreliableSequencedFragmented = new NetworkPipelineStageId[]
@@ -609,9 +607,7 @@ public void GetDefaultPipelineConfigurations(
 #if UNITY_MP_TOOLS_NETSIM_IMPLEMENTATION_ENABLED
                 NetworkPipelineStageId.Get<SimulatorPipelineStage>(),
 #endif
-#if MULTIPLAYER_TOOLS_1_0_0_PRE_7
                 NetworkPipelineStageId.Get<NetworkMetricsPipelineStage>(),
-#endif
             };
 
             var reliableSequenced = new NetworkPipelineStageId[]
@@ -620,9 +616,7 @@ public void GetDefaultPipelineConfigurations(
 #if UNITY_MP_TOOLS_NETSIM_IMPLEMENTATION_ENABLED
                 NetworkPipelineStageId.Get<SimulatorPipelineStage>(),
 #endif
-#if MULTIPLAYER_TOOLS_1_0_0_PRE_7
                 NetworkPipelineStageId.Get<NetworkMetricsPipelineStage>(),
-#endif
             };
 
             unreliableFragmentedPipelineStages = new(unreliableFragmented, Allocator.Temp);
@@ -1084,12 +1078,10 @@ protected override void OnPostLateUpdate()
                 // current frame.
                 m_Driver.ScheduleFlushSend(default).Complete();
 
-#if MULTIPLAYER_TOOLS_1_0_0_PRE_7
                 if (m_NetworkManager)
                 {
                     ExtractNetworkMetrics();
                 }
-#endif
             }
             base.OnPostLateUpdate();
         }
@@ -1099,7 +1091,6 @@ private void OnDestroy()
             DisposeInternals();
         }
 
-#if MULTIPLAYER_TOOLS_1_0_0_PRE_7
         private void ExtractNetworkMetrics()
         {
             if (m_NetworkManager.IsServer)
@@ -1167,7 +1158,6 @@ private void ExtractNetworkMetricsFromPipeline(NetworkPipeline pipeline, Network
                 networkMetricsContext->PacketReceivedCount = 0;
             }
         }
-#endif
 
         private int ExtractRtt(NetworkConnection networkConnection)
         {
@@ -1713,9 +1703,7 @@ public void CreateDriver(
 #endif
             }
 
-#if MULTIPLAYER_TOOLS_1_0_0_PRE_7
             driver.RegisterPipelineStage(new NetworkMetricsPipelineStage());
-#endif
 
             GetDefaultPipelineConfigurations(
                 out var unreliableFragmentedPipelineStages,
diff --git a/com.unity.netcode.gameobjects/Runtime/Unity.Netcode.Runtime.asmdef b/com.unity.netcode.gameobjects/Runtime/Unity.Netcode.Runtime.asmdef
@@ -33,11 +33,6 @@
             "expression": "(0,2022.2.0a5)",
             "define": "UNITY_UNET_PRESENT"
         },
-        {
-            "name": "com.unity.multiplayer.tools",
-            "expression": "1.0.0-pre.7",
-            "define": "MULTIPLAYER_TOOLS_1_0_0_PRE_7"
-        },
         {
             "name": "Unity",
             "expression": "2023",
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/Unity.Netcode.Runtime.Tests.asmdef b/com.unity.netcode.gameobjects/Tests/Runtime/Unity.Netcode.Runtime.Tests.asmdef
@@ -38,11 +38,6 @@
             "expression": "(0,2022.2.0a5)",
             "define": "UNITY_UNET_PRESENT"
         },
-        {
-            "name": "com.unity.multiplayer.tools",
-            "expression": "1.0.0-pre.7",
-            "define": "MULTIPLAYER_TOOLS_1_0_0_PRE_7"
-        },
         {
             "name": "com.unity.modules.physics",
             "expression": "",

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,6 @@ private static string GetSceneEventTypeName(uint typeCode)`
`63`	`63`	`private readonly EventMetric<SceneEventMetric> m_SceneEventSentEvent = new EventMetric<SceneEventMetric>(NetworkMetricTypes.SceneEventSent.Id);`
`64`	`64`	`private readonly EventMetric<SceneEventMetric> m_SceneEventReceivedEvent = new EventMetric<SceneEventMetric>(NetworkMetricTypes.SceneEventReceived.Id);`
`65`	`65`
`66`		`-#if MULTIPLAYER_TOOLS_1_0_0_PRE_7`
`67`	`66`	`private readonly Counter m_PacketSentCounter = new Counter(NetworkMetricTypes.PacketsSent.Id)`
`68`	`67`	`{`
`69`	`68`	`ShouldResetOnDispatch = true,`
`@@ -85,7 +84,6 @@ private static string GetSceneEventTypeName(uint typeCode)`
`85`	`84`	`ShouldResetOnDispatch = true,`
`86`	`85`	`};`
`87`	`86`	`private readonly Gauge m_PacketLossGauge = new Gauge(NetworkMetricTypes.PacketLoss.Id);`
`88`		`-#endif`
`89`	`87`
`90`	`88`	`private ulong m_NumberOfMetricsThisFrame;`
`91`	`89`
`@@ -103,13 +101,11 @@ public NetworkMetrics()`
`103`	`101`	`.WithMetricEvents(m_RpcSentEvent, m_RpcReceivedEvent)`
`104`	`102`	`.WithMetricEvents(m_ServerLogSentEvent, m_ServerLogReceivedEvent)`
`105`	`103`	`.WithMetricEvents(m_SceneEventSentEvent, m_SceneEventReceivedEvent)`
`106`		`-#if MULTIPLAYER_TOOLS_1_0_0_PRE_7`
`107`	`104`	`.WithCounters(m_PacketSentCounter, m_PacketReceivedCounter)`
`108`	`105`	`.WithGauges(m_RttToServerGauge)`
`109`	`106`	`.WithGauges(m_NetworkObjectsGauge)`
`110`	`107`	`.WithGauges(m_ConnectionsGauge)`
`111`	`108`	`.WithGauges(m_PacketLossGauge)`
`112`		`-#endif`
`113`	`109`	`.Build();`
`114`	`110`
`115`	`111`	`Dispatcher.RegisterObserver(NetcodeObserver.Observer);`
`@@ -437,76 +433,64 @@ public void TrackSceneEventReceived(ulong senderClientId, uint sceneEventType, s`
`437`	`433`
`438`	`434`	`public void TrackPacketSent(uint packetCount)`
`439`	`435`	`{`
`440`		`-#if MULTIPLAYER_TOOLS_1_0_0_PRE_7`
`441`	`436`	`if (!CanSendMetrics)`
`442`	`437`	`{`
`443`	`438`	`return;`
`444`	`439`	`}`
`445`	`440`
`446`	`441`	`m_PacketSentCounter.Increment(packetCount);`
`447`	`442`	`IncrementMetricCount();`
`448`		`-#endif`
`449`	`443`	`}`
`450`	`444`
`451`	`445`	`public void TrackPacketReceived(uint packetCount)`
`452`	`446`	`{`
`453`		`-#if MULTIPLAYER_TOOLS_1_0_0_PRE_7`
`454`	`447`	`if (!CanSendMetrics)`
`455`	`448`	`{`
`456`	`449`	`return;`
`457`	`450`	`}`
`458`	`451`
`459`	`452`	`m_PacketReceivedCounter.Increment(packetCount);`
`460`	`453`	`IncrementMetricCount();`
`461`		`-#endif`
`462`	`454`	`}`
`463`	`455`
`464`	`456`	`public void UpdateRttToServer(int rttMilliseconds)`
`465`	`457`	`{`
`466`		`-#if MULTIPLAYER_TOOLS_1_0_0_PRE_7`
`467`	`458`	`if (!CanSendMetrics)`
`468`	`459`	`{`
`469`	`460`	`return;`
`470`	`461`	`}`
`471`	`462`	`var rttSeconds = rttMilliseconds * 1e-3;`
`472`	`463`	`m_RttToServerGauge.Set(rttSeconds);`
`473`		`-#endif`
`474`	`464`	`}`
`475`	`465`
`476`	`466`	`public void UpdateNetworkObjectsCount(int count)`
`477`	`467`	`{`
`478`		`-#if MULTIPLAYER_TOOLS_1_0_0_PRE_7`
`479`	`468`	`if (!CanSendMetrics)`
`480`	`469`	`{`
`481`	`470`	`return;`
`482`	`471`	`}`
`483`	`472`
`484`	`473`	`m_NetworkObjectsGauge.Set(count);`
`485`		`-#endif`
`486`	`474`	`}`
`487`	`475`
`488`	`476`	`public void UpdateConnectionsCount(int count)`
`489`	`477`	`{`
`490`		`-#if MULTIPLAYER_TOOLS_1_0_0_PRE_7`
`491`	`478`	`if (!CanSendMetrics)`
`492`	`479`	`{`
`493`	`480`	`return;`
`494`	`481`	`}`
`495`	`482`
`496`	`483`	`m_ConnectionsGauge.Set(count);`
`497`		`-#endif`
`498`	`484`	`}`
`499`	`485`
`500`	`486`	`public void UpdatePacketLoss(float packetLoss)`
`501`	`487`	`{`
`502`		`-#if MULTIPLAYER_TOOLS_1_0_0_PRE_7`
`503`	`488`	`if (!CanSendMetrics)`
`504`	`489`	`{`
`505`	`490`	`return;`
`506`	`491`	`}`
`507`	`492`
`508`	`493`	`m_PacketLossGauge.Set(packetLoss);`
`509`		`-#endif`
`510`	`494`	`}`
`511`	`495`
`512`	`496`	`public void DispatchFrame()`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`#if MULTIPLAYER_TOOLS`
`2`		`-#if MULTIPLAYER_TOOLS_1_0_0_PRE_7`
`3`	`2`	`using AOT;`
`4`	`3`	`using Unity.Burst;`
`5`	`4`	`using Unity.Collections.LowLevel.Unsafe;`
`@@ -66,4 +65,3 @@ private static void InitializeConnection(byte* staticInstanceBuffer, int staticI`
`66`	`65`	`}`
`67`	`66`	`}`
`68`	`67`	`#endif`
`69`		`-#endif`