charleslemaux/Mirror
1
0
Fork 0
mirror of https://github.com/MirrorNetworking/Mirror.git synced 2024-11-18 02:50:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

breaking: Removed older Obsoletes (#3633)

Browse Source 
BREAKING CHANGE - Removed older Obsoletes
This commit is contained in:
MrGadget 2023-10-29 12:37:44 -04:00 committed by GitHub
parent bdb6cd8e53
commit 6a8b4beaa1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
19 changed files with 12 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Assets/Mirror/CompilerSymbols/PreprocessorDefine.cs
View File

@ -15,18 +15,14 @@ public static void AddDefineSymbols()
HashSet<string> defines = new HashSet<string>(currentDefines.Split(';'))
{
"MIRROR",
"MIRROR_57_0_OR_NEWER",
"MIRROR_58_0_OR_NEWER",
"MIRROR_65_0_OR_NEWER",
"MIRROR_66_0_OR_NEWER",
"MIRROR_2022_9_OR_NEWER",
"MIRROR_2022_10_OR_NEWER",
"MIRROR_70_0_OR_NEWER",
"MIRROR_71_0_OR_NEWER",
"MIRROR_70_OR_NEWER",
"MIRROR_71_OR_NEWER",
"MIRROR_73_OR_NEWER",
"MIRROR_78_OR_NEWER",
"MIRROR_79_OR_NEWER",
"MIRROR_81_OR_NEWER"
"MIRROR_81_OR_NEWER",
"MIRROR_82_OR_NEWER",
"MIRROR_83_OR_NEWER"
// Remove oldest when adding next month's symbol.
// Keep a rolling 12 months of symbols.
};

3
Assets/Mirror/Components/NetworkRigidbody/NetworkRigidbodyReliable.cs
View File

@ -5,8 +5,7 @@ namespace Mirror
// [RequireComponent(typeof(Rigidbody))] <- OnValidate ensures this is on .target
public class NetworkRigidbodyReliable : NetworkTransformReliable
{
new bool clientAuthority =>
syncDirection == SyncDirection.ClientToServer;
bool clientAuthority => syncDirection == SyncDirection.ClientToServer;
Rigidbody rb;
bool wasKinematic;

3
Assets/Mirror/Components/NetworkRigidbody/NetworkRigidbodyReliable2D.cs
View File

@ -5,8 +5,7 @@ namespace Mirror
// [RequireComponent(typeof(Rigidbody))] <- OnValidate ensures this is on .target
public class NetworkRigidbodyReliable2D : NetworkTransformReliable
{
new bool clientAuthority =>
syncDirection == SyncDirection.ClientToServer;
bool clientAuthority => syncDirection == SyncDirection.ClientToServer;
Rigidbody2D rb;
bool wasKinematic;

3
Assets/Mirror/Components/NetworkRigidbody/NetworkRigidbodyUnreliable.cs
View File

@ -5,8 +5,7 @@ namespace Mirror
// [RequireComponent(typeof(Rigidbody))] <- OnValidate ensures this is on .target
public class NetworkRigidbodyUnreliable : NetworkTransformUnreliable
{
new bool clientAuthority =>
syncDirection == SyncDirection.ClientToServer;
bool clientAuthority => syncDirection == SyncDirection.ClientToServer;
Rigidbody rb;
bool wasKinematic;

3
Assets/Mirror/Components/NetworkRigidbody/NetworkRigidbodyUnreliable2D.cs
View File

@ -5,8 +5,7 @@ namespace Mirror
// [RequireComponent(typeof(Rigidbody))] <- OnValidate ensures this is on .target
public class NetworkRigidbodyUnreliable2D : NetworkTransformUnreliable
{
new bool clientAuthority =>
syncDirection == SyncDirection.ClientToServer;
bool clientAuthority => syncDirection == SyncDirection.ClientToServer;
Rigidbody2D rb;
bool wasKinematic;

17
Assets/Mirror/Components/NetworkTransform/NetworkTransformBase.cs
View File

@ -32,12 +32,6 @@ public abstract class NetworkTransformBase : NetworkBehaviour
[Tooltip("The Transform component to sync. May be on on this GameObject, or on a child.")]
public Transform target;
// TODO SyncDirection { ClientToServer, ServerToClient } is easier?
// Deprecated 2022-10-25
[Obsolete("NetworkTransform clientAuthority was replaced with syncDirection. To enable client authority, set SyncDirection to ClientToServer in the Inspector.")]
[Header("[Obsolete]")] // Unity doesn't show obsolete warning for fields. do it manually.
[Tooltip("Obsolete: NetworkTransform clientAuthority was replaced with syncDirection. To enable client authority, set SyncDirection to ClientToServer in the Inspector.")]
public bool clientAuthority;
// Is this a client with authority over this transform?
// This component could be on the player object or any object that has been assigned authority to this client.
protected bool IsClientWithAuthority => isClient && authority;
@ -119,17 +113,6 @@ protected override void OnValidate()
// Unity doesn't support setting world scale.
// OnValidate force disables syncScale in world mode.
if (coordinateSpace == CoordinateSpace.World) syncScale = false;
// obsolete clientAuthority compatibility:
// if it was used, then set the new SyncDirection automatically.
// if it wasn't used, then don't touch syncDirection.
#pragma warning disable CS0618
if (clientAuthority)
{
syncDirection = SyncDirection.ClientToServer;
Debug.LogWarning($"{name}'s NetworkTransform component has obsolete .clientAuthority enabled. Please disable it and set SyncDirection to ClientToServer instead.");
}
#pragma warning restore CS0618
}
// snapshot functions //////////////////////////////////////////////////

4
Assets/Mirror/Core/HostMode.cs
View File

@ -40,9 +40,5 @@ public static void InvokeOnConnected()
//OnConnectedEvent?.Invoke(connection);
((LocalConnectionToServer)NetworkClient.connection).QueueConnectedEvent();
}
// DEPRECATED 2023-01-28
[Obsolete("ActivateHostScene did nothing, since identities all had .isClient set in NetworkServer.SpawnObjects.")]
public static void ActivateHostScene() {}
}
}

4
Assets/Mirror/Core/LocalConnectionToServer.cs
View File

@ -13,10 +13,6 @@ public class LocalConnectionToServer : NetworkConnectionToServer
// packet queue
internal readonly Queue<NetworkWriterPooled> queue = new Queue<NetworkWriterPooled>();
// Deprecated 2023-02-23
[Obsolete("Use LocalConnectionToClient.address instead.")]
public string address => "localhost";
// see caller for comments on why we need this
bool connectedEventPending;
bool disconnectedEventPending;

4
Assets/Mirror/Core/NetworkBehaviour.cs
View File

@ -67,10 +67,6 @@ public abstract class NetworkBehaviour : MonoBehaviour
// for example: main player & pets are owned. monsters & npcs aren't.
public bool isOwned => netIdentity.isOwned;
// Deprecated 2022-10-13
[Obsolete(".hasAuthority was renamed to .isOwned. This is easier to understand and prepares for SyncDirection, where there is a difference betwen isOwned and authority.")]
public bool hasAuthority => isOwned;
/// <summary>authority is true if we are allowed to modify this component's state. On server, it's true if SyncDirection is ServerToClient. On client, it's true if SyncDirection is ClientToServer and(!) if this object is owned by the client.</summary>
// on the client: if Client->Server SyncDirection and owned
// on the server: if Server->Client SyncDirection

8
Assets/Mirror/Core/NetworkClient.cs
View File

@ -83,10 +83,6 @@ public static partial class NetworkClient
/// <summary>Check if client is connected (after connecting).</summary>
public static bool isConnected => connectState == ConnectState.Connected;
// Deprecated 2022-12-12
[Obsolete("NetworkClient.isHostClient was renamed to .activeHost to be more obvious")]
public static bool isHostClient => activeHost;
// OnConnected / OnDisconnected used to be NetworkMessages that were
// invoked. this introduced a bug where external clients could send
// Connected/Disconnected messages over the network causing undefined
@ -216,10 +212,6 @@ public static void ConnectHost()
HostMode.SetupConnections();
}
// Deprecated 2022-12-12
[Obsolete("NetworkClient.ConnectLocalServer was moved to HostMode.InvokeOnConnected")]
public static void ConnectLocalServer() => HostMode.InvokeOnConnected();
// disconnect //////////////////////////////////////////////////////////
/// <summary>Disconnect from server.</summary>
public static void Disconnect()

