From 684b55c260e59cf3a232ae12dcc95f2c29ab5fcb Mon Sep 17 00:00:00 2001 From: MatthewBeshay <92357869+MatthewBeshay@users.noreply.github.com> Date: Thu, 9 Apr 2026 22:31:09 +1000 Subject: [PATCH] refactor: relocate Socket header into minecraft/network --- targets/app/common/Network/GameNetworkManager.cpp | 2 +- targets/app/common/Network/PlatformNetworkManagerStub.cpp | 2 +- targets/app/common/Network/Socket.cpp | 2 +- targets/app/windows/src/Windows64_Minecraft.cpp | 2 +- targets/minecraft/client/multiplayer/ClientConnection.cpp | 2 +- targets/minecraft/network/Connection.h | 2 +- targets/{app/common/Network => minecraft/network}/Socket.h | 0 targets/minecraft/server/MinecraftServer.cpp | 2 +- 8 files changed, 7 insertions(+), 7 deletions(-) rename targets/{app/common/Network => minecraft/network}/Socket.h (100%) diff --git a/targets/app/common/Network/GameNetworkManager.cpp b/targets/app/common/Network/GameNetworkManager.cpp index 22dd27316..67f816462 100644 --- a/targets/app/common/Network/GameNetworkManager.cpp +++ b/targets/app/common/Network/GameNetworkManager.cpp @@ -10,7 +10,7 @@ #include #include -#include "Socket.h" +#include "minecraft/network/Socket.h" #include "app/common/Game.h" #include "app/common/GameRules/GameRuleManager.h" #include "app/common/Network/PlatformNetworkManagerStub.h" diff --git a/targets/app/common/Network/PlatformNetworkManagerStub.cpp b/targets/app/common/Network/PlatformNetworkManagerStub.cpp index f46e0853f..c27df2a8f 100644 --- a/targets/app/common/Network/PlatformNetworkManagerStub.cpp +++ b/targets/app/common/Network/PlatformNetworkManagerStub.cpp @@ -6,8 +6,8 @@ #include #include "NetworkPlayerQNet.h" -#include "Socket.h" #include "app/common/Network/GameNetworkManager.h" +#include "minecraft/network/Socket.h" #include "app/linux/LinuxGame.h" #include "minecraft/network/platform/NetworkPlayerInterface.h" #include "platform/C4JThread.h" diff --git a/targets/app/common/Network/Socket.cpp b/targets/app/common/Network/Socket.cpp index afae4a595..87d0672f2 100644 --- a/targets/app/common/Network/Socket.cpp +++ b/targets/app/common/Network/Socket.cpp @@ -1,4 +1,4 @@ -#include "Socket.h" +#include "minecraft/network/Socket.h" #include diff --git a/targets/app/windows/src/Windows64_Minecraft.cpp b/targets/app/windows/src/Windows64_Minecraft.cpp index 7563ecbfc..4fdb59ee2 100644 --- a/targets/app/windows/src/Windows64_Minecraft.cpp +++ b/targets/app/windows/src/Windows64_Minecraft.cpp @@ -5,7 +5,7 @@ #include -#include "app/common/Network/Socket.h" +#include "minecraft/network/Socket.h" #include "minecraft/client/User.h" #include "minecraft/client/multiplayer/ClientConnection.h" #include "minecraft/client/multiplayer/ConnectScreen.h" diff --git a/targets/minecraft/client/multiplayer/ClientConnection.cpp b/targets/minecraft/client/multiplayer/ClientConnection.cpp index 7b615c418..3e90154c2 100644 --- a/targets/minecraft/client/multiplayer/ClientConnection.cpp +++ b/targets/minecraft/client/multiplayer/ClientConnection.cpp @@ -14,7 +14,7 @@ #include "ReceivingLevelScreen.h" #include "app/common/ConsoleGameMode.h" #include "minecraft/client/skins/ISkinAssetData.h" -#include "app/common/Network/Socket.h" +#include "minecraft/network/Socket.h" #include "app/common/Tutorial/FullTutorialMode.h" #include "minecraft/world/tutorial/ITutorial.h" #include "app/common/UI/All Platforms/UIStructs.h" diff --git a/targets/minecraft/network/Connection.h b/targets/minecraft/network/Connection.h index 918039003..e6d60480d 100644 --- a/targets/minecraft/network/Connection.h +++ b/targets/minecraft/network/Connection.h @@ -7,7 +7,7 @@ #include #include -#include "app/common/Network/Socket.h" +#include "minecraft/network/Socket.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" #include "java/System.h" diff --git a/targets/app/common/Network/Socket.h b/targets/minecraft/network/Socket.h similarity index 100% rename from targets/app/common/Network/Socket.h rename to targets/minecraft/network/Socket.h diff --git a/targets/minecraft/server/MinecraftServer.cpp b/targets/minecraft/server/MinecraftServer.cpp index a70a3c402..3805deda5 100644 --- a/targets/minecraft/server/MinecraftServer.cpp +++ b/targets/minecraft/server/MinecraftServer.cpp @@ -66,7 +66,7 @@ #include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.h" #endif #include "app/common/GameRules/LevelGeneration/ConsoleSchematicFile.h" -#include "app/common/Network/Socket.h" +#include "minecraft/network/Socket.h" #include "minecraft/Console_Debug_enum.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/ProgressRenderer.h"