* Move client/common/ and client/network/ into common/ and network/ respectively.

2025-01-22 17:23:32 -05:00 · 2023-08-19 10:05:48 +03:00 · 2023-08-19 10:05:48 +03:00 · 919e4d8625
commit 919e4d8625
parent a689ee7365
92 changed files with 238 additions and 238 deletions
--- a/compat/GL.hpp
+++ b/compat/GL.hpp
@ -96,7 +96,7 @@ void drawArrayVTC(GLuint buffer, int count, int stride);

 #else

-#include "client/common/Utils.hpp"
+#include "common/Utils.hpp"
 #include <GL/gl.h>
 #include <GL/glu.h>
 #include <GL/glext.h> // it'll include from a different dir, namely thirdparty/GL/glext.h
--- a/platforms/openal/SoundSystemAL.cpp
+++ b/platforms/openal/SoundSystemAL.cpp
@ -1,7 +1,7 @@
 #ifdef USE_OPENAL
 #include "SoundSystemAL.hpp"

-#include "client/common/Utils.hpp"
+#include "common/Utils.hpp"

 SoundSystemAL::SoundSystemAL()
 {
--- a/platforms/openal/SoundSystemAL.hpp
+++ b/platforms/openal/SoundSystemAL.hpp
@ -19,7 +19,7 @@
 #include <unordered_map>

 #include "client/sound/SoundSystem.hpp"
-#include <client/common/Vec3.hpp>
+#include <common/Vec3.hpp>

 #define MAX_IDLE_SOURCES 50
 #define MAX_DISTANCE 16.0f
--- a/platforms/windows/AppPlatform_windows.hpp
+++ b/platforms/windows/AppPlatform_windows.hpp
@ -11,7 +11,7 @@
 #include "compat/GL.hpp"
 #include <ctime>
 #include "AppPlatform.hpp"
-#include "client/common/Utils.hpp"
+#include "common/Utils.hpp"

 #ifdef ORIGINAL_CODE
 #error "This isn't original code. You probably shouldn't try to compile this"
--- a/platforms/windows/SoundSystemWindows.cpp
+++ b/platforms/windows/SoundSystemWindows.cpp
@ -8,7 +8,7 @@

 #define WIN32_LEAN_AND_MEAN
 #include "SoundSystemWindows.hpp"
-#include "client/common/Utils.hpp"
+#include "common/Utils.hpp"

 // @TODO: fix crash in playAt when Asan is active

--- a/source/AppPlatform.cpp
+++ b/source/AppPlatform.cpp
@ -7,7 +7,7 @@
 ********************************************************************/

 #include "AppPlatform.hpp"
-#include "client/common/Utils.hpp"
+#include "common/Utils.hpp"

 void AppPlatform::_tick()
 {
--- a/source/Minecraft.cpp
+++ b/source/Minecraft.cpp
@ -12,8 +12,8 @@
 #include "client/gui/screens/RenameMPLevelScreen.hpp"
 #include "client/gui/screens/SavingWorldScreen.hpp"
 #include "client/gui/screens/DeathScreen.hpp"
-#include "client/network/ServerSideNetworkHandler.hpp"
-#include "client/network/ClientSideNetworkHandler.hpp"
+#include "network/ServerSideNetworkHandler.hpp"
+#include "network/ClientSideNetworkHandler.hpp"

 #include "world/gamemode/SurvivalMode.hpp"
 #include "world/gamemode/CreativeMode.hpp"
--- a/source/Minecraft.hpp
+++ b/source/Minecraft.hpp
@ -9,13 +9,13 @@
 #pragma once

 #include "App.hpp"
-#include "client/common/CThread.hpp"
-#include "client/common/Mth.hpp"
-#include "client/common/Timer.hpp"
+#include "common/CThread.hpp"
+#include "common/Mth.hpp"
+#include "common/Timer.hpp"
 #include "client/gui/Gui.hpp"
 #include "client/gui/Screen.hpp"
-#include "client/network/RakNetInstance.hpp"
-#include "client/network/NetEventCallback.hpp"
+#include "network/RakNetInstance.hpp"
+#include "network/NetEventCallback.hpp"
 #include "client/player/input/ITurnInput.hpp"
 #include "client/renderer/GameRenderer.hpp"
 #include "client/renderer/LevelRenderer.hpp"
--- a/source/client/gui/Gui.hpp
+++ b/source/client/gui/Gui.hpp
@ -10,8 +10,8 @@

 #include "GuiComponent.hpp"
 #include "Minecraft.hpp"
-#include "client/common/Random.hpp"
-#include "client/common/Utils.hpp"
+#include "common/Random.hpp"
+#include "common/Utils.hpp"

 class Minecraft; // in case we're included from Minecraft.hpp

--- a/source/client/gui/components/AvailableGamesList.hpp
+++ b/source/client/gui/components/AvailableGamesList.hpp
@ -9,7 +9,7 @@
 #pragma once

 #include "ScrolledSelectionList.hpp"
-#include "client/network/PingedCompatibleServer.hpp"
+#include "network/PingedCompatibleServer.hpp"

 class AvailableGamesList : public ScrolledSelectionList
 {
--- a/source/client/gui/components/TextInputBox.hpp
+++ b/source/client/gui/components/TextInputBox.hpp
@ -9,7 +9,7 @@
 #pragma once

 #include "../GuiComponent.hpp"
-#include "client/common/Utils.hpp"
+#include "common/Utils.hpp"

 class Minecraft;

--- a/source/client/gui/components/WorldSelectionList.cpp
+++ b/source/client/gui/components/WorldSelectionList.cpp
@ -7,7 +7,7 @@
 ********************************************************************/

 #include "WorldSelectionList.hpp"
-#include "client/common/Utils.hpp"
+#include "common/Utils.hpp"

 static float WorldSelectionList_Static1(float a, float b, float c, float d)
 {
--- a/source/client/gui/screens/CreateWorldScreen.cpp
+++ b/source/client/gui/screens/CreateWorldScreen.cpp
@ -9,7 +9,7 @@
 #include "CreateWorldScreen.hpp"
 #include "SelectWorldScreen.hpp"
 #include "ProgressScreen.hpp"
-#include "client/common/Util.hpp"
+#include "common/Util.hpp"

 CreateWorldScreen::CreateWorldScreen() :
 	m_textName(1, 0, 0, 0, 0, "", "Unnamed world"),
--- a/source/client/gui/screens/DirectConnectScreen.cpp
+++ b/source/client/gui/screens/DirectConnectScreen.cpp
@ -9,7 +9,7 @@
 #include "DirectConnectScreen.hpp"
 #include "ProgressScreen.hpp"
 #include "JoinGameScreen.hpp"
-#include "client/common/Util.hpp"
+#include "common/Util.hpp"

 DirectConnectScreen::DirectConnectScreen() :
 	m_textAddress(1, 0, 0, 0, 0, "Server address"),
--- a/source/client/gui/screens/PauseScreen.cpp
+++ b/source/client/gui/screens/PauseScreen.cpp
@ -8,7 +8,7 @@

 #include "PauseScreen.hpp"
 #include "OptionsScreen.hpp"
-#include "client/network/ServerSideNetworkHandler.hpp"
+#include "network/ServerSideNetworkHandler.hpp"

 PauseScreen::PauseScreen() :
 	field_3C(0),
--- a/source/client/gui/screens/SelectWorldScreen.cpp
+++ b/source/client/gui/screens/SelectWorldScreen.cpp
@ -11,7 +11,7 @@
 #include "CreateWorldScreen.hpp"
 #include "ProgressScreen.hpp"
 #include "StartMenuScreen.hpp"
-#include "client/common/Util.hpp"
+#include "common/Util.hpp"

 SelectWorldScreen::SelectWorldScreen() :
 	m_btnDelete   (1, "Delete"),
--- a/source/client/model/Cube.cpp
+++ b/source/client/model/Cube.cpp
@ -7,7 +7,7 @@
 ********************************************************************/

 #include "Cube.hpp"
-#include "client/common/Utils.hpp"
+#include "common/Utils.hpp"

 const float Cube::c = 180.0f / float(M_PI);

--- a/source/client/player/input/ITurnInput.cpp
+++ b/source/client/player/input/ITurnInput.cpp
@ -6,7 +6,7 @@
 	SPDX-License-Identifier: BSD-1-Clause
 ********************************************************************/

-#include "client/common/Utils.hpp"
+#include "common/Utils.hpp"
 #include "ITurnInput.hpp"

 float ITurnInput::getDeltaTime()
--- a/source/client/player/input/KeyboardInput.hpp
+++ b/source/client/player/input/KeyboardInput.hpp
@ -8,7 +8,7 @@

 #pragma once

-#include "client/common/Options.hpp"
+#include "common/Options.hpp"

 class KeyboardInput
 {
--- a/source/client/renderer/Chunk.hpp
+++ b/source/client/renderer/Chunk.hpp
@ -8,7 +8,7 @@

 #pragma once

-#include "client/common/Utils.hpp"
+#include "common/Utils.hpp"
 #include "FrustumCuller.hpp"
 #include "RenderList.hpp"
 #include "Tesselator.hpp"
--- a/source/client/renderer/DynamicTexture.cpp
+++ b/source/client/renderer/DynamicTexture.cpp
@ -7,7 +7,7 @@
 ********************************************************************/

 #include "DynamicTexture.hpp"
-#include "client/common/Utils.hpp"
+#include "common/Utils.hpp"

 DynamicTexture::DynamicTexture(int a2) : m_textureIndex(a2)
 {
--- a/source/client/renderer/DynamicTexture.hpp
+++ b/source/client/renderer/DynamicTexture.hpp
@ -9,7 +9,7 @@
 #pragma once

 #include "Textures.hpp"
-#include "client/common/Random.hpp"
+#include "common/Random.hpp"
 class Textures; // in case we are being included from Textures. We don't need a complete type

 // Essentially, the way these work is by patching themselves into terrain.png with a
--- a/source/client/renderer/Font.hpp
+++ b/source/client/renderer/Font.hpp
@ -9,7 +9,7 @@
 #pragma once

 #include "Textures.hpp"
-#include "client/common/Options.hpp"
+#include "common/Options.hpp"

 class Font
 {
--- a/source/client/renderer/Frustum.hpp
+++ b/source/client/renderer/Frustum.hpp
@ -8,7 +8,7 @@

 #pragma once

-#include "client/common/Matrix.hpp"
+#include "common/Matrix.hpp"
 #include "world/phys/AABB.hpp"

 class Frustum
--- a/source/client/renderer/PatchManager.cpp
+++ b/source/client/renderer/PatchManager.cpp
@ -1,6 +1,6 @@
 #include "PatchManager.hpp"
 #include "AppPlatform.hpp"
-#include "client/common/Utils.hpp"
+#include "common/Utils.hpp"
 #include "world/tile/Tile.hpp"
 #include "world/item/Item.hpp"
 #include "compat/GL.hpp"
--- a/source/client/renderer/Tesselator.cpp
+++ b/source/client/renderer/Tesselator.cpp
@ -8,7 +8,7 @@

 #include "Tesselator.hpp"
 #include "compat/GL.hpp"
-#include "client/common/Utils.hpp"
+#include "common/Utils.hpp"

 #include <cstddef>

--- a/source/client/renderer/Textures.cpp
+++ b/source/client/renderer/Textures.cpp
@ -7,7 +7,7 @@
 ********************************************************************/

 #include "Textures.hpp"
-#include "client/common/Utils.hpp"
+#include "common/Utils.hpp"

 bool Textures::MIPMAP = false;

--- a/source/client/renderer/Textures.hpp
+++ b/source/client/renderer/Textures.hpp
@ -10,7 +10,7 @@
 #include <map>

 #include "compat/GL.hpp"
-#include "client/common/Options.hpp"
+#include "common/Options.hpp"
 #include "AppPlatform.hpp"
 #include "DynamicTexture.hpp"

--- a/source/client/sound/SoundEngine.hpp
+++ b/source/client/sound/SoundEngine.hpp
@ -8,8 +8,8 @@

 #pragma once

-#include "client/common/Options.hpp"
-#include "client/common/Random.hpp"
+#include "common/Options.hpp"
+#include "common/Random.hpp"
 #include "SoundSystem.hpp"
 #include "SoundRepository.hpp"

--- a/source/client/sound/SoundRepository.cpp
+++ b/source/client/sound/SoundRepository.cpp
@ -7,8 +7,8 @@
 ********************************************************************/

 #include "SoundRepository.hpp"
-#include "client/common/Utils.hpp"
-#include "client/common/Mth.hpp"
+#include "common/Utils.hpp"
+#include "common/Mth.hpp"

 void SoundRepository::add(const std::string& name, SoundDesc& sd)
 {
--- a/source/client/common/CThread.cpp
+++ b/source/client/common/CThread.cpp
@ -8,7 +8,7 @@

 #include <cstdint>
 #include "CThread.hpp"
-#include "client/common/Utils.hpp"
+#include "common/Utils.hpp"

 #if	defined(_WIN32)
 #define WIN32_LEAN_AND_MEAN
--- a/source/client/common/CThread.hpp
+++ b/source/client/common/CThread.hpp
--- a/source/client/common/LongHack.hpp
+++ b/source/client/common/LongHack.hpp
--- a/source/client/common/Matrix.cpp
+++ b/source/client/common/Matrix.cpp
--- a/source/client/common/Matrix.hpp
+++ b/source/client/common/Matrix.hpp
--- a/source/client/common/Mth.cpp
+++ b/source/client/common/Mth.cpp
--- a/source/client/common/Mth.hpp
+++ b/source/client/common/Mth.hpp
--- a/source/client/common/Options.cpp
+++ b/source/client/common/Options.cpp
--- a/source/client/common/Options.hpp
+++ b/source/client/common/Options.hpp
--- a/source/client/common/Random.cpp
+++ b/source/client/common/Random.cpp
@ -7,7 +7,7 @@
 ********************************************************************/

 #include "Random.hpp"
-#include "client/common/Utils.hpp"
+#include "common/Utils.hpp"

 /* Period parameters */
 #define N 624
--- a/source/client/common/Random.hpp
+++ b/source/client/common/Random.hpp
--- a/source/client/common/Timer.cpp
+++ b/source/client/common/Timer.cpp
@ -7,7 +7,7 @@
 ********************************************************************/

 #include "Timer.hpp"
-#include "client/common/Utils.hpp"
+#include "common/Utils.hpp"

 #if !defined(_WIN32) && defined(USE_ACCURATE_TIMER)
 #error "Implement getAccurateTimeMs() for your platform!"
--- a/source/client/common/Timer.hpp
+++ b/source/client/common/Timer.hpp
--- a/source/client/common/Util.cpp
+++ b/source/client/common/Util.cpp
--- a/source/client/common/Util.hpp
+++ b/source/client/common/Util.hpp
--- a/source/client/common/Utils.cpp
+++ b/source/client/common/Utils.cpp
@ -8,7 +8,7 @@

 // note: not an official file name

-#include "client/common/Utils.hpp"
+#include "common/Utils.hpp"

 #if defined(_WIN32) && !defined(_XBOX)

--- a/source/client/common/Utils.hpp
+++ b/source/client/common/Utils.hpp
--- a/source/client/network/ClientSideNetworkHandler.cpp
+++ b/source/client/network/ClientSideNetworkHandler.cpp
--- a/source/client/network/ClientSideNetworkHandler.hpp
+++ b/source/client/network/ClientSideNetworkHandler.hpp
--- a/source/client/network/MinecraftPackets.cpp
+++ b/source/client/network/MinecraftPackets.cpp
--- a/source/client/network/MinecraftPackets.hpp
+++ b/source/client/network/MinecraftPackets.hpp
--- a/source/client/network/NetEventCallback.cpp
+++ b/source/client/network/NetEventCallback.cpp
--- a/source/client/network/NetEventCallback.hpp
+++ b/source/client/network/NetEventCallback.hpp
--- a/source/client/network/Packet.hpp
+++ b/source/client/network/Packet.hpp
@ -9,7 +9,7 @@
 #pragma once

 #include <string>
-#include "client/common/LongHack.hpp"
+#include "common/LongHack.hpp"
 #include "RakNetTypes.h"
 #include "BitStream.h"
 #include "MessageIdentifiers.h"
--- a/source/client/network/PingedCompatibleServer.hpp
+++ b/source/client/network/PingedCompatibleServer.hpp
--- a/source/client/network/RakNetInstance.cpp
+++ b/source/client/network/RakNetInstance.cpp
--- a/source/client/network/RakNetInstance.hpp
+++ b/source/client/network/RakNetInstance.hpp
--- a/source/client/network/ServerSideNetworkHandler.cpp
+++ b/source/client/network/ServerSideNetworkHandler.cpp
--- a/source/client/network/ServerSideNetworkHandler.hpp
+++ b/source/client/network/ServerSideNetworkHandler.hpp
--- a/source/client/network/packets/AddPlayerPacket.cpp
+++ b/source/client/network/packets/AddPlayerPacket.cpp
--- a/source/client/network/packets/ChunkDataPacket.cpp
+++ b/source/client/network/packets/ChunkDataPacket.cpp
--- a/source/client/network/packets/LevelDataPacket.cpp
+++ b/source/client/network/packets/LevelDataPacket.cpp
--- a/source/client/network/packets/LoginPacket.cpp
+++ b/source/client/network/packets/LoginPacket.cpp
--- a/source/client/network/packets/MessagePacket.cpp
+++ b/source/client/network/packets/MessagePacket.cpp
--- a/source/client/network/packets/MovePlayerPacket.cpp
+++ b/source/client/network/packets/MovePlayerPacket.cpp
--- a/source/client/network/packets/PlaceBlockPacket.cpp
+++ b/source/client/network/packets/PlaceBlockPacket.cpp
--- a/source/client/network/packets/PlayerEquipmentPacket.cpp
+++ b/source/client/network/packets/PlayerEquipmentPacket.cpp
--- a/source/client/network/packets/RemoveBlockPacket.cpp
+++ b/source/client/network/packets/RemoveBlockPacket.cpp
--- a/source/client/network/packets/RemoveEntityPacket.cpp
+++ b/source/client/network/packets/RemoveEntityPacket.cpp
--- a/source/client/network/packets/RequestChunkPacket.cpp
+++ b/source/client/network/packets/RequestChunkPacket.cpp
--- a/source/client/network/packets/StartGamePacket.cpp
+++ b/source/client/network/packets/StartGamePacket.cpp
--- a/source/client/network/packets/UpdateBlockPacket.cpp
+++ b/source/client/network/packets/UpdateBlockPacket.cpp
--- a/source/world/item/Item.hpp
+++ b/source/world/item/Item.hpp
@ -9,7 +9,7 @@
 #pragma once

 #include <string>
-#include "client/common/Utils.hpp"
+#include "common/Utils.hpp"
 #include "world/level/Material.hpp"
 #include "ItemInstance.hpp"

--- a/source/world/item/ItemInstance.hpp
+++ b/source/world/item/ItemInstance.hpp
@ -8,7 +8,7 @@

 #pragma once

-#include "client/common/Utils.hpp"
+#include "common/Utils.hpp"
 #include "Item.hpp"

 class Item; // in case we're included from Item.hpp
--- a/source/world/level/Level.cpp
+++ b/source/world/level/Level.cpp
@ -9,7 +9,7 @@
 #include "Level.hpp"

 #include <algorithm>
-#include "client/common/Util.hpp"
+#include "common/Util.hpp"
 #include "world/level/levelgen/chunk/ChunkCache.hpp"
 #include "Explosion.hpp"
 #include "Region.hpp"
--- a/source/world/level/TickNextTickData.hpp
+++ b/source/world/level/TickNextTickData.hpp
@ -8,7 +8,7 @@

 #pragma once

-#include "client/common/LongHack.hpp"
+#include "common/LongHack.hpp"

 struct TickNextTickData
 {
--- a/source/world/level/levelgen/biome/Biome.hpp
+++ b/source/world/level/levelgen/biome/Biome.hpp
@ -9,7 +9,7 @@
 #pragma once

 #include <string>
-#include "client/common/Utils.hpp"
+#include "common/Utils.hpp"
 #include "world/level/levelgen/synth/PerlinNoise.hpp"
 #include "world/level/levelgen/feature/Feature.hpp"

--- a/source/world/level/levelgen/chunk/LevelChunk.hpp
+++ b/source/world/level/levelgen/chunk/LevelChunk.hpp
@ -11,7 +11,7 @@
 #include <cstring>
 #include <vector>
 #include <algorithm>
-#include "client/common/Utils.hpp"
+#include "common/Utils.hpp"
 #include "client/renderer/LightLayer.hpp"
 #include "world/phys/AABB.hpp"

--- a/source/world/level/levelgen/chunk/RandomLevelSource.hpp
+++ b/source/world/level/levelgen/chunk/RandomLevelSource.hpp
@ -14,7 +14,7 @@

 #include <unordered_map>
 #include "ChunkSource.hpp"
-#include "client/common/Utils.hpp"
+#include "common/Utils.hpp"
 #include "world/level/levelgen/synth/PerlinNoise.hpp"
 #include "world/level/levelgen/biome/BiomeSource.hpp"
 #include "world/level/levelgen/feature/Feature.hpp"
--- a/source/world/level/levelgen/chunk/TestChunkSource.hpp
+++ b/source/world/level/levelgen/chunk/TestChunkSource.hpp
@ -9,7 +9,7 @@
 #pragma once

 #include <cstring>
-#include "client/common/Utils.hpp"
+#include "common/Utils.hpp"
 #include "ChunkSource.hpp"

 class Level;
--- a/source/world/level/levelgen/feature/Feature.hpp
+++ b/source/world/level/levelgen/feature/Feature.hpp
@ -8,7 +8,7 @@

 #pragma once

-#include "client/common/Random.hpp"
+#include "common/Random.hpp"

 class Level;

--- a/source/world/level/levelgen/feature/LargeFeature.hpp
+++ b/source/world/level/levelgen/feature/LargeFeature.hpp
@ -1,6 +1,6 @@
 #pragma once

-#include "client/common/Random.hpp"
+#include "common/Random.hpp"
 #include "world/level/Level.hpp"

 class LargeFeature
--- a/source/world/level/levelgen/synth/ImprovedNoise.cpp
+++ b/source/world/level/levelgen/synth/ImprovedNoise.cpp
@ -7,7 +7,7 @@
 ********************************************************************/

 #include "ImprovedNoise.hpp"
-#include "client/common/Mth.hpp"
+#include "common/Mth.hpp"

 ImprovedNoise::ImprovedNoise()
 {
--- a/source/world/level/levelgen/synth/ImprovedNoise.hpp
+++ b/source/world/level/levelgen/synth/ImprovedNoise.hpp
@ -8,7 +8,7 @@

 #pragma once

-#include "client/common/Random.hpp"
+#include "common/Random.hpp"
 #include "Synth.hpp"

 // note: appears to maybe inherit from a class called Synth?
--- a/source/world/level/levelgen/synth/PerlinNoise.cpp
+++ b/source/world/level/levelgen/synth/PerlinNoise.cpp
@ -7,7 +7,7 @@
 ********************************************************************/

 #include "PerlinNoise.hpp"
-#include "client/common/Utils.hpp"
+#include "common/Utils.hpp"

 PerlinNoise::PerlinNoise(int nOctaves)
 {
--- a/source/world/level/storage/ExternalFileLevelStorageSource.cpp
+++ b/source/world/level/storage/ExternalFileLevelStorageSource.cpp
@ -8,7 +8,7 @@

 #include "ExternalFileLevelStorageSource.hpp"
 #include "ExternalFileLevelStorage.hpp"
-#include "client/common/Util.hpp"
+#include "common/Util.hpp"

 #ifndef DEMO

--- a/source/world/level/storage/LevelData.hpp
+++ b/source/world/level/storage/LevelData.hpp
@ -10,7 +10,7 @@

 #include <string>
 #include "BitStream.h"
-#include "client/common/Utils.hpp"
+#include "common/Utils.hpp"
 #include "world/phys/Vec3.hpp"
 #include "world/item/Inventory.hpp"

--- a/source/world/level/storage/LevelSource.hpp
+++ b/source/world/level/storage/LevelSource.hpp
@ -8,7 +8,7 @@

 #pragma once

-#include "client/common/Utils.hpp"
+#include "common/Utils.hpp"
 #include "world/level/Material.hpp"

 class LevelSource
--- a/source/world/phys/Vec3.hpp
+++ b/source/world/phys/Vec3.hpp
@ -8,7 +8,7 @@

 #pragma once

-#include "client/common/Mth.hpp"
+#include "common/Mth.hpp"

 class Vec3
 {
--- a/source/world/tile/Tile.hpp
+++ b/source/world/tile/Tile.hpp
@ -11,7 +11,7 @@
 #include <string>
 #include <vector>

-#include "client/common/Random.hpp"
+#include "common/Random.hpp"
 #include "world/phys/AABB.hpp"
 #include "world/level/storage/LevelSource.hpp"
 #include "world/level/Material.hpp"
--- a/windows_vs/minecraftcpp.vcxproj
+++ b/windows_vs/minecraftcpp.vcxproj
@ -34,15 +34,6 @@
    <ClInclude Include="..\platforms\windows\SoundSystemWindows.hpp" />
    <ClInclude Include="..\source\App.hpp" />
    <ClInclude Include="..\source\AppPlatform.hpp" />
-    <ClInclude Include="..\source\client\common\CThread.hpp" />
-    <ClInclude Include="..\source\client\common\LongHack.hpp" />
-    <ClInclude Include="..\source\client\common\Matrix.hpp" />
-    <ClInclude Include="..\source\client\common\Mth.hpp" />
-    <ClInclude Include="..\source\client\common\Options.hpp" />
-    <ClInclude Include="..\source\client\common\Random.hpp" />
-    <ClInclude Include="..\source\client\common\Timer.hpp" />
-    <ClInclude Include="..\source\client\common\Util.hpp" />
-    <ClInclude Include="..\source\client\common\Utils.hpp" />
    <ClInclude Include="..\source\client\gui\components\AvailableGamesList.hpp" />
    <ClInclude Include="..\source\client\gui\components\Button.hpp" />
    <ClInclude Include="..\source\client\gui\components\RolledSelectionList.hpp" />
@ -73,13 +64,6 @@
    <ClInclude Include="..\source\client\model\HumanoidModel.hpp" />
    <ClInclude Include="..\source\client\model\Model.hpp" />
    <ClInclude Include="..\source\client\model\PolygonQuad.hpp" />
-    <ClInclude Include="..\source\client\network\ClientSideNetworkHandler.hpp" />
-    <ClInclude Include="..\source\client\network\MinecraftPackets.hpp" />
-    <ClInclude Include="..\source\client\network\NetEventCallback.hpp" />
-    <ClInclude Include="..\source\client\network\Packet.hpp" />
-    <ClInclude Include="..\source\client\network\PingedCompatibleServer.hpp" />
-    <ClInclude Include="..\source\client\network\RakNetInstance.hpp" />
-    <ClInclude Include="..\source\client\network\ServerSideNetworkHandler.hpp" />
    <ClInclude Include="..\source\client\player\input\Controller.hpp" />
    <ClInclude Include="..\source\client\player\input\ControllerTurnInput.hpp" />
    <ClInclude Include="..\source\client\player\input\ITurnInput.hpp" />
@ -121,7 +105,23 @@
    <ClInclude Include="..\source\client\sound\SoundEngine.hpp" />
    <ClInclude Include="..\source\client\sound\SoundRepository.hpp" />
    <ClInclude Include="..\source\client\sound\SoundSystem.hpp" />
+    <ClInclude Include="..\source\common\CThread.hpp" />
+    <ClInclude Include="..\source\common\LongHack.hpp" />
+    <ClInclude Include="..\source\common\Matrix.hpp" />
+    <ClInclude Include="..\source\common\Mth.hpp" />
+    <ClInclude Include="..\source\common\Options.hpp" />
+    <ClInclude Include="..\source\common\Random.hpp" />
+    <ClInclude Include="..\source\common\Timer.hpp" />
+    <ClInclude Include="..\source\common\Util.hpp" />
+    <ClInclude Include="..\source\common\Utils.hpp" />
    <ClInclude Include="..\source\Minecraft.hpp" />
+    <ClInclude Include="..\source\network\ClientSideNetworkHandler.hpp" />
+    <ClInclude Include="..\source\network\MinecraftPackets.hpp" />
+    <ClInclude Include="..\source\network\NetEventCallback.hpp" />
+    <ClInclude Include="..\source\network\Packet.hpp" />
+    <ClInclude Include="..\source\network\PingedCompatibleServer.hpp" />
+    <ClInclude Include="..\source\network\RakNetInstance.hpp" />
+    <ClInclude Include="..\source\network\ServerSideNetworkHandler.hpp" />
    <ClInclude Include="..\source\NinecraftApp.hpp" />
    <ClInclude Include="..\source\world\entity\Entity.hpp" />
    <ClInclude Include="..\source\world\entity\FallingTile.hpp" />
@ -390,14 +390,6 @@
    <ClCompile Include="..\platforms\windows\SoundSystemWindows.cpp" />
    <ClCompile Include="..\source\App.cpp" />
    <ClCompile Include="..\source\AppPlatform.cpp" />
-    <ClCompile Include="..\source\client\common\CThread.cpp" />
-    <ClCompile Include="..\source\client\common\Matrix.cpp" />
-    <ClCompile Include="..\source\client\common\Mth.cpp" />
-    <ClCompile Include="..\source\client\common\Options.cpp" />
-    <ClCompile Include="..\source\client\common\Random.cpp" />
-    <ClCompile Include="..\source\client\common\Timer.cpp" />
-    <ClCompile Include="..\source\client\common\Util.cpp" />
-    <ClCompile Include="..\source\client\common\Utils.cpp" />
    <ClCompile Include="..\source\client\gui\components\AvailableGamesList.cpp" />
    <ClCompile Include="..\source\client\gui\components\Button.cpp" />
    <ClCompile Include="..\source\client\gui\components\RolledSelectionList.cpp" />
@ -428,24 +420,6 @@
    <ClCompile Include="..\source\client\model\HumanoidModel.cpp" />
    <ClCompile Include="..\source\client\model\Model.cpp" />
    <ClCompile Include="..\source\client\model\PolygonQuad.cpp" />
-    <ClCompile Include="..\source\client\network\ClientSideNetworkHandler.cpp" />
-    <ClCompile Include="..\source\client\network\MinecraftPackets.cpp" />
-    <ClCompile Include="..\source\client\network\NetEventCallback.cpp" />
-    <ClCompile Include="..\source\client\network\packets\AddPlayerPacket.cpp" />
-    <ClCompile Include="..\source\client\network\packets\ChunkDataPacket.cpp" />
-    <ClCompile Include="..\source\client\network\packets\LevelDataPacket.cpp" />
-    <ClCompile Include="..\source\client\network\packets\LoginPacket.cpp" />
-    <ClCompile Include="..\source\client\network\packets\MessagePacket.cpp" />
-    <ClCompile Include="..\source\client\network\packets\MovePlayerPacket.cpp" />
-    <ClCompile Include="..\source\client\network\packets\PlaceBlockPacket.cpp" />
-    <ClCompile Include="..\source\client\network\packets\PlayerEquipmentPacket.cpp" />
-    <ClCompile Include="..\source\client\network\packets\RemoveBlockPacket.cpp" />
-    <ClCompile Include="..\source\client\network\packets\RemoveEntityPacket.cpp" />
-    <ClCompile Include="..\source\client\network\packets\RequestChunkPacket.cpp" />
-    <ClCompile Include="..\source\client\network\packets\StartGamePacket.cpp" />
-    <ClCompile Include="..\source\client\network\packets\UpdateBlockPacket.cpp" />
-    <ClCompile Include="..\source\client\network\RakNetInstance.cpp" />
-    <ClCompile Include="..\source\client\network\ServerSideNetworkHandler.cpp" />
    <ClCompile Include="..\source\client\player\input\Controller.cpp" />
    <ClCompile Include="..\source\client\player\input\ControllerTurnInput.cpp" />
    <ClCompile Include="..\source\client\player\input\ITurnInput.cpp" />
@ -488,7 +462,33 @@
    <ClCompile Include="..\source\client\sound\SoundEngine.cpp" />
    <ClCompile Include="..\source\client\sound\SoundRepository.cpp" />
    <ClCompile Include="..\source\client\sound\SoundSystem.cpp" />
+    <ClCompile Include="..\source\common\CThread.cpp" />
+    <ClCompile Include="..\source\common\Matrix.cpp" />
+    <ClCompile Include="..\source\common\Mth.cpp" />
+    <ClCompile Include="..\source\common\Options.cpp" />
+    <ClCompile Include="..\source\common\Random.cpp" />
+    <ClCompile Include="..\source\common\Timer.cpp" />
+    <ClCompile Include="..\source\common\Util.cpp" />
+    <ClCompile Include="..\source\common\Utils.cpp" />
    <ClCompile Include="..\source\Minecraft.cpp" />
+    <ClCompile Include="..\source\network\ClientSideNetworkHandler.cpp" />
+    <ClCompile Include="..\source\network\MinecraftPackets.cpp" />
+    <ClCompile Include="..\source\network\NetEventCallback.cpp" />
+    <ClCompile Include="..\source\network\packets\AddPlayerPacket.cpp" />
+    <ClCompile Include="..\source\network\packets\ChunkDataPacket.cpp" />
+    <ClCompile Include="..\source\network\packets\LevelDataPacket.cpp" />
+    <ClCompile Include="..\source\network\packets\LoginPacket.cpp" />
+    <ClCompile Include="..\source\network\packets\MessagePacket.cpp" />
+    <ClCompile Include="..\source\network\packets\MovePlayerPacket.cpp" />
+    <ClCompile Include="..\source\network\packets\PlaceBlockPacket.cpp" />
+    <ClCompile Include="..\source\network\packets\PlayerEquipmentPacket.cpp" />
+    <ClCompile Include="..\source\network\packets\RemoveBlockPacket.cpp" />
+    <ClCompile Include="..\source\network\packets\RemoveEntityPacket.cpp" />
+    <ClCompile Include="..\source\network\packets\RequestChunkPacket.cpp" />
+    <ClCompile Include="..\source\network\packets\StartGamePacket.cpp" />
+    <ClCompile Include="..\source\network\packets\UpdateBlockPacket.cpp" />
+    <ClCompile Include="..\source\network\RakNetInstance.cpp" />
+    <ClCompile Include="..\source\network\ServerSideNetworkHandler.cpp" />
    <ClCompile Include="..\source\NinecraftApp.cpp" />
    <ClCompile Include="..\source\world\entity\Entity.cpp" />
    <ClCompile Include="..\source\world\entity\FallingTile.cpp" />
--- a/windows_vs/minecraftcpp.vcxproj.filters
+++ b/windows_vs/minecraftcpp.vcxproj.filters
@ -16,9 +16,6 @@
    <Filter Include="source\world">
      <UniqueIdentifier>{d7db338f-b359-4720-a51e-f2eac0cc6967}</UniqueIdentifier>
    </Filter>
-    <Filter Include="source\client\common">
-      <UniqueIdentifier>{9a0b909e-b8ec-44f1-b6de-74518cd5d0cd}</UniqueIdentifier>
-    </Filter>
    <Filter Include="source\client\gui">
      <UniqueIdentifier>{f8d05e9c-3d9c-4c5c-ab68-3708499ba745}</UniqueIdentifier>
    </Filter>
@ -31,12 +28,6 @@
    <Filter Include="source\client\model">
      <UniqueIdentifier>{c3a8e592-56de-40c6-957b-bc22cb059e5d}</UniqueIdentifier>
    </Filter>
-    <Filter Include="source\client\network">
-      <UniqueIdentifier>{43af5a60-79b9-483d-b7a1-6afaa922d5c4}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="source\client\network\packets">
-      <UniqueIdentifier>{ef5aef49-90c0-42ec-bb7b-f1819f9133ee}</UniqueIdentifier>
-    </Filter>
    <Filter Include="source\client\player">
      <UniqueIdentifier>{37e65ecf-9d30-480f-aa72-9f6250e794b5}</UniqueIdentifier>
    </Filter>
@ -103,6 +94,15 @@
    <Filter Include="source\world\phys">
      <UniqueIdentifier>{235360f7-6b7c-4029-afef-fd6b9898df39}</UniqueIdentifier>
    </Filter>
+    <Filter Include="source\common">
+      <UniqueIdentifier>{eee35d5d-6a69-4fbe-80ce-7a16f1b52499}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="source\network">
+      <UniqueIdentifier>{9c920748-ac55-4577-8c2e-89a78248273e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="source\network\packets">
+      <UniqueIdentifier>{bebcc3c4-9696-4e08-8967-6ac4e3d5d671}</UniqueIdentifier>
+    </Filter>
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="..\thirdparty\raknet\ThreadsafePacketLogger.h">
@ -579,33 +579,6 @@
    <ClInclude Include="..\source\NinecraftApp.hpp">
      <Filter>source</Filter>
    </ClInclude>
-    <ClInclude Include="..\source\client\common\CThread.hpp">
-      <Filter>source\client\common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\client\common\LongHack.hpp">
-      <Filter>source\client\common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\client\common\Matrix.hpp">
-      <Filter>source\client\common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\client\common\Mth.hpp">
-      <Filter>source\client\common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\client\common\Options.hpp">
-      <Filter>source\client\common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\client\common\Random.hpp">
-      <Filter>source\client\common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\client\common\Timer.hpp">
-      <Filter>source\client\common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\client\common\Util.hpp">
-      <Filter>source\client\common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\client\common\Utils.hpp">
-      <Filter>source\client\common</Filter>
-    </ClInclude>
    <ClInclude Include="..\source\client\gui\Gui.hpp">
      <Filter>source\client\gui</Filter>
    </ClInclude>
@ -693,27 +666,6 @@
    <ClInclude Include="..\source\client\model\Cube.hpp">
      <Filter>source\client\model</Filter>
    </ClInclude>
-    <ClInclude Include="..\source\client\network\NetEventCallback.hpp">
-      <Filter>source\client\network</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\client\network\Packet.hpp">
-      <Filter>source\client\network</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\client\network\PingedCompatibleServer.hpp">
-      <Filter>source\client\network</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\client\network\RakNetInstance.hpp">
-      <Filter>source\client\network</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\client\network\ServerSideNetworkHandler.hpp">
-      <Filter>source\client\network</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\client\network\ClientSideNetworkHandler.hpp">
-      <Filter>source\client\network</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\client\network\MinecraftPackets.hpp">
-      <Filter>source\client\network</Filter>
-    </ClInclude>
    <ClInclude Include="..\source\client\player\input\ControllerTurnInput.hpp">
      <Filter>source\client\player\input</Filter>
    </ClInclude>
@ -1167,6 +1119,54 @@
    <ClInclude Include="..\source\world\phys\Vec3.hpp">
      <Filter>source\world\phys</Filter>
    </ClInclude>
+    <ClInclude Include="..\source\common\Mth.hpp">
+      <Filter>source\common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\source\common\Options.hpp">
+      <Filter>source\common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\source\common\Random.hpp">
+      <Filter>source\common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\source\common\Timer.hpp">
+      <Filter>source\common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\source\common\Util.hpp">
+      <Filter>source\common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\source\common\Utils.hpp">
+      <Filter>source\common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\source\common\CThread.hpp">
+      <Filter>source\common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\source\common\LongHack.hpp">
+      <Filter>source\common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\source\common\Matrix.hpp">
+      <Filter>source\common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\source\network\MinecraftPackets.hpp">
+      <Filter>source\network</Filter>
+    </ClInclude>
+    <ClInclude Include="..\source\network\NetEventCallback.hpp">
+      <Filter>source\network</Filter>
+    </ClInclude>
+    <ClInclude Include="..\source\network\Packet.hpp">
+      <Filter>source\network</Filter>
+    </ClInclude>
+    <ClInclude Include="..\source\network\PingedCompatibleServer.hpp">
+      <Filter>source\network</Filter>
+    </ClInclude>
+    <ClInclude Include="..\source\network\RakNetInstance.hpp">
+      <Filter>source\network</Filter>
+    </ClInclude>
+    <ClInclude Include="..\source\network\ServerSideNetworkHandler.hpp">
+      <Filter>source\network</Filter>
+    </ClInclude>
+    <ClInclude Include="..\source\network\ClientSideNetworkHandler.hpp">
+      <Filter>source\network</Filter>
+    </ClInclude>
  </ItemGroup>
  <ItemGroup>
    <ClCompile Include="..\thirdparty\raknet\TwoWayAuthentication.cpp">
@ -1511,30 +1511,6 @@
    <ClCompile Include="..\source\NinecraftApp.cpp">
      <Filter>source</Filter>
    </ClCompile>
-    <ClCompile Include="..\source\client\common\CThread.cpp">
-      <Filter>source\client\common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\source\client\common\Matrix.cpp">
-      <Filter>source\client\common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\source\client\common\Mth.cpp">
-      <Filter>source\client\common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\source\client\common\Options.cpp">
-      <Filter>source\client\common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\source\client\common\Random.cpp">
-      <Filter>source\client\common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\source\client\common\Timer.cpp">
-      <Filter>source\client\common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\source\client\common\Util.cpp">
-      <Filter>source\client\common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\source\client\common\Utils.cpp">
-      <Filter>source\client\common</Filter>
-    </ClCompile>
    <ClCompile Include="..\source\client\gui\Gui.cpp">
      <Filter>source\client\gui</Filter>
    </ClCompile>
@ -1622,57 +1598,6 @@
    <ClCompile Include="..\source\client\model\HumanoidModel.cpp">
      <Filter>source\client\model</Filter>
    </ClCompile>
-    <ClCompile Include="..\source\client\network\NetEventCallback.cpp">
-      <Filter>source\client\network</Filter>
-    </ClCompile>
-    <ClCompile Include="..\source\client\network\RakNetInstance.cpp">
-      <Filter>source\client\network</Filter>
-    </ClCompile>
-    <ClCompile Include="..\source\client\network\ServerSideNetworkHandler.cpp">
-      <Filter>source\client\network</Filter>
-    </ClCompile>
-    <ClCompile Include="..\source\client\network\ClientSideNetworkHandler.cpp">
-      <Filter>source\client\network</Filter>
-    </ClCompile>
-    <ClCompile Include="..\source\client\network\MinecraftPackets.cpp">
-      <Filter>source\client\network</Filter>
-    </ClCompile>
-    <ClCompile Include="..\source\client\network\packets\PlaceBlockPacket.cpp">
-      <Filter>source\client\network\packets</Filter>
-    </ClCompile>
-    <ClCompile Include="..\source\client\network\packets\PlayerEquipmentPacket.cpp">
-      <Filter>source\client\network\packets</Filter>
-    </ClCompile>
-    <ClCompile Include="..\source\client\network\packets\RemoveBlockPacket.cpp">
-      <Filter>source\client\network\packets</Filter>
-    </ClCompile>
-    <ClCompile Include="..\source\client\network\packets\RemoveEntityPacket.cpp">
-      <Filter>source\client\network\packets</Filter>
-    </ClCompile>
-    <ClCompile Include="..\source\client\network\packets\RequestChunkPacket.cpp">
-      <Filter>source\client\network\packets</Filter>
-    </ClCompile>
-    <ClCompile Include="..\source\client\network\packets\StartGamePacket.cpp">
-      <Filter>source\client\network\packets</Filter>
-    </ClCompile>
-    <ClCompile Include="..\source\client\network\packets\UpdateBlockPacket.cpp">
-      <Filter>source\client\network\packets</Filter>
-    </ClCompile>
-    <ClCompile Include="..\source\client\network\packets\AddPlayerPacket.cpp">
-      <Filter>source\client\network\packets</Filter>
-    </ClCompile>
-    <ClCompile Include="..\source\client\network\packets\ChunkDataPacket.cpp">
-      <Filter>source\client\network\packets</Filter>
-    </ClCompile>
-    <ClCompile Include="..\source\client\network\packets\LoginPacket.cpp">
-      <Filter>source\client\network\packets</Filter>
-    </ClCompile>
-    <ClCompile Include="..\source\client\network\packets\MessagePacket.cpp">
-      <Filter>source\client\network\packets</Filter>
-    </ClCompile>
-    <ClCompile Include="..\source\client\network\packets\MovePlayerPacket.cpp">
-      <Filter>source\client\network\packets</Filter>
-    </ClCompile>
    <ClCompile Include="..\source\client\player\input\ITurnInput.cpp">
      <Filter>source\client\player\input</Filter>
    </ClCompile>
@ -2171,9 +2096,6 @@
    <ClCompile Include="..\thirdparty\zlib\gzclose.c">
      <Filter>thirdparty\zlib</Filter>
    </ClCompile>
-    <ClCompile Include="..\source\client\network\packets\LevelDataPacket.cpp">
-      <Filter>source\client\network\packets</Filter>
-    </ClCompile>
    <ClCompile Include="..\source\client\gui\screens\DeathScreen.cpp">
      <Filter>source\client\gui\screens</Filter>
    </ClCompile>
@ -2195,6 +2117,84 @@
    <ClCompile Include="..\source\world\phys\HitResult.cpp">
      <Filter>source\world\phys</Filter>
    </ClCompile>
+    <ClCompile Include="..\source\common\Options.cpp">
+      <Filter>source\common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\source\common\Random.cpp">
+      <Filter>source\common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\source\common\Timer.cpp">
+      <Filter>source\common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\source\common\Util.cpp">
+      <Filter>source\common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\source\common\Utils.cpp">
+      <Filter>source\common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\source\common\CThread.cpp">
+      <Filter>source\common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\source\common\Matrix.cpp">
+      <Filter>source\common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\source\common\Mth.cpp">
+      <Filter>source\common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\source\network\MinecraftPackets.cpp">
+      <Filter>source\network</Filter>
+    </ClCompile>
+    <ClCompile Include="..\source\network\NetEventCallback.cpp">
+      <Filter>source\network</Filter>
+    </ClCompile>
+    <ClCompile Include="..\source\network\RakNetInstance.cpp">
+      <Filter>source\network</Filter>
+    </ClCompile>
+    <ClCompile Include="..\source\network\ServerSideNetworkHandler.cpp">
+      <Filter>source\network</Filter>
+    </ClCompile>
+    <ClCompile Include="..\source\network\ClientSideNetworkHandler.cpp">
+      <Filter>source\network</Filter>
+    </ClCompile>
+    <ClCompile Include="..\source\network\packets\AddPlayerPacket.cpp">
+      <Filter>source\network\packets</Filter>
+    </ClCompile>
+    <ClCompile Include="..\source\network\packets\ChunkDataPacket.cpp">
+      <Filter>source\network\packets</Filter>
+    </ClCompile>
+    <ClCompile Include="..\source\network\packets\LevelDataPacket.cpp">
+      <Filter>source\network\packets</Filter>
+    </ClCompile>
+    <ClCompile Include="..\source\network\packets\LoginPacket.cpp">
+      <Filter>source\network\packets</Filter>
+    </ClCompile>
+    <ClCompile Include="..\source\network\packets\MessagePacket.cpp">
+      <Filter>source\network\packets</Filter>
+    </ClCompile>
+    <ClCompile Include="..\source\network\packets\MovePlayerPacket.cpp">
+      <Filter>source\network\packets</Filter>
+    </ClCompile>
+    <ClCompile Include="..\source\network\packets\PlaceBlockPacket.cpp">
+      <Filter>source\network\packets</Filter>
+    </ClCompile>
+    <ClCompile Include="..\source\network\packets\PlayerEquipmentPacket.cpp">
+      <Filter>source\network\packets</Filter>
+    </ClCompile>
+    <ClCompile Include="..\source\network\packets\RemoveBlockPacket.cpp">
+      <Filter>source\network\packets</Filter>
+    </ClCompile>
+    <ClCompile Include="..\source\network\packets\RemoveEntityPacket.cpp">
+      <Filter>source\network\packets</Filter>
+    </ClCompile>
+    <ClCompile Include="..\source\network\packets\RequestChunkPacket.cpp">
+      <Filter>source\network\packets</Filter>
+    </ClCompile>
+    <ClCompile Include="..\source\network\packets\UpdateBlockPacket.cpp">
+      <Filter>source\network\packets</Filter>
+    </ClCompile>
+    <ClCompile Include="..\source\network\packets\StartGamePacket.cpp">
+      <Filter>source\network\packets</Filter>
+    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <Text Include="..\thirdparty\raknet\CMakeLists.txt">