From d87dd6ae729b10374213b1dc8fa3e70acffa10bb Mon Sep 17 00:00:00 2001 From: Tropical <42101043+tropicaaal@users.noreply.github.com> Date: Thu, 9 Apr 2026 11:18:14 -0500 Subject: [PATCH] remove QNet stubs --- .../app/common/Network/NetworkPlayerQNet.cpp | 113 ------------------ .../app/common/Network/NetworkPlayerQNet.h | 54 --------- targets/app/common/Network/QNetStubs.cpp | 55 --------- targets/app/common_sources.txt | 2 - 4 files changed, 224 deletions(-) delete mode 100644 targets/app/common/Network/NetworkPlayerQNet.cpp delete mode 100644 targets/app/common/Network/NetworkPlayerQNet.h delete mode 100644 targets/app/common/Network/QNetStubs.cpp diff --git a/targets/app/common/Network/NetworkPlayerQNet.cpp b/targets/app/common/Network/NetworkPlayerQNet.cpp deleted file mode 100644 index 4c77c4a57..000000000 --- a/targets/app/common/Network/NetworkPlayerQNet.cpp +++ /dev/null @@ -1,113 +0,0 @@ -#include "NetworkPlayerQNet.h" - -#include - -#include "java/System.h" -#include "platform/NetTypes.h" - -NetworkPlayerQNet::NetworkPlayerQNet(IQNetPlayer* qnetPlayer) { - m_qnetPlayer = qnetPlayer; - m_pSocket = nullptr; -} - -unsigned char NetworkPlayerQNet::GetSmallId() { - return m_qnetPlayer->GetSmallId(); -} - -void NetworkPlayerQNet::SendData(INetworkPlayer* player, const void* pvData, - int dataSize, bool lowPriority, bool ack) { - uint32_t flags; - flags = QNET_SENDDATA_RELIABLE | QNET_SENDDATA_SEQUENTIAL; - if (lowPriority) - flags |= QNET_SENDDATA_LOW_PRIORITY | QNET_SENDDATA_SECONDARY; - m_qnetPlayer->SendData( - static_cast(player)->m_qnetPlayer, pvData, dataSize, - flags); -} - -int NetworkPlayerQNet::GetOutstandingAckCount() { return 0; } - -bool NetworkPlayerQNet::IsSameSystem(INetworkPlayer* player) { - return (m_qnetPlayer->IsSameSystem( - static_cast(player)->m_qnetPlayer) == true); -} - -int NetworkPlayerQNet::GetSendQueueSizeBytes(INetworkPlayer* player, - bool lowPriority) { - uint32_t flags = QNET_GETSENDQUEUESIZE_BYTES; - if (lowPriority) flags |= QNET_GETSENDQUEUESIZE_SECONDARY_TYPE; - return m_qnetPlayer->GetSendQueueSize( - player ? static_cast(player)->m_qnetPlayer - : nullptr, - flags); -} - -int NetworkPlayerQNet::GetSendQueueSizeMessages(INetworkPlayer* player, - bool lowPriority) { - uint32_t flags = QNET_GETSENDQUEUESIZE_MESSAGES; - if (lowPriority) flags |= QNET_GETSENDQUEUESIZE_SECONDARY_TYPE; - return m_qnetPlayer->GetSendQueueSize( - player ? static_cast(player)->m_qnetPlayer - : nullptr, - flags); -} - -int NetworkPlayerQNet::GetCurrentRtt() { return m_qnetPlayer->GetCurrentRtt(); } - -bool NetworkPlayerQNet::IsHost() { return (m_qnetPlayer->IsHost() == true); } - -bool NetworkPlayerQNet::IsGuest() { return (m_qnetPlayer->IsGuest() == true); } - -bool NetworkPlayerQNet::IsLocal() { return (m_qnetPlayer->IsLocal() == true); } - -int NetworkPlayerQNet::GetSessionIndex() { - return m_qnetPlayer->GetSessionIndex(); -} - -bool NetworkPlayerQNet::IsTalking() { - return (m_qnetPlayer->IsTalking() == true); -} - -bool NetworkPlayerQNet::IsMutedByLocalUser(int userIndex) { - return (m_qnetPlayer->IsMutedByLocalUser(userIndex) == true); -} - -bool NetworkPlayerQNet::HasVoice() { - return (m_qnetPlayer->HasVoice() == true); -} - -bool NetworkPlayerQNet::HasCamera() { - return (m_qnetPlayer->HasCamera() == true); -} - -int NetworkPlayerQNet::GetUserIndex() { return m_qnetPlayer->GetUserIndex(); } - -void NetworkPlayerQNet::SetSocket(Socket* pSocket) { m_pSocket = pSocket; } - -Socket* NetworkPlayerQNet::GetSocket() { return m_pSocket; } - -PlayerUID NetworkPlayerQNet::GetUID() { return m_qnetPlayer->GetXuid(); } - -const char* NetworkPlayerQNet::GetOnlineName() { - return m_qnetPlayer->GetGamertag(); -} - -std::string NetworkPlayerQNet::GetDisplayName() { - return m_qnetPlayer->GetGamertag(); -} - -IQNetPlayer* NetworkPlayerQNet::GetQNetPlayer() { return m_qnetPlayer; } - -void NetworkPlayerQNet::SentChunkPacket() { - m_lastChunkPacketTime = System::currentTimeMillis(); -} - -int NetworkPlayerQNet::GetTimeSinceLastChunkPacket_ms() { - // If we haven't ever sent a packet, return maximum - if (m_lastChunkPacketTime == 0) { - return INT_MAX; - } - - const int64_t currentTime = System::currentTimeMillis(); - return static_cast(currentTime - m_lastChunkPacketTime); -} \ No newline at end of file diff --git a/targets/app/common/Network/NetworkPlayerQNet.h b/targets/app/common/Network/NetworkPlayerQNet.h deleted file mode 100644 index 9df94b161..000000000 --- a/targets/app/common/Network/NetworkPlayerQNet.h +++ /dev/null @@ -1,54 +0,0 @@ -#pragma once - -#include - -#include - -#include "minecraft/network/platform/NetworkPlayerInterface.h" -#include "platform/PlatformTypes.h" - -class IQNetPlayer; -class Socket; - -// This is an implementation of the INetworkPlayer interface for the supported -// QNet-backed path. It -// effectively wraps the IQNetPlayer class in a non-platform-specific way. It is -// managed by PlatformNetworkManagerStub. - -class NetworkPlayerQNet : public INetworkPlayer { -public: - // Common player interface - NetworkPlayerQNet(IQNetPlayer* qnetPlayer); - virtual unsigned char GetSmallId(); - virtual void SendData(INetworkPlayer* player, const void* pvData, - int dataSize, bool lowPriority, bool ack); - virtual bool IsSameSystem(INetworkPlayer* player); - virtual int GetOutstandingAckCount(); - virtual int GetSendQueueSizeBytes(INetworkPlayer* player, bool lowPriority); - virtual int GetSendQueueSizeMessages(INetworkPlayer* player, - bool lowPriority); - virtual int GetCurrentRtt(); - virtual bool IsHost(); - virtual bool IsGuest(); - virtual bool IsLocal(); - virtual int GetSessionIndex(); - virtual bool IsTalking(); - virtual bool IsMutedByLocalUser(int userIndex); - virtual bool HasVoice(); - virtual bool HasCamera(); - virtual int GetUserIndex(); - virtual void SetSocket(Socket* pSocket); - virtual Socket* GetSocket(); - virtual const char* GetOnlineName(); - virtual std::string GetDisplayName(); - virtual PlayerUID GetUID(); - virtual void SentChunkPacket(); - virtual int GetTimeSinceLastChunkPacket_ms(); - - IQNetPlayer* GetQNetPlayer(); - -private: - IQNetPlayer* m_qnetPlayer; - Socket* m_pSocket; - int64_t m_lastChunkPacketTime; -}; \ No newline at end of file diff --git a/targets/app/common/Network/QNetStubs.cpp b/targets/app/common/Network/QNetStubs.cpp deleted file mode 100644 index 6243e7eb1..000000000 --- a/targets/app/common/Network/QNetStubs.cpp +++ /dev/null @@ -1,55 +0,0 @@ -#include "platform/NetTypes.h" -#include "platform/PlatformTypes.h" - -IQNetPlayer IQNet::m_player[4]; - -static bool s_gameRunning = false; - -uint8_t IQNetPlayer::GetSmallId() { return 0; } -void IQNetPlayer::SendData(IQNetPlayer* player, const void* pvData, - uint32_t dwDataSize, uint32_t dwFlags) {} -bool IQNetPlayer::IsSameSystem(IQNetPlayer* player) { return true; } -uint32_t IQNetPlayer::GetSendQueueSize(IQNetPlayer* player, uint32_t dwFlags) { - return 0; -} -uint32_t IQNetPlayer::GetCurrentRtt() { return 0; } -bool IQNetPlayer::IsHost() { return this == &IQNet::m_player[0]; } -bool IQNetPlayer::IsGuest() { return false; } -bool IQNetPlayer::IsLocal() { return true; } -PlayerUID IQNetPlayer::GetXuid() { return INVALID_XUID; } -const char* IQNetPlayer::GetGamertag() { - static const char* name = "stub"; - return name; -} -int IQNetPlayer::GetSessionIndex() { return 0; } -bool IQNetPlayer::IsTalking() { return false; } -bool IQNetPlayer::IsMutedByLocalUser(uint32_t dwUserIndex) { return false; } -bool IQNetPlayer::HasVoice() { return false; } -bool IQNetPlayer::HasCamera() { return false; } -int IQNetPlayer::GetUserIndex() { return this - &IQNet::m_player[0]; } -void IQNetPlayer::SetCustomDataValue(uintptr_t ulpCustomDataValue) { - m_customData = ulpCustomDataValue; -} -uintptr_t IQNetPlayer::GetCustomDataValue() { return m_customData; } - -int32_t IQNet::AddLocalPlayerByUserIndex(uint32_t dwUserIndex) { return 0; } -IQNetPlayer* IQNet::GetHostPlayer() { return &m_player[0]; } -IQNetPlayer* IQNet::GetLocalPlayerByUserIndex(uint32_t dwUserIndex) { - return &m_player[dwUserIndex]; -} -IQNetPlayer* IQNet::GetPlayerByIndex(uint32_t dwPlayerIndex) { - return &m_player[0]; -} -IQNetPlayer* IQNet::GetPlayerBySmallId(uint8_t SmallId) { return &m_player[0]; } -IQNetPlayer* IQNet::GetPlayerByXuid(PlayerUID xuid) { return &m_player[0]; } -uint32_t IQNet::GetPlayerCount() { return 1; } -QNET_STATE IQNet::GetState() { - return s_gameRunning ? QNET_STATE_GAME_PLAY : QNET_STATE_IDLE; -} -bool IQNet::IsHost() { return true; } -int32_t IQNet::JoinGameFromInviteInfo(uint32_t dwUserIndex, uint32_t dwUserMask, - const INVITE_INFO* pInviteInfo) { - return 0; -} -void IQNet::HostGame() { s_gameRunning = true; } -void IQNet::EndGame() { s_gameRunning = false; } diff --git a/targets/app/common_sources.txt b/targets/app/common_sources.txt index 404baea0f..89d1ecc3b 100644 --- a/targets/app/common_sources.txt +++ b/targets/app/common_sources.txt @@ -48,8 +48,6 @@ common/Game_XuiActions.cpp common/LocalizationManager.cpp common/MenuController.cpp common/Network/GameNetworkManager.cpp -common/Network/NetworkPlayerQNet.cpp -common/Network/QNetStubs.cpp common/NetworkController.cpp common/SaveManager.cpp common/SkinManager.cpp