refactor: rename CMinecraftApp to Game, extract IPlatformGame interface

This commit is contained in:
MatthewBeshay 2026-04-04 10:17:12 +11:00
parent 7ecb17596a
commit 31580d44dd
301 changed files with 718 additions and 684 deletions

View file

@ -9,6 +9,7 @@
// using namespace std;
#include "app/common/IPlatformGame.h"
#include "app/common/App_structs.h"
#include "app/common/src/Audio/Consoles_SoundEngine.h"
#include "app/common/src/DLC/DLCManager.h"
@ -54,12 +55,12 @@ class Merchant;
class CMinecraftAudio;
class CMinecraftApp {
class Game : public IPlatformGame {
private:
static int s_iHTMLFontSizesA[eHTMLSize_COUNT];
public:
CMinecraftApp();
Game();
static const float fSafeZoneX; // 5% of 1280
static const float fSafeZoneY; // 5% of 720
@ -279,7 +280,7 @@ public:
const int iPad);
int SetDefaultOptions(C_4JProfile::PROFILESETTINGS* pSettings,
const int iPad);
virtual void SetRichPresenceContext(int iPad, int contextId) = 0;
void SetRichPresenceContext(int iPad, int contextId) override = 0;
void SetGameSettings(int iPad, eGameSetting eVal, unsigned char ucVal);
unsigned char GetGameSettings(int iPad, eGameSetting eVal);
@ -681,15 +682,15 @@ public:
bool bCallback = false);
// images for save thumbnail/social post
virtual void CaptureSaveThumbnail() = 0;
virtual void GetSaveThumbnail(std::uint8_t** thumbnailData,
unsigned int* thumbnailSize) = 0;
virtual void ReleaseSaveThumbnail() = 0;
virtual void GetScreenshot(int iPad, std::uint8_t** screenshotData,
unsigned int* screenshotSize) = 0;
void CaptureSaveThumbnail() override = 0;
void GetSaveThumbnail(std::uint8_t** thumbnailData,
unsigned int* thumbnailSize) override = 0;
void ReleaseSaveThumbnail() override = 0;
void GetScreenshot(int iPad, std::uint8_t** screenshotData,
unsigned int* screenshotSize) override = 0;
virtual void ReadBannedList(int iPad, eTMSAction action = (eTMSAction)0,
bool bCallback = false) = 0;
void ReadBannedList(int iPad, eTMSAction action = (eTMSAction)0,
bool bCallback = false) override = 0;
private:
std::vector<SCreditTextItemDef*> vDLCCredits;
@ -922,13 +923,13 @@ public:
static std::uint32_t getSkinIdFromPath(const std::wstring& skin);
static std::wstring getSkinPathFromId(std::uint32_t skinId);
virtual int LoadLocalTMSFile(wchar_t* wchTMSFile) = 0;
virtual int LoadLocalTMSFile(wchar_t* wchTMSFile,
eFileExtensionType eExt) = 0;
virtual void FreeLocalTMSFiles(eTMSFileType eType) = 0;
virtual int GetLocalTMSFileIndex(wchar_t* wchTMSFile,
bool bFilenameIncludesExtension,
eFileExtensionType eEXT) = 0;
int LoadLocalTMSFile(wchar_t* wchTMSFile) override = 0;
int LoadLocalTMSFile(wchar_t* wchTMSFile,
eFileExtensionType eExt) override = 0;
void FreeLocalTMSFiles(eTMSFileType eType) override = 0;
int GetLocalTMSFileIndex(wchar_t* wchTMSFile,
bool bFilenameIncludesExtension,
eFileExtensionType eEXT) override = 0;
virtual bool GetTMSGlobalFileListRead() { return true; }
virtual bool GetTMSDLCInfoRead() { return true; }
@ -999,5 +1000,6 @@ public:
#endif
};
// singleton
// extern CMinecraftApp app;

View file

@ -0,0 +1,30 @@
#pragma once
#include <cstdint>
#include "app/common/App_enums.h"
class IPlatformGame {
public:
virtual ~IPlatformGame() = default;
virtual void SetRichPresenceContext(int iPad, int contextId) = 0;
virtual void CaptureSaveThumbnail() = 0;
virtual void GetSaveThumbnail(std::uint8_t** thumbnailData,
unsigned int* thumbnailSize) = 0;
virtual void ReleaseSaveThumbnail() = 0;
virtual void GetScreenshot(int iPad, std::uint8_t** screenshotData,
unsigned int* screenshotSize) = 0;
virtual void ReadBannedList(int iPad, eTMSAction action = (eTMSAction)0,
bool bCallback = false) = 0;
virtual int LoadLocalTMSFile(wchar_t* wchTMSFile) = 0;
virtual int LoadLocalTMSFile(wchar_t* wchTMSFile,
eFileExtensionType eExt) = 0;
virtual void FreeLocalTMSFiles(eTMSFileType eType) = 0;
virtual int GetLocalTMSFileIndex(wchar_t* wchTMSFile,
bool bFilenameIncludesExtension,
eFileExtensionType eEXT) = 0;
};

