LegacyConsole/GabsPuNs-Project_Zenith_Main
1
0
Fork 0
mirror of https://github.com/GabsPuNs/Project-Zenith-Main.git synced 2026-05-21 18:24:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename UIControl_PlayerList to UIControl_PlayerButtonList

Browse Source
This commit is contained in:
GabsPuNs
2026-05-15 12:02:49 -04:00
parent 0fa47eb931
commit 09474913a6
13 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Minecraft.Client/Common/UI/UI.h
View File

@@ -26,7 +26,7 @@
#include "UIControl_LeaderboardList.h"
#include "UIControl_LeftIconButtonList.h"
#include "UIControl_SaveList.h"
#include "UIControl_PlayerList.h"
#include "UIControl_PlayerButtonList.h"
#include "UIControl_BitmapIcon.h"
#include "UIControl_DLCList.h"
#include "UIControl_HTMLLabel.h"

10
Minecraft.Client/Common/UI/UIControl_PlayerList.cpp → Minecraft.Client/Common/UI/UIControl_PlayerButtonList.cpp
View File

@@ -1,8 +1,8 @@
#include "stdafx.h"
#include "UI.h"
#include "UIControl_PlayerList.h"
#include "UIControl_PlayerButtonList.h"
bool UIControl_PlayerList::setupControl(UIScene *scene, IggyValuePath *parent, const string &controlName)
bool UIControl_PlayerButtonList::setupControl(UIScene *scene, IggyValuePath *parent, const string &controlName)
{
UIControl::setControlType(UIControl::ePlayerButtonList);
bool success = UIControl_ButtonList::setupControl(scene,parent,controlName);
@@ -14,7 +14,7 @@ bool UIControl_PlayerList::setupControl(UIScene *scene, IggyValuePath *parent, c
return success;
}
void UIControl_PlayerList::addItem(const wstring &label, int iPlayerIcon, int iVOIPIcon)
void UIControl_PlayerButtonList::addItem(const wstring &label, int iPlayerIcon, int iVOIPIcon)
{
IggyDataValue result;
IggyDataValue value[4];
@@ -38,7 +38,7 @@ void UIControl_PlayerList::addItem(const wstring &label, int iPlayerIcon, int iV
++m_itemCount;
}
void UIControl_PlayerList::setPlayerIcon(int iId, int iPlayerIcon)
void UIControl_PlayerButtonList::setPlayerIcon(int iId, int iPlayerIcon)
{
IggyDataValue result;
IggyDataValue value[2];
@@ -51,7 +51,7 @@ void UIControl_PlayerList::setPlayerIcon(int iId, int iPlayerIcon)
IggyResult out = IggyPlayerCallMethodRS ( m_parentScene->getMovie() , &result, getIggyValuePath(), m_funcSetPlayerIcon , 2 , value );
}
void UIControl_PlayerList::setVOIPIcon(int iId, int iVOIPIcon)
void UIControl_PlayerButtonList::setVOIPIcon(int iId, int iVOIPIcon)
{
IggyDataValue result;
IggyDataValue value[2];

2
Minecraft.Client/Common/UI/UIControl_PlayerList.h → Minecraft.Client/Common/UI/UIControl_PlayerButtonList.h
View File

@@ -2,7 +2,7 @@
#include "UIControl_ButtonList.h"
class UIControl_PlayerList : public UIControl_ButtonList
class UIControl_PlayerButtonList : public UIControl_ButtonList
{
private:
IggyName m_funcSetPlayerIcon, m_funcSetVOIPIcon;

30
Minecraft.Client/Common/UI/UIScene_InGameInfoMenu.cpp
View File

@@ -13,7 +13,7 @@ UIScene_InGameInfoMenu::UIScene_InGameInfoMenu(int iPad, void *initData, UILayer
m_buttonGameOptions.init(app.GetString(IDS_HOST_OPTIONS),eControl_GameOptions);
m_labelTitle.init(app.GetString(IDS_PLAYERS_INVITE));
m_playerList.init(eControl_GamePlayers);
m_playerButtonList.init(eControl_GamePlayers);
m_players = vector<PlayerInfo *>();
@@ -28,7 +28,7 @@ UIScene_InGameInfoMenu::UIScene_InGameInfoMenu(int iPad, void *initData, UILayer
PlayerInfo *info = BuildPlayerInfo(player);
m_players.push_back(info);
m_playerList.addItem(info->m_name, info->m_colorState, info->m_voiceStatus);
m_playerButtonList.addItem(info->m_name, info->m_colorState, info->m_voiceStatus);
}
}
@@ -93,7 +93,7 @@ void UIScene_InGameInfoMenu::updateTooltips()
if(CGameNetworkManager::usingAdhocMode()) keyX = -1;
#endif
INetworkPlayer *selectedPlayer = g_NetworkManager.GetPlayerBySmallId(m_players[m_playerList.getCurrentSelection()]->m_smallId);
INetworkPlayer *selectedPlayer = g_NetworkManager.GetPlayerBySmallId(m_players[m_playerButtonList.getCurrentSelection()]->m_smallId);
int keyA = -1;
Minecraft *pMinecraft = Minecraft::GetInstance();
@@ -175,7 +175,7 @@ void UIScene_InGameInfoMenu::handleReload()
PlayerInfo *info = BuildPlayerInfo(player);
m_players.push_back(info);
m_playerList.addItem(info->m_name, info->m_colorState, info->m_voiceStatus);
m_playerButtonList.addItem(info->m_name, info->m_colorState, info->m_voiceStatus);
}
}
@@ -194,7 +194,7 @@ void UIScene_InGameInfoMenu::handleReload()
if(controlHasFocus(eControl_GamePlayers))
{
m_playerList.setCurrentSelection(getControlChildFocus());
m_playerButtonList.setCurrentSelection(getControlChildFocus());
}
}
@@ -216,18 +216,18 @@ void UIScene_InGameInfoMenu::tick()
if(info->m_voiceStatus != m_players[i]->m_voiceStatus)
{
m_players[i]->m_voiceStatus = info->m_voiceStatus;
m_playerList.setVOIPIcon(i, info->m_voiceStatus);
m_playerButtonList.setVOIPIcon(i, info->m_voiceStatus);
}
if(info->m_colorState != m_players[i]->m_colorState)
{
m_players[i]->m_colorState = info->m_colorState;
m_playerList.setPlayerIcon(i, info->m_colorState);
m_playerButtonList.setPlayerIcon(i, info->m_colorState);
}
if(info->m_name.compare( m_players[i]->m_name ) != 0 )
{
m_playerList.setButtonLabel(i, info->m_name);
m_playerButtonList.setButtonLabel(i, info->m_name);
m_players[i]->m_name = info->m_name;
}
@@ -278,9 +278,9 @@ void UIScene_InGameInfoMenu::handleInput(int iPad, int key, bool repeat, bool pr
#else
if(pressed && m_playerList.hasFocus() && (m_playerList.getItemCount() > 0) && (m_playerList.getCurrentSelection() < m_players.size()) )
if(pressed && m_playerButtonList.hasFocus() && (m_playerButtonList.getItemCount() > 0) && (m_playerButtonList.getCurrentSelection() < m_players.size()) )
{
INetworkPlayer *player = g_NetworkManager.GetPlayerBySmallId(m_players[m_playerList.getCurrentSelection()]->m_smallId);
INetworkPlayer *player = g_NetworkManager.GetPlayerBySmallId(m_players[m_playerButtonList.getCurrentSelection()]->m_smallId);
if( player != nullptr )
{
PlayerUID uid = player->GetUID();
@@ -378,7 +378,7 @@ void UIScene_InGameInfoMenu::handleFocusChange(F64 controlId, F64 childId)
switch(static_cast<int>(controlId))
{
case eControl_GamePlayers:
m_playerList.updateChildFocus( static_cast<int>(childId) );
m_playerButtonList.updateChildFocus( static_cast<int>(childId) );
};
updateTooltips();
}
@@ -394,9 +394,9 @@ void UIScene_InGameInfoMenu::OnPlayerChanged(void *callbackParam, INetworkPlayer
{
if(!playerFound && scene->m_players[i]->m_smallId == pPlayer->GetSmallId() )
{
if( scene->m_playerList.getCurrentSelection() == scene->m_playerList.getItemCount() - 1 )
if( scene->m_playerButtonList.getCurrentSelection() == scene->m_playerButtonList.getItemCount() - 1 )
{
scene->m_playerList.setCurrentSelection( scene->m_playerList.getItemCount() - 2 );
scene->m_playerButtonList.setCurrentSelection( scene->m_playerButtonList.getItemCount() - 2 );
}
// Player found
@@ -418,7 +418,7 @@ void UIScene_InGameInfoMenu::OnPlayerChanged(void *callbackParam, INetworkPlayer
scene->m_players.erase(scene->m_players.begin() + foundIndex);
// Remove player from list
scene->m_playerList.removeItem(foundIndex);
scene->m_playerButtonList.removeItem(foundIndex);
}
// If the player is joining
@@ -431,7 +431,7 @@ void UIScene_InGameInfoMenu::OnPlayerChanged(void *callbackParam, INetworkPlayer
// Note that the tick updates buttons every tick so it's only really important that we
// add the button (not the order or content)
scene->m_playerList.addItem(info->m_name, info->m_colorState, info->m_voiceStatus);
scene->m_playerButtonList.addItem(info->m_name, info->m_colorState, info->m_voiceStatus);
}
}

4
Minecraft.Client/Common/UI/UIScene_InGameInfoMenu.h
View File

@@ -28,11 +28,11 @@ private:
//wstring m_playerNames[MINECRAFT_NET_MAX_PLAYERS];
UIControl_Button m_buttonGameOptions;
UIControl_PlayerList m_playerList;
UIControl_PlayerButtonList m_playerButtonList;
UIControl_Label m_labelTitle;
UI_BEGIN_MAP_ELEMENTS_AND_NAMES(UIScene)
UI_MAP_ELEMENT( m_buttonGameOptions, "GameOptions")
UI_MAP_ELEMENT( m_playerList, "GamePlayers")
UI_MAP_ELEMENT( m_playerButtonList, "GamePlayers")
UI_MAP_ELEMENT( m_labelTitle, "Title")
UI_END_MAP_ELEMENTS_AND_NAMES()
public:

20
Minecraft.Client/Common/UI/UIScene_TeleportMenu.cpp
View File

@@ -27,7 +27,7 @@ UIScene_TeleportMenu::UIScene_TeleportMenu(int iPad, void *initData, UILayer *pa
m_labelTitle.init(app.GetString(IDS_TELEPORT_TO_ME));
}
m_playerList.init(eControl_GamePlayers);
m_playerButtonList.init(eControl_GamePlayers);
for(unsigned int i = 0; i < MINECRAFT_NET_MAX_PLAYERS; ++i)
{
@@ -81,7 +81,7 @@ UIScene_TeleportMenu::UIScene_TeleportMenu(int iPad, void *initData, UILayer *pa
m_playersVoiceState[m_playersCount] = voiceStatus;
m_playersColourState[m_playersCount] = app.GetPlayerColour( m_players[m_playersCount] );
m_playerNames[m_playersCount] = playerName;
m_playerList.addItem( playerName, app.GetPlayerColour( m_players[m_playersCount] ), voiceStatus);
m_playerButtonList.addItem( playerName, app.GetPlayerColour( m_players[m_playersCount] ), voiceStatus);
}
}
@@ -171,13 +171,13 @@ void UIScene_TeleportMenu::handleReload()
m_playersVoiceState[m_playersCount] = voiceStatus;
m_playersColourState[m_playersCount] = app.GetPlayerColour( m_players[m_playersCount] );
m_playerNames[m_playersCount] = playerName;
m_playerList.addItem( playerName, app.GetPlayerColour( m_players[m_playersCount] ), voiceStatus);
m_playerButtonList.addItem( playerName, app.GetPlayerColour( m_players[m_playersCount] ), voiceStatus);
}
}
if(controlHasFocus(eControl_GamePlayers))
{
m_playerList.setCurrentSelection(getControlChildFocus());
m_playerButtonList.setCurrentSelection(getControlChildFocus());
}
}
@@ -198,7 +198,7 @@ void UIScene_TeleportMenu::tick()
if(icon != m_playersColourState[i])
{
m_playersColourState[i] = icon;
m_playerList.setPlayerIcon( i, (int)app.GetPlayerColour( m_players[i] ) );
m_playerButtonList.setPlayerIcon( i, (int)app.GetPlayerColour( m_players[i] ) );
}
wstring playerName = L"";
@@ -214,7 +214,7 @@ void UIScene_TeleportMenu::tick()
}
if(playerName.compare( m_playerNames[i] ) != 0 )
{
m_playerList.setButtonLabel(i, playerName);
m_playerButtonList.setButtonLabel(i, playerName);
m_playerNames[i] = playerName;
}
}
@@ -282,9 +282,9 @@ void UIScene_TeleportMenu::OnPlayerChanged(void *callbackParam, INetworkPlayer *
{
if(!playerFound && scene->m_players[i] == pPlayer->GetSmallId() )
{
if( scene->m_playerList.getCurrentSelection() == scene->m_playerList.getItemCount() - 1 )
if( scene->m_playerButtonList.getCurrentSelection() == scene->m_playerButtonList.getItemCount() - 1 )
{
scene->m_playerList.setCurrentSelection( scene->m_playerList.getItemCount() - 2 );
scene->m_playerButtonList.setCurrentSelection( scene->m_playerButtonList.getItemCount() - 2 );
}
// Player removed
playerFound = true;
@@ -298,7 +298,7 @@ void UIScene_TeleportMenu::OnPlayerChanged(void *callbackParam, INetworkPlayer *
scene->m_playersVoiceState[scene->m_playersCount] = 0;
scene->m_playersColourState[scene->m_playersCount] = 0;
scene->m_playerNames[scene->m_playersCount] = L"";
scene->m_playerList.removeItem(scene->m_playersCount);
scene->m_playerButtonList.removeItem(scene->m_playersCount);
}
if( !playerFound )
@@ -339,6 +339,6 @@ void UIScene_TeleportMenu::OnPlayerChanged(void *callbackParam, INetworkPlayer *
}
}
scene->m_playerList.addItem( playerName, app.GetPlayerColour( scene->m_players[scene->m_playersCount - 1] ), voiceStatus);
scene->m_playerButtonList.addItem( playerName, app.GetPlayerColour( scene->m_players[scene->m_playersCount - 1] ), voiceStatus);
}
}

