From d3a9de8b2aaf62f0e8ed404dcd0196ee1aa8d08d Mon Sep 17 00:00:00 2001 From: Tropical <42101043+tropicaaal@users.noreply.github.com> Date: Thu, 9 Apr 2026 10:05:35 -0500 Subject: [PATCH] start work on swapping PlatformNetworkManagerStub for PlatformNetwork --- targets/app/common/Network/GameNetworkManager.cpp | 4 ++-- targets/app/common/Network/GameNetworkManager.h | 3 --- targets/app/common_sources.txt | 1 - 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/targets/app/common/Network/GameNetworkManager.cpp b/targets/app/common/Network/GameNetworkManager.cpp index 67f816462..e4cf90893 100644 --- a/targets/app/common/Network/GameNetworkManager.cpp +++ b/targets/app/common/Network/GameNetworkManager.cpp @@ -13,7 +13,6 @@ #include "minecraft/network/Socket.h" #include "app/common/Game.h" #include "app/common/GameRules/GameRuleManager.h" -#include "app/common/Network/PlatformNetworkManagerStub.h" #include "app/common/UI/All Platforms/UIEnums.h" #include "app/common/UI/All Platforms/UIStructs.h" #include "app/common/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h" @@ -54,6 +53,7 @@ #include "platform/storage/storage.h" #include "strings.h" #include "util/StringHelpers.h" +#include "platform/network/network.h" class FriendSessionInfo; class INVITE_INFO; @@ -86,7 +86,7 @@ void CGameNetworkManager::Initialise() { LevelRenderer::getGlobalChunkCount() / (Level::maxBuildHeight / 16); // dividing here by number of renderer chunks in one column - s_pPlatformNetworkManager = new IPlatformNetworkStub(); + s_pPlatformNetworkManager = &PlatformNetwork; s_pPlatformNetworkManager->Initialise(this, flagIndexSize); m_bNetworkThreadRunning = false; m_bInitialised = true; diff --git a/targets/app/common/Network/GameNetworkManager.h b/targets/app/common/Network/GameNetworkManager.h index c8de48bfd..5cde30a6b 100644 --- a/targets/app/common/Network/GameNetworkManager.h +++ b/targets/app/common/Network/GameNetworkManager.h @@ -7,7 +7,6 @@ #if !defined(__linux__) #include #endif -#include "PlatformNetworkManagerStub.h" #include "platform/network/IPlatformNetwork.h" #include "minecraft/network/INetworkService.h" #include "minecraft/network/platform/NetworkPlayerInterface.h" @@ -29,8 +28,6 @@ class INetworkPlayer; // implementation of PlatformNetworkManager to provide this functionality. class CGameNetworkManager : public ::minecraft::network::INetworkService { - friend class IPlatformNetworkStub; - public: CGameNetworkManager(); // Misc high level flow diff --git a/targets/app/common_sources.txt b/targets/app/common_sources.txt index b289335c3..cda897f04 100644 --- a/targets/app/common_sources.txt +++ b/targets/app/common_sources.txt @@ -51,7 +51,6 @@ common/LocalizationManager.cpp common/MenuController.cpp common/Network/GameNetworkManager.cpp common/Network/NetworkPlayerQNet.cpp -common/Network/PlatformNetworkManagerStub.cpp common/Network/QNetStubs.cpp common/NetworkController.cpp common/SaveManager.cpp