View file

@ -14,7 +14,7 @@
#include "app/common/App_Defines.h"
#include "app/common/src/Audio/Consoles_SoundEngine.h"
#include "app/linux/Iggy/include/rrCore.h"
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
#include "platform/C4JThread.h"
#include "platform/PlatformServices.h"
#include "java/Random.h"
@ -58,7 +58,7 @@ int strcasecmp(const char* a, const char* b) {
#undef FALSE
#endif
#if defined(_WINDOWS64)
#include "app/windows/Windows64_App.h"
#include "app/windows/WindowsGame.h"
#endif
// ASSETS

View file

@ -9,7 +9,7 @@
#include "platform/sdl2/Storage.h"
#include "DLCManager.h"
#include "app/common/src/DLC/DLCFile.h"
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
#include "app/include/XboxStubs.h"
#if defined(_WINDOWS64)
#include "app/windows/XML/ATGXmlParser.h"

View file

@ -2,7 +2,7 @@
#include "DLCManager.h"
#include "app/common/src/DLC/DLCFile.h"
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
DLCCapeFile::DLCCapeFile(const std::wstring& path)
: DLCFile(DLCManager::e_DLCType_Cape, path) {}

View file

@ -3,7 +3,7 @@
#include "DLCManager.h"
#include "app/common/src/Colours/ColourTable.h"
#include "app/common/src/DLC/DLCFile.h"
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
#include "minecraft/client/Minecraft.h"
#include "minecraft/client/skins/TexturePack.h"
#include "minecraft/client/skins/TexturePackRepository.h"

View file

@ -5,7 +5,7 @@
#include "DLCManager.h"
#include "app/common/src/DLC/DLCGameRules.h"
#include "app/common/src/GameRules/GameRuleManager.h"
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
class StringTable;

View file

@ -18,7 +18,7 @@
#include "DLCFile.h"
#include "DLCPack.h"
#include "app/common/src/GameRules/GameRuleManager.h"
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
#include "app/linux/Linux_UIController.h"
#include "platform/PlatformServices.h"
#include "util/StringHelpers.h"

View file

@ -20,7 +20,7 @@
#include "app/common/src/DLC/DLCManager.h"
#include "app/common/src/DLC/DLCSkinFile.h"
#include "app/common/src/Localisation/StringTable.h"
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
#include "app/linux/Stubs/winapi_stubs.h"
#include "util/StringHelpers.h"

View file

@ -6,7 +6,7 @@
#include "platform/sdl2/Render.h"
#include "DLCManager.h"
#include "app/common/src/DLC/DLCFile.h"
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
#include "app/include/SkinBox.h"
#include "app/include/XboxStubs.h"

View file

@ -2,7 +2,7 @@
#include "DLCManager.h"
#include "app/common/src/DLC/DLCFile.h"
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
DLCUIDataFile::DLCUIDataFile(const std::wstring& path)
: DLCFile(DLCManager::e_DLCType_UIData, path) {

View file

@ -19,7 +19,7 @@
#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
#include "app/common/src/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h"
#include "app/common/src/Localisation/StringTable.h"
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
#include "minecraft/world/level/storage/ConsoleSaveFileIO/compression.h"
#include "java/File.h"
#include "java/InputOutputStream/ByteArrayInputStream.h"

View file

@ -7,7 +7,7 @@
#include "LevelGenerationOptions.h"
#include "app/common/src/GameRules/ConsoleGameRulesConstants.h"
#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
#include "util/StringHelpers.h"
#include "java/InputOutputStream/DataOutputStream.h"
#include "minecraft/world/level/Level.h"

View file

@ -2,7 +2,7 @@
#include "app/common/src/GameRules/ConsoleGameRulesConstants.h"
#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
#include "util/StringHelpers.h"
#include "java/InputOutputStream/DataOutputStream.h"

View file

@ -11,7 +11,7 @@
#include "app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.h"
#include "app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.h"
#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
#include "util/StringHelpers.h"
#include "java/InputOutputStream/DataOutputStream.h"
#include "minecraft/Direction.h"

View file

@ -8,7 +8,7 @@
#include <unordered_map>
#include <vector>
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
#include "app/linux/Stubs/winapi_stubs.h"
#include "minecraft/world/level/storage/ConsoleSaveFileIO/compression.h"
#include "java/Class.h"

View file

@ -18,7 +18,7 @@
#include "app/common/src/GameRules/LevelGeneration/StartFeature.h"
#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
#include "app/common/src/Localisation/StringTable.h"
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
#include "app/linux/Stubs/winapi_stubs.h"
#include "java/File.h"
#include "java/InputOutputStream/ByteArrayInputStream.h"

View file

@ -2,7 +2,7 @@
#include "app/common/src/GameRules/ConsoleGameRulesConstants.h"
#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
#include "util/StringHelpers.h"
#include "java/InputOutputStream/DataOutputStream.h"

View file

@ -3,7 +3,7 @@
#include "app/common/src/GameRules/ConsoleGameRulesConstants.h"
#include "app/common/src/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h"
#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
#include "util/StringHelpers.h"
#include "java/InputOutputStream/DataOutputStream.h"
#include "minecraft/world/level/levelgen/structure/StructurePiece.h"

View file

@ -3,7 +3,7 @@
#include "app/common/src/GameRules/ConsoleGameRulesConstants.h"
#include "app/common/src/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h"
#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
#include "util/StringHelpers.h"
#include "java/InputOutputStream/DataOutputStream.h"
#include "minecraft/world/level/levelgen/structure/StructurePiece.h"

View file

@ -7,7 +7,7 @@
#include "app/common/src/GameRules/ConsoleGameRulesConstants.h"
#include "app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h"
#include "app/common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h"
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
#include "util/StringHelpers.h"
#include "minecraft/world/Container.h"
#include "minecraft/world/level/Level.h"

View file

@ -5,7 +5,7 @@
#include "app/common/src/GameRules/ConsoleGameRulesConstants.h"
#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
#include "util/StringHelpers.h"
#include "java/InputOutputStream/DataOutputStream.h"
#include "minecraft/world/item/EnchantedBookItem.h"

View file

@ -4,7 +4,7 @@
#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
#include "app/common/src/GameRules/LevelRules/Rules/GameRule.h"
#include "app/common/src/GameRules/LevelRules/Rules/GameRulesInstance.h"
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
#include "util/StringHelpers.h"
#include "java/InputOutputStream/DataOutputStream.h"
#include "minecraft/network/Connection.h"

View file

@ -7,7 +7,7 @@
#include "app/common/src/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h"
#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
#include "app/common/src/GameRules/LevelRules/Rules/GameRule.h"
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
#include "util/StringHelpers.h"
#include "minecraft/network/Connection.h"
#include "minecraft/network/packet/UpdateGameRuleProgressPacket.h"

View file

@ -13,7 +13,7 @@
#include "app/common/src/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h"
#include "app/common/src/GameRules/LevelRules/Rules/GameRule.h"
#include "app/common/src/GameRules/LevelRules/Rules/GameRulesInstance.h"
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
#include "util/StringHelpers.h"
#include "java/InputOutputStream/DataOutputStream.h"

View file

@ -4,7 +4,7 @@
#include "app/common/src/GameRules/ConsoleGameRulesConstants.h"
#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
#include "util/StringHelpers.h"
#include "java/InputOutputStream/DataOutputStream.h"

View file

@ -7,7 +7,7 @@
#include "app/common/src/GameRules/ConsoleGameRulesConstants.h"
#include "app/common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h"
#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
#include "util/StringHelpers.h"
#include "java/InputOutputStream/DataOutputStream.h"
#include "minecraft/Pos.h"

View file

@ -2,7 +2,7 @@
#include "app/common/src/GameRules/ConsoleGameRulesConstants.h"
#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
#include "util/StringHelpers.h"
#include "java/InputOutputStream/DataOutputStream.h"

View file

@ -1,6 +1,6 @@
#include "LeaderboardManager.h"
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
#include "util/StringHelpers.h"
const std::wstring LeaderboardManager::filterNames[eNumFilterModes] = {

View file

@ -3,7 +3,7 @@
#include <ranges>
#include <utility>
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
#include "app/linux/Stubs/winapi_stubs.h"
#include "java/InputOutputStream/ByteArrayInputStream.h"
#include "java/InputOutputStream/DataInputStream.h"

View file

@ -14,7 +14,7 @@
#include "platform/sdl2/Render.h"
#include "platform/sdl2/Storage.h"
#include "app/common/App_enums.h"
#include "app/common/Consoles_App.h"
#include "app/common/Game.h"
#include "app/common/src/GameRules/GameRuleManager.h"
#include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h"
#include "app/common/src/Network/NetworkPlayerInterface.h"
@ -22,7 +22,7 @@
#include "app/common/src/UI/All Platforms/UIEnums.h"
#include "app/common/src/UI/All Platforms/UIStructs.h"
#include "app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h"
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
#include "app/linux/Linux_UIController.h"
#include "app/linux/Stubs/winapi_stubs.h"
#include "Socket.h"

View file

@ -7,7 +7,7 @@
#include "app/common/src/Network/GameNetworkManager.h"
#include "app/common/src/Network/NetworkPlayerInterface.h"
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
#include "app/linux/Stubs/winapi_stubs.h"
#include "app/include/NetTypes.h"
#include "NetworkPlayerQNet.h"

View file

@ -24,7 +24,7 @@
#include "app/common/src/Tutorial/Tasks/UseTileTask.h"
#include "app/common/src/Tutorial/Tasks/XuiCraftingTask.h"
#include "app/common/src/Tutorial/Tutorial.h"
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
#include "minecraft/world/effect/MobEffect.h"
#include "minecraft/world/item/Item.h"
#include "minecraft/world/item/alchemy/PotionMacros.h"

View file

@ -10,7 +10,7 @@
#include "app/common/App_enums.h"
#include "app/common/src/Tutorial/Constraints/InputConstraint.h"
#include "app/common/src/Tutorial/Tasks/TutorialTask.h"
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
#include "minecraft/client/Minecraft.h"
#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"

View file

@ -22,7 +22,7 @@
#include "app/common/src/Tutorial/Tasks/RideEntityTask.h"
#include "app/common/src/Tutorial/Tasks/TutorialTask.h"
#include "app/common/src/UI/All Platforms/UIStructs.h"
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
#include "app/linux/Linux_UIController.h"
#include "TutorialMessage.h"
#include "util/Timer.h"

View file

@ -1,6 +1,6 @@
#include "TutorialMessage.h"
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
TutorialMessage::TutorialMessage(
int messageId, bool limitRepeats /*= false*/,

View file

@ -5,7 +5,7 @@
#include <cstdlib>
#include <utility>
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
#include "app/linux/Stubs/winapi_stubs.h"
#include "platform/PlatformServices.h"
#include "minecraft/world/level/storage/ConsoleSaveFileIO/compression.h"

View file

@ -14,7 +14,7 @@
#include "app/common/src/Tutorial/Tutorial.h"
#include "app/common/src/Tutorial/TutorialMode.h"
#include "app/common/src/UI/All Platforms/UIStructs.h"
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
#include "app/linux/Linux_UIController.h"
#include "minecraft/client/Minecraft.h"
#include "minecraft/client/multiplayer/MultiPlayerGameMode.h"

View file

@ -4,7 +4,7 @@
#include <wchar.h>
#include "app/common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h"
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
#include "java/InputOutputStream/ByteArrayOutputStream.h"
#include "java/InputOutputStream/DataOutputStream.h"
#include "minecraft/client/Minecraft.h"

View file

@ -7,7 +7,7 @@
#include "app/common/App_enums.h"
#include "app/common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h"
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
#include "java/InputOutputStream/ByteArrayOutputStream.h"
#include "java/InputOutputStream/DataOutputStream.h"
#include "minecraft/client/Minecraft.h"

View file

@ -14,7 +14,7 @@
#include "app/common/src/Console_Debug_enum.h"
#include "app/common/src/Tutorial/Tutorial.h"
#include "app/common/src/UI/All Platforms/UIEnums.h"
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
#include "app/linux/Linux_UIController.h"
#include "app/linux/Stubs/winapi_stubs.h"
#include "minecraft/client/Minecraft.h"

View file

@ -8,7 +8,7 @@
#include "platform/InputActions.h"
#include "app/common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h"
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
#include "app/linux/Linux_UIController.h"
#include "java/JavaMath.h"
#include "minecraft/client/Minecraft.h"

View file

@ -6,7 +6,7 @@
#include "platform/sdl2/Profile.h"
#include "platform/sdl2/Render.h"
#include "app/common/App_enums.h"
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
#include "app/linux/Linux_UIController.h"
#include "java/Class.h"
#include "minecraft/SharedConstants.h"

View file

@ -16,7 +16,7 @@
#include "app/common/src/GameRules/GameRuleManager.h"
#include "app/common/src/Network/GameNetworkManager.h"
#include "app/common/src/UI/UIScene.h"
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
#include "app/linux/Linux_UIController.h"
#include "app/linux/Stubs/winapi_stubs.h"
#include "minecraft/world/level/storage/ConsoleSaveFileIO/compression.h"

View file

@ -7,7 +7,7 @@
#include "platform/InputActions.h"
#include "app/common/src/Tutorial/Tutorial.h"
#include "app/common/src/UI/All Platforms/UIEnums.h"
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
#include "app/linux/Linux_UIController.h"
#include "util/StringHelpers.h"
#include "java/InputOutputStream/ByteArrayOutputStream.h"

View file

@ -38,7 +38,7 @@ enum EUILayer {
// Defines the scenes and components that can be added to a layer
// If you add to the enums below, you need to add the scene name in the right
// place in CConsoleMinecraftApp::wchSceneA
// place in Game::wchSceneA
enum EUIScene {
eUIScene_PartnernetPassword = 0,
eUIScene_Intro,
@ -107,7 +107,7 @@ enum EUIScene {
// ****************************************
// ****************************************
// When adding new scenes here, you must also update the switches in
// CConsoleMinecraftApp::NavigateToScene There are quite a few so you need
// Game::NavigateToScene There are quite a few so you need
// to check them all Also update UILayer::updateFocusState
// Anything non-xbox should be added here. The ordering of scenes above is

View file

@ -2,7 +2,7 @@
#include "app/common/src/UI/Controls/UIControl_Label.h"
#include "app/common/src/UI/UIScene.h"
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
#include "app/linux/Linux_UIController.h"
#include "strings.h"

View file

@ -12,7 +12,7 @@
#include "app/linux/Stubs/iggy_stubs.h"
#endif
#include "app/linux/Iggy/include/rrCore.h"
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
#include "app/linux/Linux_UIController.h"
#include "util/StringHelpers.h"

View file

@ -11,7 +11,7 @@
#include "app/common/src/UI/Controls/UIControl_Label.h"
#include "app/common/src/UI/UILayer.h"
#include "app/common/src/UI/UIScene.h"
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
#include "app/linux/Linux_UIController.h"
#include "util/StringHelpers.h"
#include "minecraft/client/Minecraft.h"

View file

@ -10,7 +10,7 @@
#include "app/common/src/UI/Controls/UIControl_Label.h"
#include "app/common/src/UI/UILayer.h"
#include "app/common/src/UI/UIScene.h"
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
#include "app/linux/Linux_UIController.h"
#include "util/StringHelpers.h"
#include "minecraft/SharedConstants.h"

View file

@ -6,7 +6,7 @@
#include "app/linux/Stubs/iggy_stubs.h"
#endif
#include "app/linux/Iggy/include/rrCore.h"
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
#include "java/JavaMath.h"
UIControl::UIControl() {

View file

@ -15,7 +15,7 @@
#ifndef _ENABLEIGGY
#include "app/linux/Stubs/iggy_stubs.h"
#endif
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
#include "util/StringHelpers.h"
#include "minecraft/client/Minecraft.h"

View file

@ -13,7 +13,7 @@
#ifndef _ENABLEIGGY
#include "app/linux/Stubs/iggy_stubs.h"
#endif
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
#include "java/Class.h"
#include "minecraft/client/Lighting.h"

View file

@ -14,7 +14,7 @@
#include "app/common/src/UI/Controls/UIControl_TextInput.h"
#include "app/common/src/UI/UIScene.h"
#include "app/linux/Iggy/include/rrCore.h"
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
#include "app/linux/Linux_UIController.h"
#include "minecraft/world/level/storage/ConsoleSaveFileIO/compression.h"
#include "minecraft/world/level/Level.h"

View file

@ -8,7 +8,7 @@
#ifndef _ENABLEIGGY
#include "app/linux/Stubs/iggy_stubs.h"
#endif
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
class UILayer;

View file

@ -19,7 +19,7 @@
#include "app/linux/Stubs/iggy_stubs.h"
#endif
#include "app/linux/Iggy/include/rrCore.h"
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
#include "app/linux/Linux_UIController.h"
#include "minecraft/commands/common/EnchantItemCommand.h"
#include "minecraft/commands/common/GiveItemCommand.h"

View file

@ -16,7 +16,7 @@
#include "app/common/src/UI/Controls/UIControl_TextInput.h"
#include "app/common/src/UI/UIScene.h"
#include "app/linux/Iggy/include/rrCore.h"
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
#include "app/linux/Linux_UIController.h"
#include "minecraft/world/phys/Vec3.h"

View file

@ -12,7 +12,7 @@
#include "app/common/src/UI/Controls/UIControl_TexturePackList.h"
#include "app/common/src/UI/UIScene.h"
#include "app/linux/Iggy/include/rrCore.h"
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
#include "minecraft/client/Minecraft.h"
#include "minecraft/client/skins/TexturePack.h"
#include "minecraft/client/skins/TexturePackRepository.h"

View file

@ -23,7 +23,7 @@
#include "app/common/src/UI/Controls/UIControl_TextInput.h"
#include "app/common/src/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.h"
#include "app/common/src/UI/UILayer.h"
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
#include "app/linux/Linux_UIController.h"
#include "app/include/NetTypes.h"
#include "util/StringHelpers.h"

View file

@ -7,7 +7,7 @@
#include "app/common/src/UI/Controls/UIControl_ButtonList.h"
#include "app/common/src/UI/Controls/UIControl_Label.h"
#include "app/common/src/UI/UIScene.h"
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
#include "app/linux/Linux_UIController.h"
#include "strings.h"

View file

@ -11,7 +11,7 @@
#include "app/common/src/UI/Controls/UIControl_HTMLLabel.h"
#include "app/common/src/UI/Controls/UIControl_Label.h"
#include "app/common/src/UI/UIScene.h"
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
#include "app/linux/Linux_UIController.h"
#include "strings.h"

View file

@ -13,7 +13,7 @@
#include "app/common/src/UI/Controls/UIControl_DynamicLabel.h"
#include "app/common/src/UI/UILayer.h"
#include "app/common/src/UI/UIScene.h"
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
#include "app/linux/Linux_UIController.h"
#include "minecraft/sounds/SoundTypes.h"
#include "strings.h"

View file

@ -17,7 +17,7 @@
#include "app/common/src/UI/Controls/UIControl_Label.h"
#include "app/common/src/UI/UILayer.h"
#include "app/common/src/UI/UIScene.h"
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
#include "app/linux/Linux_UIController.h"
#include "minecraft/sounds/SoundTypes.h"
#include "minecraft/world/Difficulty.h"

View file

@ -17,7 +17,7 @@
#include "app/common/src/UI/Controls/UIControl_TextInput.h"
#include "app/common/src/UI/UILayer.h"
#include "app/common/src/UI/UIScene.h"
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
#include "app/linux/Linux_UIController.h"
#include "util/StringHelpers.h"
#include "minecraft/sounds/SoundTypes.h"

View file

@ -17,7 +17,7 @@
#include "app/common/src/UI/Controls/UIControl_LeaderboardList.h"
#include "app/common/src/UI/UILayer.h"
#include "app/common/src/UI/UIScene.h"
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
#include "app/linux/Linux_UIController.h"
#include "app/linux/Stubs/winapi_stubs.h"
#include "minecraft/sounds/SoundTypes.h"

View file

@ -22,7 +22,7 @@
#include "app/common/src/UI/Controls/UIControl_Slider.h"
#include "app/common/src/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.h"
#include "app/common/src/UI/UILayer.h"
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
#include "app/linux/Linux_UIController.h"
#include "app/include/NetTypes.h"
#include "minecraft/client/Minecraft.h"

View file

@ -19,7 +19,7 @@
#include "app/common/src/UI/Controls/UIControl_SaveList.h"
#include "app/common/src/UI/UILayer.h"
#include "app/common/src/UI/UIScene.h"
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
#include "app/linux/Linux_UIController.h"
#include "app/include/NetTypes.h"
#include "java/File.h"

View file

@ -18,7 +18,7 @@
#include "app/common/src/UI/UILayer.h"
#include "app/common/src/UI/UIScene.h"
#include "app/common/src/UI/UIString.h"
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
#include "app/linux/Linux_UIController.h"
#include "app/linux/Stubs/winapi_stubs.h"
#include "app/include/NetTypes.h"

View file

@ -10,7 +10,7 @@
#include "app/common/src/UI/Controls/UIControl_DynamicLabel.h"
#include "app/common/src/UI/UILayer.h"
#include "app/common/src/UI/UIScene.h"
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
#include "app/linux/Linux_UIController.h"
#include "minecraft/sounds/SoundTypes.h"
#include "strings.h"

View file

@ -10,7 +10,7 @@
#include "app/common/src/UI/Controls/UIControl_Label.h"
#include "app/common/src/UI/UILayer.h"
#include "app/common/src/UI/UIScene.h"
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
#include "app/linux/Linux_UIController.h"
#include "minecraft/sounds/SoundTypes.h"
#include "strings.h"

View file

@ -5,7 +5,7 @@
#include "platform/sdl2/Profile.h"
#include "app/common/App_Defines.h"
#include "app/common/src/UI/UIScene.h"
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
#include "app/linux/Linux_UIController.h"
#include "minecraft/sounds/SoundTypes.h"
#include "strings.h"

View file

@ -12,7 +12,7 @@
#include "app/common/src/UI/Controls/UIControl_CheckBox.h"
#include "app/common/src/UI/Controls/UIControl_Label.h"
#include "app/common/src/UI/UIScene.h"
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
#include "app/linux/Linux_UIController.h"
#include "minecraft/client/Minecraft.h"
#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"

View file

@ -7,7 +7,7 @@
#include "platform/InputActions.h"
#include "app/common/src/UI/UILayer.h"
#include "app/common/src/UI/UIScene.h"
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
#include "app/linux/Linux_UIController.h"
#include "util/StringHelpers.h"
#include "strings.h"

View file

@ -6,7 +6,7 @@
#include "app/common/src/UI/Controls/UIControl_Button.h"
#include "app/common/src/UI/UILayer.h"
#include "app/common/src/UI/UIScene.h"
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
#include "app/linux/Linux_UIController.h"
#include "minecraft/client/Minecraft.h"
#include "minecraft/sounds/SoundTypes.h"

View file

@ -10,7 +10,7 @@
#include "app/common/App_enums.h"
#include "app/common/src/UI/Controls/UIControl_Label.h"
#include "app/common/src/UI/UIScene.h"
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
#include "app/linux/Linux_UIController.h"
#include "util/StringHelpers.h"
#include "minecraft/sounds/SoundTypes.h"

View file

@ -7,7 +7,7 @@
#include "app/common/src/UI/Controls/UIControl_ButtonList.h"
#include "app/common/src/UI/UILayer.h"
#include "app/common/src/UI/UIScene.h"
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
#include "app/linux/Linux_UIController.h"
#include "minecraft/client/Minecraft.h"
#include "minecraft/sounds/SoundTypes.h"

View file

@ -4,7 +4,7 @@
#include "app/common/src/UI/Controls/UIControl_ButtonList.h"
#include "app/common/src/UI/UILayer.h"
#include "app/common/src/UI/UIScene.h"
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
#include "app/linux/Linux_UIController.h"
#include "minecraft/client/Minecraft.h"
#include "minecraft/sounds/SoundTypes.h"

View file

@ -4,7 +4,7 @@
#include "platform/InputActions.h"
#include "app/common/src/UI/UILayer.h"
#include "app/common/src/UI/UIScene.h"
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
#include "app/linux/Linux_UIController.h"
#include "minecraft/client/Minecraft.h"
#include "strings.h"

View file

@ -8,7 +8,7 @@
#include "app/common/src/UI/Controls/UIControl_Slider.h"
#include "app/common/src/UI/UILayer.h"
#include "app/common/src/UI/UIScene.h"
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
#include "app/linux/Linux_UIController.h"
#include "minecraft/client/Minecraft.h"
#include "strings.h"

View file

@ -7,7 +7,7 @@
#include "app/common/src/UI/Controls/UIControl_Slider.h"
#include "app/common/src/UI/UILayer.h"
#include "app/common/src/UI/UIScene.h"
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
#include "app/linux/Linux_UIController.h"
#include "minecraft/client/Minecraft.h"
#include "strings.h"

View file

@ -10,7 +10,7 @@
#include "app/common/src/UI/Controls/UIControl_Slider.h"
#include "app/common/src/UI/UILayer.h"
#include "app/common/src/UI/UIScene.h"
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
#include "app/linux/Linux_UIController.h"
#include "minecraft/client/Minecraft.h"
#include "strings.h"

View file

@ -6,7 +6,7 @@
#include "app/common/src/UI/Controls/UIControl_Button.h"
#include "app/common/src/UI/UILayer.h"
#include "app/common/src/UI/UIScene.h"
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
#include "app/linux/Linux_UIController.h"
#include "minecraft/client/Minecraft.h"
#include "minecraft/sounds/SoundTypes.h"

View file

@ -14,7 +14,7 @@
#include "app/common/src/UI/Controls/UIControl_Slider.h"
#include "app/common/src/UI/UILayer.h"
#include "app/common/src/UI/UIScene.h"
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
#include "app/linux/Linux_UIController.h"
#include "minecraft/client/Minecraft.h"
#include "minecraft/sounds/SoundTypes.h"

View file

@ -10,7 +10,7 @@
#include "app/common/src/UI/Controls/UIControl_Slider.h"
#include "app/common/src/UI/UILayer.h"
#include "app/common/src/UI/UIScene.h"
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
#include "app/linux/Linux_UIController.h"
#include "minecraft/client/Minecraft.h"
#include "strings.h"

View file

@ -18,7 +18,7 @@
#include "app/common/src/UI/Controls/UIControl_PlayerSkinPreview.h"
#include "app/common/src/UI/UILayer.h"
#include "app/common/src/UI/UIScene.h"
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
#include "app/linux/Linux_UIController.h"
#include "SkinBox.h"
#include "util/StringHelpers.h"

View file

@ -13,7 +13,7 @@
#include "app/common/src/UI/Controls/UIControl_SlotList.h"
#include "app/common/src/UI/UILayer.h"
#include "app/common/src/UI/UIScene.h"
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
#include "app/linux/Linux_UIController.h"
#include "minecraft/client/Minecraft.h"
#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"

View file

@ -16,7 +16,7 @@
#include "app/common/src/UI/Controls/UIControl_SlotList.h"
#include "app/common/src/UI/Controls/UIControl_TextInput.h"
#include "app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h"
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
#include "util/StringHelpers.h"
#include "minecraft/client/Minecraft.h"
#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"

View file

@ -11,7 +11,7 @@
#include "app/common/src/UI/Controls/UIControl_Label.h"
#include "app/common/src/UI/Controls/UIControl_SlotList.h"
#include "app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h"
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
#include "minecraft/client/Minecraft.h"
#include "minecraft/world/entity/player/Inventory.h"
#include "minecraft/world/inventory/AbstractContainerMenu.h"

View file

@ -11,7 +11,7 @@
#include "app/common/src/UI/Controls/UIControl_Progress.h"
#include "app/common/src/UI/Controls/UIControl_SlotList.h"
#include "app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h"
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
#include "minecraft/SharedConstants.h"
#include "minecraft/client/Minecraft.h"
#include "minecraft/world/inventory/BrewingStandMenu.h"

View file

@ -11,7 +11,7 @@
#include "app/common/src/UI/Controls/UIControl_Label.h"
#include "app/common/src/UI/Controls/UIControl_SlotList.h"
#include "app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h"
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
#include "minecraft/client/Minecraft.h"
#include "minecraft/world/Container.h"
#include "minecraft/world/inventory/AbstractContainerMenu.h"

View file

@ -17,7 +17,7 @@
#include "app/linux/Stubs/iggy_stubs.h"
#endif
#include "app/linux/Iggy/include/rrCore.h"
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
#include "app/linux/Linux_UIController.h"
#include "app/include/XboxStubs.h"
#include "minecraft/client/Minecraft.h"

View file

@ -11,7 +11,7 @@
#include "app/common/src/UI/Controls/UIControl_Label.h"
#include "app/common/src/UI/Controls/UIControl_SlotList.h"
#include "app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h"
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
#include "minecraft/client/Minecraft.h"
#include "minecraft/world/inventory/TrapMenu.h"
#include "minecraft/world/level/tile/entity/DispenserTileEntity.h"

View file

@ -14,7 +14,7 @@
#include "app/common/src/UI/Controls/UIControl_Label.h"
#include "app/common/src/UI/Controls/UIControl_SlotList.h"
#include "app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h"
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
#include "app/linux/Linux_UIController.h"
#include "minecraft/client/Minecraft.h"
#include "minecraft/world/inventory/EnchantmentMenu.h"

View file

@ -10,7 +10,7 @@
#include "app/common/src/UI/Controls/UIControl_Label.h"
#include "app/common/src/UI/Controls/UIControl_SlotList.h"
#include "app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h"
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
#include "minecraft/client/Minecraft.h"
#include "minecraft/client/player/LocalPlayer.h"
#include "minecraft/world/inventory/FireworksMenu.h"

View file

@ -11,7 +11,7 @@
#include "app/common/src/UI/Controls/UIControl_Progress.h"
#include "app/common/src/UI/Controls/UIControl_SlotList.h"
#include "app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h"
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
#include "minecraft/client/Minecraft.h"
#include "minecraft/world/inventory/FurnaceMenu.h"
#include "minecraft/world/level/tile/entity/FurnaceTileEntity.h"

View file

@ -11,7 +11,7 @@
#include "app/common/src/UI/Controls/UIControl_Label.h"
#include "app/common/src/UI/Controls/UIControl_SlotList.h"
#include "app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h"
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
#include "minecraft/client/Minecraft.h"
#include "minecraft/world/Container.h"
#include "minecraft/world/entity/player/Inventory.h"

View file

@ -16,7 +16,7 @@
#ifndef _ENABLEIGGY
#include "app/linux/Stubs/iggy_stubs.h"
#endif
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
#include "app/linux/Linux_UIController.h"
#include "minecraft/client/Minecraft.h"
#include "minecraft/world/Container.h"

View file

@ -13,7 +13,7 @@
#include "app/common/src/UI/Controls/UIControl_MinecraftPlayer.h"
#include "app/common/src/UI/Controls/UIControl_SlotList.h"
#include "app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h"
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
#include "app/linux/Linux_UIController.h"
#include "util/StringHelpers.h"
#include "minecraft/SharedConstants.h"

View file

@ -14,7 +14,7 @@
#include "app/common/src/UI/Controls/UIControl_Label.h"
#include "app/common/src/UI/Controls/UIControl_SlotList.h"
#include "app/common/src/UI/UIScene.h"
#include "app/linux/Linux_App.h"
#include "app/linux/LinuxGame.h"
#include "app/linux/Linux_UIController.h"
#include "util/StringHelpers.h"
#include "minecraft/client/Minecraft.h"

Some files were not shown because too many files have changed in this diff Show more