From ef4d548bda3df06583cb43be48f8c7f1aea006fd Mon Sep 17 00:00:00 2001 From: AeonLucid Date: Mon, 19 Oct 2020 16:19:28 +0200 Subject: [PATCH] Update Hazel namespace to Impostor.Hazel --- src/Impostor.Client.App/Program.cs | 4 ++-- src/Impostor.Hazel/Connection.cs | 2 +- src/Impostor.Hazel/ConnectionListener.cs | 2 +- src/Impostor.Hazel/ConnectionState.cs | 2 +- src/Impostor.Hazel/ConnectionStatistics.cs | 2 +- src/Impostor.Hazel/DataReceivedEventArgs.cs | 2 +- src/Impostor.Hazel/DisconnectedEventArgs.cs | 2 +- src/Impostor.Hazel/HazelException.cs | 2 +- src/Impostor.Hazel/IPMode.cs | 2 +- src/Impostor.Hazel/IRecyclable.cs | 2 +- src/Impostor.Hazel/MessageData.cs | 2 +- src/Impostor.Hazel/MessageReader.cs | 2 +- src/Impostor.Hazel/MessageWriter.cs | 2 +- src/Impostor.Hazel/NetworkConnection.cs | 3 +-- src/Impostor.Hazel/NetworkConnectionListener.cs | 3 +-- src/Impostor.Hazel/NewConnectionEventArgs.cs | 2 +- src/Impostor.Hazel/ObjectPool.cs | 2 +- src/Impostor.Hazel/Udp/SendOptionInternal.cs | 2 +- src/Impostor.Hazel/Udp/UdpBroadcastListener.cs | 2 +- src/Impostor.Hazel/Udp/UdpBroadcaster.cs | 2 +- src/Impostor.Hazel/Udp/UdpClientConnection.cs | 2 +- src/Impostor.Hazel/Udp/UdpConnection.KeepAlive.cs | 3 +-- src/Impostor.Hazel/Udp/UdpConnection.Reliable.cs | 3 +-- src/Impostor.Hazel/Udp/UdpConnection.cs | 2 +- src/Impostor.Hazel/Udp/UdpConnectionListener.cs | 2 +- src/Impostor.Hazel/Udp/UdpServerConnection.cs | 2 +- src/Impostor.Server/Net/Client.cs | 2 +- src/Impostor.Server/Net/Hazel/HazelConnection.cs | 2 +- src/Impostor.Server/Net/Manager/ClientManager.cs | 2 +- src/Impostor.Server/Net/Matchmaker.cs | 4 ++-- src/Impostor.Server/Net/Redirector/ClientRedirector.cs | 2 +- src/Impostor.Server/Net/State/Game.Incoming.cs | 2 +- src/Impostor.Server/Net/State/Game.State.cs | 2 +- src/Impostor.Server/Net/State/Game.cs | 2 +- src/Impostor.Tests/Hazel/BufferMessageReaderTests.cs | 2 +- src/Impostor.Tools.Proxy/Program.cs | 4 ++-- 36 files changed, 39 insertions(+), 43 deletions(-) diff --git a/src/Impostor.Client.App/Program.cs b/src/Impostor.Client.App/Program.cs index f5f1cf3..4a96f9f 100644 --- a/src/Impostor.Client.App/Program.cs +++ b/src/Impostor.Client.App/Program.cs @@ -2,11 +2,11 @@ using System.Net; using System.Threading; using System.Threading.Tasks; -using Hazel; -using Hazel.Udp; using Impostor.Api.Innersloth; using Impostor.Api.Net.Messages; using Impostor.Api.Net.Messages.C2S; +using Impostor.Hazel; +using Impostor.Hazel.Udp; using Serilog; namespace Impostor.Client.App diff --git a/src/Impostor.Hazel/Connection.cs b/src/Impostor.Hazel/Connection.cs index 6b6c87e..5d8fe55 100644 --- a/src/Impostor.Hazel/Connection.cs +++ b/src/Impostor.Hazel/Connection.cs @@ -4,7 +4,7 @@ using System.Threading.Tasks; using Impostor.Api.Net.Messages; using Serilog; -namespace Hazel +namespace Impostor.Hazel { /// /// Base class for all connections. diff --git a/src/Impostor.Hazel/ConnectionListener.cs b/src/Impostor.Hazel/ConnectionListener.cs index f595432..116f657 100644 --- a/src/Impostor.Hazel/ConnectionListener.cs +++ b/src/Impostor.Hazel/ConnectionListener.cs @@ -3,7 +3,7 @@ using System.Threading.Tasks; using Impostor.Api.Net.Messages; using Serilog; -namespace Hazel +namespace Impostor.Hazel { /// /// Base class for all connection listeners. diff --git a/src/Impostor.Hazel/ConnectionState.cs b/src/Impostor.Hazel/ConnectionState.cs index 2f00cba..5dd7c6a 100644 --- a/src/Impostor.Hazel/ConnectionState.cs +++ b/src/Impostor.Hazel/ConnectionState.cs @@ -1,4 +1,4 @@ -namespace Hazel +namespace Impostor.Hazel { /// /// Represents the state a is currently in. diff --git a/src/Impostor.Hazel/ConnectionStatistics.cs b/src/Impostor.Hazel/ConnectionStatistics.cs index 018d7a0..4802620 100644 --- a/src/Impostor.Hazel/ConnectionStatistics.cs +++ b/src/Impostor.Hazel/ConnectionStatistics.cs @@ -2,7 +2,7 @@ using System.Threading; [assembly: InternalsVisibleTo("Hazel.Tests")] -namespace Hazel +namespace Impostor.Hazel { /// /// Holds statistics about the traffic through a . diff --git a/src/Impostor.Hazel/DataReceivedEventArgs.cs b/src/Impostor.Hazel/DataReceivedEventArgs.cs index 7aa824e..9176d8d 100644 --- a/src/Impostor.Hazel/DataReceivedEventArgs.cs +++ b/src/Impostor.Hazel/DataReceivedEventArgs.cs @@ -1,6 +1,6 @@ using Impostor.Api.Net.Messages; -namespace Hazel +namespace Impostor.Hazel { public struct DataReceivedEventArgs { diff --git a/src/Impostor.Hazel/DisconnectedEventArgs.cs b/src/Impostor.Hazel/DisconnectedEventArgs.cs index a029c7b..d46df4b 100644 --- a/src/Impostor.Hazel/DisconnectedEventArgs.cs +++ b/src/Impostor.Hazel/DisconnectedEventArgs.cs @@ -1,7 +1,7 @@ using System; using Impostor.Api.Net.Messages; -namespace Hazel +namespace Impostor.Hazel { public class DisconnectedEventArgs : EventArgs { diff --git a/src/Impostor.Hazel/HazelException.cs b/src/Impostor.Hazel/HazelException.cs index 6b04a7a..8c6fc3c 100644 --- a/src/Impostor.Hazel/HazelException.cs +++ b/src/Impostor.Hazel/HazelException.cs @@ -1,6 +1,6 @@ using System; -namespace Hazel +namespace Impostor.Hazel { /// /// Wrapper for exceptions thrown from Hazel. diff --git a/src/Impostor.Hazel/IPMode.cs b/src/Impostor.Hazel/IPMode.cs index a2055d0..5eb6679 100644 --- a/src/Impostor.Hazel/IPMode.cs +++ b/src/Impostor.Hazel/IPMode.cs @@ -1,4 +1,4 @@ -namespace Hazel +namespace Impostor.Hazel { /// /// Represents the IP version that a connection or listener will use. diff --git a/src/Impostor.Hazel/IRecyclable.cs b/src/Impostor.Hazel/IRecyclable.cs index 9b0f712..69be122 100644 --- a/src/Impostor.Hazel/IRecyclable.cs +++ b/src/Impostor.Hazel/IRecyclable.cs @@ -1,4 +1,4 @@ -namespace Hazel +namespace Impostor.Hazel { /// /// Interface for all items that can be returned to an object pool. diff --git a/src/Impostor.Hazel/MessageData.cs b/src/Impostor.Hazel/MessageData.cs index 4c84cca..60ab1c1 100644 --- a/src/Impostor.Hazel/MessageData.cs +++ b/src/Impostor.Hazel/MessageData.cs @@ -1,7 +1,7 @@ using System; using System.Buffers; -namespace Hazel +namespace Impostor.Hazel { public readonly struct MessageData { diff --git a/src/Impostor.Hazel/MessageReader.cs b/src/Impostor.Hazel/MessageReader.cs index 84e9ff2..ffed6ca 100644 --- a/src/Impostor.Hazel/MessageReader.cs +++ b/src/Impostor.Hazel/MessageReader.cs @@ -4,7 +4,7 @@ using System.Runtime.CompilerServices; using System.Text; using Impostor.Api.Net.Messages; -namespace Hazel +namespace Impostor.Hazel { public class MessageReader : IMessageReader { diff --git a/src/Impostor.Hazel/MessageWriter.cs b/src/Impostor.Hazel/MessageWriter.cs index 276c174..bf8dbcd 100644 --- a/src/Impostor.Hazel/MessageWriter.cs +++ b/src/Impostor.Hazel/MessageWriter.cs @@ -5,7 +5,7 @@ using System.Text; using Impostor.Api.Games; using Impostor.Api.Net.Messages; -namespace Hazel +namespace Impostor.Hazel { /// public class MessageWriter : IMessageWriter, IRecyclable, IDisposable diff --git a/src/Impostor.Hazel/NetworkConnection.cs b/src/Impostor.Hazel/NetworkConnection.cs index fc1c320..282fe10 100644 --- a/src/Impostor.Hazel/NetworkConnection.cs +++ b/src/Impostor.Hazel/NetworkConnection.cs @@ -3,8 +3,7 @@ using System.Net; using System.Threading.Tasks; using Impostor.Api.Net.Messages; - -namespace Hazel +namespace Impostor.Hazel { public enum HazelInternalErrors { diff --git a/src/Impostor.Hazel/NetworkConnectionListener.cs b/src/Impostor.Hazel/NetworkConnectionListener.cs index 4085fa3..e1d7ffa 100644 --- a/src/Impostor.Hazel/NetworkConnectionListener.cs +++ b/src/Impostor.Hazel/NetworkConnectionListener.cs @@ -1,7 +1,6 @@ using System.Net; - -namespace Hazel +namespace Impostor.Hazel { /// /// Abstract base class for a for network based connections. diff --git a/src/Impostor.Hazel/NewConnectionEventArgs.cs b/src/Impostor.Hazel/NewConnectionEventArgs.cs index efc84bb..be9e7a2 100644 --- a/src/Impostor.Hazel/NewConnectionEventArgs.cs +++ b/src/Impostor.Hazel/NewConnectionEventArgs.cs @@ -1,6 +1,6 @@ using Impostor.Api.Net.Messages; -namespace Hazel +namespace Impostor.Hazel { public struct NewConnectionEventArgs { diff --git a/src/Impostor.Hazel/ObjectPool.cs b/src/Impostor.Hazel/ObjectPool.cs index 1dc2746..6d6ce6e 100644 --- a/src/Impostor.Hazel/ObjectPool.cs +++ b/src/Impostor.Hazel/ObjectPool.cs @@ -2,7 +2,7 @@ using System.Collections.Concurrent; using System.Threading; -namespace Hazel +namespace Impostor.Hazel { /// /// A fairly simple object pool for items that will be created a lot. diff --git a/src/Impostor.Hazel/Udp/SendOptionInternal.cs b/src/Impostor.Hazel/Udp/SendOptionInternal.cs index 3681726..c0c4e21 100644 --- a/src/Impostor.Hazel/Udp/SendOptionInternal.cs +++ b/src/Impostor.Hazel/Udp/SendOptionInternal.cs @@ -1,4 +1,4 @@ -namespace Hazel.Udp +namespace Impostor.Hazel.Udp { /// /// Extra internal states for SendOption enumeration when using UDP. diff --git a/src/Impostor.Hazel/Udp/UdpBroadcastListener.cs b/src/Impostor.Hazel/Udp/UdpBroadcastListener.cs index a0b69e0..ed7b68d 100644 --- a/src/Impostor.Hazel/Udp/UdpBroadcastListener.cs +++ b/src/Impostor.Hazel/Udp/UdpBroadcastListener.cs @@ -4,7 +4,7 @@ using System.Net; using System.Net.Sockets; using System.Text; -namespace Hazel.Udp +namespace Impostor.Hazel.Udp { public class BroadcastPacket { diff --git a/src/Impostor.Hazel/Udp/UdpBroadcaster.cs b/src/Impostor.Hazel/Udp/UdpBroadcaster.cs index 0c81bf9..5fa1cca 100644 --- a/src/Impostor.Hazel/Udp/UdpBroadcaster.cs +++ b/src/Impostor.Hazel/Udp/UdpBroadcaster.cs @@ -3,7 +3,7 @@ using System.Net; using System.Net.Sockets; using System.Text; -namespace Hazel.Udp +namespace Impostor.Hazel.Udp { /// public class UdpBroadcaster : IDisposable diff --git a/src/Impostor.Hazel/Udp/UdpClientConnection.cs b/src/Impostor.Hazel/Udp/UdpClientConnection.cs index 1bb5722..f163e5b 100644 --- a/src/Impostor.Hazel/Udp/UdpClientConnection.cs +++ b/src/Impostor.Hazel/Udp/UdpClientConnection.cs @@ -8,7 +8,7 @@ using System.Threading.Tasks; using Impostor.Api.Net.Messages; using Serilog; -namespace Hazel.Udp +namespace Impostor.Hazel.Udp { /// /// Represents a client's connection to a server that uses the UDP protocol. diff --git a/src/Impostor.Hazel/Udp/UdpConnection.KeepAlive.cs b/src/Impostor.Hazel/Udp/UdpConnection.KeepAlive.cs index 81fe6c4..81cffab 100644 --- a/src/Impostor.Hazel/Udp/UdpConnection.KeepAlive.cs +++ b/src/Impostor.Hazel/Udp/UdpConnection.KeepAlive.cs @@ -4,8 +4,7 @@ using System.Diagnostics; using System.Threading; using System.Threading.Tasks; - -namespace Hazel.Udp +namespace Impostor.Hazel.Udp { partial class UdpConnection { diff --git a/src/Impostor.Hazel/Udp/UdpConnection.Reliable.cs b/src/Impostor.Hazel/Udp/UdpConnection.Reliable.cs index d39cb5d..4d925ff 100644 --- a/src/Impostor.Hazel/Udp/UdpConnection.Reliable.cs +++ b/src/Impostor.Hazel/Udp/UdpConnection.Reliable.cs @@ -6,8 +6,7 @@ using System.Threading; using System.Threading.Tasks; using Impostor.Api.Net.Messages; - -namespace Hazel.Udp +namespace Impostor.Hazel.Udp { partial class UdpConnection { diff --git a/src/Impostor.Hazel/Udp/UdpConnection.cs b/src/Impostor.Hazel/Udp/UdpConnection.cs index 39de8a7..851a2d8 100644 --- a/src/Impostor.Hazel/Udp/UdpConnection.cs +++ b/src/Impostor.Hazel/Udp/UdpConnection.cs @@ -5,7 +5,7 @@ using System.Threading.Tasks; using Impostor.Api.Net.Messages; using Serilog; -namespace Hazel.Udp +namespace Impostor.Hazel.Udp { /// /// Represents a connection that uses the UDP protocol. diff --git a/src/Impostor.Hazel/Udp/UdpConnectionListener.cs b/src/Impostor.Hazel/Udp/UdpConnectionListener.cs index ebd5044..aa3802e 100644 --- a/src/Impostor.Hazel/Udp/UdpConnectionListener.cs +++ b/src/Impostor.Hazel/Udp/UdpConnectionListener.cs @@ -8,7 +8,7 @@ using System.Threading.Channels; using System.Threading.Tasks; using Serilog; -namespace Hazel.Udp +namespace Impostor.Hazel.Udp { /// /// Listens for new UDP connections and creates UdpConnections for them. diff --git a/src/Impostor.Hazel/Udp/UdpServerConnection.cs b/src/Impostor.Hazel/Udp/UdpServerConnection.cs index d6aa107..ddd22ae 100644 --- a/src/Impostor.Hazel/Udp/UdpServerConnection.cs +++ b/src/Impostor.Hazel/Udp/UdpServerConnection.cs @@ -3,7 +3,7 @@ using System.Net; using System.Threading.Tasks; using Impostor.Api.Net.Messages; -namespace Hazel.Udp +namespace Impostor.Hazel.Udp { /// /// Represents a servers's connection to a client that uses the UDP protocol. diff --git a/src/Impostor.Server/Net/Client.cs b/src/Impostor.Server/Net/Client.cs index d369a81..68068eb 100644 --- a/src/Impostor.Server/Net/Client.cs +++ b/src/Impostor.Server/Net/Client.cs @@ -1,12 +1,12 @@ using System; using System.Threading.Tasks; -using Hazel; using Impostor.Api.Games; using Impostor.Api.Innersloth; using Impostor.Api.Innersloth.Data; using Impostor.Api.Net.Messages; using Impostor.Api.Net.Messages.C2S; using Impostor.Api.Net.Messages.S2C; +using Impostor.Hazel; using Impostor.Server.Data; using Impostor.Server.Net.Hazel; using Impostor.Server.Net.Manager; diff --git a/src/Impostor.Server/Net/Hazel/HazelConnection.cs b/src/Impostor.Server/Net/Hazel/HazelConnection.cs index e80e2ef..7b1c15e 100644 --- a/src/Impostor.Server/Net/Hazel/HazelConnection.cs +++ b/src/Impostor.Server/Net/Hazel/HazelConnection.cs @@ -1,7 +1,7 @@ using System.Net; using System.Threading.Tasks; -using Hazel; using Impostor.Api.Net.Messages; +using Impostor.Hazel; using Microsoft.Extensions.Logging; namespace Impostor.Server.Net.Hazel diff --git a/src/Impostor.Server/Net/Manager/ClientManager.cs b/src/Impostor.Server/Net/Manager/ClientManager.cs index c5cb5d0..31f0a73 100644 --- a/src/Impostor.Server/Net/Manager/ClientManager.cs +++ b/src/Impostor.Server/Net/Manager/ClientManager.cs @@ -2,12 +2,12 @@ using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; -using Hazel; using Impostor.Api.Innersloth; using Impostor.Api.Innersloth.Data; using Impostor.Api.Net; using Impostor.Api.Net.Messages; using Impostor.Api.Net.Messages.S2C; +using Impostor.Hazel; using Impostor.Server.Data; using Impostor.Server.Net.Factories; using Impostor.Server.Net.Hazel; diff --git a/src/Impostor.Server/Net/Matchmaker.cs b/src/Impostor.Server/Net/Matchmaker.cs index 290df70..2bcc7fa 100644 --- a/src/Impostor.Server/Net/Matchmaker.cs +++ b/src/Impostor.Server/Net/Matchmaker.cs @@ -2,8 +2,8 @@ using System.Net; using System.Net.Sockets; using System.Threading.Tasks; -using Hazel; -using Hazel.Udp; +using Impostor.Hazel; +using Impostor.Hazel.Udp; using Impostor.Server.Net.Manager; using Microsoft.Extensions.Logging; diff --git a/src/Impostor.Server/Net/Redirector/ClientRedirector.cs b/src/Impostor.Server/Net/Redirector/ClientRedirector.cs index 0d001f3..418e79c 100644 --- a/src/Impostor.Server/Net/Redirector/ClientRedirector.cs +++ b/src/Impostor.Server/Net/Redirector/ClientRedirector.cs @@ -1,10 +1,10 @@ using System.Threading.Tasks; -using Hazel; using Impostor.Api.Innersloth; using Impostor.Api.Innersloth.Data; using Impostor.Api.Net.Messages; using Impostor.Api.Net.Messages.C2S; using Impostor.Api.Net.Messages.S2C; +using Impostor.Hazel; using Impostor.Server.Data; using Impostor.Server.Net.Hazel; using Impostor.Server.Net.Manager; diff --git a/src/Impostor.Server/Net/State/Game.Incoming.cs b/src/Impostor.Server/Net/State/Game.Incoming.cs index b162c4d..2613098 100644 --- a/src/Impostor.Server/Net/State/Game.Incoming.cs +++ b/src/Impostor.Server/Net/State/Game.Incoming.cs @@ -1,9 +1,9 @@ using System.Threading.Tasks; -using Hazel; using Impostor.Api.Games; using Impostor.Api.Innersloth.Data; using Impostor.Api.Net; using Impostor.Api.Net.Messages; +using Impostor.Hazel; namespace Impostor.Server.Net.State { diff --git a/src/Impostor.Server/Net/State/Game.State.cs b/src/Impostor.Server/Net/State/Game.State.cs index 60f6e97..ee3184e 100644 --- a/src/Impostor.Server/Net/State/Game.State.cs +++ b/src/Impostor.Server/Net/State/Game.State.cs @@ -1,11 +1,11 @@ using System.Linq; using System.Threading.Tasks; -using Hazel; using Impostor.Api; using Impostor.Api.Events; using Impostor.Api.Innersloth.Data; using Impostor.Api.Net; using Impostor.Api.Net.Messages; +using Impostor.Hazel; namespace Impostor.Server.Net.State { diff --git a/src/Impostor.Server/Net/State/Game.cs b/src/Impostor.Server/Net/State/Game.cs index 14179d6..fd1d09c 100644 --- a/src/Impostor.Server/Net/State/Game.cs +++ b/src/Impostor.Server/Net/State/Game.cs @@ -4,7 +4,6 @@ using System.Collections.Generic; using System.Linq; using System.Net; using System.Threading.Tasks; -using Hazel; using Impostor.Api.Events.Managers; using Impostor.Api.Games; using Impostor.Api.Innersloth; @@ -12,6 +11,7 @@ using Impostor.Api.Innersloth.Data; using Impostor.Api.Net; using Impostor.Api.Net.Messages; using Impostor.Api.Net.Messages.S2C; +using Impostor.Hazel; using Impostor.Server.Hazel; using Impostor.Server.Net.Hazel; using Impostor.Server.Net.Manager; diff --git a/src/Impostor.Tests/Hazel/BufferMessageReaderTests.cs b/src/Impostor.Tests/Hazel/BufferMessageReaderTests.cs index 6e516ed..47ae813 100644 --- a/src/Impostor.Tests/Hazel/BufferMessageReaderTests.cs +++ b/src/Impostor.Tests/Hazel/BufferMessageReaderTests.cs @@ -1,4 +1,4 @@ -using Hazel; +using Impostor.Hazel; using Xunit; namespace Impostor.Tests.Hazel diff --git a/src/Impostor.Tools.Proxy/Program.cs b/src/Impostor.Tools.Proxy/Program.cs index 3023420..fdfce50 100644 --- a/src/Impostor.Tools.Proxy/Program.cs +++ b/src/Impostor.Tools.Proxy/Program.cs @@ -1,9 +1,9 @@ using System; using System.Collections.Generic; using System.Linq; -using Hazel; -using Hazel.Udp; using Impostor.Api.Net.Messages; +using Impostor.Hazel; +using Impostor.Hazel.Udp; using PcapDotNet.Core; using PcapDotNet.Packets; -- 2.39.5