15
Assets/Mirror/Core/NetworkClient_TimeInterpolation.cs
View File

@ -11,21 +11,6 @@ public static partial class NetworkClient
// via NetMan or NetworkClientConfig or NetworkClient as component etc.
public static SnapshotInterpolationSettings snapshotSettings = new SnapshotInterpolationSettings();
// obsolete snapshot settings access
// DEPRECATED 2023-03-11
// [Obsolete("NetworkClient snapshot interpolation settings were moved to NetworkClient.snapshotSettings.*")]
// public static double bufferTimeMultiplier => currentBufferTimeMultiplier;
[Obsolete("NetworkClient snapshot interpolation settings were moved to NetworkClient.snapshotSettings.*")]
public static float catchupNegativeThreshold => snapshotSettings.catchupNegativeThreshold;
[Obsolete("NetworkClient snapshot interpolation settings were moved to NetworkClient.snapshotSettings.*")]
public static float catchupPositiveThreshold => snapshotSettings.catchupPositiveThreshold;
[Obsolete("NetworkClient snapshot interpolation settings were moved to NetworkClient.snapshotSettings.*")]
public static double catchupSpeed => snapshotSettings.catchupSpeed;
[Obsolete("NetworkClient snapshot interpolation settings were moved to NetworkClient.snapshotSettings.*")]
public static double slowdownSpeed => snapshotSettings.slowdownSpeed;
[Obsolete("NetworkClient snapshot interpolation settings were moved to NetworkClient.snapshotSettings.*")]
public static int driftEmaDuration => snapshotSettings.driftEmaDuration;
// snapshot interpolation runtime data /////////////////////////////////
// buffer time is dynamically adjusted.
// store the current multiplier here, without touching the original in settings.

