mirror of
https://github.com/smartcmd/MinecraftConsoles.git
synced 2026-03-22 19:18:14 +05:00
ad74d44300
* Fix split-screen join failing when connecting to a remote host via UI
When a non-host client connected to a remote server through the in-game
UI (as opposed to the -ip/-port command line flags), the global variables
g_Win64MultiplayerIP and g_Win64MultiplayerPort were never updated from
their defaults ("127.0.0.1" and the default port). JoinSplitScreen()
relies on these globals to open a second TCP connection for the local
split-screen pad, so it would always attempt to connect to localhost,
failing immediately on any remote session.
Fix: update g_Win64MultiplayerIP and g_Win64MultiplayerPort inside
JoinGame() once the primary connection is established. This ensures
subsequent JoinSplitScreen() calls always reach the correct host
regardless of how the session was joined.
Additionally, guard PushFreeSmallId() against recycling smallIds in the
range [0, XUSER_MAX_COUNT), which are permanently reserved for the
host's local controller slots. Previously, if a host-side local pad
disconnected its smallId could re-enter the free pool and be handed
to an incoming remote client, causing that client's IQNetPlayer slot
to collide with a local pad slot on the non-host machine.
* Fix tutorial popup positioning in split-screen viewports
Replace the manual switch-case that computed viewport origin with the shared GetViewportRect/Fit16x9 helpers (from UISplitScreenHelpers.h). This ensures the tutorial popup is positioned and scaled consistently with the rest of the split-screen UI, fitting a 16:9 box inside each viewport and applying safezone offsets correctly.
Also adds missing default:break to safezone switch statements to silence compiler warnings.
Made-with: Cursor
* Prevent split-screen join when game window is not focused
Add g_KBMInput.IsWindowFocused() guard to the tryJoin condition so that gamepad input from background windows does not accidentally trigger a split-screen player join. This avoids phantom joins when the user is interacting with another application.
* Open debug overlay in fullscreen UI group during split-screen
Pass eUIGroup_Fullscreen to NavigateToScene when opening the debug overlay, so it spans the entire window instead of being confined to a single split-screen viewport. This makes the debug info readable regardless of the current split-screen layout.
* Fix non-host split-screen connections missing world updates
Previously, secondary (non-host) split-screen connections used isPrimaryConnection()
to gate nearly all world update packets, meaning the second local player would never
receive tile updates, entity movement, sounds, particles, explosions, etc.
The fix introduces per-connection tracking of which entities and chunks each
ClientConnection has loaded, and uses that information to decide whether a secondary
connection needs to process a given packet or if the primary connection already
handled it.
New members in ClientConnection:
- m_trackedEntityIds: set of entity IDs this connection has received AddEntity/AddMob/AddPlayer etc. for
- m_visibleChunks: set of chunk coordinates (packed into int64) this connection has marked visible
- Both sets are cleared on close(), respawn (dimension change), and destructor
New helpers:
- findPrimaryConnection(): walks the MultiPlayerLevel connection list to find the connection on the primary pad
- shouldProcessForEntity(id): secondary connection skips the packet only if the primary is already tracking that entity
- shouldProcessForPosition(x, z): secondary connection skips the packet only if the primary already has that chunk visible
- anyOtherConnectionHasChunk(x, z): used when a chunk becomes invisible to avoid hiding it from the level if another connection still needs it
- isTrackingEntity(id): public accessor used by shouldProcessForEntity on the primary connection
Packet handler changes:
- handleMoveEntity, handleMoveEntitySmall, handleSetEntityMotion, handleTakeItemEntity:
replaced isPrimaryConnection() with shouldProcessForEntity() so secondary
connections still process movement for entities they know about
- handleExplosion, handleLevelEvent:
replaced isPrimaryConnection() with shouldProcessForPosition() so block
destruction and level events fire for the correct connection based on chunks
- handleChunkTilesUpdate, handleBlockRegionUpdate, handleTileUpdate, handleSignUpdate,
handleTileEntityData, handleTileEvent, handleTileDestruction, handleComplexItemData,
handleSoundEvent, handleParticleEvent:
removed the isPrimaryConnection() guard entirely -- these are world-state updates
that all connections must process regardless of which pad is primary
- handleChunkVisibilityArea / handleChunkVisibility:
now populate m_visibleChunks; on visibility=false, setChunkVisible(false) is
only called on the level if no other connection still has that chunk loaded
- handleAddEntity, handleAddExperienceOrb, handleAddPainting, handleAddPlayer,
handleAddMob: now insert into m_trackedEntityIds on arrival
- handleRemoveEntity: now erases from m_trackedEntityIds on removal
- handleLevelEvent: removed a duplicate levelEvent() call that was always firing
regardless of the isPrimaryConnection() check above it (latent bug)
MultiPlayerLevel: added friend class ClientConnection to allow access to the
connections list without exposing it publicly.
* Fix fullscreen progress screen swallowing input before load completes
Two issues in UIScene_FullscreenProgress::handleInput:
1. The touchpad/button press that triggers movie skip or input forwarding
had no guard on m_threadCompleted, so pressing a button during the loading
phase would fire the skip/send logic before the background thread finished.
Added the m_threadCompleted check so that path is only reachable once
the load is actually done.
2. The `handled = true` assignment was missing from that branch, so input
events were not being consumed and could fall through to other handlers.
Added it unconditionally at the end of the block.
* Update player count decrement logic in PlatformNetworkManagerStub
Refactor the condition for decrementing the player count in CPlatformNetworkManagerStub::DoWork. The previous check was replaced with a while loop to ensure that the player count is only decremented when there are more than one player and the last player's custom data value is zero. This change improves the handling of player connections in the network manager.
* Refactor safe zone calculations in UI components for consistency
Updated the safe zone calculations across multiple UI components to ensure symmetry in split viewports. Removed unnecessary assignments and added comments for clarity. Modified the repositionHud function to include an additional parameter for better handling of HUD positioning in split-screen scenarios.
* Gui.cpp: fix F3 debug overlay in splitscreen + minor perf cleanup
The F3 debug screen was badly broken in splitscreen: it used the GUI
coordinate space which gets distorted by the splitscreen scaling, so
text appeared stretched, misaligned or completely off-screen depending
on the viewport layout.
Fixed by setting up a dedicated projection matrix using physical pixel
coordinates (g_rScreenWidth / g_rScreenHeight) each time the overlay is
drawn, completely decoupled from whatever transform the HUD is using.
The viewport dimensions are now computed per screen section so the ortho
projection matches the actual pixel area of each player's quadrant.
Version and branch strings are only shown for player 0 (iPad == 0) to
avoid repeating them across every splitscreen pane.
Also removed a few redundant calculations that were being done twice in
the same frame (atan for xRot, health halves, air supply scaled value).
These are minor and have negligible real-world impact; more substantial
per-frame caching work (safe zone calculations etc.) will follow in a
separate commit.
182 lines
8.4 KiB
C++
182 lines
8.4 KiB
C++
#pragma once
|
|
#include <unordered_set>
|
|
#include "..\Minecraft.World\net.minecraft.network.h"
|
|
class Minecraft;
|
|
class MultiPlayerLevel;
|
|
class SavedDataStorage;
|
|
class Socket;
|
|
class MultiplayerLocalPlayer;
|
|
|
|
class ClientConnection : public PacketListener
|
|
{
|
|
private:
|
|
enum eClientConnectionConnectingState
|
|
{
|
|
eCCPreLoginSent = 0,
|
|
eCCPreLoginReceived,
|
|
eCCLoginSent,
|
|
eCCLoginReceived,
|
|
eCCConnected
|
|
};
|
|
|
|
private:
|
|
bool done;
|
|
Connection *connection;
|
|
public:
|
|
wstring message;
|
|
bool createdOk; // 4J added
|
|
private:
|
|
Minecraft *minecraft;
|
|
MultiPlayerLevel *level;
|
|
bool started;
|
|
|
|
// 4J Stu - I don't think we are interested in the PlayerInfo data, so I'm not going to use it at the moment
|
|
//Map<String, PlayerInfo> playerInfoMap = new HashMap<String, PlayerInfo>();
|
|
public:
|
|
//List<PlayerInfo> playerInfos = new ArrayList<PlayerInfo>();
|
|
|
|
int maxPlayers;
|
|
|
|
public:
|
|
bool isStarted() { return started; } // 4J Added
|
|
bool isClosed() { return done; } // 4J Added
|
|
Socket *getSocket() { return connection->getSocket(); } // 4J Added
|
|
|
|
private:
|
|
DWORD m_userIndex; // 4J Added
|
|
bool isPrimaryConnection() const;
|
|
|
|
std::unordered_set<int> m_trackedEntityIds;
|
|
std::unordered_set<int64_t> m_visibleChunks;
|
|
|
|
static int64_t chunkKey(int x, int z) { return ((int64_t)x << 32) | ((int64_t)z & 0xFFFFFFFF); }
|
|
|
|
ClientConnection* findPrimaryConnection() const;
|
|
bool shouldProcessForEntity(int entityId) const;
|
|
bool shouldProcessForPosition(int blockX, int blockZ) const;
|
|
bool anyOtherConnectionHasChunk(int x, int z) const;
|
|
|
|
public:
|
|
bool isTrackingEntity(int entityId) const { return m_trackedEntityIds.count(entityId) > 0; }
|
|
|
|
public:
|
|
SavedDataStorage *savedDataStorage;
|
|
ClientConnection(Minecraft *minecraft, const wstring& ip, int port);
|
|
ClientConnection(Minecraft *minecraft, Socket *socket, int iUserIndex = -1);
|
|
~ClientConnection();
|
|
void tick();
|
|
INetworkPlayer *getNetworkPlayer();
|
|
virtual void handleLogin(shared_ptr<LoginPacket> packet);
|
|
virtual void handleAddEntity(shared_ptr<AddEntityPacket> packet);
|
|
virtual void handleAddExperienceOrb(shared_ptr<AddExperienceOrbPacket> packet);
|
|
virtual void handleAddGlobalEntity(shared_ptr<AddGlobalEntityPacket> packet);
|
|
virtual void handleAddPainting(shared_ptr<AddPaintingPacket> packet);
|
|
virtual void handleSetEntityMotion(shared_ptr<SetEntityMotionPacket> packet);
|
|
virtual void handleSetEntityData(shared_ptr<SetEntityDataPacket> packet);
|
|
virtual void handleAddPlayer(shared_ptr<AddPlayerPacket> packet);
|
|
virtual void handleTeleportEntity(shared_ptr<TeleportEntityPacket> packet);
|
|
virtual void handleSetCarriedItem(shared_ptr<SetCarriedItemPacket> packet);
|
|
virtual void handleMoveEntity(shared_ptr<MoveEntityPacket> packet);
|
|
virtual void handleRotateMob(shared_ptr<RotateHeadPacket> packet);
|
|
virtual void handleMoveEntitySmall(shared_ptr<MoveEntityPacketSmall> packet);
|
|
virtual void handleRemoveEntity(shared_ptr<RemoveEntitiesPacket> packet);
|
|
virtual void handleMovePlayer(shared_ptr<MovePlayerPacket> packet);
|
|
|
|
Random *random;
|
|
|
|
// 4J Added
|
|
virtual void handleChunkVisibilityArea(shared_ptr<ChunkVisibilityAreaPacket> packet);
|
|
|
|
virtual void handleChunkVisibility(shared_ptr<ChunkVisibilityPacket> packet);
|
|
virtual void handleChunkTilesUpdate(shared_ptr<ChunkTilesUpdatePacket> packet);
|
|
virtual void handleBlockRegionUpdate(shared_ptr<BlockRegionUpdatePacket> packet);
|
|
virtual void handleTileUpdate(shared_ptr<TileUpdatePacket> packet);
|
|
virtual void handleDisconnect(shared_ptr<DisconnectPacket> packet);
|
|
virtual void onDisconnect(DisconnectPacket::eDisconnectReason reason, void *reasonObjects);
|
|
void sendAndDisconnect(shared_ptr<Packet> packet);
|
|
void send(shared_ptr<Packet> packet);
|
|
virtual void handleTakeItemEntity(shared_ptr<TakeItemEntityPacket> packet);
|
|
virtual void handleChat(shared_ptr<ChatPacket> packet);
|
|
virtual void handleAnimate(shared_ptr<AnimatePacket> packet);
|
|
virtual void handleEntityActionAtPosition(shared_ptr<EntityActionAtPositionPacket> packet);
|
|
virtual void handlePreLogin(shared_ptr<PreLoginPacket> packet);
|
|
void close();
|
|
virtual void handleAddMob(shared_ptr<AddMobPacket> packet);
|
|
virtual void handleSetTime(shared_ptr<SetTimePacket> packet);
|
|
virtual void handleSetSpawn(shared_ptr<SetSpawnPositionPacket> packet);
|
|
virtual void handleEntityLinkPacket(shared_ptr<SetEntityLinkPacket> packet);
|
|
virtual void handleEntityEvent(shared_ptr<EntityEventPacket> packet);
|
|
private:
|
|
shared_ptr<Entity> getEntity(int entityId);
|
|
wstring GetDisplayNameByGamertag(wstring gamertag);
|
|
public:
|
|
virtual void handleSetHealth(shared_ptr<SetHealthPacket> packet);
|
|
virtual void handleSetExperience(shared_ptr<SetExperiencePacket> packet);
|
|
virtual void handleRespawn(shared_ptr<RespawnPacket> packet);
|
|
virtual void handleExplosion(shared_ptr<ExplodePacket> packet);
|
|
virtual void handleContainerOpen(shared_ptr<ContainerOpenPacket> packet);
|
|
virtual void handleContainerSetSlot(shared_ptr<ContainerSetSlotPacket> packet);
|
|
virtual void handleContainerAck(shared_ptr<ContainerAckPacket> packet);
|
|
virtual void handleContainerContent(shared_ptr<ContainerSetContentPacket> packet);
|
|
virtual void handleTileEditorOpen(shared_ptr<TileEditorOpenPacket> packet);
|
|
virtual void handleSignUpdate(shared_ptr<SignUpdatePacket> packet);
|
|
virtual void handleTileEntityData(shared_ptr<TileEntityDataPacket> packet);
|
|
virtual void handleContainerSetData(shared_ptr<ContainerSetDataPacket> packet);
|
|
virtual void handleSetEquippedItem(shared_ptr<SetEquippedItemPacket> packet);
|
|
virtual void handleContainerClose(shared_ptr<ContainerClosePacket> packet);
|
|
virtual void handleTileEvent(shared_ptr<TileEventPacket> packet);
|
|
virtual void handleTileDestruction(shared_ptr<TileDestructionPacket> packet);
|
|
virtual bool canHandleAsyncPackets();
|
|
virtual void handleGameEvent(shared_ptr<GameEventPacket> gameEventPacket);
|
|
virtual void handleComplexItemData(shared_ptr<ComplexItemDataPacket> packet);
|
|
virtual void handleLevelEvent(shared_ptr<LevelEventPacket> packet);
|
|
virtual void handleAwardStat(shared_ptr<AwardStatPacket> packet);
|
|
virtual void handleUpdateMobEffect(shared_ptr<UpdateMobEffectPacket> packet);
|
|
virtual void handleRemoveMobEffect(shared_ptr<RemoveMobEffectPacket> packet);
|
|
virtual bool isServerPacketListener();
|
|
virtual void handlePlayerInfo(shared_ptr<PlayerInfoPacket> packet);
|
|
virtual void handleKeepAlive(shared_ptr<KeepAlivePacket> packet);
|
|
virtual void handlePlayerAbilities(shared_ptr<PlayerAbilitiesPacket> playerAbilitiesPacket);
|
|
virtual void handleSoundEvent(shared_ptr<LevelSoundPacket> packet);
|
|
virtual void handleCustomPayload(shared_ptr<CustomPayloadPacket> customPayloadPacket);
|
|
virtual Connection *getConnection();
|
|
|
|
// 4J Added
|
|
virtual void handleServerSettingsChanged(shared_ptr<ServerSettingsChangedPacket> packet);
|
|
virtual void handleTexture(shared_ptr<TexturePacket> packet);
|
|
virtual void handleTextureAndGeometry(shared_ptr<TextureAndGeometryPacket> packet);
|
|
virtual void handleUpdateProgress(shared_ptr<UpdateProgressPacket> packet);
|
|
|
|
// 4J Added
|
|
static int HostDisconnectReturned(void *pParam,int iPad,C4JStorage::EMessageResult result);
|
|
static int ExitGameAndSaveReturned(void *pParam,int iPad,C4JStorage::EMessageResult result);
|
|
virtual void handleTextureChange(shared_ptr<TextureChangePacket> packet);
|
|
virtual void handleTextureAndGeometryChange(shared_ptr<TextureAndGeometryChangePacket> packet);
|
|
virtual void handleUpdateGameRuleProgressPacket(shared_ptr<UpdateGameRuleProgressPacket> packet);
|
|
virtual void handleXZ(shared_ptr<XZPacket> packet);
|
|
|
|
void displayPrivilegeChanges(shared_ptr<MultiplayerLocalPlayer> player, unsigned int oldPrivileges);
|
|
|
|
virtual void handleAddObjective(shared_ptr<SetObjectivePacket> packet);
|
|
virtual void handleSetScore(shared_ptr<SetScorePacket> packet);
|
|
virtual void handleSetDisplayObjective(shared_ptr<SetDisplayObjectivePacket> packet);
|
|
virtual void handleSetPlayerTeamPacket(shared_ptr<SetPlayerTeamPacket> packet);
|
|
virtual void handleParticleEvent(shared_ptr<LevelParticlesPacket> packet);
|
|
virtual void handleUpdateAttributes(shared_ptr<UpdateAttributesPacket> packet);
|
|
|
|
private:
|
|
// 4J: Entity link packet deferred
|
|
class DeferredEntityLinkPacket
|
|
{
|
|
public:
|
|
DWORD m_recievedTick;
|
|
shared_ptr<SetEntityLinkPacket> m_packet;
|
|
|
|
DeferredEntityLinkPacket(shared_ptr<SetEntityLinkPacket> packet);
|
|
};
|
|
|
|
vector<DeferredEntityLinkPacket> deferredEntityLinkPackets;
|
|
static const int MAX_ENTITY_LINK_DEFERRAL_INTERVAL = 1000;
|
|
|
|
void checkDeferredEntityLinkPackets(int newEntityId);
|
|
}; |