From 31580d44ddb1f68ffb5d02d789b77c82e3170a54 Mon Sep 17 00:00:00 2001 From: MatthewBeshay <92357869+MatthewBeshay@users.noreply.github.com> Date: Sat, 4 Apr 2026 10:17:12 +1100 Subject: [PATCH] refactor: rename CMinecraftApp to Game, extract IPlatformGame interface --- .../app/common/{Consoles_App.cpp => Game.cpp} | 550 +++++++++--------- targets/app/common/{Consoles_App.h => Game.h} | 38 +- targets/app/common/IPlatformGame.h | 30 + targets/app/common/src/Audio/SoundEngine.cpp | 4 +- targets/app/common/src/DLC/DLCAudioFile.cpp | 2 +- targets/app/common/src/DLC/DLCCapeFile.cpp | 2 +- .../app/common/src/DLC/DLCColourTableFile.cpp | 2 +- .../app/common/src/DLC/DLCGameRulesHeader.cpp | 2 +- targets/app/common/src/DLC/DLCManager.cpp | 2 +- targets/app/common/src/DLC/DLCPack.cpp | 2 +- targets/app/common/src/DLC/DLCSkinFile.cpp | 2 +- targets/app/common/src/DLC/DLCUIDataFile.cpp | 2 +- .../common/src/GameRules/GameRuleManager.cpp | 2 +- .../ApplySchematicRuleDefinition.cpp | 2 +- .../LevelGeneration/BiomeOverride.cpp | 2 +- .../ConsoleGenerateStructure.cpp | 2 +- .../LevelGeneration/ConsoleSchematicFile.cpp | 2 +- .../LevelGenerationOptions.cpp | 2 +- .../LevelGeneration/StartFeature.cpp | 2 +- .../XboxStructureActionGenerateBox.cpp | 2 +- .../XboxStructureActionPlaceBlock.cpp | 2 +- .../XboxStructureActionPlaceContainer.cpp | 2 +- .../AddEnchantmentRuleDefinition.cpp | 2 +- .../CollectItemRuleDefinition.cpp | 2 +- .../CompleteAllRuleDefinition.cpp | 2 +- .../RuleDefinitions/GameRuleDefinition.cpp | 2 +- .../NamedAreaRuleDefinition.cpp | 2 +- .../UpdatePlayerRuleDefinition.cpp | 2 +- .../RuleDefinitions/UseTileRuleDefinition.cpp | 2 +- .../src/Leaderboards/LeaderboardManager.cpp | 2 +- .../common/src/Localisation/StringTable.cpp | 2 +- .../common/src/Network/GameNetworkManager.cpp | 4 +- .../Network/PlatformNetworkManagerStub.cpp | 2 +- .../app/common/src/Tutorial/FullTutorial.cpp | 2 +- .../src/Tutorial/Tasks/ControllerTask.cpp | 2 +- targets/app/common/src/Tutorial/Tutorial.cpp | 2 +- .../common/src/Tutorial/TutorialMessage.cpp | 2 +- .../src/UI/All Platforms/ArchiveFile.cpp | 2 +- .../IUIScene_AbstractContainerMenu.cpp | 2 +- .../UI/All Platforms/IUIScene_AnvilMenu.cpp | 2 +- .../UI/All Platforms/IUIScene_BeaconMenu.cpp | 2 +- .../All Platforms/IUIScene_CraftingMenu.cpp | 2 +- .../All Platforms/IUIScene_CreativeMenu.cpp | 2 +- .../src/UI/All Platforms/IUIScene_HUD.cpp | 2 +- .../UI/All Platforms/IUIScene_PauseMenu.cpp | 2 +- .../UI/All Platforms/IUIScene_TradingMenu.cpp | 2 +- .../app/common/src/UI/All Platforms/UIEnums.h | 4 +- .../UIComponent_PressStartToPlay.cpp | 2 +- .../UI/Components/UIComponent_Tooltips.cpp | 2 +- .../Components/UIComponent_TutorialPopup.cpp | 2 +- .../common/src/UI/Components/UIScene_HUD.cpp | 2 +- .../app/common/src/UI/Controls/UIControl.cpp | 2 +- .../Controls/UIControl_EnchantmentButton.cpp | 2 +- .../Controls/UIControl_PlayerSkinPreview.cpp | 2 +- .../Debug/UIScene_DebugCreateSchematic.cpp | 2 +- .../UI/Scenes/Debug/UIScene_DebugOptions.cpp | 2 +- .../UI/Scenes/Debug/UIScene_DebugOverlay.cpp | 2 +- .../Scenes/Debug/UIScene_DebugSetCamera.cpp | 2 +- .../IUIScene_StartGame.cpp | 2 +- .../UIScene_CreateWorldMenu.cpp | 2 +- .../UIScene_DLCMainMenu.cpp | 2 +- .../UIScene_DLCOffersMenu.cpp | 2 +- .../Frontend Menu screens/UIScene_EULA.cpp | 2 +- .../UIScene_JoinMenu.cpp | 2 +- .../UIScene_LaunchMoreOptionsMenu.cpp | 2 +- .../UIScene_LeaderboardsMenu.cpp | 2 +- .../UIScene_LoadMenu.cpp | 2 +- .../UIScene_LoadOrJoinMenu.cpp | 2 +- .../UIScene_MainMenu.cpp | 2 +- .../UIScene_NewUpdateMessage.cpp | 2 +- .../UIScene_SaveMessage.cpp | 2 +- .../UIScene_TrialExitUpsell.cpp | 2 +- .../Help & Options/UIScene_ControlsMenu.cpp | 2 +- .../Scenes/Help & Options/UIScene_Credits.cpp | 2 +- .../UIScene_HelpAndOptionsMenu.cpp | 2 +- .../Help & Options/UIScene_HowToPlay.cpp | 2 +- .../Help & Options/UIScene_HowToPlayMenu.cpp | 2 +- .../UIScene_LanguageSelector.cpp | 2 +- .../Help & Options/UIScene_ReinstallMenu.cpp | 2 +- .../UIScene_SettingsAudioMenu.cpp | 2 +- .../UIScene_SettingsControlMenu.cpp | 2 +- .../UIScene_SettingsGraphicsMenu.cpp | 2 +- .../Help & Options/UIScene_SettingsMenu.cpp | 2 +- .../UIScene_SettingsOptionsMenu.cpp | 2 +- .../Help & Options/UIScene_SettingsUIMenu.cpp | 2 +- .../Help & Options/UIScene_SkinSelectMenu.cpp | 2 +- .../UIScene_AbstractContainerMenu.cpp | 2 +- .../Containers/UIScene_AnvilMenu.cpp | 2 +- .../Containers/UIScene_BeaconMenu.cpp | 2 +- .../Containers/UIScene_BrewingStandMenu.cpp | 2 +- .../Containers/UIScene_ContainerMenu.cpp | 2 +- .../Containers/UIScene_CreativeMenu.cpp | 2 +- .../Containers/UIScene_DispenserMenu.cpp | 2 +- .../Containers/UIScene_EnchantingMenu.cpp | 2 +- .../Containers/UIScene_FireworksMenu.cpp | 2 +- .../Containers/UIScene_FurnaceMenu.cpp | 2 +- .../Containers/UIScene_HopperMenu.cpp | 2 +- .../Containers/UIScene_HorseInventoryMenu.cpp | 2 +- .../Containers/UIScene_InventoryMenu.cpp | 2 +- .../Containers/UIScene_TradingMenu.cpp | 2 +- .../UIScene_CraftingMenu.cpp | 2 +- .../UIScene_DeathMenu.cpp | 2 +- .../In-Game Menu Screens/UIScene_EndPoem.cpp | 2 +- .../UIScene_InGameHostOptionsMenu.cpp | 2 +- .../UIScene_InGameInfoMenu.cpp | 2 +- .../UIScene_InGamePlayerOptionsMenu.cpp | 2 +- .../UIScene_PauseMenu.cpp | 2 +- .../UIScene_SignEntryMenu.cpp | 2 +- .../UIScene_TeleportMenu.cpp | 2 +- .../UI/Scenes/UIScene_ConnectingProgress.cpp | 2 +- .../UI/Scenes/UIScene_FullscreenProgress.cpp | 4 +- .../common/src/UI/Scenes/UIScene_Keyboard.cpp | 2 +- .../src/UI/Scenes/UIScene_MessageBox.cpp | 2 +- .../src/UI/Scenes/UIScene_QuadrantSignin.cpp | 2 +- targets/app/common/src/UI/UIController.cpp | 2 +- targets/app/common/src/UI/UIFontData.cpp | 2 +- targets/app/common/src/UI/UIGroup.cpp | 2 +- targets/app/common/src/UI/UILayer.cpp | 2 +- targets/app/common/src/UI/UIScene.cpp | 2 +- targets/app/common/src/UI/UIString.cpp | 2 +- targets/app/common/src/UI/UITTFFont.cpp | 2 +- .../linux/{Linux_App.cpp => LinuxGame.cpp} | 38 +- targets/app/linux/LinuxGame.h | 46 ++ targets/app/linux/Linux_App.h | 45 -- targets/app/linux/Linux_Minecraft.cpp | 6 +- targets/app/linux/Linux_UIController.cpp | 2 +- targets/app/linux/linux_game_stubs.cpp | 4 +- targets/app/src/BufferedImage.cpp | 2 +- targets/app/src/stubs.cpp | 2 +- .../Source Files/Windows64_Minecraft.cpp | 4 +- targets/app/windows/Windows64_App.cpp | 34 +- .../{Windows64_App.h => WindowsGame.h} | 7 +- targets/app/windows/XML/xmlFilesCallback.h | 6 +- targets/minecraft/client/Minecraft.cpp | 2 +- targets/minecraft/client/Options.cpp | 2 +- .../client/gui/CreateWorldScreen.cpp | 2 +- targets/minecraft/client/gui/Gui.cpp | 2 +- targets/minecraft/client/gui/PauseScreen.cpp | 2 +- targets/minecraft/client/gui/Screen.cpp | 2 +- .../client/gui/SelectWorldScreen.cpp | 2 +- .../gui/inventory/AbstractContainerScreen.cpp | 2 +- .../gui/inventory/BeaconPowerButton.cpp | 2 +- .../gui/inventory/CreativeInventoryScreen.cpp | 2 +- .../minecraft/client/model/HumanoidModel.cpp | 2 +- .../client/multiplayer/ClientConnection.cpp | 2 +- .../client/multiplayer/MultiPlayerLevel.cpp | 2 +- .../multiplayer/MultiPlayerLocalPlayer.cpp | 2 +- targets/minecraft/client/player/Input.cpp | 2 +- .../minecraft/client/player/LocalPlayer.cpp | 2 +- .../minecraft/client/player/RemotePlayer.cpp | 2 +- .../client/renderer/GameRenderer.cpp | 2 +- .../client/renderer/ItemInHandRenderer.cpp | 2 +- .../client/renderer/LevelRenderer.cpp | 2 +- .../minecraft/client/renderer/Tesselator.cpp | 2 +- .../minecraft/client/renderer/Textures.cpp | 2 +- .../entity/EntityRenderDispatcher.cpp | 2 +- .../renderer/entity/LivingEntityRenderer.cpp | 2 +- .../client/renderer/entity/PlayerRenderer.cpp | 2 +- .../texture/PreStitchedTextureMap.cpp | 2 +- .../client/renderer/texture/Stitcher.cpp | 2 +- .../client/renderer/texture/Texture.cpp | 2 +- .../renderer/texture/TextureManager.cpp | 2 +- .../client/renderer/texture/TextureMap.cpp | 2 +- .../renderer/tileentity/SignRenderer.cpp | 2 +- .../client/skins/AbstractTexturePack.cpp | 2 +- .../minecraft/client/skins/DLCTexturePack.cpp | 2 +- .../client/skins/DefaultTexturePack.h | 2 +- .../client/skins/TexturePackRepository.cpp | 2 +- .../minecraft/client/title/TitleScreen.cpp | 2 +- .../minecraft/commands/CommandDispatcher.cpp | 2 +- .../minecraft/core/ItemDispenseBehaviors.cpp | 2 +- .../packet/BlockRegionUpdatePacket.cpp | 2 +- .../network/packet/CustomPayloadPacket.cpp | 2 +- .../network/packet/GameCommandPacket.cpp | 2 +- .../minecraft/network/packet/LoginPacket.cpp | 2 +- targets/minecraft/network/packet/Packet.cpp | 2 +- .../network/packet/PreLoginPacket.cpp | 2 +- .../network/packet/RespawnPacket.cpp | 2 +- .../network/packet/SetPlayerTeamPacket.cpp | 2 +- targets/minecraft/server/MinecraftServer.cpp | 2 +- targets/minecraft/server/PlayerList.cpp | 2 +- .../minecraft/server/level/PlayerChunkMap.cpp | 2 +- .../server/level/ServerChunkCache.cpp | 2 +- .../minecraft/server/level/ServerLevel.cpp | 2 +- .../server/level/ServerLevelListener.cpp | 2 +- .../minecraft/server/level/ServerPlayer.cpp | 2 +- .../minecraft/server/level/TrackedEntity.cpp | 2 +- .../server/network/PendingConnection.cpp | 2 +- .../server/network/PlayerConnection.cpp | 2 +- .../server/network/ServerConnection.cpp | 2 +- targets/minecraft/stats/Stat.h | 2 +- targets/minecraft/stats/StatsCounter.cpp | 6 +- targets/minecraft/stdafx.h | 4 +- targets/minecraft/util/HtmlString.cpp | 2 +- targets/minecraft/world/CompoundContainer.cpp | 2 +- targets/minecraft/world/SimpleContainer.cpp | 2 +- .../world/effect/MobEffectInstance.cpp | 2 +- targets/minecraft/world/entity/Entity.cpp | 2 +- targets/minecraft/world/entity/EntityIO.cpp | 2 +- .../minecraft/world/entity/LivingEntity.cpp | 2 +- targets/minecraft/world/entity/Painting.cpp | 2 +- .../world/entity/SyncedEntityData.cpp | 2 +- .../ai/attributes/AttributeModifier.cpp | 2 +- .../world/entity/animal/EntityHorse.cpp | 2 +- .../minecraft/world/entity/animal/Ocelot.cpp | 2 +- .../entity/boss/enderdragon/EnderDragon.h | 2 +- .../world/entity/boss/wither/WitherBoss.h | 2 +- .../world/entity/item/ItemEntity.cpp | 2 +- .../world/entity/item/MinecartContainer.cpp | 2 +- .../world/entity/monster/EnderMan.cpp | 2 +- .../world/entity/monster/Monster.cpp | 2 +- .../world/entity/monster/PigZombie.cpp | 2 +- .../monster/SharedMonsterAttributes.cpp | 2 +- .../world/entity/monster/Silverfish.cpp | 2 +- .../minecraft/world/entity/monster/Spider.cpp | 2 +- .../minecraft/world/entity/npc/Villager.cpp | 2 +- .../world/entity/player/Inventory.cpp | 2 +- .../minecraft/world/entity/player/Player.cpp | 2 +- .../world/entity/projectile/Arrow.cpp | 2 +- .../world/entity/projectile/Fireball.cpp | 2 +- .../minecraft/world/inventory/AnvilMenu.cpp | 2 +- targets/minecraft/world/item/BucketItem.cpp | 2 +- targets/minecraft/world/item/EnderEyeItem.cpp | 2 +- .../world/item/FireworksChargeItem.cpp | 2 +- .../minecraft/world/item/FireworksItem.cpp | 2 +- .../world/item/HangingEntityItem.cpp | 2 +- targets/minecraft/world/item/Item.cpp | 2 +- .../minecraft/world/item/PlanterTileItem.cpp | 2 +- targets/minecraft/world/item/PotionItem.cpp | 2 +- targets/minecraft/world/item/SpawnEggItem.cpp | 2 +- targets/minecraft/world/item/TileItem.cpp | 2 +- .../minecraft/world/item/crafting/Recipes.cpp | 2 +- .../world/item/crafting/ShapedRecipy.cpp | 2 +- .../world/item/enchantment/Enchantment.cpp | 2 +- targets/minecraft/world/level/Explosion.cpp | 2 +- targets/minecraft/world/level/GameRules.cpp | 2 +- targets/minecraft/world/level/Level.cpp | 2 +- .../minecraft/world/level/PortalForcer.cpp | 2 +- .../world/level/biome/BiomeCache.cpp | 2 +- .../world/level/biome/BiomeDecorator.cpp | 2 +- .../world/level/biome/BiomeSource.cpp | 2 +- .../world/level/chunk/LevelChunk.cpp | 2 +- .../storage/ChunkStorageProfileDecorator.cpp | 2 +- .../chunk/storage/McRegionChunkStorage.cpp | 2 +- .../level/chunk/storage/OldChunkStorage.cpp | 2 +- .../world/level/dimension/Dimension.cpp | 2 +- .../world/level/dimension/HellDimension.cpp | 2 +- .../world/level/levelgen/CanyonFeature.cpp | 2 +- .../level/levelgen/CustomLevelSource.cpp | 2 +- .../world/level/levelgen/FlatLevelSource.cpp | 2 +- .../level/levelgen/HellFlatLevelSource.cpp | 2 +- .../level/levelgen/HellRandomLevelSource.cpp | 2 +- .../level/levelgen/RandomLevelSource.cpp | 2 +- .../levelgen/TheEndLevelRandomLevelSource.cpp | 2 +- .../levelgen/feature/BasicTreeFeature.cpp | 2 +- .../level/levelgen/feature/BirchFeature.cpp | 2 +- .../level/levelgen/feature/CaveFeature.cpp | 2 +- .../level/levelgen/feature/FlowerFeature.cpp | 2 +- .../level/levelgen/feature/LakeFeature.cpp | 2 +- .../levelgen/feature/MegaTreeFeature.cpp | 2 +- .../level/levelgen/feature/OreFeature.cpp | 2 +- .../level/levelgen/feature/PineFeature.cpp | 2 +- .../level/levelgen/feature/ReedsFeature.cpp | 2 +- .../level/levelgen/feature/SandFeature.cpp | 2 +- .../level/levelgen/feature/SpikeFeature.cpp | 2 +- .../level/levelgen/feature/SpringFeature.cpp | 2 +- .../level/levelgen/feature/SpruceFeature.cpp | 2 +- .../levelgen/feature/SwampTreeFeature.cpp | 2 +- .../level/levelgen/feature/TreeFeature.cpp | 2 +- .../levelgen/structure/MineShaftFeature.cpp | 2 +- .../structure/NetherBridgeFeature.cpp | 2 +- .../structure/RandomScatteredLargeFeature.cpp | 2 +- .../structure/ScatteredFeaturePieces.cpp | 2 +- .../levelgen/structure/StrongholdFeature.cpp | 2 +- .../levelgen/structure/StrongholdPieces.cpp | 2 +- .../levelgen/structure/StructureFeatureIO.cpp | 2 +- .../levelgen/structure/VillageFeature.cpp | 2 +- .../newbiome/layer/BiomeOverrideLayer.cpp | 2 +- .../world/level/newbiome/layer/Layer.cpp | 2 +- .../ConsoleSaveFileOriginal.cpp | 2 +- .../ConsoleSaveFileSplit.cpp | 2 +- .../storage/ConsoleSaveFileIO/FileHeader.cpp | 4 +- .../level/storage/DirectoryLevelStorage.cpp | 2 +- .../world/level/storage/LevelData.cpp | 2 +- .../level/storage/McRegionLevelStorage.cpp | 2 +- .../minecraft/world/level/tile/FireTile.cpp | 2 +- .../world/level/tile/NotGateTile.cpp | 2 +- .../world/level/tile/NoteBlockTile.cpp | 2 +- .../world/level/tile/StoneMonsterTile.cpp | 2 +- targets/minecraft/world/level/tile/Tile.cpp | 2 +- .../minecraft/world/level/tile/TntTile.cpp | 2 +- .../level/tile/entity/BeaconTileEntity.cpp | 2 +- .../tile/entity/BrewingStandTileEntity.cpp | 2 +- .../level/tile/entity/ChestTileEntity.cpp | 2 +- .../level/tile/entity/DispenserTileEntity.cpp | 2 +- .../level/tile/entity/DropperTileEntity.cpp | 2 +- .../entity/EnchantmentTableTileEntity.cpp | 2 +- .../level/tile/entity/FurnaceTileEntity.cpp | 2 +- .../level/tile/entity/HopperTileEntity.cpp | 2 +- .../level/tile/entity/TheEndPortalTile.cpp | 2 +- .../world/level/tile/entity/TileEntity.cpp | 2 +- 301 files changed, 718 insertions(+), 684 deletions(-) rename targets/app/common/{Consoles_App.cpp => Game.cpp} (94%) rename targets/app/common/{Consoles_App.h => Game.h} (97%) create mode 100644 targets/app/common/IPlatformGame.h rename targets/app/linux/{Linux_App.cpp => LinuxGame.cpp} (78%) create mode 100644 targets/app/linux/LinuxGame.h delete mode 100644 targets/app/linux/Linux_App.h rename targets/app/windows/{Windows64_App.h => WindowsGame.h} (91%) diff --git a/targets/app/common/Consoles_App.cpp b/targets/app/common/Game.cpp similarity index 94% rename from targets/app/common/Consoles_App.cpp rename to targets/app/common/Game.cpp index 4ea258f34..aeb8668bd 100644 --- a/targets/app/common/Consoles_App.cpp +++ b/targets/app/common/Game.cpp @@ -1,4 +1,4 @@ -#include "app/common/Consoles_App.h" +#include "app/common/Game.h" #include "platform/PlatformTypes.h" #include "platform/InputActions.h" @@ -18,7 +18,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/UIScene_FullscreenProgress.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" @@ -107,17 +107,17 @@ class Merchant; class ModelPart; class SignTileEntity; -// CMinecraftApp app; -unsigned int CMinecraftApp::m_uiLastSignInData = 0; +// Game app; +unsigned int Game::m_uiLastSignInData = 0; -const float CMinecraftApp::fSafeZoneX = 64.0f; // 5% of 1280 -const float CMinecraftApp::fSafeZoneY = 36.0f; // 5% of 720 +const float Game::fSafeZoneX = 64.0f; // 5% of 1280 +const float Game::fSafeZoneY = 36.0f; // 5% of 720 -int CMinecraftApp::s_iHTMLFontSizesA[eHTMLSize_COUNT] = { +int Game::s_iHTMLFontSizesA[eHTMLSize_COUNT] = { // 20,15,20,24 20, 13, 20, 26}; -CMinecraftApp::CMinecraftApp() { +Game::Game() { if (GAME_SETTINGS_PROFILE_DATA_BYTES != sizeof(GAME_SETTINGS)) { // 4J Stu - See comment for GAME_SETTINGS_PROFILE_DATA_BYTES in // Xbox_App.h @@ -242,7 +242,7 @@ CMinecraftApp::CMinecraftApp() { LocaleAndLanguageInit(); } -void CMinecraftApp::DebugPrintf(const char* szFormat, ...) { +void Game::DebugPrintf(const char* szFormat, ...) { #if !defined(_FINAL_BUILD) char buf[1024]; va_list ap; @@ -253,7 +253,7 @@ void CMinecraftApp::DebugPrintf(const char* szFormat, ...) { #endif } -void CMinecraftApp::DebugPrintf(int user, const char* szFormat, ...) { +void Game::DebugPrintf(int user, const char* szFormat, ...) { #if !defined(_FINAL_BUILD) if (user == USER_NONE) return; char buf[1024]; @@ -268,13 +268,13 @@ void CMinecraftApp::DebugPrintf(int user, const char* szFormat, ...) { #endif } -const wchar_t* CMinecraftApp::GetString(int iID) { +const wchar_t* Game::GetString(int iID) { // return L"Değişiklikler ve Yenilikler"; // return L"ÕÕÕÕÖÖÖÖ"; return app.m_stringTable->getString(iID); } -void CMinecraftApp::SetAction(int iPad, eXuiAction action, void* param) { +void Game::SetAction(int iPad, eXuiAction action, void* param) { if ((m_eXuiAction[iPad] == eAppAction_ReloadTexturePack) && (action == eAppAction_EthernetDisconnected)) { app.DebugPrintf( @@ -298,17 +298,17 @@ void CMinecraftApp::SetAction(int iPad, eXuiAction action, void* param) { } } -bool CMinecraftApp::IsAppPaused() { return m_bIsAppPaused; } +bool Game::IsAppPaused() { return m_bIsAppPaused; } -void CMinecraftApp::SetAppPaused(bool val) { m_bIsAppPaused = val; } +void Game::SetAppPaused(bool val) { m_bIsAppPaused = val; } -void CMinecraftApp::HandleButtonPresses() { +void Game::HandleButtonPresses() { for (int i = 0; i < 4; i++) { HandleButtonPresses(i); } } -void CMinecraftApp::HandleButtonPresses(int iPad) { +void Game::HandleButtonPresses(int iPad) { // // test an update of the profile data // void *pData=ProfileManager.GetGameDefinedProfileData(iPad); // @@ -322,7 +322,7 @@ void CMinecraftApp::HandleButtonPresses(int iPad) { // ProfileManager.WriteToProfile(iPad,true); } -bool CMinecraftApp::LoadInventoryMenu(int iPad, +bool Game::LoadInventoryMenu(int iPad, std::shared_ptr player, bool bNavigateBack) { bool success = true; @@ -343,7 +343,7 @@ bool CMinecraftApp::LoadInventoryMenu(int iPad, return success; } -bool CMinecraftApp::LoadCreativeMenu(int iPad, +bool Game::LoadCreativeMenu(int iPad, std::shared_ptr player, bool bNavigateBack) { bool success = true; @@ -364,7 +364,7 @@ bool CMinecraftApp::LoadCreativeMenu(int iPad, return success; } -bool CMinecraftApp::LoadCrafting2x2Menu(int iPad, +bool Game::LoadCrafting2x2Menu(int iPad, std::shared_ptr player) { bool success = true; @@ -387,7 +387,7 @@ bool CMinecraftApp::LoadCrafting2x2Menu(int iPad, return success; } -bool CMinecraftApp::LoadCrafting3x3Menu(int iPad, +bool Game::LoadCrafting3x3Menu(int iPad, std::shared_ptr player, int x, int y, int z) { bool success = true; @@ -411,7 +411,7 @@ bool CMinecraftApp::LoadCrafting3x3Menu(int iPad, return success; } -bool CMinecraftApp::LoadFireworksMenu(int iPad, +bool Game::LoadFireworksMenu(int iPad, std::shared_ptr player, int x, int y, int z) { bool success = true; @@ -434,7 +434,7 @@ bool CMinecraftApp::LoadFireworksMenu(int iPad, return success; } -bool CMinecraftApp::LoadEnchantingMenu(int iPad, +bool Game::LoadEnchantingMenu(int iPad, std::shared_ptr inventory, int x, int y, int z, Level* level, const std::wstring& name) { @@ -460,7 +460,7 @@ bool CMinecraftApp::LoadEnchantingMenu(int iPad, return success; } -bool CMinecraftApp::LoadFurnaceMenu( +bool Game::LoadFurnaceMenu( int iPad, std::shared_ptr inventory, std::shared_ptr furnace) { bool success = true; @@ -483,7 +483,7 @@ bool CMinecraftApp::LoadFurnaceMenu( return success; } -bool CMinecraftApp::LoadBrewingStandMenu( +bool Game::LoadBrewingStandMenu( int iPad, std::shared_ptr inventory, std::shared_ptr brewingStand) { bool success = true; @@ -506,7 +506,7 @@ bool CMinecraftApp::LoadBrewingStandMenu( return success; } -bool CMinecraftApp::LoadContainerMenu(int iPad, +bool Game::LoadContainerMenu(int iPad, std::shared_ptr inventory, std::shared_ptr container) { bool success = true; @@ -538,7 +538,7 @@ bool CMinecraftApp::LoadContainerMenu(int iPad, return success; } -bool CMinecraftApp::LoadTrapMenu(int iPad, std::shared_ptr inventory, +bool Game::LoadTrapMenu(int iPad, std::shared_ptr inventory, std::shared_ptr trap) { bool success = true; @@ -560,7 +560,7 @@ bool CMinecraftApp::LoadTrapMenu(int iPad, std::shared_ptr inventory, return success; } -bool CMinecraftApp::LoadSignEntryMenu(int iPad, +bool Game::LoadSignEntryMenu(int iPad, std::shared_ptr sign) { bool success = true; @@ -576,7 +576,7 @@ bool CMinecraftApp::LoadSignEntryMenu(int iPad, return success; } -bool CMinecraftApp::LoadRepairingMenu(int iPad, +bool Game::LoadRepairingMenu(int iPad, std::shared_ptr inventory, Level* level, int x, int y, int z) { bool success = true; @@ -598,7 +598,7 @@ bool CMinecraftApp::LoadRepairingMenu(int iPad, return success; } -bool CMinecraftApp::LoadTradingMenu(int iPad, +bool Game::LoadTradingMenu(int iPad, std::shared_ptr inventory, std::shared_ptr trader, Level* level, const std::wstring& name) { @@ -619,7 +619,7 @@ bool CMinecraftApp::LoadTradingMenu(int iPad, return success; } -bool CMinecraftApp::LoadHopperMenu(int iPad, +bool Game::LoadHopperMenu(int iPad, std::shared_ptr inventory, std::shared_ptr hopper) { bool success = true; @@ -638,7 +638,7 @@ bool CMinecraftApp::LoadHopperMenu(int iPad, return success; } -bool CMinecraftApp::LoadHopperMenu(int iPad, +bool Game::LoadHopperMenu(int iPad, std::shared_ptr inventory, std::shared_ptr hopper) { bool success = true; @@ -657,7 +657,7 @@ bool CMinecraftApp::LoadHopperMenu(int iPad, return success; } -bool CMinecraftApp::LoadHorseMenu(int iPad, +bool Game::LoadHorseMenu(int iPad, std::shared_ptr inventory, std::shared_ptr container, std::shared_ptr horse) { @@ -678,7 +678,7 @@ bool CMinecraftApp::LoadHorseMenu(int iPad, return success; } -bool CMinecraftApp::LoadBeaconMenu(int iPad, +bool Game::LoadBeaconMenu(int iPad, std::shared_ptr inventory, std::shared_ptr beacon) { bool success = true; @@ -700,7 +700,7 @@ bool CMinecraftApp::LoadBeaconMenu(int iPad, ////////////////////////////////////////////// // GAME SETTINGS ////////////////////////////////////////////// -void CMinecraftApp::InitGameSettings() { +void Game::InitGameSettings() { for (int i = 0; i < XUSER_MAX_COUNT; i++) { GameSettingsA[i] = (GAME_SETTINGS*)ProfileManager.GetGameDefinedProfileData(i); @@ -729,7 +729,7 @@ void CMinecraftApp::InitGameSettings() { } } -int CMinecraftApp::SetDefaultOptions(C_4JProfile::PROFILESETTINGS* pSettings, +int Game::SetDefaultOptions(C_4JProfile::PROFILESETTINGS* pSettings, const int iPad) { SetGameSettings(iPad, eGameSetting_MusicVolume, DEFAULT_VOLUME_LEVEL); SetGameSettings(iPad, eGameSetting_SoundFXVolume, DEFAULT_VOLUME_LEVEL); @@ -827,9 +827,9 @@ int CMinecraftApp::SetDefaultOptions(C_4JProfile::PROFILESETTINGS* pSettings, return 0; } -int CMinecraftApp::DefaultOptionsCallback( +int Game::DefaultOptionsCallback( void* pParam, C_4JProfile::PROFILESETTINGS* pSettings, const int iPad) { - CMinecraftApp* pApp = (CMinecraftApp*)pParam; + Game* pApp = (Game*)pParam; // flag the default options to be set @@ -845,7 +845,7 @@ int CMinecraftApp::DefaultOptionsCallback( return 0; } -int CMinecraftApp::OldProfileVersionCallback(void* pParam, +int Game::OldProfileVersionCallback(void* pParam, unsigned char* pucData, const unsigned short usVersion, const int iPad) { @@ -983,7 +983,7 @@ int CMinecraftApp::OldProfileVersionCallback(void* pParam, return 0; } -void CMinecraftApp::ApplyGameSettingsChanged(int iPad) { +void Game::ApplyGameSettingsChanged(int iPad) { ActionGameSettings(iPad, eGameSetting_MusicVolume); ActionGameSettings(iPad, eGameSetting_SoundFXVolume); ActionGameSettings(iPad, eGameSetting_Gamma); @@ -1016,7 +1016,7 @@ void CMinecraftApp::ApplyGameSettingsChanged(int iPad) { ActionGameSettings(iPad, eGameSetting_PS3_EULA_Read); } -void CMinecraftApp::ActionGameSettings(int iPad, eGameSetting eVal) { +void Game::ActionGameSettings(int iPad, eGameSetting eVal) { Minecraft* pMinecraft = Minecraft::GetInstance(); switch (eVal) { case eGameSetting_MusicVolume: @@ -1256,13 +1256,13 @@ void CMinecraftApp::ActionGameSettings(int iPad, eGameSetting eVal) { } } -void CMinecraftApp::SetPlayerSkin(int iPad, const std::wstring& name) { +void Game::SetPlayerSkin(int iPad, const std::wstring& name) { std::uint32_t skinId = app.getSkinIdFromPath(name); SetPlayerSkin(iPad, skinId); } -void CMinecraftApp::SetPlayerSkin(int iPad, std::uint32_t dwSkinId) { +void Game::SetPlayerSkin(int iPad, std::uint32_t dwSkinId) { DebugPrintf("Setting skin for %d to %08X\n", iPad, dwSkinId); GameSettingsA[iPad]->dwSelectedSkin = dwSkinId; @@ -1273,11 +1273,11 @@ void CMinecraftApp::SetPlayerSkin(int iPad, std::uint32_t dwSkinId) { dwSkinId); } -std::wstring CMinecraftApp::GetPlayerSkinName(int iPad) { +std::wstring Game::GetPlayerSkinName(int iPad) { return app.getSkinPathFromId(GameSettingsA[iPad]->dwSelectedSkin); } -std::uint32_t CMinecraftApp::GetPlayerSkinId(int iPad) { +std::uint32_t Game::GetPlayerSkinId(int iPad) { // 4J-PB -check the user has rights to use this skin - they may have had at // some point but the entitlement has been removed. DLCPack* Pack = nullptr; @@ -1312,17 +1312,17 @@ std::uint32_t CMinecraftApp::GetPlayerSkinId(int iPad) { return dwSkin; } -std::uint32_t CMinecraftApp::GetAdditionalModelParts(int iPad) { +std::uint32_t Game::GetAdditionalModelParts(int iPad) { return m_dwAdditionalModelParts[iPad]; } -void CMinecraftApp::SetPlayerCape(int iPad, const std::wstring& name) { +void Game::SetPlayerCape(int iPad, const std::wstring& name) { std::uint32_t capeId = Player::getCapeIdFromPath(name); SetPlayerCape(iPad, capeId); } -void CMinecraftApp::SetPlayerCape(int iPad, std::uint32_t dwCapeId) { +void Game::SetPlayerCape(int iPad, std::uint32_t dwCapeId) { DebugPrintf("Setting cape for %d to %08X\n", iPad, dwCapeId); GameSettingsA[iPad]->dwSelectedCape = dwCapeId; @@ -1336,15 +1336,15 @@ void CMinecraftApp::SetPlayerCape(int iPad, std::uint32_t dwCapeId) { dwCapeId); } -std::wstring CMinecraftApp::GetPlayerCapeName(int iPad) { +std::wstring Game::GetPlayerCapeName(int iPad) { return Player::getCapePathFromId(GameSettingsA[iPad]->dwSelectedCape); } -std::uint32_t CMinecraftApp::GetPlayerCapeId(int iPad) { +std::uint32_t Game::GetPlayerCapeId(int iPad) { return GameSettingsA[iPad]->dwSelectedCape; } -void CMinecraftApp::SetPlayerFavoriteSkin(int iPad, int iIndex, +void Game::SetPlayerFavoriteSkin(int iPad, int iIndex, unsigned int uiSkinID) { DebugPrintf("Setting favorite skin for %d to %08X\n", iPad, uiSkinID); @@ -1352,20 +1352,20 @@ void CMinecraftApp::SetPlayerFavoriteSkin(int iPad, int iIndex, GameSettingsA[iPad]->bSettingsChanged = true; } -unsigned int CMinecraftApp::GetPlayerFavoriteSkin(int iPad, int iIndex) { +unsigned int Game::GetPlayerFavoriteSkin(int iPad, int iIndex) { return GameSettingsA[iPad]->uiFavoriteSkinA[iIndex]; } -unsigned char CMinecraftApp::GetPlayerFavoriteSkinsPos(int iPad) { +unsigned char Game::GetPlayerFavoriteSkinsPos(int iPad) { return GameSettingsA[iPad]->ucCurrentFavoriteSkinPos; } -void CMinecraftApp::SetPlayerFavoriteSkinsPos(int iPad, int iPos) { +void Game::SetPlayerFavoriteSkinsPos(int iPad, int iPos) { GameSettingsA[iPad]->ucCurrentFavoriteSkinPos = (unsigned char)iPos; GameSettingsA[iPad]->bSettingsChanged = true; } -unsigned int CMinecraftApp::GetPlayerFavoriteSkinsCount(int iPad) { +unsigned int Game::GetPlayerFavoriteSkinsCount(int iPad) { unsigned int uiCount = 0; for (int i = 0; i < MAX_FAVORITE_SKINS; i++) { if (GameSettingsA[iPad]->uiFavoriteSkinA[i] != 0xFFFFFFFF) { @@ -1377,7 +1377,7 @@ unsigned int CMinecraftApp::GetPlayerFavoriteSkinsCount(int iPad) { return uiCount; } -void CMinecraftApp::ValidateFavoriteSkins(int iPad) { +void Game::ValidateFavoriteSkins(int iPad) { unsigned int uiCount = GetPlayerFavoriteSkinsCount(iPad); // remove invalid skins @@ -1413,27 +1413,27 @@ void CMinecraftApp::ValidateFavoriteSkins(int iPad) { } // Mash-up pack worlds -void CMinecraftApp::HideMashupPackWorld(int iPad, unsigned int iMashupPackID) { +void Game::HideMashupPackWorld(int iPad, unsigned int iMashupPackID) { unsigned int uiPackID = iMashupPackID - 1024; // mash-up ids start at 1024 GameSettingsA[iPad]->uiMashUpPackWorldsDisplay &= ~(1 << uiPackID); GameSettingsA[iPad]->bSettingsChanged = true; } -void CMinecraftApp::EnableMashupPackWorlds(int iPad) { +void Game::EnableMashupPackWorlds(int iPad) { GameSettingsA[iPad]->uiMashUpPackWorldsDisplay = 0xFFFFFFFF; GameSettingsA[iPad]->bSettingsChanged = true; } -unsigned int CMinecraftApp::GetMashupPackWorlds(int iPad) { +unsigned int Game::GetMashupPackWorlds(int iPad) { return GameSettingsA[iPad]->uiMashUpPackWorldsDisplay; } -void CMinecraftApp::SetMinecraftLanguage(int iPad, unsigned char ucLanguage) { +void Game::SetMinecraftLanguage(int iPad, unsigned char ucLanguage) { GameSettingsA[iPad]->ucLanguage = ucLanguage; GameSettingsA[iPad]->bSettingsChanged = true; } -unsigned char CMinecraftApp::GetMinecraftLanguage(int iPad) { +unsigned char Game::GetMinecraftLanguage(int iPad) { // if there are no game settings read yet, return the default language if (GameSettingsA[iPad] == nullptr) { return 0; @@ -1442,12 +1442,12 @@ unsigned char CMinecraftApp::GetMinecraftLanguage(int iPad) { } } -void CMinecraftApp::SetMinecraftLocale(int iPad, unsigned char ucLocale) { +void Game::SetMinecraftLocale(int iPad, unsigned char ucLocale) { GameSettingsA[iPad]->ucLocale = ucLocale; GameSettingsA[iPad]->bSettingsChanged = true; } -unsigned char CMinecraftApp::GetMinecraftLocale(int iPad) { +unsigned char Game::GetMinecraftLocale(int iPad) { // if there are no game settings read yet, return the default language if (GameSettingsA[iPad] == nullptr) { return 0; @@ -1456,7 +1456,7 @@ unsigned char CMinecraftApp::GetMinecraftLocale(int iPad) { } } -void CMinecraftApp::SetGameSettings(int iPad, eGameSetting eVal, +void Game::SetGameSettings(int iPad, eGameSetting eVal, unsigned char ucVal) { // Minecraft *pMinecraft=Minecraft::GetInstance(); @@ -1863,13 +1863,13 @@ void CMinecraftApp::SetGameSettings(int iPad, eGameSetting eVal, } } -unsigned char CMinecraftApp::GetGameSettings(eGameSetting eVal) { +unsigned char Game::GetGameSettings(eGameSetting eVal) { int iPad = ProfileManager.GetPrimaryPad(); return GetGameSettings(iPad, eVal); } -unsigned char CMinecraftApp::GetGameSettings(int iPad, eGameSetting eVal) { +unsigned char Game::GetGameSettings(int iPad, eGameSetting eVal) { switch (eVal) { case eGameSetting_MusicVolume: return GameSettingsA[iPad]->ucMusicVolume; @@ -2009,7 +2009,7 @@ unsigned char CMinecraftApp::GetGameSettings(int iPad, eGameSetting eVal) { return 0; } -void CMinecraftApp::CheckGameSettingsChanged(bool bOverride5MinuteTimer, +void Game::CheckGameSettingsChanged(bool bOverride5MinuteTimer, int iPad) { // If the settings have changed, write them to the profile @@ -2028,7 +2028,7 @@ void CMinecraftApp::CheckGameSettingsChanged(bool bOverride5MinuteTimer, } } -void CMinecraftApp::ClearGameSettingsChangedFlag(int iPad) { +void Game::ClearGameSettingsChangedFlag(int iPad) { GameSettingsA[iPad]->bSettingsChanged = false; } @@ -2038,20 +2038,20 @@ void CMinecraftApp::ClearGameSettingsChangedFlag(int iPad) { // //////////////////////////// #if !defined(_DEBUG_MENUS_ENABLED) -unsigned int CMinecraftApp::GetGameSettingsDebugMask( +unsigned int Game::GetGameSettingsDebugMask( int iPad, bool bOverridePlayer) // bOverridePlayer is to force the send for // the server to get the read options { return 0; } -void CMinecraftApp::SetGameSettingsDebugMask(int iPad, unsigned int uiVal) {} +void Game::SetGameSettingsDebugMask(int iPad, unsigned int uiVal) {} -void CMinecraftApp::ActionDebugMask(int iPad, bool bSetAllClear) {} +void Game::ActionDebugMask(int iPad, bool bSetAllClear) {} #else -unsigned int CMinecraftApp::GetGameSettingsDebugMask( +unsigned int Game::GetGameSettingsDebugMask( int iPad, bool bOverridePlayer) // bOverridePlayer is to force the send for // the server to get the read options { @@ -2070,7 +2070,7 @@ unsigned int CMinecraftApp::GetGameSettingsDebugMask( } } -void CMinecraftApp::SetGameSettingsDebugMask(int iPad, unsigned int uiVal) { +void Game::SetGameSettingsDebugMask(int iPad, unsigned int uiVal) { #if !defined(_CONTENT_PACKAGE) GameSettingsA[iPad]->bSettingsChanged = true; GameSettingsA[iPad]->uiDebugBitmask = uiVal; @@ -2086,7 +2086,7 @@ void CMinecraftApp::SetGameSettingsDebugMask(int iPad, unsigned int uiVal) { #endif } -void CMinecraftApp::ActionDebugMask(int iPad, bool bSetAllClear) { +void Game::ActionDebugMask(int iPad, bool bSetAllClear) { unsigned int ulBitmask = app.GetGameSettingsDebugMask(iPad); if (bSetAllClear) ulBitmask = 0L; @@ -2189,19 +2189,19 @@ void CMinecraftApp::ActionDebugMask(int iPad, bool bSetAllClear) { } #endif -int CMinecraftApp::displaySavingMessage(C4JStorage::ESavingMessage eVal, +int Game::displaySavingMessage(C4JStorage::ESavingMessage eVal, int iPad) { ui.ShowSavingMessage(iPad, eVal); return 0; } -void CMinecraftApp::SetActionConfirmed(void* param) { +void Game::SetActionConfirmed(void* param) { XuiActionParam* actionInfo = (XuiActionParam*)param; app.SetAction(actionInfo->iPad, actionInfo->action); } -void CMinecraftApp::HandleXuiActions(void) { +void Game::HandleXuiActions(void) { eXuiAction eAction; eTMSAction eTMS; void* param; @@ -2860,7 +2860,7 @@ void CMinecraftApp::HandleXuiActions(void) { // // ui.RequestMessageBox(IDS_RETURNEDTOMENU_TITLE, // IDS_RETURNEDTOTITLESCREEN_TEXT, uiIDA, 1, - // i,&CMinecraftApp::PrimaryPlayerSignedOutReturned,this,app.GetStringTable()); + // i,&Game::PrimaryPlayerSignedOutReturned,this,app.GetStringTable()); if (g_NetworkManager.IsInSession()) { app.SetAction( i, eAppAction_PrimaryPlayerSignedOutReturned); @@ -2947,7 +2947,7 @@ void CMinecraftApp::HandleXuiActions(void) { g_NetworkManager.CorrectErrorIDS( IDS_CONNECTION_LOST_LIVE), uiIDA, 1, i, - &CMinecraftApp:: + &Game:: EthernetDisconnectReturned, this); } else { @@ -2975,7 +2975,7 @@ void CMinecraftApp::HandleXuiActions(void) { g_NetworkManager.CorrectErrorIDS( IDS_CONNECTION_LOST_LIVE), uiIDA, 1, i, - &CMinecraftApp::EthernetDisconnectReturned, + &Game::EthernetDisconnectReturned, this); } } @@ -3027,7 +3027,7 @@ void CMinecraftApp::HandleXuiActions(void) { LoadingInputParams* loadingParams = new LoadingInputParams(); loadingParams->func = - &CMinecraftApp::SignoutExitWorldThreadProc; + &Game::SignoutExitWorldThreadProc; UIFullscreenProgressCompletionData* completionData = new UIFullscreenProgressCompletionData(); @@ -3077,7 +3077,7 @@ void CMinecraftApp::HandleXuiActions(void) { ui.RequestErrorMessage( IDS_TRIALOVER_TITLE, IDS_TRIALOVER_TEXT, uiIDA, 2, i, - &CMinecraftApp::TrialOverReturned, this); + &Game::TrialOverReturned, this); } break; // INVITES @@ -3089,7 +3089,7 @@ void CMinecraftApp::HandleXuiActions(void) { ui.RequestErrorMessage( IDS_UNLOCK_TITLE, IDS_UNLOCK_ACCEPT_INVITE, uiIDA, 2, i, - &CMinecraftApp::UnlockFullInviteReturned, this); + &Game::UnlockFullInviteReturned, this); } break; case eAppAction_ExitAndJoinFromInvite: { unsigned int uiIDA[3]; @@ -3107,7 +3107,7 @@ void CMinecraftApp::HandleXuiActions(void) { ui.RequestAlertMessage( IDS_EXIT_GAME, IDS_CONFIRM_LEAVE_VIA_INVITE, uiIDA, 3, i, - &CMinecraftApp:: + &Game:: ExitAndJoinFromInviteSaveDialogReturned, this); } else { @@ -3115,7 +3115,7 @@ void CMinecraftApp::HandleXuiActions(void) { uiIDA[1] = IDS_CONFIRM_OK; ui.RequestAlertMessage( IDS_EXIT_GAME, IDS_CONFIRM_LEAVE_VIA_INVITE, uiIDA, - 2, i, &CMinecraftApp::ExitAndJoinFromInvite, this); + 2, i, &Game::ExitAndJoinFromInvite, this); } } break; case eAppAction_ExitAndJoinFromInviteConfirmed: { @@ -3350,7 +3350,7 @@ void CMinecraftApp::HandleXuiActions(void) { LoadingInputParams* loadingParams = new LoadingInputParams(); - loadingParams->func = &CMinecraftApp::RemoteSaveThreadProc; + loadingParams->func = &Game::RemoteSaveThreadProc; loadingParams->lpParam = nullptr; UIFullscreenProgressCompletionData* completionData = @@ -3371,7 +3371,7 @@ void CMinecraftApp::HandleXuiActions(void) { loadingParams->completionData = completionData; loadingParams->cancelFunc = - &CMinecraftApp::ExitGameFromRemoteSave; + &Game::ExitGameFromRemoteSave; loadingParams->cancelText = IDS_TOOLTIPS_EXIT; ui.NavigateToScene(ProfileManager.GetPrimaryPad(), @@ -3446,7 +3446,7 @@ void CMinecraftApp::HandleXuiActions(void) { ui.RequestErrorMessage( IDS_BANNED_LEVEL_TITLE, IDS_PLAYER_BANNED_LEVEL, uiIDA, 2, i, - &CMinecraftApp::BannedLevelDialogReturned, this, + &Game::BannedLevelDialogReturned, this, wchFormat); if (result != C4JStorage::EMessage_Busy) SetAction(i, eAppAction_Idle); @@ -3516,7 +3516,7 @@ void CMinecraftApp::HandleXuiActions(void) { IDS_DLC_TEXTUREPACK_NOT_PRESENT_TITLE, IDS_DLC_TEXTUREPACK_NOT_PRESENT, uiIDA, 2, ProfileManager.GetPrimaryPad(), - &CMinecraftApp::TexturePackDialogReturned, this); + &Game::TexturePackDialogReturned, this); SetAction(i, eAppAction_Idle); } @@ -3622,9 +3622,9 @@ void CMinecraftApp::HandleXuiActions(void) { } } -int CMinecraftApp::BannedLevelDialogReturned( +int Game::BannedLevelDialogReturned( void* pParam, int iPad, const C4JStorage::EMessageResult result) { - CMinecraftApp* pApp = (CMinecraftApp*)pParam; + Game* pApp = (Game*)pParam; // Minecraft *pMinecraft=Minecraft::GetInstance(); if (result == C4JStorage::EMessage_ResultAccept) { @@ -3638,7 +3638,7 @@ int CMinecraftApp::BannedLevelDialogReturned( return 0; } -void CMinecraftApp::loadMediaArchive() { +void Game::loadMediaArchive() { std::wstring mediapath = L""; #if _WINDOWS64 @@ -3663,7 +3663,7 @@ void CMinecraftApp::loadMediaArchive() { } } -void CMinecraftApp::loadStringTable() { +void Game::loadStringTable() { if (m_stringTable != nullptr) { // we need to unload the current std::string table, this is a reload delete m_stringTable; @@ -3680,9 +3680,9 @@ void CMinecraftApp::loadStringTable() { } } -int CMinecraftApp::PrimaryPlayerSignedOutReturned( +int Game::PrimaryPlayerSignedOutReturned( void* pParam, int iPad, const C4JStorage::EMessageResult) { - // CMinecraftApp* pApp = (CMinecraftApp*)pParam; + // Game* pApp = (Game*)pParam; // Minecraft *pMinecraft=Minecraft::GetInstance(); // if the player is null, we're in the menus @@ -3699,9 +3699,9 @@ int CMinecraftApp::PrimaryPlayerSignedOutReturned( return 0; } -int CMinecraftApp::EthernetDisconnectReturned( +int Game::EthernetDisconnectReturned( void* pParam, int iPad, const C4JStorage::EMessageResult) { - // CMinecraftApp* pApp = (CMinecraftApp*)pParam; + // Game* pApp = (Game*)pParam; Minecraft* pMinecraft = Minecraft::GetInstance(); // if the player is null, we're in the menus @@ -3716,7 +3716,7 @@ int CMinecraftApp::EthernetDisconnectReturned( return 0; } -int CMinecraftApp::SignoutExitWorldThreadProc(void* lpParameter) { +int Game::SignoutExitWorldThreadProc(void* lpParameter) { // Share AABB & Vec3 pools with default (main thread) - should be ok as long // as we don't tick the main thread whilst this thread is running Compression::UseDefaultThreadStorage(); @@ -3829,9 +3829,9 @@ int CMinecraftApp::SignoutExitWorldThreadProc(void* lpParameter) { return 0; } -int CMinecraftApp::UnlockFullInviteReturned(void* pParam, int iPad, +int Game::UnlockFullInviteReturned(void* pParam, int iPad, C4JStorage::EMessageResult result) { - // CMinecraftApp* pApp = (CMinecraftApp*)pParam; + // Game* pApp = (Game*)pParam; Minecraft* pMinecraft = Minecraft::GetInstance(); bool bNoPlayer; @@ -3846,14 +3846,14 @@ int CMinecraftApp::UnlockFullInviteReturned(void* pParam, int iPad, return 0; } -int CMinecraftApp::UnlockFullSaveReturned(void* pParam, int iPad, +int Game::UnlockFullSaveReturned(void* pParam, int iPad, C4JStorage::EMessageResult result) { return 0; } -int CMinecraftApp::UnlockFullExitReturned(void* pParam, int iPad, +int Game::UnlockFullExitReturned(void* pParam, int iPad, C4JStorage::EMessageResult result) { - CMinecraftApp* pApp = (CMinecraftApp*)pParam; + Game* pApp = (Game*)pParam; Minecraft* pMinecraft = Minecraft::GetInstance(); if (result != C4JStorage::EMessage_ResultAccept) { @@ -3864,9 +3864,9 @@ int CMinecraftApp::UnlockFullExitReturned(void* pParam, int iPad, return 0; } -int CMinecraftApp::TrialOverReturned(void* pParam, int iPad, +int Game::TrialOverReturned(void* pParam, int iPad, C4JStorage::EMessageResult result) { - CMinecraftApp* pApp = (CMinecraftApp*)pParam; + Game* pApp = (Game*)pParam; Minecraft* pMinecraft = Minecraft::GetInstance(); if (result != C4JStorage::EMessage_ResultAccept) { @@ -3876,13 +3876,13 @@ int CMinecraftApp::TrialOverReturned(void* pParam, int iPad, return 0; } -void CMinecraftApp::ProfileReadErrorCallback(void* pParam) { - CMinecraftApp* pApp = (CMinecraftApp*)pParam; +void Game::ProfileReadErrorCallback(void* pParam) { + Game* pApp = (Game*)pParam; int iPrimaryPlayer = ProfileManager.GetPrimaryPad(); pApp->SetAction(iPrimaryPlayer, eAppAction_ProfileReadError); } -void CMinecraftApp::ClearSignInChangeUsersMask() { +void Game::ClearSignInChangeUsersMask() { // 4J-PB - When in the main menu, the user is on pad 0, and any change they // make to their profile will be to pad 0 data If they then go in as a // secondary player to a splitscreen game, their profile will not be read @@ -3901,10 +3901,10 @@ void CMinecraftApp::ClearSignInChangeUsersMask() { } } } -void CMinecraftApp::SignInChangeCallback(void* pParam, +void Game::SignInChangeCallback(void* pParam, bool bPrimaryPlayerChanged, unsigned int uiSignInData) { - CMinecraftApp* pApp = (CMinecraftApp*)pParam; + Game* pApp = (Game*)pParam; // check if the primary player signed out int iPrimaryPlayer = ProfileManager.GetPrimaryPad(); @@ -4075,10 +4075,10 @@ void CMinecraftApp::SignInChangeCallback(void* pParam, } } -void CMinecraftApp::NotificationsCallback(void* pParam, +void Game::NotificationsCallback(void* pParam, std::uint32_t dwNotification, unsigned int uiParam) { - CMinecraftApp* pClass = (CMinecraftApp*)pParam; + Game* pClass = (Game*)pParam; // push these on to the notifications to be handled in qnet's dowork @@ -4123,14 +4123,14 @@ void CMinecraftApp::NotificationsCallback(void* pParam, } #if defined(_DEBUG_MENUS_ENABLED) -bool CMinecraftApp::DebugArtToolsOn() { +bool Game::DebugArtToolsOn() { return DebugSettingsOn() && (GetGameSettingsDebugMask(ProfileManager.GetPrimaryPad()) & (1L << eDebugSetting_ArtTools)) != 0; } #endif -void CMinecraftApp::SetDebugSequence(const char* pchSeq) { +void Game::SetDebugSequence(const char* pchSeq) { InputManager.SetDebugSequence(pchSeq, [this]() -> int { // printf("sequence matched\n"); m_bDebugOptions = !m_bDebugOptions; @@ -4148,7 +4148,7 @@ void CMinecraftApp::SetDebugSequence(const char* pchSeq) { }); } -int CMinecraftApp::GetLocalPlayerCount(void) { +int Game::GetLocalPlayerCount(void) { int iPlayerC = 0; Minecraft* pMinecraft = Minecraft::GetInstance(); for (int i = 0; i < XUSER_MAX_COUNT; i++) { @@ -4160,7 +4160,7 @@ int CMinecraftApp::GetLocalPlayerCount(void) { return iPlayerC; } -int CMinecraftApp::MarketplaceCountsCallback( +int Game::MarketplaceCountsCallback( void* pParam, C4JStorage::DLC_TMS_DETAILS* pTMSDetails, int iPad) { app.DebugPrintf("Marketplace Counts= New - %d Total - %d\n", pTMSDetails->dwNewOffers, pTMSDetails->dwTotalOffers); @@ -4176,8 +4176,8 @@ int CMinecraftApp::MarketplaceCountsCallback( return 0; } -bool CMinecraftApp::StartInstallDLCProcess(int iPad) { - app.DebugPrintf("--- CMinecraftApp::StartInstallDLCProcess: pad=%i.\n", +bool Game::StartInstallDLCProcess(int iPad) { + app.DebugPrintf("--- Game::StartInstallDLCProcess: pad=%i.\n", iPad); // If there is already a call to this in progress, then do nothing @@ -4191,7 +4191,7 @@ bool CMinecraftApp::StartInstallDLCProcess(int iPad) { m_iTotalDLC = 0; m_iTotalDLCInstalled = 0; app.DebugPrintf( - "--- CMinecraftApp::StartInstallDLCProcess - " + "--- Game::StartInstallDLCProcess - " "StorageManager.GetInstalledDLC\n"); StorageManager.GetInstalledDLC( @@ -4201,24 +4201,24 @@ bool CMinecraftApp::StartInstallDLCProcess(int iPad) { return true; } else { app.DebugPrintf( - "--- CMinecraftApp::StartInstallDLCProcess - nothing to do\n"); + "--- Game::StartInstallDLCProcess - nothing to do\n"); return false; } } // Installed DLC callback -int CMinecraftApp::dlcInstalledCallback(int iInstalledC, int iPad) { +int Game::dlcInstalledCallback(int iInstalledC, int iPad) { DebugPrintf( - "--- CMinecraftApp::dlcInstalledCallback: totalDLC=%i, pad=%i.\n", + "--- Game::dlcInstalledCallback: totalDLC=%i, pad=%i.\n", iInstalledC, iPad); m_iTotalDLC = iInstalledC; MountNextDLC(iPad); return 0; } -void CMinecraftApp::MountNextDLC(int iPad) { - app.DebugPrintf("--- CMinecraftApp::MountNextDLC: pad=%i.\n", iPad); +void Game::MountNextDLC(int iPad) { + app.DebugPrintf("--- Game::MountNextDLC: pad=%i.\n", iPad); if (m_iTotalDLCInstalled < m_iTotalDLC) { // Mount it // We also need to match the ones the user wants to mount with the @@ -4262,10 +4262,10 @@ void CMinecraftApp::MountNextDLC(int iPad) { #define CONTENT_DATA_DISPLAY_NAME(a) (a.wszDisplayName) #endif -int CMinecraftApp::dlcMountedCallback(int iPad, std::uint32_t dwErr, +int Game::dlcMountedCallback(int iPad, std::uint32_t dwErr, std::uint32_t dwLicenceMask) { #if defined(_WINDOWS64) - DebugPrintf("--- CMinecraftApp::dlcMountedCallback\n"); + DebugPrintf("--- Game::dlcMountedCallback\n"); if (dwErr != ERROR_SUCCESS) { // corrupt DLC @@ -4326,7 +4326,7 @@ int CMinecraftApp::dlcMountedCallback(int iPad, std::uint32_t dwErr, } #undef CONTENT_DATA_DISPLAY_NAME -// void CMinecraftApp::InstallDefaultCape() +// void Game::InstallDefaultCape() // { // if(!m_bDefaultCapeInstallAttempted) // { @@ -4354,7 +4354,7 @@ int CMinecraftApp::dlcMountedCallback(int iPad, std::uint32_t dwErr, // } // } -void CMinecraftApp::HandleDLC(DLCPack* pack) { +void Game::HandleDLC(DLCPack* pack) { unsigned int dwFilesProcessed = 0; #if defined(_WINDOWS64) || defined(__linux__) std::vector dlcFilenames; @@ -4367,7 +4367,7 @@ void CMinecraftApp::HandleDLC(DLCPack* pack) { if (dwFilesProcessed == 0) m_dlcManager.removePack(pack); } -// int CMinecraftApp::DLCReadCallback(void* +// int Game::DLCReadCallback(void* // pParam,C4JStorage::DLC_FILE_DETAILS *pDLCData) // { // @@ -4379,7 +4379,7 @@ void CMinecraftApp::HandleDLC(DLCPack* pack) { // Name: InitTime() // Desc: Initializes the timer variables //------------------------------------------------------------------------------------- -void CMinecraftApp::InitTime() { +void Game::InitTime() { // Save the start time m_Time.qwTime = time_util::clock::now(); @@ -4393,7 +4393,7 @@ void CMinecraftApp::InitTime() { // Name: UpdateTime() // Desc: Updates the elapsed time since our last frame. //------------------------------------------------------------------------------------- -void CMinecraftApp::UpdateTime() { +void Game::UpdateTime() { auto qwNewTime = time_util::clock::now(); auto qwDeltaTime = qwNewTime - m_Time.qwTime; @@ -4404,14 +4404,14 @@ void CMinecraftApp::UpdateTime() { m_Time.fAppTime = std::chrono::duration(m_Time.qwAppTime).count(); } -bool CMinecraftApp::isXuidNotch(PlayerUID xuid) { +bool Game::isXuidNotch(PlayerUID xuid) { if (m_xuidNotch != INVALID_XUID && xuid != INVALID_XUID) { return ProfileManager.AreXUIDSEqual(xuid, m_xuidNotch); } return false; } -bool CMinecraftApp::isXuidDeadmau5(PlayerUID xuid) { +bool Game::isXuidDeadmau5(PlayerUID xuid) { auto it = MojangData.find(xuid); // 4J Stu - The .at and [] accessors // insert elements if they don't exist if (it != MojangData.end()) { @@ -4424,7 +4424,7 @@ bool CMinecraftApp::isXuidDeadmau5(PlayerUID xuid) { return false; } -void CMinecraftApp::AddMemoryTextureFile(const std::wstring& wName, +void Game::AddMemoryTextureFile(const std::wstring& wName, std::uint8_t* pbData, unsigned int byteCount) { std::lock_guard lock(csMemFilesLock); @@ -4463,7 +4463,7 @@ void CMinecraftApp::AddMemoryTextureFile(const std::wstring& wName, m_MEM_Files[wName] = pData; } -void CMinecraftApp::RemoveMemoryTextureFile(const std::wstring& wName) { +void Game::RemoveMemoryTextureFile(const std::wstring& wName) { std::lock_guard lock(csMemFilesLock); auto it = m_MEM_Files.find(wName); @@ -4485,7 +4485,7 @@ void CMinecraftApp::RemoveMemoryTextureFile(const std::wstring& wName) { } } -bool CMinecraftApp::DefaultCapeExists() { +bool Game::DefaultCapeExists() { std::wstring wTex = L"Special_Cape.png"; bool val = false; @@ -4498,7 +4498,7 @@ bool CMinecraftApp::DefaultCapeExists() { return val; } -bool CMinecraftApp::IsFileInMemoryTextures(const std::wstring& wName) { +bool Game::IsFileInMemoryTextures(const std::wstring& wName) { bool val = false; { @@ -4510,7 +4510,7 @@ bool CMinecraftApp::IsFileInMemoryTextures(const std::wstring& wName) { return val; } -void CMinecraftApp::GetMemFileDetails(const std::wstring& wName, +void Game::GetMemFileDetails(const std::wstring& wName, std::uint8_t** ppbData, unsigned int* pByteCount) { std::lock_guard lock(csMemFilesLock); @@ -4522,7 +4522,7 @@ void CMinecraftApp::GetMemFileDetails(const std::wstring& wName, } } -void CMinecraftApp::AddMemoryTPDFile(int iConfig, std::uint8_t* pbData, +void Game::AddMemoryTPDFile(int iConfig, std::uint8_t* pbData, unsigned int byteCount) { std::lock_guard lock(csMemTPDLock); // check it's not already in @@ -4538,7 +4538,7 @@ void CMinecraftApp::AddMemoryTPDFile(int iConfig, std::uint8_t* pbData, } } -void CMinecraftApp::RemoveMemoryTPDFile(int iConfig) { +void Game::RemoveMemoryTPDFile(int iConfig) { std::lock_guard lock(csMemTPDLock); // check it's not already in PMEMDATA pData = nullptr; @@ -4551,9 +4551,9 @@ void CMinecraftApp::RemoveMemoryTPDFile(int iConfig) { } #if defined(_WINDOWS64) -int CMinecraftApp::GetTPConfigVal(wchar_t* pwchDataFile) { return -1; } +int Game::GetTPConfigVal(wchar_t* pwchDataFile) { return -1; } #endif -bool CMinecraftApp::IsFileInTPD(int iConfig) { +bool Game::IsFileInTPD(int iConfig) { bool val = false; { @@ -4565,7 +4565,7 @@ bool CMinecraftApp::IsFileInTPD(int iConfig) { return val; } -void CMinecraftApp::GetTPD(int iConfig, std::uint8_t** ppbData, +void Game::GetTPD(int iConfig, std::uint8_t** ppbData, unsigned int* pByteCount) { std::lock_guard lock(csMemTPDLock); auto it = m_MEM_TPD.find(iConfig); @@ -4576,7 +4576,7 @@ void CMinecraftApp::GetTPD(int iConfig, std::uint8_t** ppbData, } } -// bool CMinecraftApp::UploadFileToGlobalStorage(int iQuadrant, +// bool Game::UploadFileToGlobalStorage(int iQuadrant, // C4JStorage::eGlobalStorage eStorageFacility, std::wstring *wsFile ) // { // bool bRes=false; @@ -4601,13 +4601,13 @@ void CMinecraftApp::GetTPD(int iConfig, std::uint8_t** ppbData, // return bRes; // } -void CMinecraftApp::StoreLaunchData() {} +void Game::StoreLaunchData() {} -void CMinecraftApp::ExitGame() {} +void Game::ExitGame() {} // Invites -void CMinecraftApp::ProcessInvite(std::uint32_t dwUserIndex, +void Game::ProcessInvite(std::uint32_t dwUserIndex, std::uint32_t dwLocalUsersMask, const INVITE_INFO* pInviteInfo) { m_InviteData.dwUserIndex = dwUserIndex; @@ -4617,9 +4617,9 @@ void CMinecraftApp::ProcessInvite(std::uint32_t dwUserIndex, SetAction(dwUserIndex, eAppAction_ExitAndJoinFromInvite); } -int CMinecraftApp::ExitAndJoinFromInvite(void* pParam, int iPad, +int Game::ExitAndJoinFromInvite(void* pParam, int iPad, C4JStorage::EMessageResult result) { - CMinecraftApp* pApp = (CMinecraftApp*)pParam; + Game* pApp = (Game*)pParam; // Minecraft *pMinecraft=Minecraft::GetInstance(); // buttons are swapped on this menu @@ -4630,9 +4630,9 @@ int CMinecraftApp::ExitAndJoinFromInvite(void* pParam, int iPad, return 0; } -int CMinecraftApp::ExitAndJoinFromInviteSaveDialogReturned( +int Game::ExitAndJoinFromInviteSaveDialogReturned( void* pParam, int iPad, C4JStorage::EMessageResult result) { - CMinecraftApp* pClass = (CMinecraftApp*)pParam; + Game* pClass = (Game*)pParam; // Exit with or without saving // Decline means save in this dialog if (result == C4JStorage::EMessage_ResultDecline || @@ -4661,7 +4661,7 @@ int CMinecraftApp::ExitAndJoinFromInviteSaveDialogReturned( ui.RequestErrorMessage( IDS_WARNING_DLC_TRIALTEXTUREPACK_TITLE, IDS_WARNING_DLC_TRIALTEXTUREPACK_TEXT, uiIDA, 2, iPad, - &CMinecraftApp::WarningTrialTexturePackReturned, + &Game::WarningTrialTexturePackReturned, pClass); return 0; @@ -4680,7 +4680,7 @@ int CMinecraftApp::ExitAndJoinFromInviteSaveDialogReturned( ui.RequestErrorMessage( IDS_TITLE_SAVE_GAME, IDS_CONFIRM_SAVE_GAME, uiIDA, 2, ProfileManager.GetPrimaryPad(), - &CMinecraftApp::ExitAndJoinFromInviteAndSaveReturned, + &Game::ExitAndJoinFromInviteAndSaveReturned, pClass); return 0; } else { @@ -4694,7 +4694,7 @@ int CMinecraftApp::ExitAndJoinFromInviteSaveDialogReturned( ui.RequestErrorMessage( IDS_TITLE_DECLINE_SAVE_GAME, IDS_CONFIRM_DECLINE_SAVE_GAME, uiIDA, 2, ProfileManager.GetPrimaryPad(), - &CMinecraftApp::ExitAndJoinFromInviteDeclineSaveReturned, + &Game::ExitAndJoinFromInviteDeclineSaveReturned, pClass); return 0; } @@ -4705,7 +4705,7 @@ int CMinecraftApp::ExitAndJoinFromInviteSaveDialogReturned( return 0; } -int CMinecraftApp::WarningTrialTexturePackReturned( +int Game::WarningTrialTexturePackReturned( void* pParam, int iPad, C4JStorage::EMessageResult result) { // 4J Stu - I added this in when fixing an X1 bug. We should probably add // this as well but I don't have time to test all platforms atm @@ -4713,9 +4713,9 @@ int CMinecraftApp::WarningTrialTexturePackReturned( return 0; } -int CMinecraftApp::ExitAndJoinFromInviteAndSaveReturned( +int Game::ExitAndJoinFromInviteAndSaveReturned( void* pParam, int iPad, C4JStorage::EMessageResult result) { - // CMinecraftApp* pClass = (CMinecraftApp*)pParam; + // Game* pClass = (Game*)pParam; // results switched for this dialog if (result == C4JStorage::EMessage_ResultDecline) { @@ -4742,7 +4742,7 @@ int CMinecraftApp::ExitAndJoinFromInviteAndSaveReturned( ui.RequestErrorMessage( IDS_WARNING_DLC_TRIALTEXTUREPACK_TITLE, IDS_WARNING_DLC_TRIALTEXTUREPACK_TEXT, uiIDA, 2, iPad, - &CMinecraftApp::WarningTrialTexturePackReturned, nullptr); + &Game::WarningTrialTexturePackReturned, nullptr); return 0; } @@ -4758,7 +4758,7 @@ int CMinecraftApp::ExitAndJoinFromInviteAndSaveReturned( return 0; } -int CMinecraftApp::ExitAndJoinFromInviteDeclineSaveReturned( +int Game::ExitAndJoinFromInviteDeclineSaveReturned( void* pParam, int iPad, C4JStorage::EMessageResult result) { // results switched for this dialog if (result == C4JStorage::EMessage_ResultDecline) { @@ -4778,9 +4778,9 @@ int CMinecraftApp::ExitAndJoinFromInviteDeclineSaveReturned( // We have to assume that we've not been able to load the text for the game. // ////////////////////////////////////////////////////////////////////////// -void CMinecraftApp::FatalLoadError() {} +void Game::FatalLoadError() {} -TIPSTRUCT CMinecraftApp::m_GameTipA[MAX_TIPS_GAMETIP] = { +TIPSTRUCT Game::m_GameTipA[MAX_TIPS_GAMETIP] = { {0, IDS_TIPS_GAMETIP_1}, {0, IDS_TIPS_GAMETIP_2}, {0, IDS_TIPS_GAMETIP_3}, {0, IDS_TIPS_GAMETIP_4}, {0, IDS_TIPS_GAMETIP_5}, {0, IDS_TIPS_GAMETIP_6}, @@ -4808,7 +4808,7 @@ TIPSTRUCT CMinecraftApp::m_GameTipA[MAX_TIPS_GAMETIP] = { {0, IDS_TIPS_GAMETIP_49}, {0, IDS_TIPS_GAMETIP_50}, }; -TIPSTRUCT CMinecraftApp::m_TriviaTipA[MAX_TIPS_TRIVIATIP] = { +TIPSTRUCT Game::m_TriviaTipA[MAX_TIPS_TRIVIATIP] = { {0, IDS_TIPS_TRIVIA_1}, {0, IDS_TIPS_TRIVIA_2}, {0, IDS_TIPS_TRIVIA_3}, {0, IDS_TIPS_TRIVIA_4}, {0, IDS_TIPS_TRIVIA_5}, {0, IDS_TIPS_TRIVIA_6}, {0, IDS_TIPS_TRIVIA_7}, {0, IDS_TIPS_TRIVIA_8}, {0, IDS_TIPS_TRIVIA_9}, @@ -4818,9 +4818,9 @@ TIPSTRUCT CMinecraftApp::m_TriviaTipA[MAX_TIPS_TRIVIATIP] = { {0, IDS_TIPS_TRIVIA_19}, {0, IDS_TIPS_TRIVIA_20}, }; -Random* CMinecraftApp::TipRandom = new Random(); +Random* Game::TipRandom = new Random(); -int CMinecraftApp::TipsSortFunction(const void* a, const void* b) { +int Game::TipsSortFunction(const void* a, const void* b) { // 4jcraft, scince the sortvalues can be negative, i changed it // to a three way comparison, // scince subtracting of signed integers can cause overflow. @@ -4838,7 +4838,7 @@ int CMinecraftApp::TipsSortFunction(const void* a, const void* b) { return -1; } -void CMinecraftApp::InitialiseTips() { +void Game::InitialiseTips() { // We'll randomise the tips at start up based on their priority memset(m_TipIDA, 0, sizeof(m_TipIDA)); @@ -4896,7 +4896,7 @@ void CMinecraftApp::InitialiseTips() { m_uiCurrentTip = 0; } -int CMinecraftApp::GetNextTip() { +int Game::GetNextTip() { static bool bShowSkinDLCTip = true; if (app.GetNewDLCAvailable() && app.DisplayNewDLCTip()) { return IDS_TIPS_GAMETIP_NEWDLC; @@ -4920,17 +4920,17 @@ int CMinecraftApp::GetNextTip() { return m_TipIDA[m_uiCurrentTip++]; } -int CMinecraftApp::GetHTMLColour(eMinecraftColour colour) { +int Game::GetHTMLColour(eMinecraftColour colour) { Minecraft* pMinecraft = Minecraft::GetInstance(); return pMinecraft->skins->getSelected()->getColourTable()->getColour( colour); } -int CMinecraftApp::GetHTMLFontSize(EHTMLFontSize size) { +int Game::GetHTMLFontSize(EHTMLFontSize size) { return s_iHTMLFontSizesA[size]; } -std::wstring CMinecraftApp::FormatHTMLString( +std::wstring Game::FormatHTMLString( int iPad, const std::wstring& desc, int shadowColour /*= 0xFFFFFFFF*/) { std::wstring text(desc); @@ -5097,7 +5097,7 @@ std::wstring CMinecraftApp::FormatHTMLString( return text; } -std::wstring CMinecraftApp::GetActionReplacement(int iPad, +std::wstring Game::GetActionReplacement(int iPad, unsigned char ucAction) { unsigned int input = InputManager.GetGameJoypadMaps( InputManager.GetJoypadMapVal(iPad), ucAction); @@ -5165,7 +5165,7 @@ std::wstring CMinecraftApp::GetActionReplacement(int iPad, return string; } -std::wstring CMinecraftApp::GetVKReplacement(unsigned int uiVKey) { +std::wstring Game::GetVKReplacement(unsigned int uiVKey) { std::wstring replacement = L""; switch (uiVKey) { case VK_PAD_A: @@ -5231,7 +5231,7 @@ std::wstring CMinecraftApp::GetVKReplacement(unsigned int uiVKey) { return string; } -std::wstring CMinecraftApp::GetIconReplacement(unsigned int uiIcon) { +std::wstring Game::GetIconReplacement(unsigned int uiIcon) { wchar_t string[128]; #if defined(_WIN64) @@ -5259,13 +5259,13 @@ std::wstring CMinecraftApp::GetIconReplacement(unsigned int uiIcon) { return result; } -std::unordered_map CMinecraftApp::MojangData; -std::unordered_map CMinecraftApp::DLCTextures_PackID; -std::unordered_map CMinecraftApp::DLCInfo_Trial; -std::unordered_map CMinecraftApp::DLCInfo_Full; -std::unordered_map CMinecraftApp::DLCInfo_SkinName; +std::unordered_map Game::MojangData; +std::unordered_map Game::DLCTextures_PackID; +std::unordered_map Game::DLCInfo_Trial; +std::unordered_map Game::DLCInfo_Full; +std::unordered_map Game::DLCInfo_SkinName; -int32_t CMinecraftApp::RegisterMojangData(wchar_t* pXuidName, PlayerUID xuid, +int32_t Game::RegisterMojangData(wchar_t* pXuidName, PlayerUID xuid, wchar_t* pSkin, wchar_t* pCape) { int32_t hr = 0; eXUID eTempXuid = eXUID_Undefined; @@ -5296,11 +5296,11 @@ int32_t CMinecraftApp::RegisterMojangData(wchar_t* pXuidName, PlayerUID xuid, return hr; } -MOJANG_DATA* CMinecraftApp::GetMojangDataForXuid(PlayerUID xuid) { +MOJANG_DATA* Game::GetMojangDataForXuid(PlayerUID xuid) { return MojangData[xuid]; } -int32_t CMinecraftApp::RegisterConfigValues(wchar_t* pType, int iValue) { +int32_t Game::RegisterConfigValues(wchar_t* pType, int iValue) { int32_t hr = 0; // #ifdef 0 @@ -5329,7 +5329,7 @@ int32_t CMinecraftApp::RegisterConfigValues(wchar_t* pType, int iValue) { } #if defined(_WINDOWS64) -int32_t CMinecraftApp::RegisterDLCData(wchar_t* pType, wchar_t* pBannerName, +int32_t Game::RegisterDLCData(wchar_t* pType, wchar_t* pBannerName, int iGender, uint64_t ullOfferID_Full, uint64_t ullOfferID_Trial, wchar_t* pFirstSkin, @@ -5379,20 +5379,20 @@ int32_t CMinecraftApp::RegisterDLCData(wchar_t* pType, wchar_t* pBannerName, return hr; } #elif defined(__linux__) -int32_t CMinecraftApp::RegisterDLCData(wchar_t* pType, wchar_t* pBannerName, +int32_t Game::RegisterDLCData(wchar_t* pType, wchar_t* pBannerName, int iGender, uint64_t ullOfferID_Full, uint64_t ullOfferID_Trial, wchar_t* pFirstSkin, unsigned int uiSortIndex, int iConfig, wchar_t* pDataFile) { fprintf(stderr, - "warning: CMinecraftApp::RegisterDLCData unimplemented for " + "warning: Game::RegisterDLCData unimplemented for " "platform `__linux__`\n"); return 0; } #else -int32_t CMinecraftApp::RegisterDLCData(char* pchDLCName, +int32_t Game::RegisterDLCData(char* pchDLCName, unsigned int uiSortIndex, char* pchImageURL) { // on PS3 we get all the required info from the name @@ -5439,7 +5439,7 @@ int32_t CMinecraftApp::RegisterDLCData(char* pchDLCName, } #endif -bool CMinecraftApp::GetDLCFullOfferIDForSkinID(const std::wstring& FirstSkin, +bool Game::GetDLCFullOfferIDForSkinID(const std::wstring& FirstSkin, uint64_t* pullVal) { auto it = DLCInfo_SkinName.find(FirstSkin); if (it == DLCInfo_SkinName.end()) { @@ -5449,7 +5449,7 @@ bool CMinecraftApp::GetDLCFullOfferIDForSkinID(const std::wstring& FirstSkin, return true; } } -bool CMinecraftApp::GetDLCFullOfferIDForPackID(const int iPackID, +bool Game::GetDLCFullOfferIDForPackID(const int iPackID, uint64_t* pullVal) { auto it = DLCTextures_PackID.find(iPackID); if (it == DLCTextures_PackID.end()) { @@ -5460,7 +5460,7 @@ bool CMinecraftApp::GetDLCFullOfferIDForPackID(const int iPackID, return true; } } -DLC_INFO* CMinecraftApp::GetDLCInfoForTrialOfferID(uint64_t ullOfferID_Trial) { +DLC_INFO* Game::GetDLCInfoForTrialOfferID(uint64_t ullOfferID_Trial) { // DLC_INFO *pDLCInfo=NULL; if (DLCInfo_Trial.size() > 0) { auto it = DLCInfo_Trial.find(ullOfferID_Trial); @@ -5475,7 +5475,7 @@ DLC_INFO* CMinecraftApp::GetDLCInfoForTrialOfferID(uint64_t ullOfferID_Trial) { return nullptr; } -DLC_INFO* CMinecraftApp::GetDLCInfoTrialOffer(int iIndex) { +DLC_INFO* Game::GetDLCInfoTrialOffer(int iIndex) { std::unordered_map::iterator it = DLCInfo_Trial.begin(); @@ -5485,7 +5485,7 @@ DLC_INFO* CMinecraftApp::GetDLCInfoTrialOffer(int iIndex) { return it->second; } -DLC_INFO* CMinecraftApp::GetDLCInfoFullOffer(int iIndex) { +DLC_INFO* Game::GetDLCInfoFullOffer(int iIndex) { std::unordered_map::iterator it = DLCInfo_Full.begin(); for (int i = 0; i < iIndex; i++) { @@ -5494,7 +5494,7 @@ DLC_INFO* CMinecraftApp::GetDLCInfoFullOffer(int iIndex) { return it->second; } -uint64_t CMinecraftApp::GetDLCInfoTexturesFullOffer(int iIndex) { +uint64_t Game::GetDLCInfoTexturesFullOffer(int iIndex) { std::unordered_map::iterator it = DLCTextures_PackID.begin(); for (int i = 0; i < iIndex; i++) { @@ -5504,7 +5504,7 @@ uint64_t CMinecraftApp::GetDLCInfoTexturesFullOffer(int iIndex) { return it->second; } -DLC_INFO* CMinecraftApp::GetDLCInfoForFullOfferID(uint64_t ullOfferID_Full) { +DLC_INFO* Game::GetDLCInfoForFullOfferID(uint64_t ullOfferID_Full) { if (DLCInfo_Full.size() > 0) { auto it = DLCInfo_Full.find(ullOfferID_Full); @@ -5518,7 +5518,7 @@ DLC_INFO* CMinecraftApp::GetDLCInfoForFullOfferID(uint64_t ullOfferID_Full) { return nullptr; } -void CMinecraftApp::lockSaveNotification() { +void Game::lockSaveNotification() { std::lock_guard lock(m_saveNotificationMutex); if (m_saveNotificationDepth++ == 0) { if (g_NetworkManager @@ -5537,7 +5537,7 @@ void CMinecraftApp::lockSaveNotification() { } } -void CMinecraftApp::unlockSaveNotification() { +void Game::unlockSaveNotification() { std::lock_guard lock(m_saveNotificationMutex); if (--m_saveNotificationDepth == 0) { if (g_NetworkManager @@ -5556,7 +5556,7 @@ void CMinecraftApp::unlockSaveNotification() { } } -int CMinecraftApp::RemoteSaveThreadProc(void* lpParameter) { +int Game::RemoteSaveThreadProc(void* lpParameter) { // The game should be stopped while we are doing this, but the connections // ticks may try to create some AABB's or Vec3's Compression::UseDefaultThreadStorage(); @@ -5568,7 +5568,7 @@ int CMinecraftApp::RemoteSaveThreadProc(void* lpParameter) { // default.exe!WaterlilyTile::getAABB(Level * level, int x, int y, int z) // line 38 + 8 bytes C++ // ... - // default.exe!CMinecraftApp::RemoteSaveThreadProc(void * + // default.exe!Game::RemoteSaveThreadProc(void * // lpParameter) line 6694 C++ // host autosave, and the clients can crash on receiving handleMoveEntity // when it's a tile within this thread, so need to do the tls for tiles @@ -5603,7 +5603,7 @@ int CMinecraftApp::RemoteSaveThreadProc(void* lpParameter) { return 0; } -void CMinecraftApp::ExitGameFromRemoteSave(void* lpParameter) { +void Game::ExitGameFromRemoteSave(void* lpParameter) { int primaryPad = ProfileManager.GetPrimaryPad(); unsigned int uiIDA[3]; @@ -5612,10 +5612,10 @@ void CMinecraftApp::ExitGameFromRemoteSave(void* lpParameter) { ui.RequestAlertMessage( IDS_EXIT_GAME, IDS_CONFIRM_EXIT_GAME, uiIDA, 2, primaryPad, - &CMinecraftApp::ExitGameFromRemoteSaveDialogReturned, nullptr); + &Game::ExitGameFromRemoteSaveDialogReturned, nullptr); } -int CMinecraftApp::ExitGameFromRemoteSaveDialogReturned( +int Game::ExitGameFromRemoteSaveDialogReturned( void* pParam, int iPad, C4JStorage::EMessageResult result) { // CScene_Pause* pClass = (CScene_Pause*)pParam; @@ -5635,7 +5635,7 @@ int CMinecraftApp::ExitGameFromRemoteSaveDialogReturned( return 0; } -void CMinecraftApp::SetSpecialTutorialCompletionFlag(int iPad, int index) { +void Game::SetSpecialTutorialCompletionFlag(int iPad, int index) { if (index >= 0 && index < 32 && GameSettingsA[iPad] != nullptr) { GameSettingsA[iPad]->uiSpecialTutorialBitmask |= (1 << index); } @@ -5643,13 +5643,13 @@ void CMinecraftApp::SetSpecialTutorialCompletionFlag(int iPad, int index) { // BANNED LIST FUNCTIONS -void CMinecraftApp::SetUniqueMapName(char* pszUniqueMapName) { +void Game::SetUniqueMapName(char* pszUniqueMapName) { memcpy(m_pszUniqueMapName, pszUniqueMapName, 14); } -char* CMinecraftApp::GetUniqueMapName(void) { return m_pszUniqueMapName; } +char* Game::GetUniqueMapName(void) { return m_pszUniqueMapName; } -void CMinecraftApp::InvalidateBannedList(int iPad) { +void Game::InvalidateBannedList(int iPad) { if (m_bRead_BannedListA[iPad] == true) { m_bRead_BannedListA[iPad] = false; SetBanListCheck(iPad, false); @@ -5662,7 +5662,7 @@ void CMinecraftApp::InvalidateBannedList(int iPad) { } } -void CMinecraftApp::AddLevelToBannedLevelList(int iPad, PlayerUID xuid, +void Game::AddLevelToBannedLevelList(int iPad, PlayerUID xuid, char* pszLevelName, bool bWriteToTMS) { // we will have retrieved the banned level list from TMS, so add this one to @@ -5698,7 +5698,7 @@ void CMinecraftApp::AddLevelToBannedLevelList(int iPad, PlayerUID xuid, // update telemetry too } -bool CMinecraftApp::IsInBannedLevelList(int iPad, PlayerUID xuid, +bool Game::IsInBannedLevelList(int iPad, PlayerUID xuid, char* pszLevelName) { for (auto it = m_vBannedListA[iPad]->begin(); it != m_vBannedListA[iPad]->end(); ++it) { @@ -5712,7 +5712,7 @@ bool CMinecraftApp::IsInBannedLevelList(int iPad, PlayerUID xuid, return false; } -void CMinecraftApp::RemoveLevelFromBannedLevelList(int iPad, PlayerUID xuid, +void Game::RemoveLevelFromBannedLevelList(int iPad, PlayerUID xuid, char* pszLevelName) { // bool bFound=false; // bool bRes; @@ -5757,7 +5757,7 @@ void CMinecraftApp::RemoveLevelFromBannedLevelList(int iPad, PlayerUID xuid, } // function to add credits for the DLC packs -void CMinecraftApp::AddCreditText(const wchar_t* lpStr) { +void Game::AddCreditText(const wchar_t* lpStr) { DebugPrintf("ADDING CREDIT - %ls\n", lpStr); // add a std::string from the DLC to a credits std::vector SCreditTextItemDef* pCreditStruct = new SCreditTextItemDef; @@ -5770,7 +5770,7 @@ void CMinecraftApp::AddCreditText(const wchar_t* lpStr) { vDLCCredits.push_back(pCreditStruct); } -bool CMinecraftApp::AlreadySeenCreditText(const std::wstring& wstemp) { +bool Game::AlreadySeenCreditText(const std::wstring& wstemp) { for (unsigned int i = 0; i < m_vCreditText.size(); i++) { std::wstring temp = m_vCreditText.at(i); @@ -5785,22 +5785,22 @@ bool CMinecraftApp::AlreadySeenCreditText(const std::wstring& wstemp) { return false; } -unsigned int CMinecraftApp::GetDLCCreditsCount() { +unsigned int Game::GetDLCCreditsCount() { return (unsigned int)vDLCCredits.size(); } -SCreditTextItemDef* CMinecraftApp::GetDLCCredits(int iIndex) { +SCreditTextItemDef* Game::GetDLCCredits(int iIndex) { return vDLCCredits.at(iIndex); } // Game Host options -void CMinecraftApp::SetGameHostOption(eGameHostOption eVal, +void Game::SetGameHostOption(eGameHostOption eVal, unsigned int uiVal) { SetGameHostOption(m_uiGameHostSettings, eVal, uiVal); } -void CMinecraftApp::SetGameHostOption(unsigned int& uiHostSettings, +void Game::SetGameHostOption(unsigned int& uiHostSettings, eGameHostOption eVal, unsigned int uiVal) { switch (eVal) { @@ -6035,11 +6035,11 @@ void CMinecraftApp::SetGameHostOption(unsigned int& uiHostSettings, } } -unsigned int CMinecraftApp::GetGameHostOption(eGameHostOption eVal) { +unsigned int Game::GetGameHostOption(eGameHostOption eVal) { return GetGameHostOption(m_uiGameHostSettings, eVal); } -unsigned int CMinecraftApp::GetGameHostOption(unsigned int uiHostSettings, +unsigned int Game::GetGameHostOption(unsigned int uiHostSettings, eGameHostOption eVal) { // unsigned int uiVal=0; switch (eVal) { @@ -6140,7 +6140,7 @@ unsigned int CMinecraftApp::GetGameHostOption(unsigned int uiHostSettings, return false; } -bool CMinecraftApp::CanRecordStatsAndAchievements() { +bool Game::CanRecordStatsAndAchievements() { bool isTutorial = Minecraft::GetInstance() != nullptr && Minecraft::GetInstance()->isTutorial(); // 4J Stu - All of these options give the host player some advantage, so @@ -6157,39 +6157,39 @@ bool CMinecraftApp::CanRecordStatsAndAchievements() { !isTutorial)); } -void CMinecraftApp::processSchematics(LevelChunk* levelChunk) { +void Game::processSchematics(LevelChunk* levelChunk) { m_gameRules.processSchematics(levelChunk); } -void CMinecraftApp::processSchematicsLighting(LevelChunk* levelChunk) { +void Game::processSchematicsLighting(LevelChunk* levelChunk) { m_gameRules.processSchematicsLighting(levelChunk); } -void CMinecraftApp::loadDefaultGameRules() { +void Game::loadDefaultGameRules() { m_gameRules.loadDefaultGameRules(); } -void CMinecraftApp::setLevelGenerationOptions( +void Game::setLevelGenerationOptions( LevelGenerationOptions* levelGen) { m_gameRules.setLevelGenerationOptions(levelGen); } -const wchar_t* CMinecraftApp::GetGameRulesString(const std::wstring& key) { +const wchar_t* Game::GetGameRulesString(const std::wstring& key) { return m_gameRules.GetGameRulesString(key); } -unsigned char CMinecraftApp::m_szPNG[8] = {137, 80, 78, 71, 13, 10, 26, 10}; +unsigned char Game::m_szPNG[8] = {137, 80, 78, 71, 13, 10, 26, 10}; #define PNG_TAG_tEXt 0x74455874 -unsigned int CMinecraftApp::FromBigEndian(unsigned int uiValue) { +unsigned int Game::FromBigEndian(unsigned int uiValue) { unsigned int uiReturn = ((uiValue >> 24) & 0x000000ff) | ((uiValue >> 8) & 0x0000ff00) | ((uiValue << 8) & 0x00ff0000) | ((uiValue << 24) & 0xff000000); return uiReturn; } -void CMinecraftApp::GetImageTextData(std::uint8_t* imageData, +void Game::GetImageTextData(std::uint8_t* imageData, unsigned int imageBytes, unsigned char* seedText, unsigned int& uiHostOptions, @@ -6287,7 +6287,7 @@ void CMinecraftApp::GetImageTextData(std::uint8_t* imageData, return; } -unsigned int CMinecraftApp::CreateImageTextData(std::uint8_t* textMetadata, +unsigned int Game::CreateImageTextData(std::uint8_t* textMetadata, int64_t seed, bool hasSeed, unsigned int uiHostOptions, unsigned int uiTexturePackId) { @@ -6324,7 +6324,7 @@ unsigned int CMinecraftApp::CreateImageTextData(std::uint8_t* textMetadata, return iTextMetadataBytes; } -void CMinecraftApp::AddTerrainFeaturePosition(_eTerrainFeatureType eFeatureType, +void Game::AddTerrainFeaturePosition(_eTerrainFeatureType eFeatureType, int x, int z) { // check we don't already have this in for (auto it = m_vTerrainFeatures.begin(); it < m_vTerrainFeatures.end(); @@ -6344,7 +6344,7 @@ void CMinecraftApp::AddTerrainFeaturePosition(_eTerrainFeatureType eFeatureType, m_vTerrainFeatures.push_back(pFeatureData); } -_eTerrainFeatureType CMinecraftApp::IsTerrainFeature(int x, int z) { +_eTerrainFeatureType Game::IsTerrainFeature(int x, int z) { for (auto it = m_vTerrainFeatures.begin(); it < m_vTerrainFeatures.end(); ++it) { FEATURE_DATA* pFeatureData = *it; @@ -6356,7 +6356,7 @@ _eTerrainFeatureType CMinecraftApp::IsTerrainFeature(int x, int z) { return eTerrainFeature_None; } -bool CMinecraftApp::GetTerrainFeaturePosition(_eTerrainFeatureType eType, +bool Game::GetTerrainFeaturePosition(_eTerrainFeatureType eType, int* pX, int* pZ) { for (auto it = m_vTerrainFeatures.begin(); it < m_vTerrainFeatures.end(); ++it) { @@ -6372,7 +6372,7 @@ bool CMinecraftApp::GetTerrainFeaturePosition(_eTerrainFeatureType eType, return false; } -void CMinecraftApp::ClearTerrainFeaturePosition() { +void Game::ClearTerrainFeaturePosition() { FEATURE_DATA* pFeatureData; while (m_vTerrainFeatures.size() > 0) { pFeatureData = m_vTerrainFeatures.back(); @@ -6381,7 +6381,7 @@ void CMinecraftApp::ClearTerrainFeaturePosition() { } } -void CMinecraftApp::UpdatePlayerInfo(std::uint8_t networkSmallId, +void Game::UpdatePlayerInfo(std::uint8_t networkSmallId, int16_t playerColourIndex, unsigned int playerGamePrivileges) { for (unsigned int i = 0; i < MINECRAFT_NET_MAX_PLAYERS; ++i) { @@ -6397,7 +6397,7 @@ void CMinecraftApp::UpdatePlayerInfo(std::uint8_t networkSmallId, } } -short CMinecraftApp::GetPlayerColour(std::uint8_t networkSmallId) { +short Game::GetPlayerColour(std::uint8_t networkSmallId) { short index = -1; for (unsigned int i = 0; i < MINECRAFT_NET_MAX_PLAYERS; ++i) { if (m_playerColours[i] == networkSmallId) { @@ -6408,7 +6408,7 @@ short CMinecraftApp::GetPlayerColour(std::uint8_t networkSmallId) { return index; } -unsigned int CMinecraftApp::GetPlayerPrivileges(std::uint8_t networkSmallId) { +unsigned int Game::GetPlayerPrivileges(std::uint8_t networkSmallId) { unsigned int privileges = 0; for (unsigned int i = 0; i < MINECRAFT_NET_MAX_PLAYERS; ++i) { if (m_playerColours[i] == networkSmallId) { @@ -6419,7 +6419,7 @@ unsigned int CMinecraftApp::GetPlayerPrivileges(std::uint8_t networkSmallId) { return privileges; } -std::wstring CMinecraftApp::getEntityName(eINSTANCEOF type) { +std::wstring Game::getEntityName(eINSTANCEOF type) { switch (type) { case eTYPE_WOLF: return app.GetString(IDS_WOLF); @@ -6471,7 +6471,7 @@ std::wstring CMinecraftApp::getEntityName(eINSTANCEOF type) { return L""; } -std::uint32_t CMinecraftApp::m_dwContentTypeA[e_Marketplace_MAX] = { +std::uint32_t Game::m_dwContentTypeA[e_Marketplace_MAX] = { XMARKETPLACE_OFFERING_TYPE_CONTENT, // e_DLC_SkinPack, e_DLC_TexturePacks, // e_DLC_MashupPacks XMARKETPLACE_OFFERING_TYPE_THEME, // e_DLC_Themes @@ -6479,7 +6479,7 @@ std::uint32_t CMinecraftApp::m_dwContentTypeA[e_Marketplace_MAX] = { XMARKETPLACE_OFFERING_TYPE_TILE, // e_DLC_Gamerpics }; -unsigned int CMinecraftApp::AddDLCRequest(eDLCMarketplaceType eType, +unsigned int Game::AddDLCRequest(eDLCMarketplaceType eType, bool bPromote) { // lock access { @@ -6524,7 +6524,7 @@ unsigned int CMinecraftApp::AddDLCRequest(eDLCMarketplaceType eType, return 1; } -unsigned int CMinecraftApp::AddTMSPPFileTypeRequest(eDLCContentType eType, +unsigned int Game::AddTMSPPFileTypeRequest(eDLCContentType eType, bool bPromote) { // lock access std::lock_guard lock(csTMSPPDownloadQueue); @@ -6609,7 +6609,7 @@ unsigned int CMinecraftApp::AddTMSPPFileTypeRequest(eDLCContentType eType, TMSPPRequest* pTMSPPreq = new TMSPPRequest; pTMSPPreq->CallbackFunc = - &CMinecraftApp::TMSPPFileReturned; + &Game::TMSPPFileReturned; pTMSPPreq->lpCallbackParam = this; pTMSPPreq->eStorageFacility = C4JStorage::eGlobalStorage_Title; @@ -6679,7 +6679,7 @@ unsigned int CMinecraftApp::AddTMSPPFileTypeRequest(eDLCContentType eType, memset(pTMSPPreq, 0, sizeof(TMSPPRequest)); pTMSPPreq->CallbackFunc = - &CMinecraftApp::TMSPPFileReturned; + &Game::TMSPPFileReturned; pTMSPPreq->lpCallbackParam = this; // 4J-PB - testing for now // pTMSPPreq->eStorageFacility=C4JStorage::eGlobalStorage_TitleUser; @@ -6710,7 +6710,7 @@ unsigned int CMinecraftApp::AddTMSPPFileTypeRequest(eDLCContentType eType, return 1; } -bool CMinecraftApp::CheckTMSDLCCanStop() { +bool Game::CheckTMSDLCCanStop() { std::lock_guard lock(csTMSPPDownloadQueue); for (auto it = m_TMSPPDownloadQueue.begin(); it != m_TMSPPDownloadQueue.end(); ++it) { @@ -6724,7 +6724,7 @@ bool CMinecraftApp::CheckTMSDLCCanStop() { return true; } -bool CMinecraftApp::RetrieveNextDLCContent() { +bool Game::RetrieveNextDLCContent() { // If there's already a retrieve in progress, quit // we may have re-ordered the list, so need to check every item @@ -6779,10 +6779,10 @@ bool CMinecraftApp::RetrieveNextDLCContent() { return false; } -int CMinecraftApp::TMSPPFileReturned(void* pParam, int iPad, int iUserData, +int Game::TMSPPFileReturned(void* pParam, int iPad, int iUserData, C4JStorage::PTMSPP_FILEDATA pFileData, const char* szFilename) { - CMinecraftApp* pClass = (CMinecraftApp*)pParam; + Game* pClass = (Game*)pParam; // find the right one in the vector { @@ -6831,9 +6831,9 @@ int CMinecraftApp::TMSPPFileReturned(void* pParam, int iPad, int iUserData, return 0; } -bool CMinecraftApp::RetrieveNextTMSPPContent() { return false; } +bool Game::RetrieveNextTMSPPContent() { return false; } -void CMinecraftApp::TickDLCOffersRetrieved() { +void Game::TickDLCOffersRetrieved() { if (!m_bAllDLCContentRetrieved) { if (!app.RetrieveNextDLCContent()) { app.DebugPrintf("[Consoles_App] All content retrieved.\n"); @@ -6841,7 +6841,7 @@ void CMinecraftApp::TickDLCOffersRetrieved() { } } } -void CMinecraftApp::ClearAndResetDLCDownloadQueue() { +void Game::ClearAndResetDLCDownloadQueue() { app.DebugPrintf("[Consoles_App] Clear and reset download queue.\n"); int iPosition = 0; @@ -6859,14 +6859,14 @@ void CMinecraftApp::ClearAndResetDLCDownloadQueue() { } } -void CMinecraftApp::TickTMSPPFilesRetrieved() { +void Game::TickTMSPPFilesRetrieved() { if (m_bTickTMSDLCFiles && !m_bAllTMSContentRetrieved) { if (app.RetrieveNextTMSPPContent() == false) { m_bAllTMSContentRetrieved = true; } } } -void CMinecraftApp::ClearTMSPPFilesRetrieved() { +void Game::ClearTMSPPFilesRetrieved() { int iPosition = 0; { std::lock_guard lock(csTMSPPDownloadQueue); @@ -6882,7 +6882,7 @@ void CMinecraftApp::ClearTMSPPFilesRetrieved() { } } -int CMinecraftApp::dlcOffersReturned(int iOfferC, std::uint32_t dwType, +int Game::dlcOffersReturned(int iOfferC, std::uint32_t dwType, int iPad) { // find the right one in the vector { @@ -6907,7 +6907,7 @@ int CMinecraftApp::dlcOffersReturned(int iOfferC, std::uint32_t dwType, return 0; } -eDLCContentType CMinecraftApp::Find_eDLCContentType(std::uint32_t dwType) { +eDLCContentType Game::Find_eDLCContentType(std::uint32_t dwType) { for (int i = 0; i < e_DLC_MAX; i++) { if (m_dwContentTypeA[i] == dwType) { return (eDLCContentType)i; @@ -6915,7 +6915,7 @@ eDLCContentType CMinecraftApp::Find_eDLCContentType(std::uint32_t dwType) { } return (eDLCContentType)0; } -bool CMinecraftApp::DLCContentRetrieved(eDLCMarketplaceType eType) { +bool Game::DLCContentRetrieved(eDLCMarketplaceType eType) { // If there's already a retrieve in progress, quit // we may have re-ordered the list, so need to check every item std::lock_guard lock(csDLCDownloadQueue); @@ -6931,7 +6931,7 @@ bool CMinecraftApp::DLCContentRetrieved(eDLCMarketplaceType eType) { return false; } -void CMinecraftApp::SetAdditionalSkinBoxes(std::uint32_t dwSkinID, +void Game::SetAdditionalSkinBoxes(std::uint32_t dwSkinID, SKIN_BOX* SkinBoxA, unsigned int dwSkinBoxC) { EntityRenderer* renderer = @@ -6969,7 +6969,7 @@ void CMinecraftApp::SetAdditionalSkinBoxes(std::uint32_t dwSkinID, } } -std::vector* CMinecraftApp::SetAdditionalSkinBoxes( +std::vector* Game::SetAdditionalSkinBoxes( std::uint32_t dwSkinID, std::vector* pvSkinBoxA) { EntityRenderer* renderer = EntityRenderDispatcher::instance->getRenderer(eTYPE_PLAYER); @@ -7004,7 +7004,7 @@ std::vector* CMinecraftApp::SetAdditionalSkinBoxes( return pvModelPart; } -std::vector* CMinecraftApp::GetAdditionalModelParts( +std::vector* Game::GetAdditionalModelParts( std::uint32_t dwSkinID) { std::lock_guard lock(csAdditionalModelParts); std::vector* pvModelParts = nullptr; @@ -7018,7 +7018,7 @@ std::vector* CMinecraftApp::GetAdditionalModelParts( return pvModelParts; } -std::vector* CMinecraftApp::GetAdditionalSkinBoxes( +std::vector* Game::GetAdditionalSkinBoxes( std::uint32_t dwSkinID) { std::lock_guard lock(csAdditionalSkinBoxes); std::vector* pvSkinBoxes = nullptr; @@ -7032,7 +7032,7 @@ std::vector* CMinecraftApp::GetAdditionalSkinBoxes( return pvSkinBoxes; } -unsigned int CMinecraftApp::GetAnimOverrideBitmask(std::uint32_t dwSkinID) { +unsigned int Game::GetAnimOverrideBitmask(std::uint32_t dwSkinID) { std::lock_guard lock(csAnimOverrideBitmask); unsigned int uiAnimOverrideBitmask = 0L; @@ -7046,7 +7046,7 @@ unsigned int CMinecraftApp::GetAnimOverrideBitmask(std::uint32_t dwSkinID) { return uiAnimOverrideBitmask; } -void CMinecraftApp::SetAnimOverrideBitmask(std::uint32_t dwSkinID, +void Game::SetAnimOverrideBitmask(std::uint32_t dwSkinID, unsigned int uiAnimOverrideBitmask) { // Make thread safe std::lock_guard lock(csAnimOverrideBitmask); @@ -7061,7 +7061,7 @@ void CMinecraftApp::SetAnimOverrideBitmask(std::uint32_t dwSkinID, dwSkinID, uiAnimOverrideBitmask)); } -std::uint32_t CMinecraftApp::getSkinIdFromPath(const std::wstring& skin) { +std::uint32_t Game::getSkinIdFromPath(const std::wstring& skin) { bool dlcSkin = false; unsigned int skinId = 0; @@ -7086,7 +7086,7 @@ std::uint32_t CMinecraftApp::getSkinIdFromPath(const std::wstring& skin) { return skinId; } -std::wstring CMinecraftApp::getSkinPathFromId(std::uint32_t skinId) { +std::wstring Game::getSkinPathFromId(std::uint32_t skinId) { // 4J Stu - This function maps the encoded uint32_t we store in the player // profile to a filename that is stored as a memory texture and shared // between systems in game @@ -7110,12 +7110,12 @@ std::wstring CMinecraftApp::getSkinPathFromId(std::uint32_t skinId) { return chars; } -int CMinecraftApp::TexturePackDialogReturned( +int Game::TexturePackDialogReturned( void* pParam, int iPad, C4JStorage::EMessageResult result) { return 0; } -int CMinecraftApp::getArchiveFileSize(const std::wstring& filename) { +int Game::getArchiveFileSize(const std::wstring& filename) { TexturePack* tPack = nullptr; Minecraft* pMinecraft = Minecraft::GetInstance(); if (pMinecraft && pMinecraft->skins) @@ -7127,7 +7127,7 @@ int CMinecraftApp::getArchiveFileSize(const std::wstring& filename) { return m_mediaArchive->getFileSize(filename); } -bool CMinecraftApp::hasArchiveFile(const std::wstring& filename) { +bool Game::hasArchiveFile(const std::wstring& filename) { TexturePack* tPack = nullptr; Minecraft* pMinecraft = Minecraft::GetInstance(); if (pMinecraft && pMinecraft->skins) @@ -7139,7 +7139,7 @@ bool CMinecraftApp::hasArchiveFile(const std::wstring& filename) { return m_mediaArchive->hasFile(filename); } -std::vector CMinecraftApp::getArchiveFile( +std::vector Game::getArchiveFile( const std::wstring& filename) { TexturePack* tPack = nullptr; Minecraft* pMinecraft = Minecraft::GetInstance(); @@ -7154,44 +7154,44 @@ std::vector CMinecraftApp::getArchiveFile( // DLC -int CMinecraftApp::GetDLCInfoTrialOffersCount() { +int Game::GetDLCInfoTrialOffersCount() { return (int)DLCInfo_Trial.size(); } -int CMinecraftApp::GetDLCInfoFullOffersCount() { +int Game::GetDLCInfoFullOffersCount() { return (int)DLCInfo_Full.size(); } -int CMinecraftApp::GetDLCInfoTexturesOffersCount() { +int Game::GetDLCInfoTexturesOffersCount() { return (int)DLCTextures_PackID.size(); } // AUTOSAVE -void CMinecraftApp::SetAutosaveTimerTime(void) { +void Game::SetAutosaveTimerTime(void) { int settingValue = GetGameSettings(ProfileManager.GetPrimaryPad(), eGameSetting_Autosave); m_uiAutosaveTimer = time_util::clock::now() + std::chrono::minutes(settingValue * 15); } // value x 15 to get mins -bool CMinecraftApp::AutosaveDue(void) { +bool Game::AutosaveDue(void) { return (time_util::clock::now() > m_uiAutosaveTimer); } -int64_t CMinecraftApp::SecondsToAutosave() { +int64_t Game::SecondsToAutosave() { return std::chrono::duration_cast(m_uiAutosaveTimer - time_util::clock::now()).count(); } -void CMinecraftApp::SetTrialTimerStart(void) { +void Game::SetTrialTimerStart(void) { m_fTrialTimerStart = m_Time.fAppTime; mfTrialPausedTime = 0.0f; } -float CMinecraftApp::getTrialTimer(void) { +float Game::getTrialTimer(void) { return m_Time.fAppTime - m_fTrialTimerStart - mfTrialPausedTime; } -bool CMinecraftApp::IsLocalMultiplayerAvailable() { +bool Game::IsLocalMultiplayerAvailable() { unsigned int connectedControllers = 0; for (unsigned int i = 0; i < XUSER_MAX_COUNT; ++i) { if (InputManager.IsPadConnected(i) || ProfileManager.IsSignedIn(i)) @@ -7225,7 +7225,7 @@ bool CMinecraftApp::IsLocalMultiplayerAvailable() { // 4J-PB - language and locale function -void CMinecraftApp::getLocale(std::vector& vecWstrLocales) { +void Game::getLocale(std::vector& vecWstrLocales) { std::vector locales; const unsigned int systemLanguage = XGetLanguage(); @@ -7383,15 +7383,15 @@ void CMinecraftApp::getLocale(std::vector& vecWstrLocales) { } } -int CMinecraftApp::get_eMCLang(wchar_t* pwchLocale) { +int Game::get_eMCLang(wchar_t* pwchLocale) { return m_eMCLangA[pwchLocale]; } -int CMinecraftApp::get_xcLang(wchar_t* pwchLocale) { +int Game::get_xcLang(wchar_t* pwchLocale) { return m_xcLangA[pwchLocale]; } -void CMinecraftApp::LocaleAndLanguageInit() { +void Game::LocaleAndLanguageInit() { m_localeA[eMCLang_zhCHT] = L"zh-CHT"; m_localeA[eMCLang_csCS] = L"cs-CS"; m_localeA[eMCLang_laLAS] = L"la-LAS"; @@ -7592,14 +7592,14 @@ void CMinecraftApp::LocaleAndLanguageInit() { m_xcLangA[L"zh-HANT"] = XC_LOCALE_CHINA; } -void CMinecraftApp::SetTickTMSDLCFiles(bool bVal) { +void Game::SetTickTMSDLCFiles(bool bVal) { // 4J-PB - we need to stop the retrieval of minecraft store images from TMS // when we aren't in the DLC, since going in to Play Game will change the // title id group m_bTickTMSDLCFiles = bVal; } -std::wstring CMinecraftApp::getFilePath(std::uint32_t packId, +std::wstring Game::getFilePath(std::uint32_t packId, std::wstring filename, bool bAddDataFolder, std::wstring mountPoint) { @@ -7634,7 +7634,7 @@ std::wstring titleUpdateTexturePackRoot = L"Windows64\\DLC\\"; std::wstring titleUpdateTexturePackRoot = L"CU\\DLC\\"; #endif -std::wstring CMinecraftApp::getRootPath(std::uint32_t packId, +std::wstring Game::getRootPath(std::uint32_t packId, bool allowOverride, bool bAddDataFolder, std::wstring mountPoint) { std::wstring path = mountPoint; diff --git a/targets/app/common/Consoles_App.h b/targets/app/common/Game.h similarity index 97% rename from targets/app/common/Consoles_App.h rename to targets/app/common/Game.h index dd231b1a0..8b96c2910 100644 --- a/targets/app/common/Consoles_App.h +++ b/targets/app/common/Game.h @@ -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 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; \ No newline at end of file diff --git a/targets/app/common/IPlatformGame.h b/targets/app/common/IPlatformGame.h new file mode 100644 index 000000000..8dd6b3b18 --- /dev/null +++ b/targets/app/common/IPlatformGame.h @@ -0,0 +1,30 @@ +#pragma once + +#include + +#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; +}; diff --git a/targets/app/common/src/Audio/SoundEngine.cpp b/targets/app/common/src/Audio/SoundEngine.cpp index c5ad3d676..f1738e7c5 100644 --- a/targets/app/common/src/Audio/SoundEngine.cpp +++ b/targets/app/common/src/Audio/SoundEngine.cpp @@ -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 diff --git a/targets/app/common/src/DLC/DLCAudioFile.cpp b/targets/app/common/src/DLC/DLCAudioFile.cpp index 2296bd958..2c9260afe 100644 --- a/targets/app/common/src/DLC/DLCAudioFile.cpp +++ b/targets/app/common/src/DLC/DLCAudioFile.cpp @@ -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" diff --git a/targets/app/common/src/DLC/DLCCapeFile.cpp b/targets/app/common/src/DLC/DLCCapeFile.cpp index ad981e636..5beb4e48a 100644 --- a/targets/app/common/src/DLC/DLCCapeFile.cpp +++ b/targets/app/common/src/DLC/DLCCapeFile.cpp @@ -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) {} diff --git a/targets/app/common/src/DLC/DLCColourTableFile.cpp b/targets/app/common/src/DLC/DLCColourTableFile.cpp index 76a76ad87..83b082979 100644 --- a/targets/app/common/src/DLC/DLCColourTableFile.cpp +++ b/targets/app/common/src/DLC/DLCColourTableFile.cpp @@ -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" diff --git a/targets/app/common/src/DLC/DLCGameRulesHeader.cpp b/targets/app/common/src/DLC/DLCGameRulesHeader.cpp index 80097bb89..aa57c370b 100644 --- a/targets/app/common/src/DLC/DLCGameRulesHeader.cpp +++ b/targets/app/common/src/DLC/DLCGameRulesHeader.cpp @@ -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; diff --git a/targets/app/common/src/DLC/DLCManager.cpp b/targets/app/common/src/DLC/DLCManager.cpp index 5cf7d161c..d1ab657c3 100644 --- a/targets/app/common/src/DLC/DLCManager.cpp +++ b/targets/app/common/src/DLC/DLCManager.cpp @@ -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" diff --git a/targets/app/common/src/DLC/DLCPack.cpp b/targets/app/common/src/DLC/DLCPack.cpp index 3efb14d73..07e4d78ae 100644 --- a/targets/app/common/src/DLC/DLCPack.cpp +++ b/targets/app/common/src/DLC/DLCPack.cpp @@ -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" diff --git a/targets/app/common/src/DLC/DLCSkinFile.cpp b/targets/app/common/src/DLC/DLCSkinFile.cpp index 1b84a495b..c38e7d6b8 100644 --- a/targets/app/common/src/DLC/DLCSkinFile.cpp +++ b/targets/app/common/src/DLC/DLCSkinFile.cpp @@ -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" diff --git a/targets/app/common/src/DLC/DLCUIDataFile.cpp b/targets/app/common/src/DLC/DLCUIDataFile.cpp index 123ffc9da..9b233c1a8 100644 --- a/targets/app/common/src/DLC/DLCUIDataFile.cpp +++ b/targets/app/common/src/DLC/DLCUIDataFile.cpp @@ -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) { diff --git a/targets/app/common/src/GameRules/GameRuleManager.cpp b/targets/app/common/src/GameRules/GameRuleManager.cpp index 2dad1d3ea..9c14da10e 100644 --- a/targets/app/common/src/GameRules/GameRuleManager.cpp +++ b/targets/app/common/src/GameRules/GameRuleManager.cpp @@ -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" diff --git a/targets/app/common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.cpp b/targets/app/common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.cpp index fcd060b61..a837ef0a2 100644 --- a/targets/app/common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.cpp +++ b/targets/app/common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.cpp @@ -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" diff --git a/targets/app/common/src/GameRules/LevelGeneration/BiomeOverride.cpp b/targets/app/common/src/GameRules/LevelGeneration/BiomeOverride.cpp index dd903a5ef..43e41bb85 100644 --- a/targets/app/common/src/GameRules/LevelGeneration/BiomeOverride.cpp +++ b/targets/app/common/src/GameRules/LevelGeneration/BiomeOverride.cpp @@ -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" diff --git a/targets/app/common/src/GameRules/LevelGeneration/ConsoleGenerateStructure.cpp b/targets/app/common/src/GameRules/LevelGeneration/ConsoleGenerateStructure.cpp index 43c44eaa9..98be85fb3 100644 --- a/targets/app/common/src/GameRules/LevelGeneration/ConsoleGenerateStructure.cpp +++ b/targets/app/common/src/GameRules/LevelGeneration/ConsoleGenerateStructure.cpp @@ -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" diff --git a/targets/app/common/src/GameRules/LevelGeneration/ConsoleSchematicFile.cpp b/targets/app/common/src/GameRules/LevelGeneration/ConsoleSchematicFile.cpp index af4186568..5a4567217 100644 --- a/targets/app/common/src/GameRules/LevelGeneration/ConsoleSchematicFile.cpp +++ b/targets/app/common/src/GameRules/LevelGeneration/ConsoleSchematicFile.cpp @@ -8,7 +8,7 @@ #include #include -#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" diff --git a/targets/app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.cpp b/targets/app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.cpp index 8c1e0fa54..33f77d6c1 100644 --- a/targets/app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.cpp +++ b/targets/app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.cpp @@ -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" diff --git a/targets/app/common/src/GameRules/LevelGeneration/StartFeature.cpp b/targets/app/common/src/GameRules/LevelGeneration/StartFeature.cpp index d146f924f..b66efbaa4 100644 --- a/targets/app/common/src/GameRules/LevelGeneration/StartFeature.cpp +++ b/targets/app/common/src/GameRules/LevelGeneration/StartFeature.cpp @@ -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" diff --git a/targets/app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.cpp b/targets/app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.cpp index ef2b79cfb..00ae3e039 100644 --- a/targets/app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.cpp +++ b/targets/app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.cpp @@ -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" diff --git a/targets/app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.cpp b/targets/app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.cpp index 1a19f3c0a..8f54aa1ec 100644 --- a/targets/app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.cpp +++ b/targets/app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.cpp @@ -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" diff --git a/targets/app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.cpp b/targets/app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.cpp index 989a18c90..4e807c820 100644 --- a/targets/app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.cpp +++ b/targets/app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.cpp @@ -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" diff --git a/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.cpp b/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.cpp index 74b19f992..1233444c1 100644 --- a/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.cpp +++ b/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.cpp @@ -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" diff --git a/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.cpp b/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.cpp index 39d99e5d0..f12a9428c 100644 --- a/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.cpp +++ b/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.cpp @@ -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" diff --git a/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.cpp b/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.cpp index 237b2a6e8..d9e25e2d0 100644 --- a/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.cpp +++ b/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.cpp @@ -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" diff --git a/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.cpp b/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.cpp index 1d6602717..ab7bcdbed 100644 --- a/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.cpp +++ b/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.cpp @@ -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" diff --git a/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.cpp b/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.cpp index 7c00a1ccd..cd2d37903 100644 --- a/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.cpp +++ b/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.cpp @@ -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" diff --git a/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.cpp b/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.cpp index 78b14dfb0..cdbcf25fe 100644 --- a/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.cpp +++ b/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.cpp @@ -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" diff --git a/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.cpp b/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.cpp index 16413ceeb..bddf63ba0 100644 --- a/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.cpp +++ b/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.cpp @@ -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" diff --git a/targets/app/common/src/Leaderboards/LeaderboardManager.cpp b/targets/app/common/src/Leaderboards/LeaderboardManager.cpp index a6c18c106..a43f3a7d4 100644 --- a/targets/app/common/src/Leaderboards/LeaderboardManager.cpp +++ b/targets/app/common/src/Leaderboards/LeaderboardManager.cpp @@ -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] = { diff --git a/targets/app/common/src/Localisation/StringTable.cpp b/targets/app/common/src/Localisation/StringTable.cpp index d425789df..838e005e9 100644 --- a/targets/app/common/src/Localisation/StringTable.cpp +++ b/targets/app/common/src/Localisation/StringTable.cpp @@ -3,7 +3,7 @@ #include #include -#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" diff --git a/targets/app/common/src/Network/GameNetworkManager.cpp b/targets/app/common/src/Network/GameNetworkManager.cpp index db3aa3d71..d133f22f2 100644 --- a/targets/app/common/src/Network/GameNetworkManager.cpp +++ b/targets/app/common/src/Network/GameNetworkManager.cpp @@ -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" diff --git a/targets/app/common/src/Network/PlatformNetworkManagerStub.cpp b/targets/app/common/src/Network/PlatformNetworkManagerStub.cpp index 138dfc587..17fb5443a 100644 --- a/targets/app/common/src/Network/PlatformNetworkManagerStub.cpp +++ b/targets/app/common/src/Network/PlatformNetworkManagerStub.cpp @@ -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" diff --git a/targets/app/common/src/Tutorial/FullTutorial.cpp b/targets/app/common/src/Tutorial/FullTutorial.cpp index 900ac498f..8f79ed9d7 100644 --- a/targets/app/common/src/Tutorial/FullTutorial.cpp +++ b/targets/app/common/src/Tutorial/FullTutorial.cpp @@ -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" diff --git a/targets/app/common/src/Tutorial/Tasks/ControllerTask.cpp b/targets/app/common/src/Tutorial/Tasks/ControllerTask.cpp index 41e97c491..aaf25d66e 100644 --- a/targets/app/common/src/Tutorial/Tasks/ControllerTask.cpp +++ b/targets/app/common/src/Tutorial/Tasks/ControllerTask.cpp @@ -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" diff --git a/targets/app/common/src/Tutorial/Tutorial.cpp b/targets/app/common/src/Tutorial/Tutorial.cpp index 508ee29ff..d56d54293 100644 --- a/targets/app/common/src/Tutorial/Tutorial.cpp +++ b/targets/app/common/src/Tutorial/Tutorial.cpp @@ -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" diff --git a/targets/app/common/src/Tutorial/TutorialMessage.cpp b/targets/app/common/src/Tutorial/TutorialMessage.cpp index 729e8c98b..7403dac4a 100644 --- a/targets/app/common/src/Tutorial/TutorialMessage.cpp +++ b/targets/app/common/src/Tutorial/TutorialMessage.cpp @@ -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*/, diff --git a/targets/app/common/src/UI/All Platforms/ArchiveFile.cpp b/targets/app/common/src/UI/All Platforms/ArchiveFile.cpp index 96b7f0568..79db751e2 100644 --- a/targets/app/common/src/UI/All Platforms/ArchiveFile.cpp +++ b/targets/app/common/src/UI/All Platforms/ArchiveFile.cpp @@ -5,7 +5,7 @@ #include #include -#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" diff --git a/targets/app/common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.cpp b/targets/app/common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.cpp index 3c6b654aa..2fdfe4b84 100644 --- a/targets/app/common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.cpp +++ b/targets/app/common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.cpp @@ -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" diff --git a/targets/app/common/src/UI/All Platforms/IUIScene_AnvilMenu.cpp b/targets/app/common/src/UI/All Platforms/IUIScene_AnvilMenu.cpp index 80853487f..55ef3a9e1 100644 --- a/targets/app/common/src/UI/All Platforms/IUIScene_AnvilMenu.cpp +++ b/targets/app/common/src/UI/All Platforms/IUIScene_AnvilMenu.cpp @@ -4,7 +4,7 @@ #include #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" diff --git a/targets/app/common/src/UI/All Platforms/IUIScene_BeaconMenu.cpp b/targets/app/common/src/UI/All Platforms/IUIScene_BeaconMenu.cpp index 8a0b03e2a..6e84ffe93 100644 --- a/targets/app/common/src/UI/All Platforms/IUIScene_BeaconMenu.cpp +++ b/targets/app/common/src/UI/All Platforms/IUIScene_BeaconMenu.cpp @@ -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" diff --git a/targets/app/common/src/UI/All Platforms/IUIScene_CraftingMenu.cpp b/targets/app/common/src/UI/All Platforms/IUIScene_CraftingMenu.cpp index 12cafee81..2d50f47ca 100644 --- a/targets/app/common/src/UI/All Platforms/IUIScene_CraftingMenu.cpp +++ b/targets/app/common/src/UI/All Platforms/IUIScene_CraftingMenu.cpp @@ -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" diff --git a/targets/app/common/src/UI/All Platforms/IUIScene_CreativeMenu.cpp b/targets/app/common/src/UI/All Platforms/IUIScene_CreativeMenu.cpp index becc4eecc..a5e701ed2 100644 --- a/targets/app/common/src/UI/All Platforms/IUIScene_CreativeMenu.cpp +++ b/targets/app/common/src/UI/All Platforms/IUIScene_CreativeMenu.cpp @@ -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" diff --git a/targets/app/common/src/UI/All Platforms/IUIScene_HUD.cpp b/targets/app/common/src/UI/All Platforms/IUIScene_HUD.cpp index 899c32c0a..6aa71f154 100644 --- a/targets/app/common/src/UI/All Platforms/IUIScene_HUD.cpp +++ b/targets/app/common/src/UI/All Platforms/IUIScene_HUD.cpp @@ -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" diff --git a/targets/app/common/src/UI/All Platforms/IUIScene_PauseMenu.cpp b/targets/app/common/src/UI/All Platforms/IUIScene_PauseMenu.cpp index ac6e7c0b5..bb2e2170e 100644 --- a/targets/app/common/src/UI/All Platforms/IUIScene_PauseMenu.cpp +++ b/targets/app/common/src/UI/All Platforms/IUIScene_PauseMenu.cpp @@ -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" diff --git a/targets/app/common/src/UI/All Platforms/IUIScene_TradingMenu.cpp b/targets/app/common/src/UI/All Platforms/IUIScene_TradingMenu.cpp index ee02ef4e2..0c7140dab 100644 --- a/targets/app/common/src/UI/All Platforms/IUIScene_TradingMenu.cpp +++ b/targets/app/common/src/UI/All Platforms/IUIScene_TradingMenu.cpp @@ -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" diff --git a/targets/app/common/src/UI/All Platforms/UIEnums.h b/targets/app/common/src/UI/All Platforms/UIEnums.h index 22ee72f8b..947455751 100644 --- a/targets/app/common/src/UI/All Platforms/UIEnums.h +++ b/targets/app/common/src/UI/All Platforms/UIEnums.h @@ -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 diff --git a/targets/app/common/src/UI/Components/UIComponent_PressStartToPlay.cpp b/targets/app/common/src/UI/Components/UIComponent_PressStartToPlay.cpp index ee4eb55cd..8f1610125 100644 --- a/targets/app/common/src/UI/Components/UIComponent_PressStartToPlay.cpp +++ b/targets/app/common/src/UI/Components/UIComponent_PressStartToPlay.cpp @@ -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" diff --git a/targets/app/common/src/UI/Components/UIComponent_Tooltips.cpp b/targets/app/common/src/UI/Components/UIComponent_Tooltips.cpp index bf568215f..59bb96ffe 100644 --- a/targets/app/common/src/UI/Components/UIComponent_Tooltips.cpp +++ b/targets/app/common/src/UI/Components/UIComponent_Tooltips.cpp @@ -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" diff --git a/targets/app/common/src/UI/Components/UIComponent_TutorialPopup.cpp b/targets/app/common/src/UI/Components/UIComponent_TutorialPopup.cpp index afe7c1665..69a1d1e44 100644 --- a/targets/app/common/src/UI/Components/UIComponent_TutorialPopup.cpp +++ b/targets/app/common/src/UI/Components/UIComponent_TutorialPopup.cpp @@ -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" diff --git a/targets/app/common/src/UI/Components/UIScene_HUD.cpp b/targets/app/common/src/UI/Components/UIScene_HUD.cpp index 9fa4c1bb9..448567cf9 100644 --- a/targets/app/common/src/UI/Components/UIScene_HUD.cpp +++ b/targets/app/common/src/UI/Components/UIScene_HUD.cpp @@ -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" diff --git a/targets/app/common/src/UI/Controls/UIControl.cpp b/targets/app/common/src/UI/Controls/UIControl.cpp index c647c460f..2982ca3ca 100644 --- a/targets/app/common/src/UI/Controls/UIControl.cpp +++ b/targets/app/common/src/UI/Controls/UIControl.cpp @@ -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() { diff --git a/targets/app/common/src/UI/Controls/UIControl_EnchantmentButton.cpp b/targets/app/common/src/UI/Controls/UIControl_EnchantmentButton.cpp index 2bbbe5878..8822b5972 100644 --- a/targets/app/common/src/UI/Controls/UIControl_EnchantmentButton.cpp +++ b/targets/app/common/src/UI/Controls/UIControl_EnchantmentButton.cpp @@ -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" diff --git a/targets/app/common/src/UI/Controls/UIControl_PlayerSkinPreview.cpp b/targets/app/common/src/UI/Controls/UIControl_PlayerSkinPreview.cpp index 49ff7e1f2..0684d7c3f 100644 --- a/targets/app/common/src/UI/Controls/UIControl_PlayerSkinPreview.cpp +++ b/targets/app/common/src/UI/Controls/UIControl_PlayerSkinPreview.cpp @@ -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" diff --git a/targets/app/common/src/UI/Scenes/Debug/UIScene_DebugCreateSchematic.cpp b/targets/app/common/src/UI/Scenes/Debug/UIScene_DebugCreateSchematic.cpp index 22a210443..fd71dcc0c 100644 --- a/targets/app/common/src/UI/Scenes/Debug/UIScene_DebugCreateSchematic.cpp +++ b/targets/app/common/src/UI/Scenes/Debug/UIScene_DebugCreateSchematic.cpp @@ -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" diff --git a/targets/app/common/src/UI/Scenes/Debug/UIScene_DebugOptions.cpp b/targets/app/common/src/UI/Scenes/Debug/UIScene_DebugOptions.cpp index 5efbeb8ed..5dde0006c 100644 --- a/targets/app/common/src/UI/Scenes/Debug/UIScene_DebugOptions.cpp +++ b/targets/app/common/src/UI/Scenes/Debug/UIScene_DebugOptions.cpp @@ -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; diff --git a/targets/app/common/src/UI/Scenes/Debug/UIScene_DebugOverlay.cpp b/targets/app/common/src/UI/Scenes/Debug/UIScene_DebugOverlay.cpp index 852418444..361d6a38f 100644 --- a/targets/app/common/src/UI/Scenes/Debug/UIScene_DebugOverlay.cpp +++ b/targets/app/common/src/UI/Scenes/Debug/UIScene_DebugOverlay.cpp @@ -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" diff --git a/targets/app/common/src/UI/Scenes/Debug/UIScene_DebugSetCamera.cpp b/targets/app/common/src/UI/Scenes/Debug/UIScene_DebugSetCamera.cpp index f0a2a0c6b..cd0463c77 100644 --- a/targets/app/common/src/UI/Scenes/Debug/UIScene_DebugSetCamera.cpp +++ b/targets/app/common/src/UI/Scenes/Debug/UIScene_DebugSetCamera.cpp @@ -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" diff --git a/targets/app/common/src/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.cpp b/targets/app/common/src/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.cpp index 57f33b15e..1956c867f 100644 --- a/targets/app/common/src/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.cpp +++ b/targets/app/common/src/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.cpp @@ -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" diff --git a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp index 6b65bf73e..22b90ceb4 100644 --- a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp +++ b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp @@ -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" diff --git a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.cpp b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.cpp index 4f6614b4b..5fce56541 100644 --- a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.cpp +++ b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.cpp @@ -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" diff --git a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.cpp b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.cpp index 8ef925c4f..15e6dedd9 100644 --- a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.cpp +++ b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.cpp @@ -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" diff --git a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_EULA.cpp b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_EULA.cpp index 8305dd73d..206b68273 100644 --- a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_EULA.cpp +++ b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_EULA.cpp @@ -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" diff --git a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.cpp b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.cpp index db68c1093..34bdad051 100644 --- a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.cpp +++ b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.cpp @@ -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" diff --git a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.cpp b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.cpp index 485375eae..2b1ed4b83 100644 --- a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.cpp +++ b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.cpp @@ -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" diff --git a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.cpp b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.cpp index e3a5eb834..43f8201a8 100644 --- a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.cpp +++ b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.cpp @@ -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" diff --git a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp index 241981a9b..e595e3704 100644 --- a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp +++ b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp @@ -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" diff --git a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp index 8f4ae8319..e1610d1f4 100644 --- a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp +++ b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp @@ -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" diff --git a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp index ecffba4ea..f765f1ef4 100644 --- a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp +++ b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp @@ -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" diff --git a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.cpp b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.cpp index cc9de7026..b632e9668 100644 --- a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.cpp +++ b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.cpp @@ -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" diff --git a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.cpp b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.cpp index 4a72db8cd..740ca06f6 100644 --- a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.cpp +++ b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.cpp @@ -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" diff --git a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.cpp b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.cpp index 9f9228647..226ecc828 100644 --- a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.cpp +++ b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.cpp @@ -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" diff --git a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_ControlsMenu.cpp b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_ControlsMenu.cpp index 5af9b8577..29e35203e 100644 --- a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_ControlsMenu.cpp +++ b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_ControlsMenu.cpp @@ -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" diff --git a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_Credits.cpp b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_Credits.cpp index a161624cc..8087f2967 100644 --- a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_Credits.cpp +++ b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_Credits.cpp @@ -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" diff --git a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.cpp b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.cpp index da55bf399..ff2ca1eb7 100644 --- a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.cpp +++ b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.cpp @@ -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" diff --git a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_HowToPlay.cpp b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_HowToPlay.cpp index f34f24463..5060c2ef9 100644 --- a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_HowToPlay.cpp +++ b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_HowToPlay.cpp @@ -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" diff --git a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.cpp b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.cpp index 5f563f49a..70bc4b1a4 100644 --- a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.cpp +++ b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.cpp @@ -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" diff --git a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_LanguageSelector.cpp b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_LanguageSelector.cpp index a74859bc1..fbba0d40f 100644 --- a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_LanguageSelector.cpp +++ b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_LanguageSelector.cpp @@ -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" diff --git a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_ReinstallMenu.cpp b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_ReinstallMenu.cpp index 745e7552e..6b37125bd 100644 --- a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_ReinstallMenu.cpp +++ b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_ReinstallMenu.cpp @@ -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" diff --git a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.cpp b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.cpp index 20e08f631..cd2c88468 100644 --- a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.cpp +++ b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.cpp @@ -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" diff --git a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.cpp b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.cpp index ecb01da08..d8d50a846 100644 --- a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.cpp +++ b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.cpp @@ -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" diff --git a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.cpp b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.cpp index dd41f5356..2d4d6d324 100644 --- a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.cpp +++ b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.cpp @@ -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" diff --git a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsMenu.cpp b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsMenu.cpp index 8dbb1de6a..539f75c9e 100644 --- a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsMenu.cpp +++ b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsMenu.cpp @@ -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" diff --git a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.cpp b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.cpp index 63689253b..b3bcc89a0 100644 --- a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.cpp +++ b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.cpp @@ -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" diff --git a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.cpp b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.cpp index e3136db17..2012ab0bf 100644 --- a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.cpp +++ b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.cpp @@ -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" diff --git a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp index 0c5968825..b5d23a57e 100644 --- a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp +++ b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp @@ -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" diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.cpp b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.cpp index 341613a47..6af0020b8 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.cpp +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.cpp @@ -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" diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.cpp b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.cpp index 94a30a131..de86ffe83 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.cpp +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.cpp @@ -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" diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.cpp b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.cpp index a0427e3a7..ac1ffa331 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.cpp +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.cpp @@ -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" diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.cpp b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.cpp index 336de2ca5..c2a484b61 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.cpp +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.cpp @@ -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" diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.cpp b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.cpp index 3723aeffd..d8c0702d7 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.cpp +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.cpp @@ -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" diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.cpp b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.cpp index 5c58aaba3..53d1648ff 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.cpp +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.cpp @@ -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" diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.cpp b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.cpp index 3adfda8aa..661aad066 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.cpp +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.cpp @@ -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" diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.cpp b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.cpp index d7de9e58e..cff34b14f 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.cpp +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.cpp @@ -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" diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.cpp b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.cpp index 1792129b3..54b885a53 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.cpp +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.cpp @@ -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" diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.cpp b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.cpp index 71472eeef..6ba1dcb04 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.cpp +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.cpp @@ -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" diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.cpp b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.cpp index d42c81b74..3bc476737 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.cpp +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.cpp @@ -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" diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.cpp b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.cpp index 21ad5c8d7..d436bbc39 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.cpp +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.cpp @@ -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" diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.cpp b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.cpp index 807fe6e6f..bc0cfeb02 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.cpp +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.cpp @@ -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" diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.cpp b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.cpp index 8f6bb8070..1d2ad093f 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.cpp +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.cpp @@ -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" diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.cpp b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.cpp index 3c014d7b3..466ace887 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.cpp +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.cpp @@ -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/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" diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.cpp b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.cpp index b3d04a370..b9c7efccb 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.cpp +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.cpp @@ -14,7 +14,7 @@ #include "app/common/src/UI/Controls/UIControl_Button.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" diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.cpp b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.cpp index 099bfe1cc..38db9a44e 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.cpp +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.cpp @@ -12,7 +12,7 @@ #include "app/common/App_enums.h" #include "app/common/src/Tutorial/Tutorial.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 "java/Random.h" diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.cpp b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.cpp index 6c0c423e2..8029686fa 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.cpp +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.cpp @@ -11,7 +11,7 @@ #include "app/common/src/UI/Controls/UIControl_Button.h" #include "app/common/src/UI/Controls/UIControl_CheckBox.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/ClientConnection.h" diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.cpp b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.cpp index e7c69b7e8..4e608dbd2 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.cpp +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.cpp @@ -15,7 +15,7 @@ #include "app/common/src/UI/Controls/UIControl_PlayerList.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/client/Minecraft.h" diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.cpp b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.cpp index fe582fcb9..1a3bd04f0 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.cpp +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.cpp @@ -13,7 +13,7 @@ #include "app/common/src/UI/Controls/UIControl_Label.h" #include "app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.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/ClientConnection.h" diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.cpp b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.cpp index 9aaf92783..e09b8e88c 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.cpp +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.cpp @@ -17,7 +17,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/client/multiplayer/MultiPlayerLocalPlayer.h" diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.cpp b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.cpp index 9fdc9e695..f75806778 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.cpp +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.cpp @@ -9,7 +9,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/client/Minecraft.h" diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.cpp b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.cpp index 784f10159..f28476144 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.cpp +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.cpp @@ -12,7 +12,7 @@ #include "app/common/src/UI/Controls/UIControl_PlayerList.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/ClientConnection.h" diff --git a/targets/app/common/src/UI/Scenes/UIScene_ConnectingProgress.cpp b/targets/app/common/src/UI/Scenes/UIScene_ConnectingProgress.cpp index 7725535fb..30a840eb3 100644 --- a/targets/app/common/src/UI/Scenes/UIScene_ConnectingProgress.cpp +++ b/targets/app/common/src/UI/Scenes/UIScene_ConnectingProgress.cpp @@ -11,7 +11,7 @@ #include "app/common/src/UI/Controls/UIControl_Progress.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 "java/System.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/app/common/src/UI/Scenes/UIScene_FullscreenProgress.cpp b/targets/app/common/src/UI/Scenes/UIScene_FullscreenProgress.cpp index 660ac4f24..bd0fb1c4c 100644 --- a/targets/app/common/src/UI/Scenes/UIScene_FullscreenProgress.cpp +++ b/targets/app/common/src/UI/Scenes/UIScene_FullscreenProgress.cpp @@ -15,7 +15,7 @@ #include "app/common/src/UI/Controls/UIControl_Progress.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 "platform/C4JThread.h" @@ -170,7 +170,7 @@ void UIScene_FullscreenProgress::tick() { if (exitcode == ERROR_CANCELLED) { // Current thread cancelled for whatever reason // Currently used only for the - // CConsoleMinecraftApp::RemoteSaveThreadProc thread Assume to + // Game::RemoteSaveThreadProc thread Assume to // just ignore this thread as something else is now running that // will cause another action } else { diff --git a/targets/app/common/src/UI/Scenes/UIScene_Keyboard.cpp b/targets/app/common/src/UI/Scenes/UIScene_Keyboard.cpp index 5c8d14ae8..23b1a8567 100644 --- a/targets/app/common/src/UI/Scenes/UIScene_Keyboard.cpp +++ b/targets/app/common/src/UI/Scenes/UIScene_Keyboard.cpp @@ -7,7 +7,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 "strings.h" diff --git a/targets/app/common/src/UI/Scenes/UIScene_MessageBox.cpp b/targets/app/common/src/UI/Scenes/UIScene_MessageBox.cpp index 440ad4304..60a02ef5e 100644 --- a/targets/app/common/src/UI/Scenes/UIScene_MessageBox.cpp +++ b/targets/app/common/src/UI/Scenes/UIScene_MessageBox.cpp @@ -9,7 +9,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 "strings.h" diff --git a/targets/app/common/src/UI/Scenes/UIScene_QuadrantSignin.cpp b/targets/app/common/src/UI/Scenes/UIScene_QuadrantSignin.cpp index fad832559..6cd46d396 100644 --- a/targets/app/common/src/UI/Scenes/UIScene_QuadrantSignin.cpp +++ b/targets/app/common/src/UI/Scenes/UIScene_QuadrantSignin.cpp @@ -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 "strings.h" diff --git a/targets/app/common/src/UI/UIController.cpp b/targets/app/common/src/UI/UIController.cpp index 72bae84d5..6f2ade9b1 100644 --- a/targets/app/common/src/UI/UIController.cpp +++ b/targets/app/common/src/UI/UIController.cpp @@ -33,7 +33,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 "app/include/BufferedImage.h" #include "UIFontData.h" diff --git a/targets/app/common/src/UI/UIFontData.cpp b/targets/app/common/src/UI/UIFontData.cpp index b72a6209c..61c9ad4c9 100644 --- a/targets/app/common/src/UI/UIFontData.cpp +++ b/targets/app/common/src/UI/UIFontData.cpp @@ -4,7 +4,7 @@ #include -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" ///////////////////////////////////////////////////// // --- -- --- THIS FILE IS IN UNICODE --- -- --- // diff --git a/targets/app/common/src/UI/UIGroup.cpp b/targets/app/common/src/UI/UIGroup.cpp index f2bc43ab6..f992e39a1 100644 --- a/targets/app/common/src/UI/UIGroup.cpp +++ b/targets/app/common/src/UI/UIGroup.cpp @@ -7,7 +7,7 @@ #include "app/common/src/UI/All Platforms/UIEnums.h" #include "app/common/src/UI/UILayer.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/client/MemoryTracker.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/app/common/src/UI/UILayer.cpp b/targets/app/common/src/UI/UILayer.cpp index 2c2fd78ca..39390a1e0 100644 --- a/targets/app/common/src/UI/UILayer.cpp +++ b/targets/app/common/src/UI/UILayer.cpp @@ -77,7 +77,7 @@ #include "app/common/src/UI/UIGroup.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" UILayer::UILayer(UIGroup* parent) { diff --git a/targets/app/common/src/UI/UIScene.cpp b/targets/app/common/src/UI/UIScene.cpp index c0d37bc91..20c833581 100644 --- a/targets/app/common/src/UI/UIScene.cpp +++ b/targets/app/common/src/UI/UIScene.cpp @@ -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 "app/linux/Stubs/winapi_stubs.h" #include "util/StringHelpers.h" diff --git a/targets/app/common/src/UI/UIString.cpp b/targets/app/common/src/UI/UIString.cpp index c185a1d96..b53d70b26 100644 --- a/targets/app/common/src/UI/UIString.cpp +++ b/targets/app/common/src/UI/UIString.cpp @@ -1,6 +1,6 @@ #include "UIString.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "app/include/XboxStubs.h" #include "util/StringHelpers.h" diff --git a/targets/app/common/src/UI/UITTFFont.cpp b/targets/app/common/src/UI/UITTFFont.cpp index c93397ec6..53e9036f6 100644 --- a/targets/app/common/src/UI/UITTFFont.cpp +++ b/targets/app/common/src/UI/UITTFFont.cpp @@ -7,7 +7,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 "util/StringHelpers.h" #include "platform/PlatformServices.h" diff --git a/targets/app/linux/Linux_App.cpp b/targets/app/linux/LinuxGame.cpp similarity index 78% rename from targets/app/linux/Linux_App.cpp rename to targets/app/linux/LinuxGame.cpp index 5b38f1bc9..844f43c09 100644 --- a/targets/app/linux/Linux_App.cpp +++ b/targets/app/linux/LinuxGame.cpp @@ -1,4 +1,4 @@ -#include "Linux_App.h" +#include "LinuxGame.h" #include @@ -8,7 +8,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/Network/GameNetworkManager.h" #include "app/common/src/UI/All Platforms/UIStructs.h" #include "platform/C4JThread.h" @@ -17,35 +17,35 @@ #include "minecraft/server/MinecraftServer.h" #include "minecraft/world/level/LevelSettings.h" -CConsoleMinecraftApp app; +LinuxGame app; #define CONTEXT_GAME_STATE 0 -CConsoleMinecraftApp::CConsoleMinecraftApp() : CMinecraftApp() {} +LinuxGame::LinuxGame() : Game() {} -void CConsoleMinecraftApp::SetRichPresenceContext(int iPad, int contextId) {} +void LinuxGame::SetRichPresenceContext(int iPad, int contextId) {} -void CConsoleMinecraftApp::StoreLaunchData() {} -void CConsoleMinecraftApp::ExitGame() { - app.DebugPrintf("Linux_App CConsoleMinecraftApp::ExitGame AFTER START\n"); +void LinuxGame::StoreLaunchData() {} +void LinuxGame::ExitGame() { + app.DebugPrintf("Linux_App LinuxGame::ExitGame AFTER START\n"); RenderManager.Close(); } -void CConsoleMinecraftApp::FatalLoadError() { +void LinuxGame::FatalLoadError() { app.DebugPrintf( - "CConsoleMinecraftApp::FatalLoadError - asserting 0 and dying...\n"); + "LinuxGame::FatalLoadError - asserting 0 and dying...\n"); assert(0); } -void CConsoleMinecraftApp::CaptureSaveThumbnail() {} -void CConsoleMinecraftApp::GetSaveThumbnail(std::uint8_t** thumbnailData, +void LinuxGame::CaptureSaveThumbnail() {} +void LinuxGame::GetSaveThumbnail(std::uint8_t** thumbnailData, unsigned int* thumbnailSize) {} -void CConsoleMinecraftApp::ReleaseSaveThumbnail() {} +void LinuxGame::ReleaseSaveThumbnail() {} -void CConsoleMinecraftApp::GetScreenshot(int iPad, +void LinuxGame::GetScreenshot(int iPad, std::uint8_t** screenshotData, unsigned int* screenshotSize) {} -void CConsoleMinecraftApp::TemporaryCreateGameStart() { +void LinuxGame::TemporaryCreateGameStart() { ////////////////////////////////////////////////////////////////////////////////////////////// /// From CScene_Main::OnInit @@ -121,17 +121,17 @@ void CConsoleMinecraftApp::TemporaryCreateGameStart() { thread->run(); } -int CConsoleMinecraftApp::GetLocalTMSFileIndex(wchar_t* wchTMSFile, +int LinuxGame::GetLocalTMSFileIndex(wchar_t* wchTMSFile, bool bFilenameIncludesExtension, eFileExtensionType eEXT) { return -1; } -int CConsoleMinecraftApp::LoadLocalTMSFile(wchar_t* wchTMSFile) { return -1; } +int LinuxGame::LoadLocalTMSFile(wchar_t* wchTMSFile) { return -1; } -int CConsoleMinecraftApp::LoadLocalTMSFile(wchar_t* wchTMSFile, +int LinuxGame::LoadLocalTMSFile(wchar_t* wchTMSFile, eFileExtensionType eExt) { return -1; } -void CConsoleMinecraftApp::FreeLocalTMSFiles(eTMSFileType eType) {} +void LinuxGame::FreeLocalTMSFiles(eTMSFileType eType) {} diff --git a/targets/app/linux/LinuxGame.h b/targets/app/linux/LinuxGame.h new file mode 100644 index 000000000..a9d0160ef --- /dev/null +++ b/targets/app/linux/LinuxGame.h @@ -0,0 +1,46 @@ +#pragma once + +#include + +#include "app/common/App_enums.h" +#include "app/common/Game.h" + +class C4JStringTable; + +class LinuxGame : public Game { +public: + LinuxGame(); + + void SetRichPresenceContext(int iPad, int contextId) override; + + void StoreLaunchData() override; + void ExitGame() override; + void FatalLoadError() override; + + void CaptureSaveThumbnail() override; + void GetSaveThumbnail(std::uint8_t** thumbnailData, + unsigned int* thumbnailSize) override; + void ReleaseSaveThumbnail() override; + void GetScreenshot(int iPad, std::uint8_t** screenshotData, + unsigned int* screenshotSize) override; + + int LoadLocalTMSFile(wchar_t* wchTMSFile) override; + int LoadLocalTMSFile(wchar_t* wchTMSFile, + eFileExtensionType eExt) override; + + void FreeLocalTMSFiles(eTMSFileType eType) override; + int GetLocalTMSFileIndex( + wchar_t* wchTMSFile, bool bFilenameIncludesExtension, + eFileExtensionType eEXT = eFileExtensionType_PNG) override; + + void ReadBannedList(int iPad, eTMSAction action = (eTMSAction)0, + bool bCallback = false) override {} + + C4JStringTable* GetStringTable() { return nullptr; } + + // original code + virtual void TemporaryCreateGameStart(); +}; + +extern LinuxGame app; + diff --git a/targets/app/linux/Linux_App.h b/targets/app/linux/Linux_App.h deleted file mode 100644 index 472b6af54..000000000 --- a/targets/app/linux/Linux_App.h +++ /dev/null @@ -1,45 +0,0 @@ -#pragma once - -#include - -#include "app/common/App_enums.h" -#include "app/common/Consoles_App.h" - -class C4JStringTable; - -class CConsoleMinecraftApp : public CMinecraftApp { -public: - CConsoleMinecraftApp(); - - virtual void SetRichPresenceContext(int iPad, int contextId); - - virtual void StoreLaunchData(); - virtual void ExitGame(); - virtual void FatalLoadError(); - - virtual void CaptureSaveThumbnail(); - virtual void GetSaveThumbnail(std::uint8_t** thumbnailData, - unsigned int* thumbnailSize); - virtual void ReleaseSaveThumbnail(); - virtual void GetScreenshot(int iPad, std::uint8_t** screenshotData, - unsigned int* screenshotSize); - - virtual int LoadLocalTMSFile(wchar_t* wchTMSFile); - virtual int LoadLocalTMSFile(wchar_t* wchTMSFile, eFileExtensionType eExt); - - virtual void FreeLocalTMSFiles(eTMSFileType eType); - virtual int GetLocalTMSFileIndex( - wchar_t* wchTMSFile, bool bFilenameIncludesExtension, - eFileExtensionType eEXT = eFileExtensionType_PNG); - - // BANNED LEVEL LIST - virtual void ReadBannedList(int iPad, eTMSAction action = (eTMSAction)0, - bool bCallback = false) {} - - C4JStringTable* GetStringTable() { return nullptr; } - - // original code - virtual void TemporaryCreateGameStart(); -}; - -extern CConsoleMinecraftApp app; diff --git a/targets/app/linux/Linux_Minecraft.cpp b/targets/app/linux/Linux_Minecraft.cpp index 660704556..4c7ac5631 100644 --- a/targets/app/linux/Linux_Minecraft.cpp +++ b/targets/app/linux/Linux_Minecraft.cpp @@ -60,7 +60,7 @@ static void sigsegv_handler(int sig) { #include "app/common/App_Defines.h" #include "app/common/src/Audio/SoundEngine.h" #include "app/common/src/Network/GameNetworkManager.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/client/Minecraft.h" @@ -490,11 +490,11 @@ int main(int argc, const char* argv[]) { // a level if the primary player signs out ProfileManager.SetSignInChangeCallback( [](bool bVal, unsigned int uiSignInData) { - CConsoleMinecraftApp::SignInChangeCallback(&app, bVal, uiSignInData); + Game::SignInChangeCallback(&app, bVal, uiSignInData); }); // Set a callback for when there is a read error on profile data - // StorageManager.SetProfileReadErrorCallback(&CConsoleMinecraftApp::ProfileReadErrorCallback, + // StorageManager.SetProfileReadErrorCallback(&Game::ProfileReadErrorCallback, // &app); // QNet needs to be setup after profile manager, as we do not want its diff --git a/targets/app/linux/Linux_UIController.cpp b/targets/app/linux/Linux_UIController.cpp index a95f0482f..e6cf502b2 100644 --- a/targets/app/linux/Linux_UIController.cpp +++ b/targets/app/linux/Linux_UIController.cpp @@ -10,7 +10,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/windows/Iggy/include/gdraw.h" ConsoleUIController ui; diff --git a/targets/app/linux/linux_game_stubs.cpp b/targets/app/linux/linux_game_stubs.cpp index d89528d77..0fea096da 100644 --- a/targets/app/linux/linux_game_stubs.cpp +++ b/targets/app/linux/linux_game_stubs.cpp @@ -1,10 +1,10 @@ #ifdef __linux__ -#include "app/common/Consoles_App.h" +#include "app/common/Game.h" #include "app/include/stubs.h" void Display::update() {} -int CMinecraftApp::GetTPConfigVal(wchar_t* pwchDataFile) { return 0; } +int Game::GetTPConfigVal(wchar_t* pwchDataFile) { return 0; } #endif diff --git a/targets/app/src/BufferedImage.cpp b/targets/app/src/BufferedImage.cpp index 8df5bcc18..405979696 100644 --- a/targets/app/src/BufferedImage.cpp +++ b/targets/app/src/BufferedImage.cpp @@ -10,7 +10,7 @@ #include "app/common/src/DLC/DLCFile.h" #include "app/common/src/DLC/DLCManager.h" #include "app/common/src/DLC/DLCPack.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "app/linux/Stubs/winapi_stubs.h" #include "PlatformTypes.h" #include "util/StringHelpers.h" diff --git a/targets/app/src/stubs.cpp b/targets/app/src/stubs.cpp index 114b56424..e7b0bf301 100644 --- a/targets/app/src/stubs.cpp +++ b/targets/app/src/stubs.cpp @@ -1,7 +1,7 @@ #include "app/include/stubs.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #if defined(__linux__) void LinuxLogStubLightmapProbe() { diff --git a/targets/app/windows/Source Files/Windows64_Minecraft.cpp b/targets/app/windows/Source Files/Windows64_Minecraft.cpp index 344676ea8..985594685 100644 --- a/targets/app/windows/Source Files/Windows64_Minecraft.cpp +++ b/targets/app/windows/Source Files/Windows64_Minecraft.cpp @@ -736,8 +736,8 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance, // no profile data for the player ProfileManager.SetDefaultOptionsCallback( [](C_4JProfile::PROFILESETTINGS* pSettings, int iPad) { - return CConsoleMinecraftApp::DefaultOptionsCallback(&app, pSettings, - iPad); + return Game::DefaultOptionsCallback(&app, pSettings, + iPad); }); // QNet needs to be setup after profile manager, as we do not want its // Notify listener to handle XN_SYS_SIGNINCHANGED notifications. This does diff --git a/targets/app/windows/Windows64_App.cpp b/targets/app/windows/Windows64_App.cpp index 0617fd640..66375cb6c 100644 --- a/targets/app/windows/Windows64_App.cpp +++ b/targets/app/windows/Windows64_App.cpp @@ -1,7 +1,7 @@  -#include "Windows64_App.h" +#include "WindowsGame.h" -#include "app/common/Consoles_App.h" +#include "app/common/Game.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/User.h" #include "minecraft/server/MinecraftServer.h" @@ -12,31 +12,31 @@ #include "minecraft/world/level/LevelType.h" #include "minecraft/world/level/biome/BiomeSource.h" -CConsoleMinecraftApp app; +WindowsGame app; #define CONTEXT_GAME_STATE 0 -CConsoleMinecraftApp::CConsoleMinecraftApp() : CMinecraftApp() {} +WindowsGame::WindowsGame() : Game() {} -void CConsoleMinecraftApp::SetRichPresenceContext(int iPad, int contextId) { +void WindowsGame::SetRichPresenceContext(int iPad, int contextId) { ProfileManager.SetRichPresenceContextValue(iPad, CONTEXT_GAME_STATE, contextId); } -void CConsoleMinecraftApp::StoreLaunchData() {} -void CConsoleMinecraftApp::ExitGame() {} -void CConsoleMinecraftApp::FatalLoadError() {} +void WindowsGame::StoreLaunchData() {} +void WindowsGame::ExitGame() {} +void WindowsGame::FatalLoadError() {} -void CConsoleMinecraftApp::CaptureSaveThumbnail() {} -void CConsoleMinecraftApp::GetSaveThumbnail(std::uint8_t** thumbnailData, +void WindowsGame::CaptureSaveThumbnail() {} +void WindowsGame::GetSaveThumbnail(std::uint8_t** thumbnailData, unsigned int* thumbnailSize) {} -void CConsoleMinecraftApp::ReleaseSaveThumbnail() {} +void WindowsGame::ReleaseSaveThumbnail() {} -void CConsoleMinecraftApp::GetScreenshot(int iPad, +void WindowsGame::GetScreenshot(int iPad, std::uint8_t** screenshotData, unsigned int* screenshotSize) {} -void CConsoleMinecraftApp::TemporaryCreateGameStart() { +void WindowsGame::TemporaryCreateGameStart() { ////////////////////////////////////////////////////////////////////////////////////////////// /// From CScene_Main::OnInit @@ -112,17 +112,17 @@ void CConsoleMinecraftApp::TemporaryCreateGameStart() { thread->run(); } -int CConsoleMinecraftApp::GetLocalTMSFileIndex(wchar_t* wchTMSFile, +int WindowsGame::GetLocalTMSFileIndex(wchar_t* wchTMSFile, bool bFilenameIncludesExtension, eFileExtensionType eEXT) { return -1; } -int CConsoleMinecraftApp::LoadLocalTMSFile(wchar_t* wchTMSFile) { return -1; } +int WindowsGame::LoadLocalTMSFile(wchar_t* wchTMSFile) { return -1; } -int CConsoleMinecraftApp::LoadLocalTMSFile(wchar_t* wchTMSFile, +int WindowsGame::LoadLocalTMSFile(wchar_t* wchTMSFile, eFileExtensionType eExt) { return -1; } -void CConsoleMinecraftApp::FreeLocalTMSFiles(eTMSFileType eType) {} +void WindowsGame::FreeLocalTMSFiles(eTMSFileType eType) {} diff --git a/targets/app/windows/Windows64_App.h b/targets/app/windows/WindowsGame.h similarity index 91% rename from targets/app/windows/Windows64_App.h rename to targets/app/windows/WindowsGame.h index c48c35499..81b2ab899 100644 --- a/targets/app/windows/Windows64_App.h +++ b/targets/app/windows/WindowsGame.h @@ -1,8 +1,8 @@ #pragma once -class CConsoleMinecraftApp : public CMinecraftApp { +class WindowsGame : public Game { public: - CConsoleMinecraftApp(); + WindowsGame(); virtual void SetRichPresenceContext(int iPad, int contextId); @@ -35,4 +35,5 @@ public: virtual void TemporaryCreateGameStart(); }; -extern CConsoleMinecraftApp app; +extern WindowsGame app; + diff --git a/targets/app/windows/XML/xmlFilesCallback.h b/targets/app/windows/XML/xmlFilesCallback.h index 220febb6f..af5b04db8 100644 --- a/targets/app/windows/XML/xmlFilesCallback.h +++ b/targets/app/windows/XML/xmlFilesCallback.h @@ -58,7 +58,7 @@ public: // if the xuid hasn't been defined, then we can't use the data if (xuid != 0LL) { - return CConsoleMinecraftApp::RegisterMojangData( + return Game::RegisterMojangData( wNameXUID, xuid, wNameSkin, wNameCloak); } else return 1; @@ -136,7 +136,7 @@ public: wprintf(L"Type - %s, Value - %d, ", wType, iValue); #endif - return CConsoleMinecraftApp::RegisterConfigValues(wType, + return Game::RegisterConfigValues(wType, iValue); } else { return 1; @@ -267,7 +267,7 @@ public: #endif app.DebugPrintf("Full = %lld, Trial %lld\n", ullFull, ullTrial); - return CConsoleMinecraftApp::RegisterDLCData( + return Game::RegisterDLCData( wType, wNameBanner, iGender, ullFull, ullTrial, wFirstSkin, uiSortIndex, iConfig, wDataFile); } else { diff --git a/targets/minecraft/client/Minecraft.cpp b/targets/minecraft/client/Minecraft.cpp index 1955d7cf1..80875804d 100644 --- a/targets/minecraft/client/Minecraft.cpp +++ b/targets/minecraft/client/Minecraft.cpp @@ -22,7 +22,7 @@ #include "app/common/src/Tutorial/Tutorial.h" #include "app/common/src/UI/All Platforms/UIEnums.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 "app/linux/Stubs/winapi_stubs.h" #include "app/include/XboxStubs.h" diff --git a/targets/minecraft/client/Options.cpp b/targets/minecraft/client/Options.cpp index 2fca6d4d9..20a7c4b9c 100644 --- a/targets/minecraft/client/Options.cpp +++ b/targets/minecraft/client/Options.cpp @@ -2,7 +2,7 @@ #include "KeyMapping.h" #include "app/common/src/Audio/SoundEngine.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "app/include/stubs.h" #include "util/StringHelpers.h" #include "java/File.h" diff --git a/targets/minecraft/client/gui/CreateWorldScreen.cpp b/targets/minecraft/client/gui/CreateWorldScreen.cpp index a21336724..68beb3d40 100644 --- a/targets/minecraft/client/gui/CreateWorldScreen.cpp +++ b/targets/minecraft/client/gui/CreateWorldScreen.cpp @@ -14,7 +14,7 @@ #include "app/common/src/Network/GameNetworkManager.h" #include "app/common/src/UI/All Platforms/UIEnums.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 "app/include/NetTypes.h" #include "app/include/stubs.h" diff --git a/targets/minecraft/client/gui/Gui.cpp b/targets/minecraft/client/gui/Gui.cpp index 05d23267d..6e9a8290d 100644 --- a/targets/minecraft/client/gui/Gui.cpp +++ b/targets/minecraft/client/gui/Gui.cpp @@ -9,7 +9,7 @@ #include "Facing.h" #include "app/common/App_enums.h" #include "app/common/App_structs.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "app/linux/Linux_UIController.h" #include "app/include/XboxStubs.h" #include "util/StringHelpers.h" diff --git a/targets/minecraft/client/gui/PauseScreen.cpp b/targets/minecraft/client/gui/PauseScreen.cpp index f50f5fd7d..da12bf5d7 100644 --- a/targets/minecraft/client/gui/PauseScreen.cpp +++ b/targets/minecraft/client/gui/PauseScreen.cpp @@ -12,7 +12,7 @@ #include "MessageScreen.h" #include "app/common/App_enums.h" #include "app/common/src/Network/GameNetworkManager.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "OptionsScreen.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/gui/Screen.h" diff --git a/targets/minecraft/client/gui/Screen.cpp b/targets/minecraft/client/gui/Screen.cpp index 277cdc99b..a08d6050f 100644 --- a/targets/minecraft/client/gui/Screen.cpp +++ b/targets/minecraft/client/gui/Screen.cpp @@ -7,7 +7,7 @@ #include "app/common/App_enums.h" #include "app/common/src/Audio/SoundEngine.h" #include "app/common/src/Network/GameNetworkManager.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "app/include/stubs.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/gui/Screen.h" diff --git a/targets/minecraft/client/gui/SelectWorldScreen.cpp b/targets/minecraft/client/gui/SelectWorldScreen.cpp index 2ad4534d7..101e19cdd 100644 --- a/targets/minecraft/client/gui/SelectWorldScreen.cpp +++ b/targets/minecraft/client/gui/SelectWorldScreen.cpp @@ -8,7 +8,7 @@ #include "Button.h" #include "ConfirmScreen.h" #include "CreateWorldScreen.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "app/linux/Stubs/winapi_stubs.h" #include "RenameWorldScreen.h" #include "util/StringHelpers.h" diff --git a/targets/minecraft/client/gui/inventory/AbstractContainerScreen.cpp b/targets/minecraft/client/gui/inventory/AbstractContainerScreen.cpp index 70f0ed5e0..3e76f6922 100644 --- a/targets/minecraft/client/gui/inventory/AbstractContainerScreen.cpp +++ b/targets/minecraft/client/gui/inventory/AbstractContainerScreen.cpp @@ -4,7 +4,7 @@ #include -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "app/include/stubs.h" #include "minecraft/client/KeyMapping.h" #include "minecraft/client/Lighting.h" diff --git a/targets/minecraft/client/gui/inventory/BeaconPowerButton.cpp b/targets/minecraft/client/gui/inventory/BeaconPowerButton.cpp index bdfc42631..ae1bd13a0 100644 --- a/targets/minecraft/client/gui/inventory/BeaconPowerButton.cpp +++ b/targets/minecraft/client/gui/inventory/BeaconPowerButton.cpp @@ -3,7 +3,7 @@ #include #include "BeaconScreen.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "minecraft/client/gui/inventory/AbstractBeaconButton.h" #include "minecraft/world/effect/MobEffect.h" #include "minecraft/client/renderer/Textures.h" diff --git a/targets/minecraft/client/gui/inventory/CreativeInventoryScreen.cpp b/targets/minecraft/client/gui/inventory/CreativeInventoryScreen.cpp index 30a505eac..e3e88aa76 100644 --- a/targets/minecraft/client/gui/inventory/CreativeInventoryScreen.cpp +++ b/targets/minecraft/client/gui/inventory/CreativeInventoryScreen.cpp @@ -10,7 +10,7 @@ #include "platform/sdl2/Render.h" #include "AbstractContainerScreen.h" #include "app/common/src/UI/All Platforms/IUIScene_CreativeMenu.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "app/include/stubs.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/Lighting.h" diff --git a/targets/minecraft/client/model/HumanoidModel.cpp b/targets/minecraft/client/model/HumanoidModel.cpp index cac1fb5e5..7801c5f6f 100644 --- a/targets/minecraft/client/model/HumanoidModel.cpp +++ b/targets/minecraft/client/model/HumanoidModel.cpp @@ -5,7 +5,7 @@ #include #include "platform/sdl2/Render.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "minecraft/client/model/geom/Model.h" #include "minecraft/client/model/geom/ModelPart.h" #include "minecraft/world/entity/Entity.h" diff --git a/targets/minecraft/client/multiplayer/ClientConnection.cpp b/targets/minecraft/client/multiplayer/ClientConnection.cpp index 31f0987a5..807bfe18c 100644 --- a/targets/minecraft/client/multiplayer/ClientConnection.cpp +++ b/targets/minecraft/client/multiplayer/ClientConnection.cpp @@ -30,7 +30,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/Containers/UIScene_TradingMenu.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 "MultiPlayerLevel.h" diff --git a/targets/minecraft/client/multiplayer/MultiPlayerLevel.cpp b/targets/minecraft/client/multiplayer/MultiPlayerLevel.cpp index acbe623c0..0cd434f1d 100644 --- a/targets/minecraft/client/multiplayer/MultiPlayerLevel.cpp +++ b/targets/minecraft/client/multiplayer/MultiPlayerLevel.cpp @@ -15,7 +15,7 @@ #include "app/common/src/Audio/SoundEngine.h" #include "app/common/src/Console_Debug_enum.h" #include "app/common/src/Network/GameNetworkManager.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "MultiPlayerChunkCache.h" #include "MultiPlayerLocalPlayer.h" #include "java/JavaMath.h" diff --git a/targets/minecraft/client/multiplayer/MultiPlayerLocalPlayer.cpp b/targets/minecraft/client/multiplayer/MultiPlayerLocalPlayer.cpp index cdbbfe5c8..0bbf3b91a 100644 --- a/targets/minecraft/client/multiplayer/MultiPlayerLocalPlayer.cpp +++ b/targets/minecraft/client/multiplayer/MultiPlayerLocalPlayer.cpp @@ -8,7 +8,7 @@ #include "app/common/src/Tutorial/Tutorial.h" #include "app/common/src/Tutorial/TutorialEnum.h" #include "app/common/src/Tutorial/TutorialMode.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/MultiPlayerGameMode.h" #include "minecraft/client/player/Input.h" diff --git a/targets/minecraft/client/player/Input.cpp b/targets/minecraft/client/player/Input.cpp index 1bcd5f75a..fd231d699 100644 --- a/targets/minecraft/client/player/Input.cpp +++ b/targets/minecraft/client/player/Input.cpp @@ -6,7 +6,7 @@ #include "platform/sdl2/Input.h" #include "LocalPlayer.h" #include "app/common/App_enums.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/MultiPlayerGameMode.h" #include "minecraft/world/entity/player/Abilities.h" diff --git a/targets/minecraft/client/player/LocalPlayer.cpp b/targets/minecraft/client/player/LocalPlayer.cpp index ee9f8a46a..fff0a7612 100644 --- a/targets/minecraft/client/player/LocalPlayer.cpp +++ b/targets/minecraft/client/player/LocalPlayer.cpp @@ -35,7 +35,7 @@ #include "app/common/src/Tutorial/Tutorial.h" #include "app/common/src/Tutorial/TutorialMode.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 "PlatformTypes.h" diff --git a/targets/minecraft/client/player/RemotePlayer.cpp b/targets/minecraft/client/player/RemotePlayer.cpp index 844ec37cf..a48fa4e40 100644 --- a/targets/minecraft/client/player/RemotePlayer.cpp +++ b/targets/minecraft/client/player/RemotePlayer.cpp @@ -4,7 +4,7 @@ #include #include -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "Pos.h" #include "minecraft/world/entity/player/Inventory.h" #include "minecraft/world/entity/player/Player.h" diff --git a/targets/minecraft/client/renderer/GameRenderer.cpp b/targets/minecraft/client/renderer/GameRenderer.cpp index e44a0c6ab..744e27a79 100644 --- a/targets/minecraft/client/renderer/GameRenderer.cpp +++ b/targets/minecraft/client/renderer/GameRenderer.cpp @@ -16,7 +16,7 @@ #include "app/common/App_enums.h" #include "platform/ShutdownManager.h" #include "app/common/src/Colours/ColourTable.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "app/linux/Stubs/winapi_stubs.h" #include "app/include/BufferedImage.h" #include "app/include/FrameProfiler.h" diff --git a/targets/minecraft/client/renderer/ItemInHandRenderer.cpp b/targets/minecraft/client/renderer/ItemInHandRenderer.cpp index aff054c12..bc85fa098 100644 --- a/targets/minecraft/client/renderer/ItemInHandRenderer.cpp +++ b/targets/minecraft/client/renderer/ItemInHandRenderer.cpp @@ -9,7 +9,7 @@ #include "platform/sdl2/Render.h" #include "app/common/App_enums.h" #include "app/common/src/Colours/ColourTable.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "Tesselator.h" #include "Textures.h" #include "TileRenderer.h" diff --git a/targets/minecraft/client/renderer/LevelRenderer.cpp b/targets/minecraft/client/renderer/LevelRenderer.cpp index a9c4da425..8f9eda518 100644 --- a/targets/minecraft/client/renderer/LevelRenderer.cpp +++ b/targets/minecraft/client/renderer/LevelRenderer.cpp @@ -22,7 +22,7 @@ #include "app/common/src/Audio/SoundEngine.h" #include "app/common/src/Colours/ColourTable.h" #include "app/common/src/Console_Debug_enum.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "app/include/FrameProfiler.h" #include "app/include/MobSkinMemTextureProcessor.h" #include "app/include/stubs.h" diff --git a/targets/minecraft/client/renderer/Tesselator.cpp b/targets/minecraft/client/renderer/Tesselator.cpp index 2a3215124..b10c8fd3f 100644 --- a/targets/minecraft/client/renderer/Tesselator.cpp +++ b/targets/minecraft/client/renderer/Tesselator.cpp @@ -5,7 +5,7 @@ #include #include "platform/sdl2/Render.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "app/include/stubs.h" #include "minecraft/client/MemoryTracker.h" diff --git a/targets/minecraft/client/renderer/Textures.cpp b/targets/minecraft/client/renderer/Textures.cpp index da05ad108..eccbbe06f 100644 --- a/targets/minecraft/client/renderer/Textures.cpp +++ b/targets/minecraft/client/renderer/Textures.cpp @@ -9,7 +9,7 @@ #include "platform/sdl2/Render.h" #include "HttpTexture.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "app/include/BufferedImage.h" #include "app/include/MemTexture.h" #include "app/include/MemTextureProcessor.h" diff --git a/targets/minecraft/client/renderer/entity/EntityRenderDispatcher.cpp b/targets/minecraft/client/renderer/entity/EntityRenderDispatcher.cpp index 4e023e014..bd0a73d89 100644 --- a/targets/minecraft/client/renderer/entity/EntityRenderDispatcher.cpp +++ b/targets/minecraft/client/renderer/entity/EntityRenderDispatcher.cpp @@ -34,7 +34,7 @@ #include "LightningBoltRenderer.h" #include "MinecartRenderer.h" #include "MinecartSpawnerRenderer.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "MobRenderer.h" #include "MushroomCowRenderer.h" #include "OcelotRenderer.h" diff --git a/targets/minecraft/client/renderer/entity/LivingEntityRenderer.cpp b/targets/minecraft/client/renderer/entity/LivingEntityRenderer.cpp index 38d5972f3..30e469227 100644 --- a/targets/minecraft/client/renderer/entity/LivingEntityRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/LivingEntityRenderer.cpp @@ -7,7 +7,7 @@ #include "platform/sdl2/Render.h" #include "EntityRenderDispatcher.h" #include "app/common/App_enums.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "java/Class.h" #include "java/Random.h" diff --git a/targets/minecraft/client/renderer/entity/PlayerRenderer.cpp b/targets/minecraft/client/renderer/entity/PlayerRenderer.cpp index 259ff330e..9c4acb77f 100644 --- a/targets/minecraft/client/renderer/entity/PlayerRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/PlayerRenderer.cpp @@ -8,7 +8,7 @@ #include "EntityRenderDispatcher.h" #include "HumanoidMobRenderer.h" #include "app/common/App_enums.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "java/Class.h" #include "minecraft/Facing.h" #include "minecraft/SharedConstants.h" diff --git a/targets/minecraft/client/renderer/texture/PreStitchedTextureMap.cpp b/targets/minecraft/client/renderer/texture/PreStitchedTextureMap.cpp index 2ef2590c3..e0b83b47c 100644 --- a/targets/minecraft/client/renderer/texture/PreStitchedTextureMap.cpp +++ b/targets/minecraft/client/renderer/texture/PreStitchedTextureMap.cpp @@ -3,7 +3,7 @@ #include #include -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "app/linux/Stubs/winapi_stubs.h" #include "app/include/BufferedImage.h" #include "SimpleIcon.h" diff --git a/targets/minecraft/client/renderer/texture/Stitcher.cpp b/targets/minecraft/client/renderer/texture/Stitcher.cpp index 0adc97fa3..5a9498de0 100644 --- a/targets/minecraft/client/renderer/texture/Stitcher.cpp +++ b/targets/minecraft/client/renderer/texture/Stitcher.cpp @@ -2,7 +2,7 @@ #include -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "app/linux/Stubs/winapi_stubs.h" #include "StitchSlot.h" #include "Texture.h" diff --git a/targets/minecraft/client/renderer/texture/Texture.cpp b/targets/minecraft/client/renderer/texture/Texture.cpp index b30ae0fb5..74d720e11 100644 --- a/targets/minecraft/client/renderer/texture/Texture.cpp +++ b/targets/minecraft/client/renderer/texture/Texture.cpp @@ -6,7 +6,7 @@ #include #include "platform/sdl2/Render.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "app/include/BufferedImage.h" #include "TextureManager.h" #include "java/Buffer.h" diff --git a/targets/minecraft/client/renderer/texture/TextureManager.cpp b/targets/minecraft/client/renderer/texture/TextureManager.cpp index c63da3099..b03f23e1b 100644 --- a/targets/minecraft/client/renderer/texture/TextureManager.cpp +++ b/targets/minecraft/client/renderer/texture/TextureManager.cpp @@ -5,7 +5,7 @@ #include #include -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "app/include/BufferedImage.h" #include "Stitcher.h" #include "Texture.h" diff --git a/targets/minecraft/client/renderer/texture/TextureMap.cpp b/targets/minecraft/client/renderer/texture/TextureMap.cpp index 2c31c026e..c32a5249d 100644 --- a/targets/minecraft/client/renderer/texture/TextureMap.cpp +++ b/targets/minecraft/client/renderer/texture/TextureMap.cpp @@ -5,7 +5,7 @@ #include #include -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "app/linux/Stubs/winapi_stubs.h" #include "app/include/BufferedImage.h" #include "StitchSlot.h" diff --git a/targets/minecraft/client/renderer/tileentity/SignRenderer.cpp b/targets/minecraft/client/renderer/tileentity/SignRenderer.cpp index 30bd06dfd..8e65c852a 100644 --- a/targets/minecraft/client/renderer/tileentity/SignRenderer.cpp +++ b/targets/minecraft/client/renderer/tileentity/SignRenderer.cpp @@ -7,7 +7,7 @@ #include "platform/sdl2/Render.h" #include "app/common/App_enums.h" #include "app/common/src/Colours/ColourTable.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "app/include/XboxStubs.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/minecraft/client/skins/AbstractTexturePack.cpp b/targets/minecraft/client/skins/AbstractTexturePack.cpp index dbef0b984..688e2cc7f 100644 --- a/targets/minecraft/client/skins/AbstractTexturePack.cpp +++ b/targets/minecraft/client/skins/AbstractTexturePack.cpp @@ -6,7 +6,7 @@ #include #include "app/common/src/Colours/ColourTable.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/BufferedImage.h" diff --git a/targets/minecraft/client/skins/DLCTexturePack.cpp b/targets/minecraft/client/skins/DLCTexturePack.cpp index 694634232..7f95d6f7c 100644 --- a/targets/minecraft/client/skins/DLCTexturePack.cpp +++ b/targets/minecraft/client/skins/DLCTexturePack.cpp @@ -23,7 +23,7 @@ #include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" #include "app/common/src/Localisation/StringTable.h" #include "app/common/src/UI/All Platforms/ArchiveFile.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/BufferedImage.h" diff --git a/targets/minecraft/client/skins/DefaultTexturePack.h b/targets/minecraft/client/skins/DefaultTexturePack.h index 77887b98f..b7fd41292 100644 --- a/targets/minecraft/client/skins/DefaultTexturePack.h +++ b/targets/minecraft/client/skins/DefaultTexturePack.h @@ -2,7 +2,7 @@ #include #include "AbstractTexturePack.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "java/InputOutputStream/InputStream.h" #include "strings.h" diff --git a/targets/minecraft/client/skins/TexturePackRepository.cpp b/targets/minecraft/client/skins/TexturePackRepository.cpp index 12c889cb2..640f4b945 100644 --- a/targets/minecraft/client/skins/TexturePackRepository.cpp +++ b/targets/minecraft/client/skins/TexturePackRepository.cpp @@ -11,7 +11,7 @@ #include "app/common/App_enums.h" #include "app/common/src/DLC/DLCManager.h" #include "app/common/src/DLC/DLCPack.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "app/linux/Linux_UIController.h" #include "java/File.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/minecraft/client/title/TitleScreen.cpp b/targets/minecraft/client/title/TitleScreen.cpp index 8f0844af5..52633dada 100644 --- a/targets/minecraft/client/title/TitleScreen.cpp +++ b/targets/minecraft/client/title/TitleScreen.cpp @@ -6,7 +6,7 @@ #include #include "platform/sdl2/Render.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "app/linux/Stubs/winapi_stubs.h" #include "app/include/BufferedImage.h" #include "util/StringHelpers.h" diff --git a/targets/minecraft/commands/CommandDispatcher.cpp b/targets/minecraft/commands/CommandDispatcher.cpp index 50044df3a..634d6d371 100644 --- a/targets/minecraft/commands/CommandDispatcher.cpp +++ b/targets/minecraft/commands/CommandDispatcher.cpp @@ -3,7 +3,7 @@ #include #include -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "minecraft/commands/Command.h" #include "minecraft/commands/CommandSender.h" #include "minecraft/commands/CommandsEnum.h" diff --git a/targets/minecraft/core/ItemDispenseBehaviors.cpp b/targets/minecraft/core/ItemDispenseBehaviors.cpp index cbffc1ba6..e9b6aaac9 100644 --- a/targets/minecraft/core/ItemDispenseBehaviors.cpp +++ b/targets/minecraft/core/ItemDispenseBehaviors.cpp @@ -4,7 +4,7 @@ #include #include "app/common/App_enums.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "java/Class.h" #include "java/Random.h" #include "minecraft/core/AbstractProjectileDispenseBehavior.h" diff --git a/targets/minecraft/network/packet/BlockRegionUpdatePacket.cpp b/targets/minecraft/network/packet/BlockRegionUpdatePacket.cpp index 6eb4ef032..3872f8c1b 100644 --- a/targets/minecraft/network/packet/BlockRegionUpdatePacket.cpp +++ b/targets/minecraft/network/packet/BlockRegionUpdatePacket.cpp @@ -3,7 +3,7 @@ #include #include -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "PacketListener.h" #include "minecraft/world/level/storage/ConsoleSaveFileIO/compression.h" #include "java/InputOutputStream/DataInputStream.h" diff --git a/targets/minecraft/network/packet/CustomPayloadPacket.cpp b/targets/minecraft/network/packet/CustomPayloadPacket.cpp index 73adfd6a5..72ccc7bb3 100644 --- a/targets/minecraft/network/packet/CustomPayloadPacket.cpp +++ b/targets/minecraft/network/packet/CustomPayloadPacket.cpp @@ -2,7 +2,7 @@ #include -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "app/linux/Stubs/winapi_stubs.h" #include "PacketListener.h" #include "java/InputOutputStream/DataInputStream.h" diff --git a/targets/minecraft/network/packet/GameCommandPacket.cpp b/targets/minecraft/network/packet/GameCommandPacket.cpp index a6a2452c8..13fadd380 100644 --- a/targets/minecraft/network/packet/GameCommandPacket.cpp +++ b/targets/minecraft/network/packet/GameCommandPacket.cpp @@ -2,7 +2,7 @@ #include -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "app/linux/Stubs/winapi_stubs.h" #include "PacketListener.h" #include "java/InputOutputStream/DataInputStream.h" diff --git a/targets/minecraft/network/packet/LoginPacket.cpp b/targets/minecraft/network/packet/LoginPacket.cpp index a634e37e7..58e5bd641 100644 --- a/targets/minecraft/network/packet/LoginPacket.cpp +++ b/targets/minecraft/network/packet/LoginPacket.cpp @@ -1,6 +1,6 @@ #include "LoginPacket.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "PacketListener.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" diff --git a/targets/minecraft/network/packet/Packet.cpp b/targets/minecraft/network/packet/Packet.cpp index bf3b33ddb..bd77f0cd7 100644 --- a/targets/minecraft/network/packet/Packet.cpp +++ b/targets/minecraft/network/packet/Packet.cpp @@ -12,7 +12,7 @@ #include #include -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "app/linux/Stubs/winapi_stubs.h" #include "java/Exceptions.h" #include "java/InputOutputStream/DataInputStream.h" diff --git a/targets/minecraft/network/packet/PreLoginPacket.cpp b/targets/minecraft/network/packet/PreLoginPacket.cpp index 7e7fa48dd..e5542db9b 100644 --- a/targets/minecraft/network/packet/PreLoginPacket.cpp +++ b/targets/minecraft/network/packet/PreLoginPacket.cpp @@ -5,7 +5,7 @@ #include "app/common/src/BuildVer/BuildVer.h" #include "platform/IPlatformNetwork.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "app/linux/Stubs/winapi_stubs.h" #include "PacketListener.h" #include "java/InputOutputStream/DataInputStream.h" diff --git a/targets/minecraft/network/packet/RespawnPacket.cpp b/targets/minecraft/network/packet/RespawnPacket.cpp index 73744eaad..25b9bcc83 100644 --- a/targets/minecraft/network/packet/RespawnPacket.cpp +++ b/targets/minecraft/network/packet/RespawnPacket.cpp @@ -2,7 +2,7 @@ #include -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "PacketListener.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" diff --git a/targets/minecraft/network/packet/SetPlayerTeamPacket.cpp b/targets/minecraft/network/packet/SetPlayerTeamPacket.cpp index f4e5f9443..8d79d076d 100644 --- a/targets/minecraft/network/packet/SetPlayerTeamPacket.cpp +++ b/targets/minecraft/network/packet/SetPlayerTeamPacket.cpp @@ -2,7 +2,7 @@ #include -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "app/linux/Stubs/winapi_stubs.h" #include "PacketListener.h" #include "java/InputOutputStream/DataInputStream.h" diff --git a/targets/minecraft/server/MinecraftServer.cpp b/targets/minecraft/server/MinecraftServer.cpp index b51f07f44..e022c7eec 100644 --- a/targets/minecraft/server/MinecraftServer.cpp +++ b/targets/minecraft/server/MinecraftServer.cpp @@ -20,7 +20,7 @@ #include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" #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 "PlayerList.h" #include "Settings.h" #include "util/Timer.h" diff --git a/targets/minecraft/server/PlayerList.cpp b/targets/minecraft/server/PlayerList.cpp index 3d22b4697..c9b00588a 100644 --- a/targets/minecraft/server/PlayerList.cpp +++ b/targets/minecraft/server/PlayerList.cpp @@ -18,7 +18,7 @@ #include "app/common/src/Network/Socket.h" #include "app/common/src/Tutorial/Tutorial.h" #include "app/common/src/Tutorial/TutorialEnum.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 "MinecraftServer.h" diff --git a/targets/minecraft/server/level/PlayerChunkMap.cpp b/targets/minecraft/server/level/PlayerChunkMap.cpp index 30adce0d8..fb4ae3e27 100644 --- a/targets/minecraft/server/level/PlayerChunkMap.cpp +++ b/targets/minecraft/server/level/PlayerChunkMap.cpp @@ -11,7 +11,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 "ServerChunkCache.h" #include "ServerLevel.h" #include "ServerPlayer.h" diff --git a/targets/minecraft/server/level/ServerChunkCache.cpp b/targets/minecraft/server/level/ServerChunkCache.cpp index cc30cbf9c..386c2ad9e 100644 --- a/targets/minecraft/server/level/ServerChunkCache.cpp +++ b/targets/minecraft/server/level/ServerChunkCache.cpp @@ -6,7 +6,7 @@ #include -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "app/linux/Stubs/winapi_stubs.h" #include "ServerLevel.h" #include "minecraft/world/level/storage/ConsoleSaveFileIO/compression.h" diff --git a/targets/minecraft/server/level/ServerLevel.cpp b/targets/minecraft/server/level/ServerLevel.cpp index 34ff511d8..94275453f 100644 --- a/targets/minecraft/server/level/ServerLevel.cpp +++ b/targets/minecraft/server/level/ServerLevel.cpp @@ -13,7 +13,7 @@ #include "app/common/src/DLC/DLCManager.h" #include "app/common/src/DLC/DLCPack.h" #include "app/common/src/Network/NetworkPlayerInterface.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "PlayerChunkMap.h" #include "Pos.h" #include "ServerChunkCache.h" diff --git a/targets/minecraft/server/level/ServerLevelListener.cpp b/targets/minecraft/server/level/ServerLevelListener.cpp index 3dbad36d5..b48dbcd92 100644 --- a/targets/minecraft/server/level/ServerLevelListener.cpp +++ b/targets/minecraft/server/level/ServerLevelListener.cpp @@ -4,7 +4,7 @@ #include #include "EntityTracker.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "PlayerChunkMap.h" #include "ServerLevel.h" #include "ServerPlayer.h" diff --git a/targets/minecraft/server/level/ServerPlayer.cpp b/targets/minecraft/server/level/ServerPlayer.cpp index dab00cfc8..3d6764379 100644 --- a/targets/minecraft/server/level/ServerPlayer.cpp +++ b/targets/minecraft/server/level/ServerPlayer.cpp @@ -14,7 +14,7 @@ #include "app/common/src/GameRules/LevelRules/Rules/GameRulesInstance.h" #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 "ServerLevel.h" #include "ServerPlayerGameMode.h" #include "java/InputOutputStream/ByteArrayInputStream.h" diff --git a/targets/minecraft/server/level/TrackedEntity.cpp b/targets/minecraft/server/level/TrackedEntity.cpp index 3a5a84cda..fed155b53 100644 --- a/targets/minecraft/server/level/TrackedEntity.cpp +++ b/targets/minecraft/server/level/TrackedEntity.cpp @@ -11,7 +11,7 @@ #include "platform/PlatformTypes.h" #include "EntityTracker.h" #include "app/common/src/Network/NetworkPlayerInterface.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "ServerPlayer.h" #include "java/Class.h" #include "minecraft/SharedConstants.h" diff --git a/targets/minecraft/server/network/PendingConnection.cpp b/targets/minecraft/server/network/PendingConnection.cpp index 739890738..bdb7ca9c6 100644 --- a/targets/minecraft/server/network/PendingConnection.cpp +++ b/targets/minecraft/server/network/PendingConnection.cpp @@ -11,7 +11,7 @@ #include "app/common/src/BuildVer/BuildVer.h" #include "app/common/src/Network/NetworkPlayerInterface.h" #include "platform/IPlatformNetwork.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 "PlayerConnection.h" diff --git a/targets/minecraft/server/network/PlayerConnection.cpp b/targets/minecraft/server/network/PlayerConnection.cpp index ce7be0c53..37d49ec11 100644 --- a/targets/minecraft/server/network/PlayerConnection.cpp +++ b/targets/minecraft/server/network/PlayerConnection.cpp @@ -15,7 +15,7 @@ #include "app/common/src/Network/GameNetworkManager.h" #include "app/common/src/Network/NetworkPlayerInterface.h" #include "app/common/src/Network/Socket.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "app/include/SkinBox.h" #include "ServerConnection.h" #include "java/Class.h" diff --git a/targets/minecraft/server/network/ServerConnection.cpp b/targets/minecraft/server/network/ServerConnection.cpp index e8494c554..698827860 100644 --- a/targets/minecraft/server/network/ServerConnection.cpp +++ b/targets/minecraft/server/network/ServerConnection.cpp @@ -2,7 +2,7 @@ #include -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "PendingConnection.h" #include "PlayerConnection.h" #include "util/StringHelpers.h" diff --git a/targets/minecraft/stats/Stat.h b/targets/minecraft/stats/Stat.h index 992486b52..94acdc79b 100644 --- a/targets/minecraft/stats/Stat.h +++ b/targets/minecraft/stats/Stat.h @@ -8,7 +8,7 @@ #include #include "GenericStats.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "StatFormatter.h" class DecimalFormat; diff --git a/targets/minecraft/stats/StatsCounter.cpp b/targets/minecraft/stats/StatsCounter.cpp index f6d8c497d..d525d0d52 100644 --- a/targets/minecraft/stats/StatsCounter.cpp +++ b/targets/minecraft/stats/StatsCounter.cpp @@ -12,7 +12,7 @@ #include "platform/sdl2/Profile.h" #include "app/common/App_structs.h" #include "app/common/src/Leaderboards/LeaderboardManager.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "minecraft/stats/Achievement.h" #include "minecraft/stats/Achievements.h" #include "minecraft/stats/GenericStats.h" @@ -185,7 +185,7 @@ void StatsCounter::save(int player, bool force) { (LARGE_STATS_COUNT * 4 * (sizeof(unsigned int) - sizeof(unsigned short))); assert(uiTotalStatsSize <= - (CConsoleMinecraftApp::GAME_DEFINED_PROFILE_DATA_BYTES - + (Game::GAME_DEFINED_PROFILE_DATA_BYTES - sizeof(GAME_SETTINGS))); // Retrieve the data pointer from the profile @@ -198,7 +198,7 @@ void StatsCounter::save(int player, bool force) { // Reset all the data to 0 (we're going to replace it with the map data) memset(statData, 0, - CConsoleMinecraftApp::GAME_DEFINED_PROFILE_DATA_BYTES - + Game::GAME_DEFINED_PROFILE_DATA_BYTES - sizeof(GAME_SETTINGS)); // For each stat diff --git a/targets/minecraft/stdafx.h b/targets/minecraft/stdafx.h index 82666dfe2..2d8cf8455 100644 --- a/targets/minecraft/stdafx.h +++ b/targets/minecraft/stdafx.h @@ -5,7 +5,7 @@ #pragma once #ifdef _WINDOWS64 -#include "app/windows/Windows64_App.h" +#include "app/windows/WindowsGame.h" #else -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #endif diff --git a/targets/minecraft/util/HtmlString.cpp b/targets/minecraft/util/HtmlString.cpp index 442303f18..cabed04bc 100644 --- a/targets/minecraft/util/HtmlString.cpp +++ b/targets/minecraft/util/HtmlString.cpp @@ -4,7 +4,7 @@ #include #include -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "util/StringHelpers.h" HtmlString::HtmlString(std::wstring text, eMinecraftColour hexColor, diff --git a/targets/minecraft/world/CompoundContainer.cpp b/targets/minecraft/world/CompoundContainer.cpp index a40f90133..f30488cf3 100644 --- a/targets/minecraft/world/CompoundContainer.cpp +++ b/targets/minecraft/world/CompoundContainer.cpp @@ -1,6 +1,6 @@ #include "CompoundContainer.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "minecraft/network/packet/ContainerOpenPacket.h" #include "minecraft/world/Container.h" diff --git a/targets/minecraft/world/SimpleContainer.cpp b/targets/minecraft/world/SimpleContainer.cpp index d5d6746f1..022bb38b4 100644 --- a/targets/minecraft/world/SimpleContainer.cpp +++ b/targets/minecraft/world/SimpleContainer.cpp @@ -2,7 +2,7 @@ #include -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "minecraft/world/Container.h" #include "minecraft/world/item/ItemInstance.h" #include "net.minecraft.world.ContainerListener.h" diff --git a/targets/minecraft/world/effect/MobEffectInstance.cpp b/targets/minecraft/world/effect/MobEffectInstance.cpp index ab6b28e83..ad0c7f5f6 100644 --- a/targets/minecraft/world/effect/MobEffectInstance.cpp +++ b/targets/minecraft/world/effect/MobEffectInstance.cpp @@ -6,7 +6,7 @@ #include #include -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "minecraft/world/effect/MobEffect.h" #include "nbt/CompoundTag.h" diff --git a/targets/minecraft/world/entity/Entity.cpp b/targets/minecraft/world/entity/Entity.cpp index 3017bd39e..5ada7ae89 100644 --- a/targets/minecraft/world/entity/Entity.cpp +++ b/targets/minecraft/world/entity/Entity.cpp @@ -15,7 +15,7 @@ #include "EntityIO.h" #include "EntityPos.h" #include "app/common/App_enums.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "app/linux/Stubs/winapi_stubs.h" #include "SyncedEntityData.h" #include "util/StringHelpers.h" diff --git a/targets/minecraft/world/entity/EntityIO.cpp b/targets/minecraft/world/entity/EntityIO.cpp index 538910761..ec60be53c 100644 --- a/targets/minecraft/world/entity/EntityIO.cpp +++ b/targets/minecraft/world/entity/EntityIO.cpp @@ -3,7 +3,7 @@ #include #include "Entity.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "Painting.h" #include "java/Class.h" #include "java/JavaIntHash.h" diff --git a/targets/minecraft/world/entity/LivingEntity.cpp b/targets/minecraft/world/entity/LivingEntity.cpp index 36f14a5c7..2fed0a239 100644 --- a/targets/minecraft/world/entity/LivingEntity.cpp +++ b/targets/minecraft/world/entity/LivingEntity.cpp @@ -13,7 +13,7 @@ #include #include -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "java/Class.h" #include "java/JavaMath.h" #include "java/Random.h" diff --git a/targets/minecraft/world/entity/Painting.cpp b/targets/minecraft/world/entity/Painting.cpp index e3964b6bf..5b3eeb6dc 100644 --- a/targets/minecraft/world/entity/Painting.cpp +++ b/targets/minecraft/world/entity/Painting.cpp @@ -3,7 +3,7 @@ #include #include -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "java/Random.h" #include "minecraft/world/entity/Entity.h" #include "minecraft/world/entity/HangingEntity.h" diff --git a/targets/minecraft/world/entity/SyncedEntityData.cpp b/targets/minecraft/world/entity/SyncedEntityData.cpp index dc9ab6a9d..110ff13f6 100644 --- a/targets/minecraft/world/entity/SyncedEntityData.cpp +++ b/targets/minecraft/world/entity/SyncedEntityData.cpp @@ -4,7 +4,7 @@ #include -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" #include "minecraft/network/packet/Packet.h" diff --git a/targets/minecraft/world/entity/ai/attributes/AttributeModifier.cpp b/targets/minecraft/world/entity/ai/attributes/AttributeModifier.cpp index daf55d610..8850776aa 100644 --- a/targets/minecraft/world/entity/ai/attributes/AttributeModifier.cpp +++ b/targets/minecraft/world/entity/ai/attributes/AttributeModifier.cpp @@ -4,7 +4,7 @@ #include #include "app/common/App_enums.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "minecraft/util/HtmlString.h" #include "minecraft/world/entity/ai/attributes/Attribute.h" diff --git a/targets/minecraft/world/entity/animal/EntityHorse.cpp b/targets/minecraft/world/entity/animal/EntityHorse.cpp index 110cd5857..da40cc2ac 100644 --- a/targets/minecraft/world/entity/animal/EntityHorse.cpp +++ b/targets/minecraft/world/entity/animal/EntityHorse.cpp @@ -6,7 +6,7 @@ #include #include -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "util/StringHelpers.h" #include "java/Random.h" #include "minecraft/client/renderer/Textures.h" diff --git a/targets/minecraft/world/entity/animal/Ocelot.cpp b/targets/minecraft/world/entity/animal/Ocelot.cpp index 950729c98..4d5a382fb 100644 --- a/targets/minecraft/world/entity/animal/Ocelot.cpp +++ b/targets/minecraft/world/entity/animal/Ocelot.cpp @@ -6,7 +6,7 @@ #include #include "IPlatformInput.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "util/StringHelpers.h" #include "java/Random.h" #include "minecraft/SharedConstants.h" diff --git a/targets/minecraft/world/entity/boss/enderdragon/EnderDragon.h b/targets/minecraft/world/entity/boss/enderdragon/EnderDragon.h index 4ce216f65..454c74c6a 100644 --- a/targets/minecraft/world/entity/boss/enderdragon/EnderDragon.h +++ b/targets/minecraft/world/entity/boss/enderdragon/EnderDragon.h @@ -5,7 +5,7 @@ #include #include -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "java/Class.h" #include "minecraft/stdafx.h" #include "minecraft/world/entity/LivingEntity.h" diff --git a/targets/minecraft/world/entity/boss/wither/WitherBoss.h b/targets/minecraft/world/entity/boss/wither/WitherBoss.h index f5880334f..58ae44577 100644 --- a/targets/minecraft/world/entity/boss/wither/WitherBoss.h +++ b/targets/minecraft/world/entity/boss/wither/WitherBoss.h @@ -3,7 +3,7 @@ #include #include -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "java/Class.h" #include "minecraft/stdafx.h" #include "minecraft/world/entity/EntitySelector.h" diff --git a/targets/minecraft/world/entity/item/ItemEntity.cpp b/targets/minecraft/world/entity/item/ItemEntity.cpp index 6bc7cbef1..062bc1247 100644 --- a/targets/minecraft/world/entity/item/ItemEntity.cpp +++ b/targets/minecraft/world/entity/item/ItemEntity.cpp @@ -6,7 +6,7 @@ #include #include -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "SharedConstants.h" #include "java/JavaMath.h" #include "java/Random.h" diff --git a/targets/minecraft/world/entity/item/MinecartContainer.cpp b/targets/minecraft/world/entity/item/MinecartContainer.cpp index fb91846b6..728e20e8f 100644 --- a/targets/minecraft/world/entity/item/MinecartContainer.cpp +++ b/targets/minecraft/world/entity/item/MinecartContainer.cpp @@ -2,7 +2,7 @@ #include -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "java/Random.h" #include "minecraft/world/Container.h" #include "minecraft/world/entity/item/ItemEntity.h" diff --git a/targets/minecraft/world/entity/monster/EnderMan.cpp b/targets/minecraft/world/entity/monster/EnderMan.cpp index b719d8bc0..b44f8fda6 100644 --- a/targets/minecraft/world/entity/monster/EnderMan.cpp +++ b/targets/minecraft/world/entity/monster/EnderMan.cpp @@ -7,7 +7,7 @@ #include #include -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "java/Random.h" #include "minecraft/core/particles/ParticleTypes.h" #include "minecraft/sounds/SoundTypes.h" diff --git a/targets/minecraft/world/entity/monster/Monster.cpp b/targets/minecraft/world/entity/monster/Monster.cpp index 98d763d4b..8a3efd90d 100644 --- a/targets/minecraft/world/entity/monster/Monster.cpp +++ b/targets/minecraft/world/entity/monster/Monster.cpp @@ -5,7 +5,7 @@ #include #include -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "java/Random.h" #include "minecraft/client/Minecraft.h" #include "minecraft/util/Mth.h" diff --git a/targets/minecraft/world/entity/monster/PigZombie.cpp b/targets/minecraft/world/entity/monster/PigZombie.cpp index a78e27143..1c7a7544b 100644 --- a/targets/minecraft/world/entity/monster/PigZombie.cpp +++ b/targets/minecraft/world/entity/monster/PigZombie.cpp @@ -3,7 +3,7 @@ #include #include -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "java/Random.h" #include "minecraft/sounds/SoundTypes.h" #include "minecraft/world/Difficulty.h" diff --git a/targets/minecraft/world/entity/monster/SharedMonsterAttributes.cpp b/targets/minecraft/world/entity/monster/SharedMonsterAttributes.cpp index 8f4d8f9da..a3c3e8b1d 100644 --- a/targets/minecraft/world/entity/monster/SharedMonsterAttributes.cpp +++ b/targets/minecraft/world/entity/monster/SharedMonsterAttributes.cpp @@ -5,7 +5,7 @@ #include #include -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "minecraft/world/entity/ai/attributes/Attribute.h" #include "minecraft/world/entity/ai/attributes/AttributeInstance.h" #include "minecraft/world/entity/ai/attributes/AttributeModifier.h" diff --git a/targets/minecraft/world/entity/monster/Silverfish.cpp b/targets/minecraft/world/entity/monster/Silverfish.cpp index 20042c5b7..f44581675 100644 --- a/targets/minecraft/world/entity/monster/Silverfish.cpp +++ b/targets/minecraft/world/entity/monster/Silverfish.cpp @@ -2,7 +2,7 @@ #include -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "java/Random.h" #include "minecraft/Facing.h" #include "minecraft/sounds/SoundTypes.h" diff --git a/targets/minecraft/world/entity/monster/Spider.cpp b/targets/minecraft/world/entity/monster/Spider.cpp index 3f8141359..31f1fb95d 100644 --- a/targets/minecraft/world/entity/monster/Spider.cpp +++ b/targets/minecraft/world/entity/monster/Spider.cpp @@ -6,7 +6,7 @@ #include #include -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "java/Random.h" #include "minecraft/sounds/SoundTypes.h" #include "minecraft/world/Difficulty.h" diff --git a/targets/minecraft/world/entity/npc/Villager.cpp b/targets/minecraft/world/entity/npc/Villager.cpp index 128554781..07502eb47 100644 --- a/targets/minecraft/world/entity/npc/Villager.cpp +++ b/targets/minecraft/world/entity/npc/Villager.cpp @@ -4,7 +4,7 @@ #include #include -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "Pos.h" #include "SharedConstants.h" #include "java/Random.h" diff --git a/targets/minecraft/world/entity/player/Inventory.cpp b/targets/minecraft/world/entity/player/Inventory.cpp index 6bd3d243b..efc5dfe3e 100644 --- a/targets/minecraft/world/entity/player/Inventory.cpp +++ b/targets/minecraft/world/entity/player/Inventory.cpp @@ -4,7 +4,7 @@ #include -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "minecraft/stats/GenericStats.h" #include "minecraft/world/entity/LivingEntity.h" #include "minecraft/world/entity/player/Abilities.h" diff --git a/targets/minecraft/world/entity/player/Player.cpp b/targets/minecraft/world/entity/player/Player.cpp index 4e28ba603..942b575b0 100644 --- a/targets/minecraft/world/entity/player/Player.cpp +++ b/targets/minecraft/world/entity/player/Player.cpp @@ -25,7 +25,7 @@ #include "app/common/Minecraft_Macros.h" #include "app/common/src/DLC/DLCManager.h" #include "app/common/src/DLC/DLCSkinFile.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "java/JavaMath.h" #include "java/Random.h" #include "minecraft/Direction.h" diff --git a/targets/minecraft/world/entity/projectile/Arrow.cpp b/targets/minecraft/world/entity/projectile/Arrow.cpp index 0230157a1..a2f4cd331 100644 --- a/targets/minecraft/world/entity/projectile/Arrow.cpp +++ b/targets/minecraft/world/entity/projectile/Arrow.cpp @@ -8,7 +8,7 @@ #include #include -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "java/Random.h" #include "minecraft/core/particles/ParticleTypes.h" #include "minecraft/network/packet/GameEventPacket.h" diff --git a/targets/minecraft/world/entity/projectile/Fireball.cpp b/targets/minecraft/world/entity/projectile/Fireball.cpp index 1cbdafa24..bab78c6f4 100644 --- a/targets/minecraft/world/entity/projectile/Fireball.cpp +++ b/targets/minecraft/world/entity/projectile/Fireball.cpp @@ -9,7 +9,7 @@ #include #include -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "java/Random.h" #include "minecraft/SharedConstants.h" #include "minecraft/core/particles/ParticleTypes.h" diff --git a/targets/minecraft/world/inventory/AnvilMenu.cpp b/targets/minecraft/world/inventory/AnvilMenu.cpp index 83d0e7196..4032dcfb7 100644 --- a/targets/minecraft/world/inventory/AnvilMenu.cpp +++ b/targets/minecraft/world/inventory/AnvilMenu.cpp @@ -5,7 +5,7 @@ #include #include -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "util/StringHelpers.h" #include "minecraft/world/Container.h" #include "minecraft/world/entity/player/Abilities.h" diff --git a/targets/minecraft/world/item/BucketItem.cpp b/targets/minecraft/world/item/BucketItem.cpp index 1379c9ea3..412af3e40 100644 --- a/targets/minecraft/world/item/BucketItem.cpp +++ b/targets/minecraft/world/item/BucketItem.cpp @@ -3,7 +3,7 @@ #include #include -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "java/Class.h" #include "java/JavaMath.h" #include "java/Random.h" diff --git a/targets/minecraft/world/item/EnderEyeItem.cpp b/targets/minecraft/world/item/EnderEyeItem.cpp index 2b37c27fe..185fa0a57 100644 --- a/targets/minecraft/world/item/EnderEyeItem.cpp +++ b/targets/minecraft/world/item/EnderEyeItem.cpp @@ -2,7 +2,7 @@ #include -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "java/Random.h" #include "minecraft/Direction.h" #include "minecraft/core/particles/ParticleTypes.h" diff --git a/targets/minecraft/world/item/FireworksChargeItem.cpp b/targets/minecraft/world/item/FireworksChargeItem.cpp index 0a8008bf1..87c8ff857 100644 --- a/targets/minecraft/world/item/FireworksChargeItem.cpp +++ b/targets/minecraft/world/item/FireworksChargeItem.cpp @@ -2,7 +2,7 @@ #include -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "minecraft/util/HtmlString.h" #include "minecraft/world/IconRegister.h" #include "minecraft/world/item/DyePowderItem.h" diff --git a/targets/minecraft/world/item/FireworksItem.cpp b/targets/minecraft/world/item/FireworksItem.cpp index ad8c68363..1fccc3fba 100644 --- a/targets/minecraft/world/item/FireworksItem.cpp +++ b/targets/minecraft/world/item/FireworksItem.cpp @@ -3,7 +3,7 @@ #include #include -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "util/StringHelpers.h" #include "minecraft/util/HtmlString.h" #include "minecraft/world/entity/player/Abilities.h" diff --git a/targets/minecraft/world/item/HangingEntityItem.cpp b/targets/minecraft/world/item/HangingEntityItem.cpp index 447f095e3..dfc939a36 100644 --- a/targets/minecraft/world/item/HangingEntityItem.cpp +++ b/targets/minecraft/world/item/HangingEntityItem.cpp @@ -9,7 +9,7 @@ #include "Direction.h" #include "Facing.h" #include "app/common/App_enums.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "minecraft/stats/GenericStats.h" #include "minecraft/util/HtmlString.h" #include "minecraft/world/entity/HangingEntity.h" diff --git a/targets/minecraft/world/item/Item.cpp b/targets/minecraft/world/item/Item.cpp index b70630013..7c0ebdd40 100644 --- a/targets/minecraft/world/item/Item.cpp +++ b/targets/minecraft/world/item/Item.cpp @@ -7,7 +7,7 @@ #include "HangingEntityItem.h" #include "MapItem.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "java/Class.h" #include "java/Random.h" #include "minecraft/stats/Stats.h" diff --git a/targets/minecraft/world/item/PlanterTileItem.cpp b/targets/minecraft/world/item/PlanterTileItem.cpp index 2f4125f4d..13277fb4b 100644 --- a/targets/minecraft/world/item/PlanterTileItem.cpp +++ b/targets/minecraft/world/item/PlanterTileItem.cpp @@ -3,7 +3,7 @@ #include #include "app/common/src/Console_Debug_enum.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "minecraft/Facing.h" #include "minecraft/stats/GenericStats.h" #include "minecraft/world/entity/player/Player.h" diff --git a/targets/minecraft/world/item/PotionItem.cpp b/targets/minecraft/world/item/PotionItem.cpp index 79693f799..672015a08 100644 --- a/targets/minecraft/world/item/PotionItem.cpp +++ b/targets/minecraft/world/item/PotionItem.cpp @@ -3,7 +3,7 @@ #include #include "app/common/App_enums.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "util/StringHelpers.h" #include "java/Random.h" #include "minecraft/SharedConstants.h" diff --git a/targets/minecraft/world/item/SpawnEggItem.cpp b/targets/minecraft/world/item/SpawnEggItem.cpp index 6cb1fad1b..012595571 100644 --- a/targets/minecraft/world/item/SpawnEggItem.cpp +++ b/targets/minecraft/world/item/SpawnEggItem.cpp @@ -5,7 +5,7 @@ #include "Facing.h" #include "app/common/src/Colours/ColourTable.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "util/StringHelpers.h" #include "java/Class.h" #include "java/Random.h" diff --git a/targets/minecraft/world/item/TileItem.cpp b/targets/minecraft/world/item/TileItem.cpp index 283a729ad..e1fea3621 100644 --- a/targets/minecraft/world/item/TileItem.cpp +++ b/targets/minecraft/world/item/TileItem.cpp @@ -5,7 +5,7 @@ #include #include "app/common/src/Console_Debug_enum.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "java/Class.h" #include "minecraft/Facing.h" #include "minecraft/stats/GenericStats.h" diff --git a/targets/minecraft/world/item/crafting/Recipes.cpp b/targets/minecraft/world/item/crafting/Recipes.cpp index bb79885a1..e1f6278b7 100644 --- a/targets/minecraft/world/item/crafting/Recipes.cpp +++ b/targets/minecraft/world/item/crafting/Recipes.cpp @@ -8,7 +8,7 @@ #include #include -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "minecraft/world/inventory/CraftingContainer.h" #include "minecraft/world/item/CoalItem.h" #include "minecraft/world/item/Item.h" diff --git a/targets/minecraft/world/item/crafting/ShapedRecipy.cpp b/targets/minecraft/world/item/crafting/ShapedRecipy.cpp index 4b664fd16..f881a6311 100644 --- a/targets/minecraft/world/item/crafting/ShapedRecipy.cpp +++ b/targets/minecraft/world/item/crafting/ShapedRecipy.cpp @@ -8,7 +8,7 @@ #include #include "platform/PlatformTypes.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "Recipes.h" #include "minecraft/world/inventory/CraftingContainer.h" #include "minecraft/world/item/ItemInstance.h" diff --git a/targets/minecraft/world/item/enchantment/Enchantment.cpp b/targets/minecraft/world/item/enchantment/Enchantment.cpp index fa9eb5a9a..21f176b27 100644 --- a/targets/minecraft/world/item/enchantment/Enchantment.cpp +++ b/targets/minecraft/world/item/enchantment/Enchantment.cpp @@ -4,7 +4,7 @@ #include #include "app/common/App_enums.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "minecraft/util/HtmlString.h" #include "minecraft/world/item/ItemInstance.h" #include "minecraft/world/item/enchantment/ArrowDamageEnchantment.h" diff --git a/targets/minecraft/world/level/Explosion.cpp b/targets/minecraft/world/level/Explosion.cpp index eb6d58a87..9b64f9c8d 100644 --- a/targets/minecraft/world/level/Explosion.cpp +++ b/targets/minecraft/world/level/Explosion.cpp @@ -6,7 +6,7 @@ #include #include -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "java/Class.h" #include "java/Random.h" #include "minecraft/core/particles/ParticleTypes.h" diff --git a/targets/minecraft/world/level/GameRules.cpp b/targets/minecraft/world/level/GameRules.cpp index 8f4d32bce..0f5276268 100644 --- a/targets/minecraft/world/level/GameRules.cpp +++ b/targets/minecraft/world/level/GameRules.cpp @@ -3,7 +3,7 @@ #include #include "app/common/App_enums.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" // 4J: GameRules isn't in use anymore, just routes any requests to app game host // options, kept things commented out for context diff --git a/targets/minecraft/world/level/Level.cpp b/targets/minecraft/world/level/Level.cpp index 2da3fdb9d..4989cbcce 100644 --- a/targets/minecraft/world/level/Level.cpp +++ b/targets/minecraft/world/level/Level.cpp @@ -19,7 +19,7 @@ #include "app/common/src/Colours/ColourTable.h" #include "app/common/src/Console_Debug_enum.h" #include "app/common/src/Network/GameNetworkManager.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "app/linux/Stubs/winapi_stubs.h" #include "app/include/FrameProfiler.h" #include "java/Random.h" diff --git a/targets/minecraft/world/level/PortalForcer.cpp b/targets/minecraft/world/level/PortalForcer.cpp index c344413eb..56a3e3fd0 100644 --- a/targets/minecraft/world/level/PortalForcer.cpp +++ b/targets/minecraft/world/level/PortalForcer.cpp @@ -2,7 +2,7 @@ #include -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "Pos.h" #include "java/Random.h" #include "minecraft/Direction.h" diff --git a/targets/minecraft/world/level/biome/BiomeCache.cpp b/targets/minecraft/world/level/biome/BiomeCache.cpp index b448b2b29..4459b50fd 100644 --- a/targets/minecraft/world/level/biome/BiomeCache.cpp +++ b/targets/minecraft/world/level/biome/BiomeCache.cpp @@ -3,7 +3,7 @@ #include #include "BiomeSource.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "minecraft/world/level/biome/Biome.h" BiomeCache::Block::Block(int x, int z, BiomeCache* parent) { diff --git a/targets/minecraft/world/level/biome/BiomeDecorator.cpp b/targets/minecraft/world/level/biome/BiomeDecorator.cpp index 3b779a76b..193f2f6f8 100644 --- a/targets/minecraft/world/level/biome/BiomeDecorator.cpp +++ b/targets/minecraft/world/level/biome/BiomeDecorator.cpp @@ -1,7 +1,7 @@ #include "minecraft/world/level/biome/BiomeDecorator.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "app/linux/Stubs/winapi_stubs.h" #include "java/Random.h" #include "minecraft/world/level/Level.h" diff --git a/targets/minecraft/world/level/biome/BiomeSource.cpp b/targets/minecraft/world/level/biome/BiomeSource.cpp index b29076e04..5026ee7eb 100644 --- a/targets/minecraft/world/level/biome/BiomeSource.cpp +++ b/targets/minecraft/world/level/biome/BiomeSource.cpp @@ -6,7 +6,7 @@ #include "IPlatformInput.h" #include "app/common/src/Console_Debug_enum.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "java/Random.h" #include "java/System.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/minecraft/world/level/chunk/LevelChunk.cpp b/targets/minecraft/world/level/chunk/LevelChunk.cpp index 052c2d310..e92cb29d8 100644 --- a/targets/minecraft/world/level/chunk/LevelChunk.cpp +++ b/targets/minecraft/world/level/chunk/LevelChunk.cpp @@ -9,7 +9,7 @@ #include #include "app/common/src/Network/GameNetworkManager.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "SparseLightStorage.h" #include "java/Class.h" #include "java/Random.h" diff --git a/targets/minecraft/world/level/chunk/storage/ChunkStorageProfileDecorator.cpp b/targets/minecraft/world/level/chunk/storage/ChunkStorageProfileDecorator.cpp index c75b840d4..6bf13d9e0 100644 --- a/targets/minecraft/world/level/chunk/storage/ChunkStorageProfileDecorator.cpp +++ b/targets/minecraft/world/level/chunk/storage/ChunkStorageProfileDecorator.cpp @@ -2,7 +2,7 @@ #include -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "java/System.h" #include "minecraft/world/level/chunk/storage/ChunkStorage.h" diff --git a/targets/minecraft/world/level/chunk/storage/McRegionChunkStorage.cpp b/targets/minecraft/world/level/chunk/storage/McRegionChunkStorage.cpp index d15a07e37..41e24a74b 100644 --- a/targets/minecraft/world/level/chunk/storage/McRegionChunkStorage.cpp +++ b/targets/minecraft/world/level/chunk/storage/McRegionChunkStorage.cpp @@ -10,7 +10,7 @@ #include "IPlatformInput.h" #include "app/common/src/Console_Debug_enum.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "platform/C4JThread.h" #include "minecraft/world/level/storage/ConsoleSaveFileIO/compression.h" #include "java/InputOutputStream/BufferedOutputStream.h" diff --git a/targets/minecraft/world/level/chunk/storage/OldChunkStorage.cpp b/targets/minecraft/world/level/chunk/storage/OldChunkStorage.cpp index 67bc3f739..c3754e0ad 100644 --- a/targets/minecraft/world/level/chunk/storage/OldChunkStorage.cpp +++ b/targets/minecraft/world/level/chunk/storage/OldChunkStorage.cpp @@ -12,7 +12,7 @@ #include "IPlatformInput.h" #include "app/common/src/Console_Debug_enum.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "util/Definitions.h" #include "java/File.h" #include "java/InputOutputStream/DataInputStream.h" diff --git a/targets/minecraft/world/level/dimension/Dimension.cpp b/targets/minecraft/world/level/dimension/Dimension.cpp index 15f2dfee2..f46257b2e 100644 --- a/targets/minecraft/world/level/dimension/Dimension.cpp +++ b/targets/minecraft/world/level/dimension/Dimension.cpp @@ -9,7 +9,7 @@ #include "app/common/App_enums.h" #include "app/common/src/Colours/ColourTable.h" #include "app/common/src/Console_Debug_enum.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "NormalDimension.h" #include "TheEndDimension.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/minecraft/world/level/dimension/HellDimension.cpp b/targets/minecraft/world/level/dimension/HellDimension.cpp index d92653608..2f7dc19b4 100644 --- a/targets/minecraft/world/level/dimension/HellDimension.cpp +++ b/targets/minecraft/world/level/dimension/HellDimension.cpp @@ -6,7 +6,7 @@ #include "app/common/App_enums.h" #include "app/common/src/Colours/ColourTable.h" #include "app/common/src/Console_Debug_enum.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "minecraft/client/Minecraft.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/LevelType.h" diff --git a/targets/minecraft/world/level/levelgen/CanyonFeature.cpp b/targets/minecraft/world/level/levelgen/CanyonFeature.cpp index 654b55be3..0c2d2b553 100644 --- a/targets/minecraft/world/level/levelgen/CanyonFeature.cpp +++ b/targets/minecraft/world/level/levelgen/CanyonFeature.cpp @@ -4,7 +4,7 @@ #include #include "app/common/App_enums.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "java/Random.h" #include "minecraft/util/Mth.h" #include "minecraft/world/level/Level.h" diff --git a/targets/minecraft/world/level/levelgen/CustomLevelSource.cpp b/targets/minecraft/world/level/levelgen/CustomLevelSource.cpp index 14ae35a4d..671dbc961 100644 --- a/targets/minecraft/world/level/levelgen/CustomLevelSource.cpp +++ b/targets/minecraft/world/level/levelgen/CustomLevelSource.cpp @@ -5,7 +5,7 @@ #include #include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "platform/PlatformServices.h" #include "minecraft/world/level/biome/Biome.h" #include "minecraft/world/level/chunk/ChunkSource.h" diff --git a/targets/minecraft/world/level/levelgen/FlatLevelSource.cpp b/targets/minecraft/world/level/levelgen/FlatLevelSource.cpp index ffd596279..42b58d265 100644 --- a/targets/minecraft/world/level/levelgen/FlatLevelSource.cpp +++ b/targets/minecraft/world/level/levelgen/FlatLevelSource.cpp @@ -5,7 +5,7 @@ #include -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "java/Random.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/biome/Biome.h" diff --git a/targets/minecraft/world/level/levelgen/HellFlatLevelSource.cpp b/targets/minecraft/world/level/levelgen/HellFlatLevelSource.cpp index 8a1cfeb4c..700f66641 100644 --- a/targets/minecraft/world/level/levelgen/HellFlatLevelSource.cpp +++ b/targets/minecraft/world/level/levelgen/HellFlatLevelSource.cpp @@ -6,7 +6,7 @@ #include #include -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "java/Random.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/biome/Biome.h" diff --git a/targets/minecraft/world/level/levelgen/HellRandomLevelSource.cpp b/targets/minecraft/world/level/levelgen/HellRandomLevelSource.cpp index 156ba8b43..4dd0b186d 100644 --- a/targets/minecraft/world/level/levelgen/HellRandomLevelSource.cpp +++ b/targets/minecraft/world/level/levelgen/HellRandomLevelSource.cpp @@ -7,7 +7,7 @@ #include #include -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "java/Random.h" #include "minecraft/world/entity/MobCategory.h" #include "minecraft/world/level/Level.h" diff --git a/targets/minecraft/world/level/levelgen/RandomLevelSource.cpp b/targets/minecraft/world/level/levelgen/RandomLevelSource.cpp index eee85ca0b..a98f0f523 100644 --- a/targets/minecraft/world/level/levelgen/RandomLevelSource.cpp +++ b/targets/minecraft/world/level/levelgen/RandomLevelSource.cpp @@ -6,7 +6,7 @@ #include #include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "util/Timer.h" #include "java/Random.h" #include "minecraft/util/Mth.h" diff --git a/targets/minecraft/world/level/levelgen/TheEndLevelRandomLevelSource.cpp b/targets/minecraft/world/level/levelgen/TheEndLevelRandomLevelSource.cpp index 87e20452b..a331b7656 100644 --- a/targets/minecraft/world/level/levelgen/TheEndLevelRandomLevelSource.cpp +++ b/targets/minecraft/world/level/levelgen/TheEndLevelRandomLevelSource.cpp @@ -5,7 +5,7 @@ #include -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "java/Random.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/biome/Biome.h" diff --git a/targets/minecraft/world/level/levelgen/feature/BasicTreeFeature.cpp b/targets/minecraft/world/level/levelgen/feature/BasicTreeFeature.cpp index e310ecdbc..a2f877de2 100644 --- a/targets/minecraft/world/level/levelgen/feature/BasicTreeFeature.cpp +++ b/targets/minecraft/world/level/levelgen/feature/BasicTreeFeature.cpp @@ -6,7 +6,7 @@ #include #include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "java/Random.h" #include "minecraft/util/Mth.h" #include "minecraft/world/level/Level.h" diff --git a/targets/minecraft/world/level/levelgen/feature/BirchFeature.cpp b/targets/minecraft/world/level/levelgen/feature/BirchFeature.cpp index 2ca7a5645..1b80880ad 100644 --- a/targets/minecraft/world/level/levelgen/feature/BirchFeature.cpp +++ b/targets/minecraft/world/level/levelgen/feature/BirchFeature.cpp @@ -3,7 +3,7 @@ #include #include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "java/Random.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/levelgen/feature/Feature.h" diff --git a/targets/minecraft/world/level/levelgen/feature/CaveFeature.cpp b/targets/minecraft/world/level/levelgen/feature/CaveFeature.cpp index ba7d39d36..711774532 100644 --- a/targets/minecraft/world/level/levelgen/feature/CaveFeature.cpp +++ b/targets/minecraft/world/level/levelgen/feature/CaveFeature.cpp @@ -6,7 +6,7 @@ #include #include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "java/Random.h" #include "minecraft/util/Mth.h" #include "minecraft/world/level/Level.h" diff --git a/targets/minecraft/world/level/levelgen/feature/FlowerFeature.cpp b/targets/minecraft/world/level/levelgen/feature/FlowerFeature.cpp index c439e0bb9..95e1645cb 100644 --- a/targets/minecraft/world/level/levelgen/feature/FlowerFeature.cpp +++ b/targets/minecraft/world/level/levelgen/feature/FlowerFeature.cpp @@ -1,7 +1,7 @@ #include "FlowerFeature.h" #include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "java/Random.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/dimension/Dimension.h" diff --git a/targets/minecraft/world/level/levelgen/feature/LakeFeature.cpp b/targets/minecraft/world/level/levelgen/feature/LakeFeature.cpp index 3a6cbddb4..8bda16c58 100644 --- a/targets/minecraft/world/level/levelgen/feature/LakeFeature.cpp +++ b/targets/minecraft/world/level/levelgen/feature/LakeFeature.cpp @@ -1,7 +1,7 @@ #include "LakeFeature.h" #include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "java/Random.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/LightLayer.h" diff --git a/targets/minecraft/world/level/levelgen/feature/MegaTreeFeature.cpp b/targets/minecraft/world/level/levelgen/feature/MegaTreeFeature.cpp index cab4358a6..386604164 100644 --- a/targets/minecraft/world/level/levelgen/feature/MegaTreeFeature.cpp +++ b/targets/minecraft/world/level/levelgen/feature/MegaTreeFeature.cpp @@ -3,7 +3,7 @@ #include #include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "java/Random.h" #include "minecraft/util/Mth.h" #include "minecraft/world/level/Level.h" diff --git a/targets/minecraft/world/level/levelgen/feature/OreFeature.cpp b/targets/minecraft/world/level/levelgen/feature/OreFeature.cpp index 4da0dfcf3..93d748087 100644 --- a/targets/minecraft/world/level/levelgen/feature/OreFeature.cpp +++ b/targets/minecraft/world/level/levelgen/feature/OreFeature.cpp @@ -3,7 +3,7 @@ #include #include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "java/Random.h" #include "minecraft/util/Mth.h" #include "minecraft/world/level/Level.h" diff --git a/targets/minecraft/world/level/levelgen/feature/PineFeature.cpp b/targets/minecraft/world/level/levelgen/feature/PineFeature.cpp index cff549e34..18cf4734f 100644 --- a/targets/minecraft/world/level/levelgen/feature/PineFeature.cpp +++ b/targets/minecraft/world/level/levelgen/feature/PineFeature.cpp @@ -3,7 +3,7 @@ #include #include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "java/Random.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/tile/LeafTile.h" diff --git a/targets/minecraft/world/level/levelgen/feature/ReedsFeature.cpp b/targets/minecraft/world/level/levelgen/feature/ReedsFeature.cpp index f991e7f3c..e48443ab0 100644 --- a/targets/minecraft/world/level/levelgen/feature/ReedsFeature.cpp +++ b/targets/minecraft/world/level/levelgen/feature/ReedsFeature.cpp @@ -1,7 +1,7 @@ #include "ReedsFeature.h" #include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "java/Random.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/material/Material.h" diff --git a/targets/minecraft/world/level/levelgen/feature/SandFeature.cpp b/targets/minecraft/world/level/levelgen/feature/SandFeature.cpp index 27281ae3e..6ac800f6a 100644 --- a/targets/minecraft/world/level/levelgen/feature/SandFeature.cpp +++ b/targets/minecraft/world/level/levelgen/feature/SandFeature.cpp @@ -1,7 +1,7 @@ #include "SandFeature.h" #include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "java/Random.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/material/Material.h" diff --git a/targets/minecraft/world/level/levelgen/feature/SpikeFeature.cpp b/targets/minecraft/world/level/levelgen/feature/SpikeFeature.cpp index 4bd3a5f14..b6cb58dbb 100644 --- a/targets/minecraft/world/level/levelgen/feature/SpikeFeature.cpp +++ b/targets/minecraft/world/level/levelgen/feature/SpikeFeature.cpp @@ -2,7 +2,7 @@ #include -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "java/Random.h" #include "minecraft/world/entity/boss/enderdragon/EnderCrystal.h" #include "minecraft/world/level/Level.h" diff --git a/targets/minecraft/world/level/levelgen/feature/SpringFeature.cpp b/targets/minecraft/world/level/levelgen/feature/SpringFeature.cpp index 63bbe9dd5..d2d946620 100644 --- a/targets/minecraft/world/level/levelgen/feature/SpringFeature.cpp +++ b/targets/minecraft/world/level/levelgen/feature/SpringFeature.cpp @@ -1,7 +1,7 @@ #include "SpringFeature.h" #include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/tile/Tile.h" diff --git a/targets/minecraft/world/level/levelgen/feature/SpruceFeature.cpp b/targets/minecraft/world/level/levelgen/feature/SpruceFeature.cpp index 2bac8139c..202ac78dd 100644 --- a/targets/minecraft/world/level/levelgen/feature/SpruceFeature.cpp +++ b/targets/minecraft/world/level/levelgen/feature/SpruceFeature.cpp @@ -3,7 +3,7 @@ #include #include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "java/Random.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/levelgen/feature/Feature.h" diff --git a/targets/minecraft/world/level/levelgen/feature/SwampTreeFeature.cpp b/targets/minecraft/world/level/levelgen/feature/SwampTreeFeature.cpp index 0af083772..773fba1af 100644 --- a/targets/minecraft/world/level/levelgen/feature/SwampTreeFeature.cpp +++ b/targets/minecraft/world/level/levelgen/feature/SwampTreeFeature.cpp @@ -3,7 +3,7 @@ #include #include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "java/Random.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/material/Material.h" diff --git a/targets/minecraft/world/level/levelgen/feature/TreeFeature.cpp b/targets/minecraft/world/level/levelgen/feature/TreeFeature.cpp index a0477a07d..6acad9303 100644 --- a/targets/minecraft/world/level/levelgen/feature/TreeFeature.cpp +++ b/targets/minecraft/world/level/levelgen/feature/TreeFeature.cpp @@ -3,7 +3,7 @@ #include #include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "java/Random.h" #include "minecraft/Direction.h" #include "minecraft/world/level/Level.h" diff --git a/targets/minecraft/world/level/levelgen/structure/MineShaftFeature.cpp b/targets/minecraft/world/level/levelgen/structure/MineShaftFeature.cpp index 6a10adb33..af89bbe44 100644 --- a/targets/minecraft/world/level/levelgen/structure/MineShaftFeature.cpp +++ b/targets/minecraft/world/level/levelgen/structure/MineShaftFeature.cpp @@ -10,7 +10,7 @@ #include "app/common/App_enums.h" #include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "java/Random.h" #include "minecraft/util/Mth.h" #include "minecraft/world/level/levelgen/structure/MineShaftStart.h" diff --git a/targets/minecraft/world/level/levelgen/structure/NetherBridgeFeature.cpp b/targets/minecraft/world/level/levelgen/structure/NetherBridgeFeature.cpp index 8af680c40..0ead8b346 100644 --- a/targets/minecraft/world/level/levelgen/structure/NetherBridgeFeature.cpp +++ b/targets/minecraft/world/level/levelgen/structure/NetherBridgeFeature.cpp @@ -4,7 +4,7 @@ #include #include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "NetherBridgePieces.h" #include "java/Class.h" #include "java/Random.h" diff --git a/targets/minecraft/world/level/levelgen/structure/RandomScatteredLargeFeature.cpp b/targets/minecraft/world/level/levelgen/structure/RandomScatteredLargeFeature.cpp index 7c97fc4ec..05e1932bf 100644 --- a/targets/minecraft/world/level/levelgen/structure/RandomScatteredLargeFeature.cpp +++ b/targets/minecraft/world/level/levelgen/structure/RandomScatteredLargeFeature.cpp @@ -4,7 +4,7 @@ #include #include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "ScatteredFeaturePieces.h" #include "java/Class.h" #include "java/Random.h" diff --git a/targets/minecraft/world/level/levelgen/structure/ScatteredFeaturePieces.cpp b/targets/minecraft/world/level/levelgen/structure/ScatteredFeaturePieces.cpp index b2211fd09..a74726325 100644 --- a/targets/minecraft/world/level/levelgen/structure/ScatteredFeaturePieces.cpp +++ b/targets/minecraft/world/level/levelgen/structure/ScatteredFeaturePieces.cpp @@ -6,7 +6,7 @@ #include #include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "java/Random.h" #include "minecraft/Direction.h" #include "minecraft/Facing.h" diff --git a/targets/minecraft/world/level/levelgen/structure/StrongholdFeature.cpp b/targets/minecraft/world/level/levelgen/structure/StrongholdFeature.cpp index b21fd0828..8d2f06d5d 100644 --- a/targets/minecraft/world/level/levelgen/structure/StrongholdFeature.cpp +++ b/targets/minecraft/world/level/levelgen/structure/StrongholdFeature.cpp @@ -10,7 +10,7 @@ #include "app/common/App_enums.h" #include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "app/linux/Stubs/winapi_stubs.h" #include "StrongholdPieces.h" #include "java/JavaMath.h" diff --git a/targets/minecraft/world/level/levelgen/structure/StrongholdPieces.cpp b/targets/minecraft/world/level/levelgen/structure/StrongholdPieces.cpp index 039df4998..d473dcf0e 100644 --- a/targets/minecraft/world/level/levelgen/structure/StrongholdPieces.cpp +++ b/targets/minecraft/world/level/levelgen/structure/StrongholdPieces.cpp @@ -7,7 +7,7 @@ #include #include "app/common/App_enums.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "util/StringHelpers.h" #include "java/Random.h" #include "minecraft/Direction.h" diff --git a/targets/minecraft/world/level/levelgen/structure/StructureFeatureIO.cpp b/targets/minecraft/world/level/levelgen/structure/StructureFeatureIO.cpp index 4f01fec98..9de107b29 100644 --- a/targets/minecraft/world/level/levelgen/structure/StructureFeatureIO.cpp +++ b/targets/minecraft/world/level/levelgen/structure/StructureFeatureIO.cpp @@ -4,7 +4,7 @@ #include #include -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "minecraft/world/level/levelgen/structure/MineShaftPieces.h" #include "minecraft/world/level/levelgen/structure/MineShaftStart.h" #include "minecraft/world/level/levelgen/structure/NetherBridgeFeature.h" diff --git a/targets/minecraft/world/level/levelgen/structure/VillageFeature.cpp b/targets/minecraft/world/level/levelgen/structure/VillageFeature.cpp index 98ae241cf..790e66aa9 100644 --- a/targets/minecraft/world/level/levelgen/structure/VillageFeature.cpp +++ b/targets/minecraft/world/level/levelgen/structure/VillageFeature.cpp @@ -6,7 +6,7 @@ #include "app/common/App_enums.h" #include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "VillagePieces.h" #include "java/Random.h" #include "minecraft/util/Mth.h" diff --git a/targets/minecraft/world/level/newbiome/layer/BiomeOverrideLayer.cpp b/targets/minecraft/world/level/newbiome/layer/BiomeOverrideLayer.cpp index 8abde4119..51a46ae9a 100644 --- a/targets/minecraft/world/level/newbiome/layer/BiomeOverrideLayer.cpp +++ b/targets/minecraft/world/level/newbiome/layer/BiomeOverrideLayer.cpp @@ -2,7 +2,7 @@ #include -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "platform/PlatformServices.h" #include "minecraft/world/level/newbiome/layer/Layer.h" #if defined(__linux__) diff --git a/targets/minecraft/world/level/newbiome/layer/Layer.cpp b/targets/minecraft/world/level/newbiome/layer/Layer.cpp index dcfc389c6..c73a4db47 100644 --- a/targets/minecraft/world/level/newbiome/layer/Layer.cpp +++ b/targets/minecraft/world/level/newbiome/layer/Layer.cpp @@ -8,7 +8,7 @@ #include "BiomeOverrideLayer.h" #include "IPlatformInput.h" #include "app/common/src/Console_Debug_enum.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "minecraft/world/level/LevelType.h" #include "minecraft/world/level/newbiome/layer/AddIslandLayer.h" #include "minecraft/world/level/newbiome/layer/AddMushroomIslandLayer.h" diff --git a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.cpp b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.cpp index 680e1def5..a46f9615f 100644 --- a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.cpp +++ b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.cpp @@ -16,7 +16,7 @@ #include "app/common/App_enums.h" #include "app/common/src/BuildVer/BuildVer.h" #include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" -#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/File.h" diff --git a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp index 8ce4ea937..92645bd2f 100644 --- a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp +++ b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp @@ -17,7 +17,7 @@ #include "app/common/App_enums.h" #include "app/common/src/BuildVer/BuildVer.h" #include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "app/linux/Stubs/winapi_stubs.h" #include "util/Timer.h" #include "util/StringHelpers.h" diff --git a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.cpp b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.cpp index 9fea1b59a..129c81425 100644 --- a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.cpp +++ b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.cpp @@ -11,12 +11,12 @@ #include #include -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "app/linux/Stubs/winapi_stubs.h" #include "util/Definitions.h" #include "java/System.h" -extern CConsoleMinecraftApp app; +extern LinuxGame app; FileHeader::FileHeader() { lastFile = nullptr; diff --git a/targets/minecraft/world/level/storage/DirectoryLevelStorage.cpp b/targets/minecraft/world/level/storage/DirectoryLevelStorage.cpp index f8fb4b181..6ba4a2049 100644 --- a/targets/minecraft/world/level/storage/DirectoryLevelStorage.cpp +++ b/targets/minecraft/world/level/storage/DirectoryLevelStorage.cpp @@ -14,7 +14,7 @@ #include "LevelData.h" #include "app/common/src/Console_Debug_enum.h" #include "app/common/src/GameRules/GameRuleManager.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "app/linux/Stubs/winapi_stubs.h" #include "util/StringHelpers.h" #include "java/File.h" diff --git a/targets/minecraft/world/level/storage/LevelData.cpp b/targets/minecraft/world/level/storage/LevelData.cpp index b8a4bd904..83893ee61 100644 --- a/targets/minecraft/world/level/storage/LevelData.cpp +++ b/targets/minecraft/world/level/storage/LevelData.cpp @@ -7,7 +7,7 @@ #include "app/common/App_Defines.h" #include "app/common/App_enums.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "java/System.h" #include "minecraft/world/level/GameRules.h" #include "minecraft/world/level/LevelSettings.h" diff --git a/targets/minecraft/world/level/storage/McRegionLevelStorage.cpp b/targets/minecraft/world/level/storage/McRegionLevelStorage.cpp index aba388d38..07ec7b43c 100644 --- a/targets/minecraft/world/level/storage/McRegionLevelStorage.cpp +++ b/targets/minecraft/world/level/storage/McRegionLevelStorage.cpp @@ -6,7 +6,7 @@ #include #include "LevelData.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "java/File.h" #include "minecraft/world/level/chunk/storage/McRegionChunkStorage.h" #include "minecraft/world/level/chunk/storage/RegionFileCache.h" diff --git a/targets/minecraft/world/level/tile/FireTile.cpp b/targets/minecraft/world/level/tile/FireTile.cpp index 8d6e55ee8..29be2d805 100644 --- a/targets/minecraft/world/level/tile/FireTile.cpp +++ b/targets/minecraft/world/level/tile/FireTile.cpp @@ -5,7 +5,7 @@ #include #include "app/common/App_enums.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "java/Random.h" #include "minecraft/core/particles/ParticleTypes.h" #include "minecraft/server/MinecraftServer.h" diff --git a/targets/minecraft/world/level/tile/NotGateTile.cpp b/targets/minecraft/world/level/tile/NotGateTile.cpp index 2d4a50cbb..0d76cd7b1 100644 --- a/targets/minecraft/world/level/tile/NotGateTile.cpp +++ b/targets/minecraft/world/level/tile/NotGateTile.cpp @@ -1,6 +1,6 @@ #include "NotGateTile.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "java/Random.h" #include "minecraft/core/particles/ParticleTypes.h" #include "minecraft/sounds/SoundTypes.h" diff --git a/targets/minecraft/world/level/tile/NoteBlockTile.cpp b/targets/minecraft/world/level/tile/NoteBlockTile.cpp index 1dfded851..dcc937b22 100644 --- a/targets/minecraft/world/level/tile/NoteBlockTile.cpp +++ b/targets/minecraft/world/level/tile/NoteBlockTile.cpp @@ -3,7 +3,7 @@ #include #include -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "minecraft/core/particles/ParticleTypes.h" #include "minecraft/sounds/SoundTypes.h" #include "minecraft/world/level/Level.h" diff --git a/targets/minecraft/world/level/tile/StoneMonsterTile.cpp b/targets/minecraft/world/level/tile/StoneMonsterTile.cpp index 2de77e1de..6fc9a8d2e 100644 --- a/targets/minecraft/world/level/tile/StoneMonsterTile.cpp +++ b/targets/minecraft/world/level/tile/StoneMonsterTile.cpp @@ -2,7 +2,7 @@ #include -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "java/Class.h" #include "minecraft/world/entity/monster/Silverfish.h" #include "minecraft/world/item/ItemInstance.h" diff --git a/targets/minecraft/world/level/tile/Tile.cpp b/targets/minecraft/world/level/tile/Tile.cpp index fe3819555..7e2766700 100644 --- a/targets/minecraft/world/level/tile/Tile.cpp +++ b/targets/minecraft/world/level/tile/Tile.cpp @@ -5,7 +5,7 @@ #include #include "Facing.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "util/StringHelpers.h" #include "java/Class.h" #include "java/Random.h" diff --git a/targets/minecraft/world/level/tile/TntTile.cpp b/targets/minecraft/world/level/tile/TntTile.cpp index 6addb4261..e3bfbf899 100644 --- a/targets/minecraft/world/level/tile/TntTile.cpp +++ b/targets/minecraft/world/level/tile/TntTile.cpp @@ -3,7 +3,7 @@ #include #include "app/common/App_enums.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "java/Class.h" #include "java/Random.h" #include "minecraft/Facing.h" diff --git a/targets/minecraft/world/level/tile/entity/BeaconTileEntity.cpp b/targets/minecraft/world/level/tile/entity/BeaconTileEntity.cpp index 4019c21a9..c2c85b71e 100644 --- a/targets/minecraft/world/level/tile/entity/BeaconTileEntity.cpp +++ b/targets/minecraft/world/level/tile/entity/BeaconTileEntity.cpp @@ -3,7 +3,7 @@ #include #include -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "SharedConstants.h" #include "minecraft/network/packet/TileEntityDataPacket.h" #include "minecraft/world/effect/MobEffect.h" diff --git a/targets/minecraft/world/level/tile/entity/BrewingStandTileEntity.cpp b/targets/minecraft/world/level/tile/entity/BrewingStandTileEntity.cpp index ff11f89a0..85e48f505 100644 --- a/targets/minecraft/world/level/tile/entity/BrewingStandTileEntity.cpp +++ b/targets/minecraft/world/level/tile/entity/BrewingStandTileEntity.cpp @@ -6,7 +6,7 @@ #include #include "Facing.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "minecraft/SharedConstants.h" #include "minecraft/world/entity/player/Player.h" #include "minecraft/world/item/Item.h" diff --git a/targets/minecraft/world/level/tile/entity/ChestTileEntity.cpp b/targets/minecraft/world/level/tile/entity/ChestTileEntity.cpp index bd111694d..bd03d0e9d 100644 --- a/targets/minecraft/world/level/tile/entity/ChestTileEntity.cpp +++ b/targets/minecraft/world/level/tile/entity/ChestTileEntity.cpp @@ -5,7 +5,7 @@ #include #include "Direction.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "SharedConstants.h" #include "TileEntity.h" #include "java/Random.h" diff --git a/targets/minecraft/world/level/tile/entity/DispenserTileEntity.cpp b/targets/minecraft/world/level/tile/entity/DispenserTileEntity.cpp index e726d55ff..492558328 100644 --- a/targets/minecraft/world/level/tile/entity/DispenserTileEntity.cpp +++ b/targets/minecraft/world/level/tile/entity/DispenserTileEntity.cpp @@ -2,7 +2,7 @@ #include -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "TileEntity.h" #include "java/Random.h" #include "minecraft/world/Container.h" diff --git a/targets/minecraft/world/level/tile/entity/DropperTileEntity.cpp b/targets/minecraft/world/level/tile/entity/DropperTileEntity.cpp index 2f985ced4..7e8a9b991 100644 --- a/targets/minecraft/world/level/tile/entity/DropperTileEntity.cpp +++ b/targets/minecraft/world/level/tile/entity/DropperTileEntity.cpp @@ -3,7 +3,7 @@ #include #include -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "minecraft/world/level/tile/entity/TileEntity.h" #include "strings.h" diff --git a/targets/minecraft/world/level/tile/entity/EnchantmentTableTileEntity.cpp b/targets/minecraft/world/level/tile/entity/EnchantmentTableTileEntity.cpp index e11c08b34..11371e655 100644 --- a/targets/minecraft/world/level/tile/entity/EnchantmentTableTileEntity.cpp +++ b/targets/minecraft/world/level/tile/entity/EnchantmentTableTileEntity.cpp @@ -4,7 +4,7 @@ #include #include -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "java/Random.h" #include "minecraft/world/entity/player/Player.h" #include "minecraft/world/level/Level.h" diff --git a/targets/minecraft/world/level/tile/entity/FurnaceTileEntity.cpp b/targets/minecraft/world/level/tile/entity/FurnaceTileEntity.cpp index 832a37c37..519cbd231 100644 --- a/targets/minecraft/world/level/tile/entity/FurnaceTileEntity.cpp +++ b/targets/minecraft/world/level/tile/entity/FurnaceTileEntity.cpp @@ -3,7 +3,7 @@ #include #include "Facing.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "minecraft/world/Container.h" #include "minecraft/world/entity/player/Player.h" #include "minecraft/world/item/CoalItem.h" diff --git a/targets/minecraft/world/level/tile/entity/HopperTileEntity.cpp b/targets/minecraft/world/level/tile/entity/HopperTileEntity.cpp index 3db9d6617..39a184427 100644 --- a/targets/minecraft/world/level/tile/entity/HopperTileEntity.cpp +++ b/targets/minecraft/world/level/tile/entity/HopperTileEntity.cpp @@ -6,7 +6,7 @@ #include #include "Facing.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "java/Random.h" #include "minecraft/util/Mth.h" #include "minecraft/world/WorldlyContainer.h" diff --git a/targets/minecraft/world/level/tile/entity/TheEndPortalTile.cpp b/targets/minecraft/world/level/tile/entity/TheEndPortalTile.cpp index 000536bca..0e4824612 100644 --- a/targets/minecraft/world/level/tile/entity/TheEndPortalTile.cpp +++ b/targets/minecraft/world/level/tile/entity/TheEndPortalTile.cpp @@ -3,7 +3,7 @@ #include #include "app/common/App_enums.h" -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "TheEndPortalTileEntity.h" #include "java/Class.h" #include "java/Random.h" diff --git a/targets/minecraft/world/level/tile/entity/TileEntity.cpp b/targets/minecraft/world/level/tile/entity/TileEntity.cpp index ab7d5a16d..908e58d19 100644 --- a/targets/minecraft/world/level/tile/entity/TileEntity.cpp +++ b/targets/minecraft/world/level/tile/entity/TileEntity.cpp @@ -2,7 +2,7 @@ #include -#include "app/linux/Linux_App.h" +#include "app/linux/LinuxGame.h" #include "PistonPieceTileEntity.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/tile/JukeboxTile.h"