4
Assets/Mirror/Core/NetworkConnectionToClient.cs
View File

@ -20,10 +20,6 @@ public class NetworkConnectionToClient : NetworkConnection
// TODO move to server's NetworkConnectionToClient?
public readonly HashSet<NetworkIdentity> observing = new HashSet<NetworkIdentity>();
// Deprecated 2022-10-13
[Obsolete(".clientOwnedObjects was renamed to .owned :)")]
public HashSet<NetworkIdentity> clientOwnedObjects => owned;
// unbatcher
public Unbatcher unbatcher = new Unbatcher();

4
Assets/Mirror/Core/NetworkIdentity.cs
View File

@ -93,10 +93,6 @@ public sealed class NetworkIdentity : MonoBehaviour
// for example: main player & pets are owned. monsters & npcs aren't.
public bool isOwned { get; internal set; }
// Deprecated 2022-10-13
[Obsolete(".hasAuthority was renamed to .isOwned. This is easier to understand and prepares for SyncDirection, where there is a difference betwen isOwned and authority.")]
public bool hasAuthority => isOwned;
/// <summary>The set of network connections (players) that can see this object.</summary>
public readonly Dictionary<int, NetworkConnectionToClient> observers =
new Dictionary<int, NetworkConnectionToClient>();

18
Assets/Mirror/Core/NetworkManager.cs
View File

