refactor: move NetworkPlayerInterface and SessionInfo into minecraft

2026-05-06 13:03:36 +00:00 · 2026-04-08 21:15:09 +10:00 · 2026-04-08 21:15:09 +10:00 · e5cdd2c370
parent 9b830f1bfc
commit e5cdd2c370
32 changed files with 33 additions and 33 deletions
--- 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"
--- 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"
--- 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"
--- 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;
--- a/targets/app/common/Network/NetworkPlayerQNet.h
+++ b/targets/app/common/Network/NetworkPlayerQNet.h
@ -5,7 +5,7 @@
 #include <string>

 #include "platform/PlatformTypes.h"
-#include "NetworkPlayerInterface.h"
+#include "minecraft/network/platform/NetworkPlayerInterface.h"

 class IQNetPlayer;
 class Socket;
--- 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;
--- a/targets/app/common/Network/PlatformNetworkManagerStub.cpp
+++ b/targets/app/common/Network/PlatformNetworkManagerStub.cpp
@ -6,7 +6,7 @@
 #include <compare>

 #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"
--- 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;
--- 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"

--- a/targets/app/common/Network/Socket.h
+++ b/targets/app/common/Network/Socket.h
@ -11,7 +11,7 @@
 #include <queue>

 #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"
--- a/targets/app/common/Tutorial/Constraints/ChangeStateConstraint.cpp
+++ b/targets/app/common/Tutorial/Constraints/ChangeStateConstraint.cpp
@ -2,7 +2,7 @@

 #include <memory>

-#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"
--- a/targets/app/common/UI/Scenes/Frontend
+++ b/targets/app/common/UI/Scenes/Frontend
@ -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"
--- a/targets/app/common/UI/Scenes/Frontend
+++ b/targets/app/common/UI/Scenes/Frontend
@ -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"
--- a/Screens/UIScene_InGameHostOptionsMenu.cpp
+++ b/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"
--- a/targets/app/common/UI/Scenes/In-Game
+++ b/targets/app/common/UI/Scenes/In-Game
@ -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"
--- a/Screens/UIScene_InGamePlayerOptionsMenu.cpp
+++ b/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"
--- a/targets/app/common/UI/Scenes/In-Game
+++ b/targets/app/common/UI/Scenes/In-Game
@ -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"
--- 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"
--- 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"
--- 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"
--- 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"
--- a/targets/minecraft/network/platform/NetworkPlayerInterface.h
+++ b/targets/minecraft/network/platform/NetworkPlayerInterface.h
--- a/targets/minecraft/network/platform/SessionInfo.h
+++ b/targets/minecraft/network/platform/SessionInfo.h
--- 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"
--- 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"
--- a/targets/minecraft/server/level/EntityTracker.cpp
+++ b/targets/minecraft/server/level/EntityTracker.cpp
@ -7,7 +7,7 @@
 #include <utility>
 #include <vector>

-#include "app/common/Network/NetworkPlayerInterface.h"
+#include "minecraft/network/platform/NetworkPlayerInterface.h"
 #include "ServerLevel.h"
 #include "ServerPlayer.h"
 #include "TrackedEntity.h"
--- a/targets/minecraft/server/level/PlayerChunkMap.cpp
+++ b/targets/minecraft/server/level/PlayerChunkMap.cpp
@ -11,7 +11,7 @@
 #include <utility>

 #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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"