4
Minecraft.Client/Common/UI/UIScene_TeleportMenu.h
View File

@@ -17,10 +17,10 @@ private:
short m_playersColourState[MINECRAFT_NET_MAX_PLAYERS];
wstring m_playerNames[MINECRAFT_NET_MAX_PLAYERS];
UIControl_PlayerList m_playerList;
UIControl_PlayerButtonList m_playerButtonList;
UIControl_Label m_labelTitle;
UI_BEGIN_MAP_ELEMENTS_AND_NAMES(UIScene)
UI_MAP_ELEMENT( m_playerList, "GamePlayers")
UI_MAP_ELEMENT( m_playerButtonList, "GamePlayers")
UI_MAP_ELEMENT( m_labelTitle, "Title")
UI_END_MAP_ELEMENTS_AND_NAMES()
public:

4
Minecraft.Client/cmake/sources/Durango.cmake
View File

@@ -88,8 +88,8 @@ set(_MINECRAFT_CLIENT_DURANGO_COMMON_UI_CONTROLS
"${CMAKE_CURRENT_SOURCE_DIR}/Common/UI/UIControl_MinecraftHorse.h"
"${CMAKE_CURRENT_SOURCE_DIR}/Common/UI/UIControl_MinecraftPlayer.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/Common/UI/UIControl_MinecraftPlayer.h"
"${CMAKE_CURRENT_SOURCE_DIR}/Common/UI/UIControl_PlayerList.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/Common/UI/UIControl_PlayerList.h"
"${CMAKE_CURRENT_SOURCE_DIR}/Common/UI/UIControl_PlayerButtonList.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/Common/UI/UIControl_PlayerButtonList.h"
"${CMAKE_CURRENT_SOURCE_DIR}/Common/UI/UIControl_PlayerSkinPreview.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/Common/UI/UIControl_PlayerSkinPreview.h"
"${CMAKE_CURRENT_SOURCE_DIR}/Common/UI/UIControl_Progress.cpp"

4
Minecraft.Client/cmake/sources/ORBIS.cmake
View File

@@ -118,8 +118,8 @@ set(_MINECRAFT_CLIENT_ORBIS_COMMON_UI_CONTROLS
"${CMAKE_CURRENT_SOURCE_DIR}/Common/UI/UIControl_MinecraftHorse.h"
"${CMAKE_CURRENT_SOURCE_DIR}/Common/UI/UIControl_MinecraftPlayer.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/Common/UI/UIControl_MinecraftPlayer.h"
"${CMAKE_CURRENT_SOURCE_DIR}/Common/UI/UIControl_PlayerList.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/Common/UI/UIControl_PlayerList.h"
"${CMAKE_CURRENT_SOURCE_DIR}/Common/UI/UIControl_PlayerButtonList.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/Common/UI/UIControl_PlayerButtonList.h"
"${CMAKE_CURRENT_SOURCE_DIR}/Common/UI/UIControl_PlayerSkinPreview.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/Common/UI/UIControl_PlayerSkinPreview.h"
"${CMAKE_CURRENT_SOURCE_DIR}/Common/UI/UIControl_Progress.cpp"

4
Minecraft.Client/cmake/sources/PS3.cmake
View File

@@ -106,8 +106,8 @@ set(_MINECRAFT_CLIENT_PS3_COMMON_UI_CONTROLS
"${CMAKE_CURRENT_SOURCE_DIR}/Common/UI/UIControl_MinecraftHorse.h"
"${CMAKE_CURRENT_SOURCE_DIR}/Common/UI/UIControl_MinecraftPlayer.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/Common/UI/UIControl_MinecraftPlayer.h"
"${CMAKE_CURRENT_SOURCE_DIR}/Common/UI/UIControl_PlayerList.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/Common/UI/UIControl_PlayerList.h"
"${CMAKE_CURRENT_SOURCE_DIR}/Common/UI/UIControl_PlayerButtonList.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/Common/UI/UIControl_PlayerButtonList.h"
"${CMAKE_CURRENT_SOURCE_DIR}/Common/UI/UIControl_PlayerSkinPreview.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/Common/UI/UIControl_PlayerSkinPreview.h"
"${CMAKE_CURRENT_SOURCE_DIR}/Common/UI/UIControl_Progress.cpp"

4
Minecraft.Client/cmake/sources/PSVita.cmake
View File

@@ -106,8 +106,8 @@ set(_MINECRAFT_CLIENT_PSVITA_COMMON_UI_CONTROLS
"${CMAKE_CURRENT_SOURCE_DIR}/Common/UI/UIControl_MinecraftHorse.h"
"${CMAKE_CURRENT_SOURCE_DIR}/Common/UI/UIControl_MinecraftPlayer.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/Common/UI/UIControl_MinecraftPlayer.h"
"${CMAKE_CURRENT_SOURCE_DIR}/Common/UI/UIControl_PlayerList.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/Common/UI/UIControl_PlayerList.h"
"${CMAKE_CURRENT_SOURCE_DIR}/Common/UI/UIControl_PlayerButtonList.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/Common/UI/UIControl_PlayerButtonList.h"
"${CMAKE_CURRENT_SOURCE_DIR}/Common/UI/UIControl_PlayerSkinPreview.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/Common/UI/UIControl_PlayerSkinPreview.h"
"${CMAKE_CURRENT_SOURCE_DIR}/Common/UI/UIControl_Progress.cpp"

4
Minecraft.Client/cmake/sources/Windows.cmake
View File

@@ -93,8 +93,8 @@ set(_MINECRAFT_CLIENT_WINDOWS_COMMON_UI_CONTROLS
"${CMAKE_CURRENT_SOURCE_DIR}/Common/UI/UIControl_MinecraftPlayer.h"
"${CMAKE_CURRENT_SOURCE_DIR}/Common/UI/UIControl_MultiList.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/Common/UI/UIControl_MultiList.h"
"${CMAKE_CURRENT_SOURCE_DIR}/Common/UI/UIControl_PlayerList.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/Common/UI/UIControl_PlayerList.h"
"${CMAKE_CURRENT_SOURCE_DIR}/Common/UI/UIControl_PlayerButtonList.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/Common/UI/UIControl_PlayerButtonList.h"
"${CMAKE_CURRENT_SOURCE_DIR}/Common/UI/UIControl_PlayerSkinPreview.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/Common/UI/UIControl_PlayerSkinPreview.h"
"${CMAKE_CURRENT_SOURCE_DIR}/Common/UI/UIControl_Progress.cpp"

2
Minecraft.Server/cmake/sources/Common.cmake
View File

@@ -159,7 +159,7 @@ set(_MINECRAFT_SERVER_COMMON_ROOT
"${CMAKE_CURRENT_SOURCE_DIR}/../Minecraft.Client/Common/UI/UIControl_MinecraftHorse.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/../Minecraft.Client/Common/UI/UIControl_MinecraftPlayer.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/../Minecraft.Client/Common/UI/UIControl_MultiList.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/../Minecraft.Client/Common/UI/UIControl_PlayerList.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/../Minecraft.Client/Common/UI/UIControl_PlayerButtonList.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/../Minecraft.Client/Common/UI/UIControl_PlayerSkinPreview.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/../Minecraft.Client/Common/UI/UIControl_Progress.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/../Minecraft.Client/Common/UI/UIControl_SaveList.cpp"