@ -41,20 +41,6 @@ public class NetworkManager : MonoBehaviour
[FormerlySerializedAs("serverTickRate")]
public int sendRate = 60;
// Deprecated 2022-10-31
[Obsolete("NetworkManager.serverTickRate was renamed to sendRate because that's what it configures for both server & client now.")]
public int serverTickRate => sendRate;
// tick rate is in Hz.
// convert to interval in seconds for convenience where needed.
//
// send interval is 1 / sendRate.
// but for tests we need a way to set it to exactly 0.
// 1 / int.max would not be exactly 0, so handel that manually.
// Deprecated 2022-10-06
[Obsolete("NetworkManager.serverTickInterval was moved to NetworkServer.tickInterval for consistency.")]
public float serverTickInterval => NetworkServer.tickInterval;
// client send rate follows server send rate to avoid errors for now
/// <summary>Client Update frequency, per second. Use around 60Hz for fast paced games like Counter-Strike to minimize latency. Use around 30Hz for games like WoW to minimize computations. Use around 1-10Hz for slow paced games like EVE.</summary>
// [Tooltip("Client broadcasts 'sendRate' times per second. Use around 60Hz for fast paced games like Counter-Strike to minimize latency. Use around 30Hz for games like WoW to minimize computations. Use around 1-10Hz for slow paced games like EVE.")]
@ -306,10 +292,6 @@ bool IsServerOnlineSceneChangeNeeded() =>
!Utils.IsSceneActive(onlineScene) &&
onlineScene != offlineScene;
// Deprecated 2022-12-12
[Obsolete("NetworkManager.IsSceneActive moved to Utils.IsSceneActive")]
public static bool IsSceneActive(string scene) => Utils.IsSceneActive(scene);
// NetworkManager exposes some NetworkServer/Client configuration.
// we apply it every Update() in order to avoid two sources of truth.
// fixes issues where NetworkServer.sendRate was never set because

5
Assets/Mirror/Core/NetworkReaderExtensions.cs
View File

@ -103,11 +103,6 @@ public static byte[] ReadBytesAndSize(this NetworkReader reader)
// Use checked() to force it to throw OverflowException if data is invalid
return count == 0 ? null : reader.ReadBytes(checked((int)(count - 1u)));
}
// DEPRECATED 2023-08-12
[Obsolete("ReadBytesAndSizeSegment was renamed to ReadArraySegmentAndSize for clarity.")]
public static ArraySegment<byte> ReadBytesAndSizeSegment(this NetworkReader reader) =>
ReadArraySegmentAndSize(reader);
// Reads ArraySegment and size header
/// <exception cref="T:OverflowException">if count is invalid</exception>
public static ArraySegment<byte> ReadArraySegmentAndSize(this NetworkReader reader)

10
Assets/Mirror/Core/NetworkServer.cs
View File

@ -52,10 +52,6 @@ public static partial class NetworkServer
// see also: https://github.com/vis2k/Mirror/pull/2595
public static bool dontListen;
// Deprecated 2022-12-12
[Obsolete("NetworkServer.localClientActive was renamed to .activeHost to be more obvious")]
public static bool localClientActive => activeHost;
/// <summary>active checks if the server has been started either has standalone or as host server.</summary>
public static bool active { get; internal set; }
@ -1871,11 +1867,5 @@ internal static void NetworkLateUpdate()
fullUpdateDuration.End();
}
}
// calls OnStartClient for all SERVER objects in host mode once.
// client doesn't get spawn messages for those, so need to call manually.
// Deprecated 2022-12-12
[Obsolete("NetworkServer.ActivateHostScene was moved to HostMode.ActivateHostScene")]
public static void ActivateHostScene() => HostMode.ActivateHostScene();
}
}

8
Assets/Mirror/Core/NetworkTime.cs
View File

