From fcfae3b2ff9efc75b02c474724b3ad6e950a2219 Mon Sep 17 00:00:00 2001 From: Cassunshine Date: Sun, 10 Dec 2023 16:03:17 -0500 Subject: [PATCH] -update namespaces across entire project --- Client/Network/C2SConnection.cs | 4 ++-- Client/Network/ClientConnectionContext.cs | 11 ++++------- Client/Network/InternetC2SConnection.cs | 12 ++++++------ Client/Rendering/GameRenderer.cs | 2 +- Client/Rendering/Gui/GuiRenderer.cs | 2 +- Client/Rendering/Models/BlockModelManager.cs | 2 +- Client/Rendering/Utils/ColorFunctions.cs | 2 +- Client/Rendering/Utils/RenderingUtils.cs | 2 +- Client/Rendering/World/ChunkMeshBuilder.cs | 2 +- Client/Server/IntegratedServer.cs | 2 +- .../World/Entity/ControlledClientPlayerEntity.cs | 2 +- Common/Network/ConnectionBase.cs | 4 +--- Common/Network/Packets/C2S/C2SPacket.cs | 2 +- .../Packets/C2S/Gameplay/PlayerUpdated.cs | 3 +-- .../Packets/C2S/Handshake/C2SHandshakeDone.cs | 4 ++-- Common/Network/Packets/Packet.cs | 4 ++-- Common/Network/Packets/PacketHandler.cs | 3 +-- Common/Network/Packets/S2C/Gameplay/ChunkData.cs | 4 ++-- .../Network/Packets/S2C/Gameplay/ChunkUnload.cs | 3 +-- .../Packets/S2C/Gameplay/Entity/EntityPacket.cs | 3 +-- .../S2C/Gameplay/Entity/EntityTransformUpdate.cs | 10 ++++------ .../Packets/S2C/Handshake/S2CHandshakeDone.cs | 4 ++-- .../Network/Packets/S2C/Handshake/SetupWorld.cs | 4 ++-- Common/Network/Packets/S2C/S2CPacket.cs | 2 +- Common/Network/Packets/Utils/PacketMap.cs | 4 ++-- Common/Network/Packets/Utils/PacketPool.cs | 2 +- Common/Network/Packets/Utils/RawIDMap.cs | 4 ++-- Common/Network/S2CConnection.cs | 6 ++---- .../Components/Networking/ConnectionManager.cs | 5 ++--- .../Components/Networking/LNLHostManager.cs | 16 ++++++++-------- .../Networking/ServerConnectionContext.cs | 16 +++++++--------- Common/Server/Components/PlayerManager.cs | 7 +++---- Common/Server/Components/ServerComponent.cs | 2 +- Common/Server/Components/WorldManager.cs | 5 ++--- Common/Server/VoxelServer.cs | 7 +++---- Common/Server/World/ServerWorld.cs | 2 +- .../Compressed/CompressedVDataReader.cs | 2 +- .../Compressed/CompressedVDataWriter.cs | 2 +- Common/Util/Serialization/VDataReader.cs | 3 +-- Common/Util/Serialization/VDataWriter.cs | 4 +--- Common/Util/Serialization/VSerializable.cs | 2 +- Common/World/Entity/Entity.cs | 3 --- 42 files changed, 80 insertions(+), 105 deletions(-) diff --git a/Client/Network/C2SConnection.cs b/Client/Network/C2SConnection.cs index d4be014..d24e017 100644 --- a/Client/Network/C2SConnection.cs +++ b/Client/Network/C2SConnection.cs @@ -1,5 +1,5 @@ -using Common.Network; -using Common.Network.Packets.S2C; +using Voxel.Common.Network; +using Voxel.Common.Network.Packets.S2C; namespace Voxel.Client.Network; diff --git a/Client/Network/ClientConnectionContext.cs b/Client/Network/ClientConnectionContext.cs index b7cd187..96b8d65 100644 --- a/Client/Network/ClientConnectionContext.cs +++ b/Client/Network/ClientConnectionContext.cs @@ -1,14 +1,11 @@ using System; -using Common.Network.Packets; -using Common.Network.Packets.C2S; -using Common.Network.Packets.C2S.Handshake; -using Common.Network.Packets.S2C; -using Common.Network.Packets.S2C.Gameplay; -using Common.Network.Packets.S2C.Handshake; -using Common.Network.Packets.Utils; using Voxel.Client.World; using Voxel.Common.Network.Packets; +using Voxel.Common.Network.Packets.C2S; +using Voxel.Common.Network.Packets.S2C; using Voxel.Common.Network.Packets.S2C.Gameplay; +using Voxel.Common.Network.Packets.S2C.Handshake; +using Voxel.Common.Network.Packets.Utils; namespace Voxel.Client.Network; diff --git a/Client/Network/InternetC2SConnection.cs b/Client/Network/InternetC2SConnection.cs index 041d316..005f425 100644 --- a/Client/Network/InternetC2SConnection.cs +++ b/Client/Network/InternetC2SConnection.cs @@ -1,13 +1,13 @@ using System; using System.Net; using System.Net.Sockets; -using Common.Network.Packets; -using Common.Network.Packets.C2S; -using Common.Network.Packets.C2S.Handshake; -using Common.Network.Packets.S2C; -using Common.Network.Packets.Utils; -using Common.Util.Serialization.Compressed; using LiteNetLib; +using Voxel.Common.Network.Packets; +using Voxel.Common.Network.Packets.C2S; +using Voxel.Common.Network.Packets.C2S.Handshake; +using Voxel.Common.Network.Packets.S2C; +using Voxel.Common.Network.Packets.Utils; +using Voxel.Common.Util.Serialization.Compressed; namespace Voxel.Client.Network; diff --git a/Client/Rendering/GameRenderer.cs b/Client/Rendering/GameRenderer.cs index 875696b..475941b 100644 --- a/Client/Rendering/GameRenderer.cs +++ b/Client/Rendering/GameRenderer.cs @@ -2,7 +2,7 @@ using GlmSharp; using Voxel.Client.Keybinding; using Voxel.Client.Rendering.Debug; -using Voxel.Client.Rendering.GUI; +using Voxel.Client.Rendering.Gui; using Voxel.Client.Rendering.World; using Voxel.Common.Collision; using Voxel.Common.World; diff --git a/Client/Rendering/Gui/GuiRenderer.cs b/Client/Rendering/Gui/GuiRenderer.cs index 81dfe50..23e8909 100644 --- a/Client/Rendering/Gui/GuiRenderer.cs +++ b/Client/Rendering/Gui/GuiRenderer.cs @@ -2,7 +2,7 @@ using Veldrid; using Voxel.Client.Rendering.VertexTypes; -namespace Voxel.Client.Rendering.GUI; +namespace Voxel.Client.Rendering.Gui; public class GuiRenderer : Renderer, IDisposable { public readonly Pipeline GuiPipeline; diff --git a/Client/Rendering/Models/BlockModelManager.cs b/Client/Rendering/Models/BlockModelManager.cs index 1e41bf2..c321383 100644 --- a/Client/Rendering/Models/BlockModelManager.cs +++ b/Client/Rendering/Models/BlockModelManager.cs @@ -4,9 +4,9 @@ using GlmSharp; using Newtonsoft.Json; using Voxel.Client.Rendering.Texture; +using Voxel.Client.Rendering.Utils; using Voxel.Common.Tile; using Voxel.Core.Assets; -using Voxel.Rendering.Utils; namespace Voxel.Client.Rendering.Models; diff --git a/Client/Rendering/Utils/ColorFunctions.cs b/Client/Rendering/Utils/ColorFunctions.cs index 72b3188..4cec59b 100644 --- a/Client/Rendering/Utils/ColorFunctions.cs +++ b/Client/Rendering/Utils/ColorFunctions.cs @@ -2,7 +2,7 @@ using GlmSharp; using Voxel.Common.Util; -namespace Voxel.Rendering.Utils; +namespace Voxel.Client.Rendering.Utils; public static class ColorFunctions { [MethodImpl(MethodImplOptions.AggressiveOptimization)] diff --git a/Client/Rendering/Utils/RenderingUtils.cs b/Client/Rendering/Utils/RenderingUtils.cs index 57429d0..1f4b104 100644 --- a/Client/Rendering/Utils/RenderingUtils.cs +++ b/Client/Rendering/Utils/RenderingUtils.cs @@ -1,6 +1,6 @@ using GlmSharp; -namespace Voxel.Rendering.Utils; +namespace Voxel.Client.Rendering.Utils; public static class RenderingUtils { diff --git a/Client/Rendering/World/ChunkMeshBuilder.cs b/Client/Rendering/World/ChunkMeshBuilder.cs index a58b0cb..cd986c1 100644 --- a/Client/Rendering/World/ChunkMeshBuilder.cs +++ b/Client/Rendering/World/ChunkMeshBuilder.cs @@ -5,13 +5,13 @@ using GlmSharp; using Newtonsoft.Json.Serialization; using Voxel.Client.Rendering.Models; +using Voxel.Client.Rendering.Utils; using Voxel.Client.Rendering.VertexTypes; using Voxel.Client.World; using Voxel.Common.Tile; using Voxel.Common.Util; using Voxel.Common.World.Storage; using Voxel.Common.World.Views; -using Voxel.Rendering.Utils; namespace Voxel.Client.Rendering.World; diff --git a/Client/Server/IntegratedServer.cs b/Client/Server/IntegratedServer.cs index 5f27ec9..5ef6e9d 100644 --- a/Client/Server/IntegratedServer.cs +++ b/Client/Server/IntegratedServer.cs @@ -1,4 +1,4 @@ -using Common.Server; +using Voxel.Common.Server; namespace Voxel.Client.Server; diff --git a/Client/World/Entity/ControlledClientPlayerEntity.cs b/Client/World/Entity/ControlledClientPlayerEntity.cs index bda9be7..0e893d1 100644 --- a/Client/World/Entity/ControlledClientPlayerEntity.cs +++ b/Client/World/Entity/ControlledClientPlayerEntity.cs @@ -1,9 +1,9 @@ using System; -using Common.Network.Packets.Utils; using GlmSharp; using SharpGen.Runtime; using Voxel.Client.Keybinding; using Voxel.Common.Network.Packets.C2S.Gameplay; +using Voxel.Common.Network.Packets.Utils; using Voxel.Common.Util; namespace Voxel.Client.World.Entity; diff --git a/Common/Network/ConnectionBase.cs b/Common/Network/ConnectionBase.cs index 257b497..a80b6ec 100644 --- a/Common/Network/ConnectionBase.cs +++ b/Common/Network/ConnectionBase.cs @@ -1,8 +1,6 @@ -using Common.Network.Packets; -using NLog.Targets; using Voxel.Common.Network.Packets; -namespace Common.Network; +namespace Voxel.Common.Network; public abstract class ConnectionBase where T : Packet { diff --git a/Common/Network/Packets/C2S/C2SPacket.cs b/Common/Network/Packets/C2S/C2SPacket.cs index b42fe9d..1b84223 100644 --- a/Common/Network/Packets/C2S/C2SPacket.cs +++ b/Common/Network/Packets/C2S/C2SPacket.cs @@ -1,4 +1,4 @@ -namespace Common.Network.Packets.C2S; +namespace Voxel.Common.Network.Packets.C2S; public abstract class C2SPacket : Packet { diff --git a/Common/Network/Packets/C2S/Gameplay/PlayerUpdated.cs b/Common/Network/Packets/C2S/Gameplay/PlayerUpdated.cs index fa8cd59..eb66753 100644 --- a/Common/Network/Packets/C2S/Gameplay/PlayerUpdated.cs +++ b/Common/Network/Packets/C2S/Gameplay/PlayerUpdated.cs @@ -1,6 +1,5 @@ -using Common.Network.Packets.C2S; -using Common.Util.Serialization; using GlmSharp; +using Voxel.Common.Util.Serialization; namespace Voxel.Common.Network.Packets.C2S.Gameplay; diff --git a/Common/Network/Packets/C2S/Handshake/C2SHandshakeDone.cs b/Common/Network/Packets/C2S/Handshake/C2SHandshakeDone.cs index 891b189..6d77f08 100644 --- a/Common/Network/Packets/C2S/Handshake/C2SHandshakeDone.cs +++ b/Common/Network/Packets/C2S/Handshake/C2SHandshakeDone.cs @@ -1,6 +1,6 @@ -using Common.Util.Serialization; +using Voxel.Common.Util.Serialization; -namespace Common.Network.Packets.C2S.Handshake; +namespace Voxel.Common.Network.Packets.C2S.Handshake; public class C2SHandshakeDone : C2SPacket { diff --git a/Common/Network/Packets/Packet.cs b/Common/Network/Packets/Packet.cs index a1c6d1c..b2c6e1c 100644 --- a/Common/Network/Packets/Packet.cs +++ b/Common/Network/Packets/Packet.cs @@ -1,6 +1,6 @@ -using Common.Util.Serialization; +using Voxel.Common.Util.Serialization; -namespace Common.Network.Packets; +namespace Voxel.Common.Network.Packets; public abstract class Packet : VSerializable { diff --git a/Common/Network/Packets/PacketHandler.cs b/Common/Network/Packets/PacketHandler.cs index 559e59e..0b488d0 100644 --- a/Common/Network/Packets/PacketHandler.cs +++ b/Common/Network/Packets/PacketHandler.cs @@ -1,5 +1,4 @@ -using Common.Network.Packets; -using Common.Network.Packets.Utils; +using Voxel.Common.Network.Packets.Utils; namespace Voxel.Common.Network.Packets; diff --git a/Common/Network/Packets/S2C/Gameplay/ChunkData.cs b/Common/Network/Packets/S2C/Gameplay/ChunkData.cs index e1ffd75..55a1493 100644 --- a/Common/Network/Packets/S2C/Gameplay/ChunkData.cs +++ b/Common/Network/Packets/S2C/Gameplay/ChunkData.cs @@ -1,10 +1,10 @@ -using Common.Util.Serialization; using GlmSharp; using Voxel.Common.Tile; +using Voxel.Common.Util.Serialization; using Voxel.Common.World; using Voxel.Common.World.Storage; -namespace Common.Network.Packets.S2C.Gameplay; +namespace Voxel.Common.Network.Packets.S2C.Gameplay; public class ChunkData : S2CPacket { diff --git a/Common/Network/Packets/S2C/Gameplay/ChunkUnload.cs b/Common/Network/Packets/S2C/Gameplay/ChunkUnload.cs index e859d82..9a0f0b0 100644 --- a/Common/Network/Packets/S2C/Gameplay/ChunkUnload.cs +++ b/Common/Network/Packets/S2C/Gameplay/ChunkUnload.cs @@ -1,6 +1,5 @@ -using Common.Network.Packets.S2C; -using Common.Util.Serialization; using GlmSharp; +using Voxel.Common.Util.Serialization; using Voxel.Common.World; namespace Voxel.Common.Network.Packets.S2C.Gameplay; diff --git a/Common/Network/Packets/S2C/Gameplay/Entity/EntityPacket.cs b/Common/Network/Packets/S2C/Gameplay/Entity/EntityPacket.cs index 568fba4..3f795ef 100644 --- a/Common/Network/Packets/S2C/Gameplay/Entity/EntityPacket.cs +++ b/Common/Network/Packets/S2C/Gameplay/Entity/EntityPacket.cs @@ -1,5 +1,4 @@ -using Common.Network.Packets.S2C; -using Common.Util.Serialization; +using Voxel.Common.Util.Serialization; namespace Voxel.Common.Network.Packets.S2C.Gameplay.Entity; diff --git a/Common/Network/Packets/S2C/Gameplay/Entity/EntityTransformUpdate.cs b/Common/Network/Packets/S2C/Gameplay/Entity/EntityTransformUpdate.cs index 83c99a2..1093611 100644 --- a/Common/Network/Packets/S2C/Gameplay/Entity/EntityTransformUpdate.cs +++ b/Common/Network/Packets/S2C/Gameplay/Entity/EntityTransformUpdate.cs @@ -1,20 +1,18 @@ -using Common.Util.Serialization; using GlmSharp; -using Voxel.Common.Network.Packets.S2C.Gameplay.Entity; -using Voxel.Common.World.Entity; +using Voxel.Common.Util.Serialization; -namespace Common.Network.Packets.S2C.Gameplay; +namespace Voxel.Common.Network.Packets.S2C.Gameplay.Entity; public class EntityTransformUpdate : EntityPacket { public dvec3 Position; public float Rotation; - public override void Init(Entity entity) { + public override void Init(World.Entity.Entity entity) { Position = entity.position; Rotation = entity.rotation; } - public override void Apply(Entity entity) { + public override void Apply(World.Entity.Entity entity) { entity.position = Position; entity.rotation = Rotation; } diff --git a/Common/Network/Packets/S2C/Handshake/S2CHandshakeDone.cs b/Common/Network/Packets/S2C/Handshake/S2CHandshakeDone.cs index c5d242b..e172456 100644 --- a/Common/Network/Packets/S2C/Handshake/S2CHandshakeDone.cs +++ b/Common/Network/Packets/S2C/Handshake/S2CHandshakeDone.cs @@ -1,6 +1,6 @@ -using Common.Util.Serialization; +using Voxel.Common.Util.Serialization; -namespace Common.Network.Packets.S2C.Handshake; +namespace Voxel.Common.Network.Packets.S2C.Handshake; public class S2CHandshakeDone : S2CPacket { diff --git a/Common/Network/Packets/S2C/Handshake/SetupWorld.cs b/Common/Network/Packets/S2C/Handshake/SetupWorld.cs index 5d36dcc..63e7545 100644 --- a/Common/Network/Packets/S2C/Handshake/SetupWorld.cs +++ b/Common/Network/Packets/S2C/Handshake/SetupWorld.cs @@ -1,6 +1,6 @@ -using Common.Util.Serialization; +using Voxel.Common.Util.Serialization; -namespace Common.Network.Packets.S2C.Handshake; +namespace Voxel.Common.Network.Packets.S2C.Handshake; public class SetupWorld : S2CPacket { public override void Write(VDataWriter writer) { diff --git a/Common/Network/Packets/S2C/S2CPacket.cs b/Common/Network/Packets/S2C/S2CPacket.cs index 4491154..625f455 100644 --- a/Common/Network/Packets/S2C/S2CPacket.cs +++ b/Common/Network/Packets/S2C/S2CPacket.cs @@ -1,4 +1,4 @@ -namespace Common.Network.Packets.S2C; +namespace Voxel.Common.Network.Packets.S2C; public abstract class S2CPacket : Packet { diff --git a/Common/Network/Packets/Utils/PacketMap.cs b/Common/Network/Packets/Utils/PacketMap.cs index 50850c1..d4ed0e3 100644 --- a/Common/Network/Packets/Utils/PacketMap.cs +++ b/Common/Network/Packets/Utils/PacketMap.cs @@ -1,7 +1,7 @@ using System.Reflection; -using Common.Util.Serialization; +using Voxel.Common.Util.Serialization; -namespace Common.Network.Packets.Utils; +namespace Voxel.Common.Network.Packets.Utils; public class PacketMap : RawIDMap where T : Packet { public void FillOutgoingMap() { diff --git a/Common/Network/Packets/Utils/PacketPool.cs b/Common/Network/Packets/Utils/PacketPool.cs index f7a7dcc..cb94ea9 100644 --- a/Common/Network/Packets/Utils/PacketPool.cs +++ b/Common/Network/Packets/Utils/PacketPool.cs @@ -1,6 +1,6 @@ using System.Collections.Concurrent; -namespace Common.Network.Packets.Utils; +namespace Voxel.Common.Network.Packets.Utils; public static class PacketPool { private static Dictionary> Pools = new(); diff --git a/Common/Network/Packets/Utils/RawIDMap.cs b/Common/Network/Packets/Utils/RawIDMap.cs index 6a164b3..e7af126 100644 --- a/Common/Network/Packets/Utils/RawIDMap.cs +++ b/Common/Network/Packets/Utils/RawIDMap.cs @@ -1,7 +1,7 @@ using System.Diagnostics.CodeAnalysis; -using Common.Util.Serialization; +using Voxel.Common.Util.Serialization; -namespace Common.Network.Packets.Utils; +namespace Voxel.Common.Network.Packets.Utils; /// /// Maps a RawID to some type and back. diff --git a/Common/Network/S2CConnection.cs b/Common/Network/S2CConnection.cs index 2cc8486..dce0a1b 100644 --- a/Common/Network/S2CConnection.cs +++ b/Common/Network/S2CConnection.cs @@ -1,8 +1,6 @@ -using Common.Network.Packets; -using Common.Network.Packets.C2S; -using Common.Network.Packets.S2C; +using Voxel.Common.Network.Packets.C2S; -namespace Common.Network; +namespace Voxel.Common.Network; /// /// Connection out from the server to another client. diff --git a/Common/Server/Components/Networking/ConnectionManager.cs b/Common/Server/Components/Networking/ConnectionManager.cs index d273952..c0475d5 100644 --- a/Common/Server/Components/Networking/ConnectionManager.cs +++ b/Common/Server/Components/Networking/ConnectionManager.cs @@ -1,7 +1,6 @@ -using Common.Network; -using Common.Network.Packets; +using Voxel.Common.Network; -namespace Common.Server.Components.Networking; +namespace Voxel.Common.Server.Components.Networking; public class ConnectionManager : ServerComponent { diff --git a/Common/Server/Components/Networking/LNLHostManager.cs b/Common/Server/Components/Networking/LNLHostManager.cs index 280dbba..6ef492a 100644 --- a/Common/Server/Components/Networking/LNLHostManager.cs +++ b/Common/Server/Components/Networking/LNLHostManager.cs @@ -1,15 +1,15 @@ using System.Net; using System.Net.Sockets; -using Common.Network; -using Common.Network.Packets; -using Common.Network.Packets.C2S; -using Common.Network.Packets.S2C; -using Common.Network.Packets.Utils; -using Common.Util.Serialization.Compressed; using LiteNetLib; using LiteNetLib.Utils; - -namespace Common.Server.Components.Networking; +using Voxel.Common.Network; +using Voxel.Common.Network.Packets; +using Voxel.Common.Network.Packets.C2S; +using Voxel.Common.Network.Packets.S2C; +using Voxel.Common.Network.Packets.Utils; +using Voxel.Common.Util.Serialization.Compressed; + +namespace Voxel.Common.Server.Components.Networking; /// /// Server component that opens this server up to being connected to over the internet. diff --git a/Common/Server/Components/Networking/ServerConnectionContext.cs b/Common/Server/Components/Networking/ServerConnectionContext.cs index 5993cbc..e7011fb 100644 --- a/Common/Server/Components/Networking/ServerConnectionContext.cs +++ b/Common/Server/Components/Networking/ServerConnectionContext.cs @@ -1,18 +1,16 @@ -using Common.Network; -using Common.Network.Packets; -using Common.Network.Packets.C2S; -using Common.Network.Packets.C2S.Handshake; -using Common.Network.Packets.S2C; -using Common.Network.Packets.S2C.Gameplay; -using Common.Network.Packets.S2C.Handshake; -using Common.Network.Packets.Utils; +using Voxel.Common.Network; using Voxel.Common.Network.Packets; +using Voxel.Common.Network.Packets.C2S; using Voxel.Common.Network.Packets.C2S.Gameplay; +using Voxel.Common.Network.Packets.C2S.Handshake; +using Voxel.Common.Network.Packets.S2C; using Voxel.Common.Network.Packets.S2C.Gameplay; +using Voxel.Common.Network.Packets.S2C.Handshake; +using Voxel.Common.Network.Packets.Utils; using Voxel.Common.World; using Voxel.Common.World.Entity; -namespace Common.Server.Components.Networking; +namespace Voxel.Common.Server.Components.Networking; /// /// This is what controls a connection to a player from the server. diff --git a/Common/Server/Components/PlayerManager.cs b/Common/Server/Components/PlayerManager.cs index 7e30d99..9f278f7 100644 --- a/Common/Server/Components/PlayerManager.cs +++ b/Common/Server/Components/PlayerManager.cs @@ -1,10 +1,9 @@ -using Common.Network.Packets.S2C.Handshake; -using Common.Server.Components.Networking; using GlmSharp; -using Voxel.Common.Config; +using Voxel.Common.Network.Packets.S2C.Handshake; +using Voxel.Common.Server.Components.Networking; using Voxel.Common.World.Entity; -namespace Common.Server.Components; +namespace Voxel.Common.Server.Components; public class PlayerManager : ServerComponent { diff --git a/Common/Server/Components/ServerComponent.cs b/Common/Server/Components/ServerComponent.cs index fbea3dc..0d73fb0 100644 --- a/Common/Server/Components/ServerComponent.cs +++ b/Common/Server/Components/ServerComponent.cs @@ -1,4 +1,4 @@ -namespace Common.Server.Components; +namespace Voxel.Common.Server.Components; public abstract class ServerComponent { public readonly VoxelServer Server; diff --git a/Common/Server/Components/WorldManager.cs b/Common/Server/Components/WorldManager.cs index 96986f5..20246a7 100644 --- a/Common/Server/Components/WorldManager.cs +++ b/Common/Server/Components/WorldManager.cs @@ -1,7 +1,6 @@ -using Common.Server.World; -using Voxel.Common.World; +using Voxel.Common.Server.World; -namespace Common.Server.Components; +namespace Voxel.Common.Server.Components; public class WorldManager : ServerComponent { diff --git a/Common/Server/VoxelServer.cs b/Common/Server/VoxelServer.cs index 24c671a..fb3ab30 100644 --- a/Common/Server/VoxelServer.cs +++ b/Common/Server/VoxelServer.cs @@ -1,9 +1,8 @@ -using Common.Server.Components; -using Common.Server.Components.Networking; -using FastNoiseOO.Generators; +using Voxel.Common.Server.Components; +using Voxel.Common.Server.Components.Networking; using Voxel.Common.Util; -namespace Common.Server; +namespace Voxel.Common.Server; /// /// A logical server for the game, used for both internal and external servers. diff --git a/Common/Server/World/ServerWorld.cs b/Common/Server/World/ServerWorld.cs index 6d2e88c..ed0f64f 100644 --- a/Common/Server/World/ServerWorld.cs +++ b/Common/Server/World/ServerWorld.cs @@ -2,7 +2,7 @@ using Voxel.Common.World; using Voxel.Common.World.Generation; -namespace Common.Server.World; +namespace Voxel.Common.Server.World; public class ServerWorld : VoxelWorld { protected override Chunk CreateChunk(ivec3 pos) { diff --git a/Common/Util/Serialization/Compressed/CompressedVDataReader.cs b/Common/Util/Serialization/Compressed/CompressedVDataReader.cs index 86f9254..ff2511c 100644 --- a/Common/Util/Serialization/Compressed/CompressedVDataReader.cs +++ b/Common/Util/Serialization/Compressed/CompressedVDataReader.cs @@ -1,7 +1,7 @@ using System.Buffers; using ZstdSharp; -namespace Common.Util.Serialization.Compressed; +namespace Voxel.Common.Util.Serialization.Compressed; public class CompressedVDataReader : VDataReader { diff --git a/Common/Util/Serialization/Compressed/CompressedVDataWriter.cs b/Common/Util/Serialization/Compressed/CompressedVDataWriter.cs index ddc9660..1a587f2 100644 --- a/Common/Util/Serialization/Compressed/CompressedVDataWriter.cs +++ b/Common/Util/Serialization/Compressed/CompressedVDataWriter.cs @@ -1,7 +1,7 @@ using System.Buffers; using ZstdSharp; -namespace Common.Util.Serialization.Compressed; +namespace Voxel.Common.Util.Serialization.Compressed; public class CompressedVDataWriter : VDataWriter { diff --git a/Common/Util/Serialization/VDataReader.cs b/Common/Util/Serialization/VDataReader.cs index e7209cd..b87031c 100644 --- a/Common/Util/Serialization/VDataReader.cs +++ b/Common/Util/Serialization/VDataReader.cs @@ -1,9 +1,8 @@ using System.Buffers; using System.Text; using GlmSharp; -using ZstdSharp; -namespace Common.Util.Serialization; +namespace Voxel.Common.Util.Serialization; /// /// Used to read binary data directly, contains a few nice helper functions that default C# stuff doesn't have, like pulling the current bytes as a span. diff --git a/Common/Util/Serialization/VDataWriter.cs b/Common/Util/Serialization/VDataWriter.cs index 9dd0558..854a8e6 100644 --- a/Common/Util/Serialization/VDataWriter.cs +++ b/Common/Util/Serialization/VDataWriter.cs @@ -1,10 +1,8 @@ using System.Buffers; using System.Text; using GlmSharp; -using NLog; -using ZstdSharp; -namespace Common.Util.Serialization; +namespace Voxel.Common.Util.Serialization; /// /// Used to write binary data directly, contains a few nice helper functions that default C# stuff doesn't have, like pulling the current bytes as a span. diff --git a/Common/Util/Serialization/VSerializable.cs b/Common/Util/Serialization/VSerializable.cs index 956c305..7752323 100644 --- a/Common/Util/Serialization/VSerializable.cs +++ b/Common/Util/Serialization/VSerializable.cs @@ -1,4 +1,4 @@ -namespace Common.Util.Serialization; +namespace Voxel.Common.Util.Serialization; public interface VSerializable { diff --git a/Common/World/Entity/Entity.cs b/Common/World/Entity/Entity.cs index 744fa12..9a8e9e6 100644 --- a/Common/World/Entity/Entity.cs +++ b/Common/World/Entity/Entity.cs @@ -1,6 +1,3 @@ -using Common.Network.Packets; -using Common.Network.Packets.S2C.Gameplay; -using Common.Network.Packets.Utils; using GlmSharp; using Voxel.Common.Collision; using Voxel.Common.Util;