From e5cdd2c370c43bec55698e0bdca538a43a820471 Mon Sep 17 00:00:00 2001 From: MatthewBeshay <92357869+MatthewBeshay@users.noreply.github.com> Date: Wed, 8 Apr 2026 21:15:09 +1000 Subject: [PATCH] refactor: move NetworkPlayerInterface and SessionInfo into minecraft --- targets/app/common/Game.cpp | 2 +- targets/app/common/Game_XuiActions.cpp | 2 +- targets/app/common/Network/GameNetworkManager.cpp | 2 +- targets/app/common/Network/GameNetworkManager.h | 4 ++-- targets/app/common/Network/NetworkPlayerQNet.h | 2 +- targets/app/common/Network/PlatformNetworkManagerInterface.h | 4 ++-- targets/app/common/Network/PlatformNetworkManagerStub.cpp | 2 +- targets/app/common/Network/PlatformNetworkManagerStub.h | 4 ++-- targets/app/common/Network/Socket.cpp | 2 +- targets/app/common/Network/Socket.h | 2 +- .../app/common/Tutorial/Constraints/ChangeStateConstraint.cpp | 2 +- .../UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.cpp | 2 +- .../Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp | 2 +- .../In-Game Menu Screens/UIScene_InGameHostOptionsMenu.cpp | 2 +- .../UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.cpp | 2 +- .../In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.cpp | 2 +- .../UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.cpp | 2 +- targets/minecraft/client/Minecraft.cpp | 2 +- targets/minecraft/client/multiplayer/ClientConnection.cpp | 2 +- targets/minecraft/network/Connection.cpp | 2 +- targets/minecraft/network/packet/PlayerInfoPacket.cpp | 2 +- .../network/platform}/NetworkPlayerInterface.h | 0 .../Network => minecraft/network/platform}/SessionInfo.h | 0 targets/minecraft/server/MinecraftServer.cpp | 2 +- targets/minecraft/server/PlayerList.cpp | 2 +- targets/minecraft/server/level/EntityTracker.cpp | 2 +- targets/minecraft/server/level/PlayerChunkMap.cpp | 2 +- targets/minecraft/server/level/ServerLevel.cpp | 2 +- targets/minecraft/server/level/ServerPlayer.cpp | 2 +- targets/minecraft/server/level/TrackedEntity.cpp | 2 +- targets/minecraft/server/network/PendingConnection.cpp | 2 +- targets/minecraft/server/network/PlayerConnection.cpp | 2 +- 32 files changed, 33 insertions(+), 33 deletions(-) rename targets/{app/common/Network => minecraft/network/platform}/NetworkPlayerInterface.h (100%) rename targets/{app/common/Network => minecraft/network/platform}/SessionInfo.h (100%) diff --git a/targets/app/common/Game.cpp b/targets/app/common/Game.cpp index 8357f07a9..9125722d3 100644 --- a/targets/app/common/Game.cpp +++ b/targets/app/common/Game.cpp @@ -13,7 +13,7 @@ #include "app/common/DLC/DLCSkinFile.h" #include "app/common/GameRules/GameRuleManager.h" #include "app/common/Network/GameNetworkManager.h" -#include "app/common/Network/NetworkPlayerInterface.h" +#include "minecraft/network/platform/NetworkPlayerInterface.h" #include "app/common/Tutorial/Tutorial.h" #include "app/common/UI/All Platforms/UIEnums.h" #include "app/common/UI/All Platforms/UIStructs.h" diff --git a/targets/app/common/Game_XuiActions.cpp b/targets/app/common/Game_XuiActions.cpp index e6e9bd8e0..9dba39495 100644 --- a/targets/app/common/Game_XuiActions.cpp +++ b/targets/app/common/Game_XuiActions.cpp @@ -3,7 +3,7 @@ #include "app/common/Game.h" #include "app/common/GameRules/GameRuleManager.h" #include "app/common/Network/GameNetworkManager.h" -#include "app/common/Network/NetworkPlayerInterface.h" +#include "minecraft/network/platform/NetworkPlayerInterface.h" #include "app/common/Tutorial/Tutorial.h" #include "app/common/UI/All Platforms/UIEnums.h" #include "app/common/UI/All Platforms/UIStructs.h" diff --git a/targets/app/common/Network/GameNetworkManager.cpp b/targets/app/common/Network/GameNetworkManager.cpp index e844beae6..b28291984 100644 --- a/targets/app/common/Network/GameNetworkManager.cpp +++ b/targets/app/common/Network/GameNetworkManager.cpp @@ -17,7 +17,7 @@ #include "app/common/Game.h" #include "app/common/GameRules/GameRuleManager.h" #include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h" -#include "app/common/Network/NetworkPlayerInterface.h" +#include "minecraft/network/platform/NetworkPlayerInterface.h" #include "app/common/Network/PlatformNetworkManagerStub.h" #include "app/common/UI/All Platforms/UIEnums.h" #include "app/common/UI/All Platforms/UIStructs.h" diff --git a/targets/app/common/Network/GameNetworkManager.h b/targets/app/common/Network/GameNetworkManager.h index 9389b3f98..93ceff24c 100644 --- a/targets/app/common/Network/GameNetworkManager.h +++ b/targets/app/common/Network/GameNetworkManager.h @@ -10,9 +10,9 @@ #include "platform/PlatformTypes.h" #include "platform/IPlatformNetwork.h" #include "platform/NetTypes.h" -#include "NetworkPlayerInterface.h" +#include "minecraft/network/platform/NetworkPlayerInterface.h" #include "PlatformNetworkManagerStub.h" -#include "SessionInfo.h" +#include "minecraft/network/platform/SessionInfo.h" #include "platform/C4JThread.h" class ClientConnection; diff --git a/targets/app/common/Network/NetworkPlayerQNet.h b/targets/app/common/Network/NetworkPlayerQNet.h index 65d961848..3de173cf1 100644 --- a/targets/app/common/Network/NetworkPlayerQNet.h +++ b/targets/app/common/Network/NetworkPlayerQNet.h @@ -5,7 +5,7 @@ #include #include "platform/PlatformTypes.h" -#include "NetworkPlayerInterface.h" +#include "minecraft/network/platform/NetworkPlayerInterface.h" class IQNetPlayer; class Socket; diff --git a/targets/app/common/Network/PlatformNetworkManagerInterface.h b/targets/app/common/Network/PlatformNetworkManagerInterface.h index 069747bd1..297641349 100644 --- a/targets/app/common/Network/PlatformNetworkManagerInterface.h +++ b/targets/app/common/Network/PlatformNetworkManagerInterface.h @@ -7,8 +7,8 @@ #endif #include "platform/NetTypes.h" #include "minecraft/client/model/SkinBox.h" -#include "NetworkPlayerInterface.h" -#include "SessionInfo.h" +#include "minecraft/network/platform/NetworkPlayerInterface.h" +#include "minecraft/network/platform/SessionInfo.h" #include "platform/C4JThread.h" class ClientConnection; diff --git a/targets/app/common/Network/PlatformNetworkManagerStub.cpp b/targets/app/common/Network/PlatformNetworkManagerStub.cpp index 62bd9c69e..3ae7bb298 100644 --- a/targets/app/common/Network/PlatformNetworkManagerStub.cpp +++ b/targets/app/common/Network/PlatformNetworkManagerStub.cpp @@ -6,7 +6,7 @@ #include #include "app/common/Network/GameNetworkManager.h" -#include "app/common/Network/NetworkPlayerInterface.h" +#include "minecraft/network/platform/NetworkPlayerInterface.h" #include "app/linux/LinuxGame.h" #include "app/linux/Stubs/winapi_stubs.h" #include "platform/NetTypes.h" diff --git a/targets/app/common/Network/PlatformNetworkManagerStub.h b/targets/app/common/Network/PlatformNetworkManagerStub.h index 9f1f15ca5..2d7d80f0a 100644 --- a/targets/app/common/Network/PlatformNetworkManagerStub.h +++ b/targets/app/common/Network/PlatformNetworkManagerStub.h @@ -8,9 +8,9 @@ #include "platform/NetTypes.h" #include "minecraft/client/model/SkinBox.h" #include "platform/XboxStubs.h" -#include "NetworkPlayerInterface.h" +#include "minecraft/network/platform/NetworkPlayerInterface.h" #include "platform/IPlatformNetwork.h" -#include "SessionInfo.h" +#include "minecraft/network/platform/SessionInfo.h" #include "platform/C4JThread.h" class C4JThread; diff --git a/targets/app/common/Network/Socket.cpp b/targets/app/common/Network/Socket.cpp index 691e29d2e..6ae610c25 100644 --- a/targets/app/common/Network/Socket.cpp +++ b/targets/app/common/Network/Socket.cpp @@ -9,7 +9,7 @@ // 4jcraft TODO #include "platform/ShutdownManager.h" #include "app/common/Network/GameNetworkManager.h" -#include "app/common/Network/NetworkPlayerInterface.h" +#include "minecraft/network/platform/NetworkPlayerInterface.h" #include "platform/NetTypes.h" #include "minecraft/server/network/ServerConnection.h" diff --git a/targets/app/common/Network/Socket.h b/targets/app/common/Network/Socket.h index e8d69ff85..ca45f8f34 100644 --- a/targets/app/common/Network/Socket.h +++ b/targets/app/common/Network/Socket.h @@ -11,7 +11,7 @@ #include #include "app/common/Network/GameNetworkManager.h" -#include "app/common/Network/NetworkPlayerInterface.h" +#include "minecraft/network/platform/NetworkPlayerInterface.h" #include "platform/C4JThread.h" #include "java/InputOutputStream/InputStream.h" #include "java/InputOutputStream/OutputStream.h" diff --git a/targets/app/common/Tutorial/Constraints/ChangeStateConstraint.cpp b/targets/app/common/Tutorial/Constraints/ChangeStateConstraint.cpp index 5135f2c8e..6859cfa6f 100644 --- a/targets/app/common/Tutorial/Constraints/ChangeStateConstraint.cpp +++ b/targets/app/common/Tutorial/Constraints/ChangeStateConstraint.cpp @@ -2,7 +2,7 @@ #include -#include "app/common/Network/NetworkPlayerInterface.h" +#include "minecraft/network/platform/NetworkPlayerInterface.h" #include "app/common/Tutorial/Constraints/TutorialConstraint.h" #include "app/common/Tutorial/Tutorial.h" #include "app/common/Tutorial/TutorialEnum.h" diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.cpp index 791c2c9dc..aa6abf132 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.cpp +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.cpp @@ -6,7 +6,7 @@ #include "minecraft/GameTypes.h" #include "app/common/Network/GameNetworkManager.h" -#include "app/common/Network/SessionInfo.h" +#include "minecraft/network/platform/SessionInfo.h" #include "app/common/UI/All Platforms/UIStructs.h" #include "app/common/UI/Controls/UIControl_Button.h" #include "app/common/UI/Controls/UIControl_ButtonList.h" diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp index 42627d430..3ec6865a4 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp @@ -13,7 +13,7 @@ #include "app/common/DLC/DLCManager.h" #include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h" #include "app/common/Network/GameNetworkManager.h" -#include "app/common/Network/SessionInfo.h" +#include "minecraft/network/platform/SessionInfo.h" #include "app/common/UI/Controls/UIControl_Label.h" #include "app/common/UI/Controls/UIControl_SaveList.h" #include "app/common/UI/UILayer.h" diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.cpp index 37a433684..a207a9a2f 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.cpp @@ -5,7 +5,7 @@ #include "minecraft/GameEnums.h" #include "app/common/Network/GameNetworkManager.h" -#include "app/common/Network/NetworkPlayerInterface.h" +#include "minecraft/network/platform/NetworkPlayerInterface.h" #include "app/common/UI/All Platforms/UIStructs.h" #include "app/common/UI/Controls/UIControl_Button.h" #include "app/common/UI/Controls/UIControl_CheckBox.h" diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.cpp index 766c715f3..23af36775 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.cpp @@ -7,7 +7,7 @@ #include "minecraft/GameEnums.h" #include "app/common/Console_Debug_enum.h" #include "app/common/Network/GameNetworkManager.h" -#include "app/common/Network/NetworkPlayerInterface.h" +#include "minecraft/network/platform/NetworkPlayerInterface.h" #include "app/common/UI/All Platforms/UIStructs.h" #include "app/common/UI/Controls/UIControl_Button.h" #include "app/common/UI/Controls/UIControl_Label.h" diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.cpp index 1a0cf76fd..d5106a9f0 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.cpp @@ -5,7 +5,7 @@ #include "minecraft/GameEnums.h" #include "app/common/Network/GameNetworkManager.h" -#include "app/common/Network/NetworkPlayerInterface.h" +#include "minecraft/network/platform/NetworkPlayerInterface.h" #include "app/common/UI/All Platforms/UIStructs.h" #include "app/common/UI/Controls/UIControl_Button.h" #include "app/common/UI/Controls/UIControl_CheckBox.h" diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.cpp index d5c4379a1..e19845312 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.cpp @@ -5,7 +5,7 @@ #include "app/common/Console_Debug_enum.h" #include "app/common/Network/GameNetworkManager.h" -#include "app/common/Network/NetworkPlayerInterface.h" +#include "minecraft/network/platform/NetworkPlayerInterface.h" #include "app/common/UI/All Platforms/UIStructs.h" #include "app/common/UI/Controls/UIControl_Label.h" #include "app/common/UI/Controls/UIControl_PlayerList.h" diff --git a/targets/minecraft/client/Minecraft.cpp b/targets/minecraft/client/Minecraft.cpp index 309bcf5f3..04621cdfe 100644 --- a/targets/minecraft/client/Minecraft.cpp +++ b/targets/minecraft/client/Minecraft.cpp @@ -20,7 +20,7 @@ #include "app/common/Audio/SoundEngine.h" #include "app/common/DLC/DLCManager.h" #include "app/common/Network/GameNetworkManager.h" -#include "app/common/Network/NetworkPlayerInterface.h" +#include "minecraft/network/platform/NetworkPlayerInterface.h" #include "app/common/Tutorial/Tutorial.h" #include "app/common/UI/All Platforms/UIEnums.h" #include "app/common/UI/All Platforms/UIStructs.h" diff --git a/targets/minecraft/client/multiplayer/ClientConnection.cpp b/targets/minecraft/client/multiplayer/ClientConnection.cpp index 6cd6c0603..e7a12ad97 100644 --- a/targets/minecraft/client/multiplayer/ClientConnection.cpp +++ b/targets/minecraft/client/multiplayer/ClientConnection.cpp @@ -23,7 +23,7 @@ #include "app/common/DLC/DLCSkinFile.h" #include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" #include "app/common/Network/GameNetworkManager.h" -#include "app/common/Network/NetworkPlayerInterface.h" +#include "minecraft/network/platform/NetworkPlayerInterface.h" #include "app/common/Network/Socket.h" #include "app/common/Tutorial/FullTutorialMode.h" #include "app/common/Tutorial/Tutorial.h" diff --git a/targets/minecraft/network/Connection.cpp b/targets/minecraft/network/Connection.cpp index e29dc6e21..6e40ba86b 100644 --- a/targets/minecraft/network/Connection.cpp +++ b/targets/minecraft/network/Connection.cpp @@ -8,7 +8,7 @@ #include "platform/ShutdownManager.h" #include "app/common/Network/GameNetworkManager.h" -#include "app/common/Network/NetworkPlayerInterface.h" +#include "minecraft/network/platform/NetworkPlayerInterface.h" #include "app/common/Network/Socket.h" #include "util/StringHelpers.h" #include "minecraft/world/level/storage/ConsoleSaveFileIO/compression.h" diff --git a/targets/minecraft/network/packet/PlayerInfoPacket.cpp b/targets/minecraft/network/packet/PlayerInfoPacket.cpp index 7ea79b2a3..95e226d30 100644 --- a/targets/minecraft/network/packet/PlayerInfoPacket.cpp +++ b/targets/minecraft/network/packet/PlayerInfoPacket.cpp @@ -1,4 +1,4 @@ -#include "app/common/Network/NetworkPlayerInterface.h" +#include "minecraft/network/platform/NetworkPlayerInterface.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" #include "minecraft/network/packet/PacketListener.h" diff --git a/targets/app/common/Network/NetworkPlayerInterface.h b/targets/minecraft/network/platform/NetworkPlayerInterface.h similarity index 100% rename from targets/app/common/Network/NetworkPlayerInterface.h rename to targets/minecraft/network/platform/NetworkPlayerInterface.h diff --git a/targets/app/common/Network/SessionInfo.h b/targets/minecraft/network/platform/SessionInfo.h similarity index 100% rename from targets/app/common/Network/SessionInfo.h rename to targets/minecraft/network/platform/SessionInfo.h diff --git a/targets/minecraft/server/MinecraftServer.cpp b/targets/minecraft/server/MinecraftServer.cpp index ec321d02e..a23f12d2e 100644 --- a/targets/minecraft/server/MinecraftServer.cpp +++ b/targets/minecraft/server/MinecraftServer.cpp @@ -21,7 +21,7 @@ #include "app/common/GameRules/GameRuleManager.h" #include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h" #include "app/common/Network/GameNetworkManager.h" -#include "app/common/Network/NetworkPlayerInterface.h" +#include "minecraft/network/platform/NetworkPlayerInterface.h" #include "PlayerList.h" #include "Settings.h" #include "util/Timer.h" diff --git a/targets/minecraft/server/PlayerList.cpp b/targets/minecraft/server/PlayerList.cpp index 20efba2eb..daea1f0a5 100644 --- a/targets/minecraft/server/PlayerList.cpp +++ b/targets/minecraft/server/PlayerList.cpp @@ -16,7 +16,7 @@ #include "app/common/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h" #include "app/common/GameRules/LevelRules/Rules/GameRulesInstance.h" #include "app/common/Network/GameNetworkManager.h" -#include "app/common/Network/NetworkPlayerInterface.h" +#include "minecraft/network/platform/NetworkPlayerInterface.h" #include "app/common/Network/Socket.h" #include "app/common/Tutorial/Tutorial.h" #include "app/common/Tutorial/TutorialEnum.h" diff --git a/targets/minecraft/server/level/EntityTracker.cpp b/targets/minecraft/server/level/EntityTracker.cpp index cfe112c3a..2a47cf946 100644 --- a/targets/minecraft/server/level/EntityTracker.cpp +++ b/targets/minecraft/server/level/EntityTracker.cpp @@ -7,7 +7,7 @@ #include #include -#include "app/common/Network/NetworkPlayerInterface.h" +#include "minecraft/network/platform/NetworkPlayerInterface.h" #include "ServerLevel.h" #include "ServerPlayer.h" #include "TrackedEntity.h" diff --git a/targets/minecraft/server/level/PlayerChunkMap.cpp b/targets/minecraft/server/level/PlayerChunkMap.cpp index 746292478..971574bd8 100644 --- a/targets/minecraft/server/level/PlayerChunkMap.cpp +++ b/targets/minecraft/server/level/PlayerChunkMap.cpp @@ -11,7 +11,7 @@ #include #include "app/common/Network/GameNetworkManager.h" -#include "app/common/Network/NetworkPlayerInterface.h" +#include "minecraft/network/platform/NetworkPlayerInterface.h" #include "ServerChunkCache.h" #include "ServerLevel.h" #include "ServerPlayer.h" diff --git a/targets/minecraft/server/level/ServerLevel.cpp b/targets/minecraft/server/level/ServerLevel.cpp index 77a16c7f5..6b52b602e 100644 --- a/targets/minecraft/server/level/ServerLevel.cpp +++ b/targets/minecraft/server/level/ServerLevel.cpp @@ -14,7 +14,7 @@ #include "app/common/Console_Debug_enum.h" #include "app/common/DLC/DLCManager.h" #include "app/common/DLC/DLCPack.h" -#include "app/common/Network/NetworkPlayerInterface.h" +#include "minecraft/network/platform/NetworkPlayerInterface.h" #include "PlayerChunkMap.h" #include "Pos.h" #include "ServerChunkCache.h" diff --git a/targets/minecraft/server/level/ServerPlayer.cpp b/targets/minecraft/server/level/ServerPlayer.cpp index d6778ea81..97af1a433 100644 --- a/targets/minecraft/server/level/ServerPlayer.cpp +++ b/targets/minecraft/server/level/ServerPlayer.cpp @@ -15,7 +15,7 @@ #include "app/common/Console_Debug_enum.h" #include "app/common/GameRules/LevelRules/Rules/GameRulesInstance.h" #include "app/common/Network/GameNetworkManager.h" -#include "app/common/Network/NetworkPlayerInterface.h" +#include "minecraft/network/platform/NetworkPlayerInterface.h" #include "ServerLevel.h" #include "ServerPlayerGameMode.h" #include "java/InputOutputStream/ByteArrayInputStream.h" diff --git a/targets/minecraft/server/level/TrackedEntity.cpp b/targets/minecraft/server/level/TrackedEntity.cpp index aa4e8518c..2f8162e82 100644 --- a/targets/minecraft/server/level/TrackedEntity.cpp +++ b/targets/minecraft/server/level/TrackedEntity.cpp @@ -11,7 +11,7 @@ #include "platform/PlatformTypes.h" #include "EntityTracker.h" -#include "app/common/Network/NetworkPlayerInterface.h" +#include "minecraft/network/platform/NetworkPlayerInterface.h" #include "ServerPlayer.h" #include "java/Class.h" #include "minecraft/SharedConstants.h" diff --git a/targets/minecraft/server/network/PendingConnection.cpp b/targets/minecraft/server/network/PendingConnection.cpp index 0784be2d0..fc098b461 100644 --- a/targets/minecraft/server/network/PendingConnection.cpp +++ b/targets/minecraft/server/network/PendingConnection.cpp @@ -11,7 +11,7 @@ #include "platform/storage/storage.h" #include "minecraft/GameEnums.h" #include "app/common/BuildVer/BuildVer.h" -#include "app/common/Network/NetworkPlayerInterface.h" +#include "minecraft/network/platform/NetworkPlayerInterface.h" #include "platform/IPlatformNetwork.h" #include "platform/NetTypes.h" #include "PlayerConnection.h" diff --git a/targets/minecraft/server/network/PlayerConnection.cpp b/targets/minecraft/server/network/PlayerConnection.cpp index 79644d33f..af89390d2 100644 --- a/targets/minecraft/server/network/PlayerConnection.cpp +++ b/targets/minecraft/server/network/PlayerConnection.cpp @@ -16,7 +16,7 @@ #include "app/common/DLC/DLCManager.h" #include "app/common/DLC/DLCSkinFile.h" #include "app/common/Network/GameNetworkManager.h" -#include "app/common/Network/NetworkPlayerInterface.h" +#include "minecraft/network/platform/NetworkPlayerInterface.h" #include "app/common/Network/Socket.h" #include "minecraft/client/model/SkinBox.h" #include "ServerConnection.h"