@ -22,14 +22,6 @@ public static class NetworkTime
const float DefaultPingInterval = 0.1f; // for resets
public static float PingInterval = DefaultPingInterval;
// DEPRECATED 2023-07-06
[Obsolete("NetworkTime.PingFrequency was renamed to PingInterval, because we use it as seconds, not as Hz. Please rename all usages, but keep using it just as before.")]
public static float PingFrequency
{
get => PingInterval;
set => PingInterval = value;
}
/// <summary>Average out the last few results from Ping</summary>
// const because it's used immediately in _rtt constructor.
public const int PingWindowSize = 50; // average over 50 * 100ms = 5s

5
Assets/Mirror/Core/NetworkWriterExtensions.cs
View File

@ -106,11 +106,6 @@ public static void WriteBytesAndSize(this NetworkWriter writer, byte[] buffer, i
writer.WriteBytes(buffer, offset, count);
}
// DEPRECATED 2023-08-12
[Obsolete("WriteBytesAndSizeSegment was renamed to WriteArraySegmentAndSize for clarity.")]
public static void WriteBytesAndSizeSegment(this NetworkWriter writer, ArraySegment<byte> segment) =>
WriteArraySegmentAndSize(writer, segment);
// writes ArraySegment of byte (most common type) and size header
public static void WriteArraySegmentAndSize(this NetworkWriter writer, ArraySegment<byte> segment)
{

6
ProjectSettings/ProjectSettings.asset
View File

@ -579,9 +579,9 @@ PlayerSettings:
webGLDecompressionFallback: 0
webGLPowerPreference: 2
scriptingDefineSymbols:
Server: MIRROR;MIRROR_57_0_OR_NEWER;MIRROR_58_0_OR_NEWER;MIRROR_65_0_OR_NEWER;MIRROR_66_0_OR_NEWER;MIRROR_2022_9_OR_NEWER;MIRROR_2022_10_OR_NEWER;MIRROR_70_0_OR_NEWER;MIRROR_71_0_OR_NEWER;MIRROR_73_OR_NEWER
Standalone: MIRROR;MIRROR_57_0_OR_NEWER;MIRROR_58_0_OR_NEWER;MIRROR_65_0_OR_NEWER;MIRROR_66_0_OR_NEWER;MIRROR_2022_9_OR_NEWER;MIRROR_2022_10_OR_NEWER;MIRROR_70_0_OR_NEWER;MIRROR_71_0_OR_NEWER;MIRROR_73_OR_NEWER;MIRROR_78_OR_NEWER;MIRROR_79_OR_NEWER;MIRROR_81_OR_NEWER
WebGL: MIRROR;MIRROR_57_0_OR_NEWER;MIRROR_58_0_OR_NEWER;MIRROR_65_0_OR_NEWER;MIRROR_66_0_OR_NEWER;MIRROR_2022_9_OR_NEWER;MIRROR_2022_10_OR_NEWER;MIRROR_70_0_OR_NEWER;MIRROR_71_0_OR_NEWER;MIRROR_73_OR_NEWER
Server: MIRROR_70_OR_NEWER;MIRROR_71_OR_NEWER;MIRROR_73_OR_NEWER;MIRROR_78_OR_NEWER;MIRROR_79_OR_NEWER;MIRROR_81_OR_NEWER;MIRROR_82_OR_NEWER;MIRROR_83_OR_NEWER
Standalone: MIRROR_70_OR_NEWER;MIRROR_71_OR_NEWER;MIRROR_73_OR_NEWER;MIRROR_78_OR_NEWER;MIRROR_79_OR_NEWER;MIRROR_81_OR_NEWER;MIRROR_82_OR_NEWER;MIRROR_83_OR_NEWER
WebGL: MIRROR_70_OR_NEWER;MIRROR_71_OR_NEWER;MIRROR_73_OR_NEWER;MIRROR_78_OR_NEWER;MIRROR_79_OR_NEWER;MIRROR_81_OR_NEWER;MIRROR_82_OR_NEWER;MIRROR_83_OR_NEWER
additionalCompilerArguments: {}
platformArchitecture: {}
scriptingBackend: