painful update

This commit is contained in:
JuiceyDev
2026-03-06 18:31:46 +01:00
parent 587e9a676e
commit 417ea73050
408 changed files with 1605 additions and 1594 deletions
@@ -8,7 +8,7 @@
#include "SoundEngine.h"
#include "../../../Textures/Packs/TexturePackRepository.h"
#include "../../../Textures/Packs/TexturePack.h"
#include "../../../Build/Common/DLC/DLCAudioFile.h"
#include "../../../../Common/DLC/DLCAudioFile.h"
#include "../../../Textures/Packs/DLCTexturePack.h"
@@ -2,7 +2,7 @@
using namespace std;
#include <xuirender.h>
#include "../../../Build/Common/UI/UIFontData.h"
#include "../../../../Common/UI/UIFontData.h"
// 4J This class is partially based of the ATG font implementation
//--------------------------------------------------------------------------------------
@@ -3,7 +3,7 @@
#include <xuiresource.h>
#include <xuiapp.h>
#include "../../../Build/Common/Leaderboards/LeaderboardManager.h"
#include "../../../../Common/Leaderboards/LeaderboardManager.h"
class XboxLeaderboardManager : public LeaderboardManager
{
@@ -1,6 +1,6 @@
#pragma once
#include "../../../Build/Common/Network/NetworkPlayerInterface.h"
#include "../../../../Common/Network/NetworkPlayerInterface.h"
// This is an implementation of the INetworkPlayer interface, for Xbox 360. It effectively wraps the IQNetPlayer class in a non-platform-specific way. It is
// managed by PlatformNetworkManagerXbox.
@@ -3,7 +3,7 @@
#include "../../../../Minecraft.World/Util/StringHelpers.h"
#include "PlatformNetworkManagerXbox.h"
#include "NetworkPlayerXbox.h"
#include "../../../Build/Common/Network/GameNetworkManager.h"
#include "../../../../Common/Network/GameNetworkManager.h"
CPlatformNetworkManagerXbox *g_pPlatformNetworkManager;
@@ -3,9 +3,9 @@ using namespace std;
#include <vector>
#include <qnet.h>
#include "../../../../Minecraft.World/Util/C4JThread.h"
#include "../../../Build/Common/Network/NetworkPlayerInterface.h"
#include "../../../Build/Common/Network/PlatformNetworkManagerInterface.h"
#include "../../../Build/Common/Network/SessionInfo.h"
#include "../../../../Common/Network/NetworkPlayerInterface.h"
#include "../../../../Common/Network/PlatformNetworkManagerInterface.h"
#include "../../../../Common/Network/SessionInfo.h"
// This is how often we allow a search for new games
#define MINECRAFT_XSESSION_SEARCH_DELAY_MILLISECONDS 30000
+113 -113
View File
@@ -1,64 +1,64 @@
#include "../../../Minecraft.World/Build/stdafx.h"
#include "../../Build/Common/UI/UIStructs.h"
#include "../../../Common/UI/UIStructs.h"
#include "../../Build/Common/XUI/XUI_Intro.h"
#include "../../Build/Common/XUI/XUI_MainMenu.h"
#include "../../Build/Common/XUI/XUI_NewUpdateMessage.h"
#include "../../Build/Common/XUI/XUI_HelpAndOptions.h"
#include "../../Build/Common/XUI/XUI_TextEntry.h"
#include "../../Build/Common/XUI/XUI_HelpHowToPlay.h"
#include "../../Build/Common/XUI/XUI_HowToPlayMenu.h"
#include "../../Build/Common/XUI/XUI_HelpControls.h"
#include "../../Build/Common/XUI/XUI_TextEntry.h"
#include "../../Build/Common/XUI/XUI_LoadSettings.h"
#include "../../Build/Common/XUI/XUI_SettingsAll.h"
#include "../../Build/Common/XUI/XUI_SettingsOptions.h"
#include "../../Build/Common/XUI/XUI_SettingsAudio.h"
#include "../../Build/Common/XUI/XUI_SettingsControl.h"
#include "../../Build/Common/XUI/XUI_SettingsGraphics.h"
#include "../../Build/Common/XUI/XUI_SettingsUI.h"
#include "../../Build/Common/XUI/XUI_Leaderboards.h"
#include "../../Build/Common/XUI/XUI_Debug.h"
#include "../../Build/Common/XUI/XUI_DebugTips.h"
#include "../../Build/Common/XUI/XUI_Reinstall.h"
#include "../../Build/Common/XUI/XUI_Death.h"
#include "../../Build/Common/XUI/XUI_DebugOverlay.h"
#include "../../Build/Common/XUI/XUI_DLCOffers.h"
#include "../../Build/Common/XUI/XUI_SocialPost.h"
#include "../../Build/Common/XUI/XUI_Scene_Container.h"
#include "../../Build/Common/XUI/XUI_Scene_Furnace.h"
#include "../../Build/Common/XUI/XUI_Scene_Inventory.h"
#include "../../Build/Common/XUI/XUI_Scene_Trap.h"
#include "../../Build/Common/XUI/XUI_Control_ComboBox.h"
#include "../../Build/Common/XUI/XUI_MultiGameInfo.h"
#include "../../Build/Common/XUI/XUI_MultiGameJoinLoad.h"
#include "../../Build/Common/XUI/XUI_MultiGameCreate.h"
#include "../../Build/Common/XUI/XUI_MultiGameLaunchMoreOptions.h"
#include "../../Build/Common/XUI/XUI_SignEntry.h"
#include "../../Build/Common/XUI/XUI_InGameInfo.h"
#include "../../Build/Common/XUI/XUI_TrialExitUpsell.h"
#include "../../Build/Common/XUI/XUI_BasePlayer.h"
#include "../../Build/Common/XUI/XUI_PartnernetPassword.h"
#include "../../Build/Common/XUI/XUI_SaveMessage.h"
#include "../../Build/Common/XUI/XUI_Chat.h"
#include "../../Build/Common/XUI/XUI_SkinSelect.h"
#include "../../Build/Common/XUI/XUI_InGameHostOptions.h"
#include "../../Build/Common/XUI/XUI_InGamePlayerOptions.h"
#include "../../Build/Common/XUI/XUI_Scene_Enchant.h"
#include "../../Build/Common/XUI/XUI_Scene_BrewingStand.h"
#include "../../Build/Common/XUI/XUI_XZP_Icons.h"
#include "../../Build/Common/XUI/XUI_Controls.h"
#include "../../Build/Common/XUI/XUI_Scene_Win.h"
#include "../../Build/Common/XUI/XUI_HUD.h"
#include "../../Build/Common/XUI/XUI_DebugSetCamera.h"
//#include "../../Build/Common/XUI/XUI_TransferToXboxOne.h"
#include "../../../Common/XUI/XUI_Intro.h"
#include "../../../Common/XUI/XUI_MainMenu.h"
#include "../../../Common/XUI/XUI_NewUpdateMessage.h"
#include "../../../Common/XUI/XUI_HelpAndOptions.h"
#include "../../../Common/XUI/XUI_TextEntry.h"
#include "../../../Common/XUI/XUI_HelpHowToPlay.h"
#include "../../../Common/XUI/XUI_HowToPlayMenu.h"
#include "../../../Common/XUI/XUI_HelpControls.h"
#include "../../../Common/XUI/XUI_TextEntry.h"
#include "../../../Common/XUI/XUI_LoadSettings.h"
#include "../../../Common/XUI/XUI_SettingsAll.h"
#include "../../../Common/XUI/XUI_SettingsOptions.h"
#include "../../../Common/XUI/XUI_SettingsAudio.h"
#include "../../../Common/XUI/XUI_SettingsControl.h"
#include "../../../Common/XUI/XUI_SettingsGraphics.h"
#include "../../../Common/XUI/XUI_SettingsUI.h"
#include "../../../Common/XUI/XUI_Leaderboards.h"
#include "../../../Common/XUI/XUI_Debug.h"
#include "../../../Common/XUI/XUI_DebugTips.h"
#include "../../../Common/XUI/XUI_Reinstall.h"
#include "../../../Common/XUI/XUI_Death.h"
#include "../../../Common/XUI/XUI_DebugOverlay.h"
#include "../../../Common/XUI/XUI_DLCOffers.h"
#include "../../../Common/XUI/XUI_SocialPost.h"
#include "../../../Common/XUI/XUI_Scene_Container.h"
#include "../../../Common/XUI/XUI_Scene_Furnace.h"
#include "../../../Common/XUI/XUI_Scene_Inventory.h"
#include "../../../Common/XUI/XUI_Scene_Trap.h"
#include "../../../Common/XUI/XUI_Control_ComboBox.h"
#include "../../../Common/XUI/XUI_MultiGameInfo.h"
#include "../../../Common/XUI/XUI_MultiGameJoinLoad.h"
#include "../../../Common/XUI/XUI_MultiGameCreate.h"
#include "../../../Common/XUI/XUI_MultiGameLaunchMoreOptions.h"
#include "../../../Common/XUI/XUI_SignEntry.h"
#include "../../../Common/XUI/XUI_InGameInfo.h"
#include "../../../Common/XUI/XUI_TrialExitUpsell.h"
#include "../../../Common/XUI/XUI_BasePlayer.h"
#include "../../../Common/XUI/XUI_PartnernetPassword.h"
#include "../../../Common/XUI/XUI_SaveMessage.h"
#include "../../../Common/XUI/XUI_Chat.h"
#include "../../../Common/XUI/XUI_SkinSelect.h"
#include "../../../Common/XUI/XUI_InGameHostOptions.h"
#include "../../../Common/XUI/XUI_InGamePlayerOptions.h"
#include "../../../Common/XUI/XUI_Scene_Enchant.h"
#include "../../../Common/XUI/XUI_Scene_BrewingStand.h"
#include "../../../Common/XUI/XUI_XZP_Icons.h"
#include "../../../Common/XUI/XUI_Controls.h"
#include "../../../Common/XUI/XUI_Scene_Win.h"
#include "../../../Common/XUI/XUI_HUD.h"
#include "../../../Common/XUI/XUI_DebugSetCamera.h"
//#include "../../../Common/XUI/XUI_TransferToXboxOne.h"
#ifdef _DEBUG_MENUS_ENABLED
#include "../../Build/Common/XUI/XUI_DebugItemEditor.h"
#include "../../../Common/XUI/XUI_DebugItemEditor.h"
#endif
#ifndef _CONTENT_PACKAGE
#include "../../Build/Common/XUI/XUI_DebugSchematicCreator.h"
#include "../../../Common/XUI/XUI_DebugSchematicCreator.h"
#endif
#include "../../../Minecraft.World/Recipes/Recipy.h"
@@ -88,16 +88,16 @@
#include "../../GameState/GameMode.h"
#include "Social/SocialManager.h"
#include <xgraphics.h>
#include "../../Build/Common/Tutorial/TutorialMode.h"
#include "../../../Common/Tutorial/TutorialMode.h"
#include "XML/ATGXmlParser.h"
#include "XML/xmlFilesCallback.h"
#include "4JLibs/inc/4J_Input.h"
#include "Font/XUI_FontRenderer.h"
#include "../../Build/Common/Minecraft_Macros.h"
#include "../../../Common/Minecraft_Macros.h"
#include "../../Network/PlayerList.h"
#include "../../Player/ServerPlayer.h"
#include "../../Build/Common/GameRules/ConsoleGameRules.h"
#include "../../Build/Common/GameRules/ConsoleSchematicFile.h"
#include "../../../Common/GameRules/ConsoleGameRules.h"
#include "../../../Common/GameRules/ConsoleSchematicFile.h"
#include "../../../Minecraft.World/IO/Streams/InputOutputStream.h"
#include "../../../Minecraft.World/Level/Storage/LevelSettings.h"
#include "../../Player/User.h"
@@ -109,67 +109,67 @@
#include "../../../Minecraft.World/IO/Streams/Compression.h"
#include "../../Textures/Packs/TexturePackRepository.h"
#include "../../Textures/Packs/TexturePack.h"
#include "../../Build/Common/DLC/DLCAudioFile.h"
#include "../../../Common/DLC/DLCAudioFile.h"
#include "../../Textures/Packs/DLCTexturePack.h"
#include "../../Build/Common/XUI/XUI_Intro.h"
#include "../../Build/Common/XUI/XUI_MainMenu.h"
#include "../../Build/Common/XUI/XUI_NewUpdateMessage.h"
#include "../../Build/Common/XUI/XUI_HelpAndOptions.h"
#include "../../Build/Common/XUI/XUI_TextEntry.h"
#include "../../Build/Common/XUI/XUI_HelpHowToPlay.h"
#include "../../Build/Common/XUI/XUI_HowToPlayMenu.h"
#include "../../Build/Common/XUI/XUI_HelpControls.h"
#include "../../Build/Common/XUI/XUI_TextEntry.h"
#include "../../Build/Common/XUI/XUI_LoadSettings.h"
#include "../../Build/Common/XUI/XUI_SettingsAll.h"
#include "../../Build/Common/XUI/XUI_SettingsOptions.h"
#include "../../Build/Common/XUI/XUI_SettingsAudio.h"
#include "../../Build/Common/XUI/XUI_SettingsControl.h"
#include "../../Build/Common/XUI/XUI_SettingsGraphics.h"
#include "../../Build/Common/XUI/XUI_SettingsUI.h"
#include "../../Build/Common/XUI/XUI_Leaderboards.h"
#include "../../Build/Common/XUI/XUI_Debug.h"
#include "../../Build/Common/XUI/XUI_DebugTips.h"
#include "../../Build/Common/XUI/XUI_Reinstall.h"
#include "../../Build/Common/XUI/XUI_Death.h"
#include "../../Build/Common/XUI/XUI_DebugOverlay.h"
#include "../../Build/Common/XUI/XUI_DLCOffers.h"
#include "../../Build/Common/XUI/XUI_SocialPost.h"
#include "../../Build/Common/XUI/XUI_Scene_Container.h"
#include "../../Build/Common/XUI/XUI_Scene_Furnace.h"
#include "../../Build/Common/XUI/XUI_Scene_Inventory.h"
#include "../../Build/Common/XUI/XUI_Scene_Trap.h"
#include "../../Build/Common/XUI/XUI_Control_ComboBox.h"
#include "../../Build/Common/XUI/XUI_MultiGameInfo.h"
#include "../../Build/Common/XUI/XUI_MultiGameJoinLoad.h"
#include "../../Build/Common/XUI/XUI_MultiGameCreate.h"
#include "../../Build/Common/XUI/XUI_MultiGameLaunchMoreOptions.h"
#include "../../Build/Common/XUI/XUI_SignEntry.h"
#include "../../Build/Common/XUI/XUI_InGameInfo.h"
#include "../../Build/Common/XUI/XUI_TrialExitUpsell.h"
#include "../../Build/Common/XUI/XUI_BasePlayer.h"
#include "../../Build/Common/XUI/XUI_PartnernetPassword.h"
#include "../../Build/Common/XUI/XUI_SaveMessage.h"
#include "../../Build/Common/XUI/XUI_Chat.h"
#include "../../Build/Common/XUI/XUI_SkinSelect.h"
#include "../../Build/Common/XUI/XUI_InGameHostOptions.h"
#include "../../Build/Common/XUI/XUI_InGamePlayerOptions.h"
#include "../../Build/Common/XUI/XUI_Scene_Enchant.h"
#include "../../Build/Common/XUI/XUI_Scene_BrewingStand.h"
#include "../../Build/Common/XUI/XUI_XZP_Icons.h"
#include "../../Build/Common/XUI/XUI_Controls.h"
#include "../../Build/Common/XUI/XUI_Scene_Win.h"
#include "../../Build/Common/XUI/XUI_HUD.h"
#include "../../Build/Common/XUI/XUI_Scene_Anvil.h"
#include "../../Build/Common/XUI/XUI_Scene_Trading.h"
#include "../../Build/Common/XUI/XUI_Teleport.h"
#include "../../../Common/XUI/XUI_Intro.h"
#include "../../../Common/XUI/XUI_MainMenu.h"
#include "../../../Common/XUI/XUI_NewUpdateMessage.h"
#include "../../../Common/XUI/XUI_HelpAndOptions.h"
#include "../../../Common/XUI/XUI_TextEntry.h"
#include "../../../Common/XUI/XUI_HelpHowToPlay.h"
#include "../../../Common/XUI/XUI_HowToPlayMenu.h"
#include "../../../Common/XUI/XUI_HelpControls.h"
#include "../../../Common/XUI/XUI_TextEntry.h"
#include "../../../Common/XUI/XUI_LoadSettings.h"
#include "../../../Common/XUI/XUI_SettingsAll.h"
#include "../../../Common/XUI/XUI_SettingsOptions.h"
#include "../../../Common/XUI/XUI_SettingsAudio.h"
#include "../../../Common/XUI/XUI_SettingsControl.h"
#include "../../../Common/XUI/XUI_SettingsGraphics.h"
#include "../../../Common/XUI/XUI_SettingsUI.h"
#include "../../../Common/XUI/XUI_Leaderboards.h"
#include "../../../Common/XUI/XUI_Debug.h"
#include "../../../Common/XUI/XUI_DebugTips.h"
#include "../../../Common/XUI/XUI_Reinstall.h"
#include "../../../Common/XUI/XUI_Death.h"
#include "../../../Common/XUI/XUI_DebugOverlay.h"
#include "../../../Common/XUI/XUI_DLCOffers.h"
#include "../../../Common/XUI/XUI_SocialPost.h"
#include "../../../Common/XUI/XUI_Scene_Container.h"
#include "../../../Common/XUI/XUI_Scene_Furnace.h"
#include "../../../Common/XUI/XUI_Scene_Inventory.h"
#include "../../../Common/XUI/XUI_Scene_Trap.h"
#include "../../../Common/XUI/XUI_Control_ComboBox.h"
#include "../../../Common/XUI/XUI_MultiGameInfo.h"
#include "../../../Common/XUI/XUI_MultiGameJoinLoad.h"
#include "../../../Common/XUI/XUI_MultiGameCreate.h"
#include "../../../Common/XUI/XUI_MultiGameLaunchMoreOptions.h"
#include "../../../Common/XUI/XUI_SignEntry.h"
#include "../../../Common/XUI/XUI_InGameInfo.h"
#include "../../../Common/XUI/XUI_TrialExitUpsell.h"
#include "../../../Common/XUI/XUI_BasePlayer.h"
#include "../../../Common/XUI/XUI_PartnernetPassword.h"
#include "../../../Common/XUI/XUI_SaveMessage.h"
#include "../../../Common/XUI/XUI_Chat.h"
#include "../../../Common/XUI/XUI_SkinSelect.h"
#include "../../../Common/XUI/XUI_InGameHostOptions.h"
#include "../../../Common/XUI/XUI_InGamePlayerOptions.h"
#include "../../../Common/XUI/XUI_Scene_Enchant.h"
#include "../../../Common/XUI/XUI_Scene_BrewingStand.h"
#include "../../../Common/XUI/XUI_XZP_Icons.h"
#include "../../../Common/XUI/XUI_Controls.h"
#include "../../../Common/XUI/XUI_Scene_Win.h"
#include "../../../Common/XUI/XUI_HUD.h"
#include "../../../Common/XUI/XUI_Scene_Anvil.h"
#include "../../../Common/XUI/XUI_Scene_Trading.h"
#include "../../../Common/XUI/XUI_Teleport.h"
#ifdef _DEBUG_MENUS_ENABLED
#include "../../Build/Common/XUI/XUI_DebugItemEditor.h"
#include "../../../Common/XUI/XUI_DebugItemEditor.h"
#endif
#ifndef _CONTENT_PACKAGE
#include "../../Build/Common/XUI/XUI_DebugSchematicCreator.h"
#include "../../../Common/XUI/XUI_DebugSchematicCreator.h"
#endif
#include "Xbox_App.h"
@@ -25,7 +25,7 @@
#include "../../UI/Screens/ConnectScreen.h"
#include "Social/SocialManager.h"
#include "Leaderboards/XboxLeaderboardManager.h"
#include "../../Build/Common/XUI/XUI_Scene_Container.h"
#include "../../../Common/XUI/XUI_Scene_Container.h"
#include "../../Rendering/Tesselator.h"
#include "../../GameState/Options.h"
#include "Sentient/SentientManager.h"
@@ -1,7 +1,7 @@
#include "../../../Minecraft.World/Build/stdafx.h"
#include "Xbox_UIController.h"
#include "../../Build/Common/XUI/XUI_Scene_Base.h"
#include "../../Build/Common/XUI/XUI_Scene_Win.h"
#include "../../../Common/XUI/XUI_Scene_Base.h"
#include "../../../Common/XUI/XUI_Scene_Win.h"
ConsoleUIController ui;
@@ -1,6 +1,6 @@
#pragma once
#include "../../Build/Common/UI/IUIController.h"
#include "../../../Common/UI/IUIController.h"
class ConsoleUIController : public IUIController
{