-update namespaces across entire project

Oliver-makes-code · Dec 10, 2023 · fcfae3b · fcfae3b
1 parent f52a354
commit fcfae3b
Show file tree

Hide file tree

Showing 42 changed files with 80 additions and 105 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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<T> where T : Packet {
 

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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<T> : RawIDMap<Type> where T : Packet {
     public void FillOutgoingMap() {

diff --git 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<Type, ConcurrentQueue<Packet>> Pools = new();

diff --git 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;
 
 /// <summary>
 /// Maps a RawID to some type and back.

diff --git 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;
 
 /// <summary>
 /// Connection out from the server to another client.

diff --git 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
@@ -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;
 
 /// <summary>
 /// 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
@@ -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;
 
 /// <summary>
 /// 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
@@ -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
@@ -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
@@ -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
@@ -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;
 
 /// <summary>
 /// A logical server for the game, used for both internal and external servers.