diff --git a/targets/app/common/ArchiveManager.cpp b/targets/app/common/ArchiveManager.cpp index 51dd2b9d3..5d023a570 100644 --- a/targets/app/common/ArchiveManager.cpp +++ b/targets/app/common/ArchiveManager.cpp @@ -4,7 +4,7 @@ #include #include "app/common/UI/All Platforms/ArchiveFile.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "java/File.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/skins/TexturePack.h" diff --git a/targets/app/common/Audio/SoundEngine.cpp b/targets/app/common/Audio/SoundEngine.cpp index c2f46cea5..7a63e2171 100644 --- a/targets/app/common/Audio/SoundEngine.cpp +++ b/targets/app/common/Audio/SoundEngine.cpp @@ -12,7 +12,7 @@ #include "app/common/Audio/ConsoleSoundEngine.h" #include "app/linux/Iggy/include/rrCore.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "java/Random.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" diff --git a/targets/app/common/DLC/DLCAudioFile.cpp b/targets/app/common/DLC/DLCAudioFile.cpp index a74834c17..a9626f7d2 100644 --- a/targets/app/common/DLC/DLCAudioFile.cpp +++ b/targets/app/common/DLC/DLCAudioFile.cpp @@ -7,7 +7,7 @@ #include "DLCManager.h" #include "app/common/DLC/DLCFile.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "platform/XboxStubs.h" #include "platform/renderer/renderer.h" #include "platform/storage/storage.h" diff --git a/targets/app/common/DLC/DLCCapeFile.cpp b/targets/app/common/DLC/DLCCapeFile.cpp index bde677ee6..42559a1c8 100644 --- a/targets/app/common/DLC/DLCCapeFile.cpp +++ b/targets/app/common/DLC/DLCCapeFile.cpp @@ -2,7 +2,7 @@ #include "DLCManager.h" #include "app/common/DLC/DLCFile.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" DLCCapeFile::DLCCapeFile(const std::string& path) : DLCFile(DLCManager::e_DLCType_Cape, path) {} diff --git a/targets/app/common/DLC/DLCColourTableFile.cpp b/targets/app/common/DLC/DLCColourTableFile.cpp index 8cf7ed6b3..aaca55a6e 100644 --- a/targets/app/common/DLC/DLCColourTableFile.cpp +++ b/targets/app/common/DLC/DLCColourTableFile.cpp @@ -2,7 +2,7 @@ #include "DLCManager.h" #include "app/common/DLC/DLCFile.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/resources/Colours/ColourTable.h" #include "minecraft/client/skins/TexturePack.h" diff --git a/targets/app/common/DLC/DLCGameRulesHeader.cpp b/targets/app/common/DLC/DLCGameRulesHeader.cpp index e86ec21f7..16beb8b57 100644 --- a/targets/app/common/DLC/DLCGameRulesHeader.cpp +++ b/targets/app/common/DLC/DLCGameRulesHeader.cpp @@ -5,7 +5,7 @@ #include "DLCManager.h" #include "app/common/DLC/DLCGameRules.h" #include "app/common/GameRules/GameRuleManager.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" class StringTable; diff --git a/targets/app/common/DLC/DLCLocalisationFile.cpp b/targets/app/common/DLC/DLCLocalisationFile.cpp index 5eb68ad59..d6ef40067 100644 --- a/targets/app/common/DLC/DLCLocalisationFile.cpp +++ b/targets/app/common/DLC/DLCLocalisationFile.cpp @@ -2,7 +2,7 @@ #include "DLCManager.h" #include "app/common/DLC/DLCFile.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "minecraft/locale/StringTable.h" DLCLocalisationFile::DLCLocalisationFile(const std::string& path) diff --git a/targets/app/common/DLC/DLCManager.cpp b/targets/app/common/DLC/DLCManager.cpp index f729b54e6..365c701b0 100644 --- a/targets/app/common/DLC/DLCManager.cpp +++ b/targets/app/common/DLC/DLCManager.cpp @@ -16,7 +16,7 @@ #include "DLCFile.h" #include "DLCPack.h" #include "app/common/GameRules/GameRuleManager.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "app/linux/Linux_UIController.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/skins/TexturePackRepository.h" diff --git a/targets/app/common/DLC/DLCPack.cpp b/targets/app/common/DLC/DLCPack.cpp index 56accae69..d7e0f1714 100644 --- a/targets/app/common/DLC/DLCPack.cpp +++ b/targets/app/common/DLC/DLCPack.cpp @@ -17,7 +17,7 @@ #include "app/common/DLC/DLCFile.h" #include "app/common/DLC/DLCManager.h" #include "app/common/DLC/DLCSkinFile.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "minecraft/Console_Debug_enum.h" #include "minecraft/locale/StringTable.h" #include "platform/profile/profile.h" diff --git a/targets/app/common/DLC/DLCSkinFile.cpp b/targets/app/common/DLC/DLCSkinFile.cpp index 2f13329c6..4ac69aee0 100644 --- a/targets/app/common/DLC/DLCSkinFile.cpp +++ b/targets/app/common/DLC/DLCSkinFile.cpp @@ -5,7 +5,7 @@ #include "DLCManager.h" #include "app/common/DLC/DLCFile.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "minecraft/client/model/SkinBox.h" #include "platform/XboxStubs.h" #include "platform/renderer/renderer.h" diff --git a/targets/app/common/DLC/DLCUIDataFile.cpp b/targets/app/common/DLC/DLCUIDataFile.cpp index b799b548c..73c147893 100644 --- a/targets/app/common/DLC/DLCUIDataFile.cpp +++ b/targets/app/common/DLC/DLCUIDataFile.cpp @@ -2,7 +2,7 @@ #include "DLCManager.h" #include "app/common/DLC/DLCFile.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" DLCUIDataFile::DLCUIDataFile(const std::string& path) : DLCFile(DLCManager::e_DLCType_UIData, path) { diff --git a/targets/app/common/DLCController.cpp b/targets/app/common/DLCController.cpp index bdbb1a044..5b74a5a06 100644 --- a/targets/app/common/DLCController.cpp +++ b/targets/app/common/DLCController.cpp @@ -7,7 +7,7 @@ #include "app/common/DLC/DLCPack.h" #include "app/common/DLC/DLCSkinFile.h" #include "app/common/Game.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "app/linux/Linux_UIController.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/skins/TexturePack.h" diff --git a/targets/app/common/Game.cpp b/targets/app/common/Game.cpp index a7414eea4..091ec8cc8 100644 --- a/targets/app/common/Game.cpp +++ b/targets/app/common/Game.cpp @@ -9,7 +9,6 @@ #include "app/common/UI/All Platforms/UIEnums.h" #include "app/common/UI/All Platforms/UIStructs.h" #include "app/common/UI/Scenes/UIScene_FullscreenProgress.h" -#include "app/linux/LinuxGame.h" #include "app/linux/Linux_UIController.h" #include "java/Class.h" #include "java/File.h" @@ -32,7 +31,6 @@ #include "minecraft/client/renderer/entity/EntityRenderer.h" #include "minecraft/client/skins/TexturePack.h" #include "minecraft/network/packet/DisconnectPacket.h" -#include "platform/network/network.h" #include "minecraft/server/MinecraftServer.h" #include "minecraft/stats/StatsCounter.h" #include "minecraft/world/Container.h" @@ -41,9 +39,10 @@ #include "minecraft/world/item/crafting/Recipy.h" #include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/level/tile/entity/HopperTileEntity.h" -#include "platform/network/NetTypes.h" #include "platform/PlatformTypes.h" #include "platform/XboxStubs.h" +#include "platform/network/NetTypes.h" +#include "platform/network/network.h" #include "platform/profile/profile.h" #include "platform/renderer/renderer.h" #include "platform/storage/storage.h" @@ -353,7 +352,10 @@ bool Game::isXuidDeadmau5(PlayerUID xuid) { void Game::StoreLaunchData() {} -void Game::ExitGame() {} +void Game::ExitGame() { + DebugPrintf("[Game] ExitGame AFTER START\n"); + PlatformRenderer.Close(); +} // Invites @@ -366,7 +368,10 @@ void Game::ExitGame() {} // We have to assume that we've not been able to load the text for the game. // ////////////////////////////////////////////////////////////////////////// -void Game::FatalLoadError() {} +void Game::FatalLoadError() { + DebugPrintf("FatalLoadError - asserting 0 and dying...\n"); + assert(0); +} // Game Host options @@ -631,3 +636,5 @@ std::string Game::getRootPath(std::uint32_t packId, bool allowOverride, return path + "\\"; } } + +Game app; diff --git a/targets/app/common/Game.h b/targets/app/common/Game.h index 575d1f28f..c8e08930d 100644 --- a/targets/app/common/Game.h +++ b/targets/app/common/Game.h @@ -5,6 +5,7 @@ #include "platform/profile/profile.h" #include "platform/storage/storage.h" +#include "platform/renderer/renderer.h" #include "util/Timer.h" // using namespace std; @@ -1209,5 +1210,4 @@ public: #endif }; -// singleton -// extern CMinecraftApp app; \ No newline at end of file +extern Game app; \ No newline at end of file diff --git a/targets/app/common/GameRules/GameRuleManager.cpp b/targets/app/common/GameRules/GameRuleManager.cpp index b80f37c19..a8c66c0d6 100644 --- a/targets/app/common/GameRules/GameRuleManager.cpp +++ b/targets/app/common/GameRules/GameRuleManager.cpp @@ -16,7 +16,7 @@ #include "app/common/GameRules/LevelGeneration/LevelGenerators.h" #include "app/common/GameRules/LevelRules/LevelRules.h" #include "app/common/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "java/File.h" #include "java/InputOutputStream/ByteArrayInputStream.h" #include "java/InputOutputStream/ByteArrayOutputStream.h" diff --git a/targets/app/common/GameRules/LevelGeneration/ApplySchematicRuleDefinition.cpp b/targets/app/common/GameRules/LevelGeneration/ApplySchematicRuleDefinition.cpp index 38d1afb6b..8200ddb49 100644 --- a/targets/app/common/GameRules/LevelGeneration/ApplySchematicRuleDefinition.cpp +++ b/targets/app/common/GameRules/LevelGeneration/ApplySchematicRuleDefinition.cpp @@ -3,7 +3,7 @@ #include #include -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "minecraft/world/level/levelgen/ConsoleSchematicFile.h" #include "java/InputOutputStream/DataOutputStream.h" #include "minecraft/world/level/ConsoleGameRulesConstants.h" diff --git a/targets/app/common/GameRules/LevelGeneration/BiomeOverride.cpp b/targets/app/common/GameRules/LevelGeneration/BiomeOverride.cpp index 5886fb321..3eca5ed55 100644 --- a/targets/app/common/GameRules/LevelGeneration/BiomeOverride.cpp +++ b/targets/app/common/GameRules/LevelGeneration/BiomeOverride.cpp @@ -1,6 +1,6 @@ #include "BiomeOverride.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "java/InputOutputStream/DataOutputStream.h" #include "minecraft/world/level/ConsoleGameRulesConstants.h" #include "minecraft/world/level/GameRules/GameRuleDefinition.h" diff --git a/targets/app/common/GameRules/LevelGeneration/ConsoleGenerateStructure.cpp b/targets/app/common/GameRules/LevelGeneration/ConsoleGenerateStructure.cpp index 2ceeb4e76..714c77637 100644 --- a/targets/app/common/GameRules/LevelGeneration/ConsoleGenerateStructure.cpp +++ b/targets/app/common/GameRules/LevelGeneration/ConsoleGenerateStructure.cpp @@ -9,7 +9,7 @@ #include "app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h" #include "app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.h" #include "app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "java/InputOutputStream/DataOutputStream.h" #include "minecraft/Direction.h" #include "minecraft/world/level/ConsoleGameRulesConstants.h" diff --git a/targets/app/common/GameRules/LevelGeneration/LevelGenerationOptions.cpp b/targets/app/common/GameRules/LevelGeneration/LevelGenerationOptions.cpp index 8351c4328..b2e2479f3 100644 --- a/targets/app/common/GameRules/LevelGeneration/LevelGenerationOptions.cpp +++ b/targets/app/common/GameRules/LevelGeneration/LevelGenerationOptions.cpp @@ -15,7 +15,7 @@ #include "app/common/GameRules/LevelGeneration/ConsoleGenerateStructure.h" #include "minecraft/world/level/levelgen/ConsoleSchematicFile.h" #include "app/common/GameRules/LevelGeneration/StartFeature.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "java/File.h" #include "java/InputOutputStream/ByteArrayInputStream.h" #include "java/InputOutputStream/DataInputStream.h" diff --git a/targets/app/common/GameRules/LevelGeneration/StartFeature.cpp b/targets/app/common/GameRules/LevelGeneration/StartFeature.cpp index 76299849d..5a3c0f634 100644 --- a/targets/app/common/GameRules/LevelGeneration/StartFeature.cpp +++ b/targets/app/common/GameRules/LevelGeneration/StartFeature.cpp @@ -1,6 +1,6 @@ #include "StartFeature.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "java/InputOutputStream/DataOutputStream.h" #include "minecraft/world/level/ConsoleGameRulesConstants.h" #include "minecraft/world/level/GameRules/GameRuleDefinition.h" diff --git a/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.cpp b/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.cpp index 5cf0fdeda..e3254aab9 100644 --- a/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.cpp +++ b/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.cpp @@ -1,7 +1,7 @@ #include "XboxStructureActionGenerateBox.h" #include "app/common/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "java/InputOutputStream/DataOutputStream.h" #include "minecraft/world/level/ConsoleGameRulesConstants.h" #include "minecraft/world/level/GameRules/GameRuleDefinition.h" diff --git a/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.cpp b/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.cpp index 34299492b..b0690c711 100644 --- a/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.cpp +++ b/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.cpp @@ -1,7 +1,7 @@ #include "XboxStructureActionPlaceBlock.h" #include "app/common/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "java/InputOutputStream/DataOutputStream.h" #include "minecraft/world/level/ConsoleGameRulesConstants.h" #include "minecraft/world/level/GameRules/GameRuleDefinition.h" diff --git a/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.cpp b/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.cpp index 68d512003..494fb30a7 100644 --- a/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.cpp +++ b/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.cpp @@ -6,7 +6,7 @@ #include "app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h" #include "app/common/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "minecraft/world/Container.h" #include "minecraft/world/level/ConsoleGameRulesConstants.h" #include "minecraft/world/level/Level.h" diff --git a/targets/app/common/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.cpp b/targets/app/common/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.cpp index 4d089fc17..55187a29e 100644 --- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.cpp +++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.cpp @@ -3,7 +3,7 @@ #include #include -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "java/InputOutputStream/DataOutputStream.h" #include "minecraft/world/item/EnchantedBookItem.h" #include "minecraft/world/item/Item.h" diff --git a/targets/app/common/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.cpp b/targets/app/common/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.cpp index 3fe6282c6..9bfaf0834 100644 --- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.cpp +++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.cpp @@ -1,6 +1,6 @@ #include "CollectItemRuleDefinition.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "java/InputOutputStream/DataOutputStream.h" #include "minecraft/network/Connection.h" #include "minecraft/network/packet/UpdateGameRuleProgressPacket.h" diff --git a/targets/app/common/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.cpp b/targets/app/common/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.cpp index c8431003b..9b48fc742 100644 --- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.cpp +++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.cpp @@ -5,7 +5,7 @@ #include #include "app/common/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "minecraft/network/Connection.h" #include "minecraft/network/packet/UpdateGameRuleProgressPacket.h" #include "minecraft/world/level/GameRules/GameRule.h" diff --git a/targets/app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.cpp b/targets/app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.cpp index ea42d5261..9149bc99e 100644 --- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.cpp +++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.cpp @@ -10,7 +10,7 @@ #include "app/common/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h" #include "app/common/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "java/InputOutputStream/DataOutputStream.h" #include "minecraft/world/level/ConsoleGameRulesConstants.h" #include "minecraft/world/level/GameRules/GameRule.h" diff --git a/targets/app/common/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.cpp b/targets/app/common/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.cpp index 456bc4e48..768a7c3b8 100644 --- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.cpp +++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.cpp @@ -2,7 +2,7 @@ #include -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "java/InputOutputStream/DataOutputStream.h" #include "minecraft/world/level/ConsoleGameRulesConstants.h" #include "minecraft/world/level/GameRules/GameRuleDefinition.h" diff --git a/targets/app/common/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.cpp b/targets/app/common/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.cpp index b29b7911d..b95f6600e 100644 --- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.cpp +++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.cpp @@ -5,7 +5,7 @@ #include #include "app/common/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "java/InputOutputStream/DataOutputStream.h" #include "minecraft/Pos.h" #include "minecraft/world/entity/player/Inventory.h" diff --git a/targets/app/common/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.cpp b/targets/app/common/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.cpp index b29ab5797..4c5afe076 100644 --- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.cpp +++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.cpp @@ -1,6 +1,6 @@ #include "UseTileRuleDefinition.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "java/InputOutputStream/DataOutputStream.h" #include "minecraft/world/level/ConsoleGameRulesConstants.h" #include "minecraft/world/level/GameRules/GameRuleDefinition.h" diff --git a/targets/app/common/GameSettingsManager.cpp b/targets/app/common/GameSettingsManager.cpp index 9220fb7d2..cc9794a14 100644 --- a/targets/app/common/GameSettingsManager.cpp +++ b/targets/app/common/GameSettingsManager.cpp @@ -5,7 +5,7 @@ #include "app/common/Audio/SoundEngine.h" #include "app/common/Game.h" #include "app/common/Network/GameNetworkManager.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "app/linux/Linux_UIController.h" #include "minecraft/Console_Debug_enum.h" #include "minecraft/GameEnums.h" diff --git a/targets/app/common/Game_XuiActions.cpp b/targets/app/common/Game_XuiActions.cpp index 042cc5bdc..a342f9415 100644 --- a/targets/app/common/Game_XuiActions.cpp +++ b/targets/app/common/Game_XuiActions.cpp @@ -8,7 +8,7 @@ #include "app/common/UI/All Platforms/UIEnums.h" #include "app/common/UI/All Platforms/UIStructs.h" #include "app/common/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "app/linux/Linux_UIController.h" #include "minecraft/GameEnums.h" #include "minecraft/GameTypes.h" diff --git a/targets/app/common/LocalizationManager.cpp b/targets/app/common/LocalizationManager.cpp index 9a2210b50..037b134d5 100644 --- a/targets/app/common/LocalizationManager.cpp +++ b/targets/app/common/LocalizationManager.cpp @@ -8,7 +8,7 @@ #include "app/common/App_structs.h" #include "app/common/UI/All Platforms/ArchiveFile.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "java/Random.h" #include "minecraft/GameEnums.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/app/common/MenuController.cpp b/targets/app/common/MenuController.cpp index d5e0f541a..5742082e3 100644 --- a/targets/app/common/MenuController.cpp +++ b/targets/app/common/MenuController.cpp @@ -9,7 +9,7 @@ #include "app/common/UI/All Platforms/UIEnums.h" #include "app/common/UI/All Platforms/UIStructs.h" #include "app/common/UI/Scenes/UIScene_FullscreenProgress.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "app/linux/Linux_UIController.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/ProgressRenderer.h" diff --git a/targets/app/common/Network/GameNetworkManager.cpp b/targets/app/common/Network/GameNetworkManager.cpp index 4a971e2a9..690cc343c 100644 --- a/targets/app/common/Network/GameNetworkManager.cpp +++ b/targets/app/common/Network/GameNetworkManager.cpp @@ -16,7 +16,7 @@ #include "app/common/UI/All Platforms/UIEnums.h" #include "app/common/UI/All Platforms/UIStructs.h" #include "app/common/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "app/linux/Linux_UIController.h" #include "java/File.h" #include "minecraft/GameEnums.h" diff --git a/targets/app/common/NetworkController.cpp b/targets/app/common/NetworkController.cpp index 3d37c560a..a7a4bfa94 100644 --- a/targets/app/common/NetworkController.cpp +++ b/targets/app/common/NetworkController.cpp @@ -7,7 +7,7 @@ #include "app/common/DLC/DLCPack.h" #include "app/common/Game.h" #include "app/common/Network/GameNetworkManager.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "app/linux/Linux_UIController.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/ProgressRenderer.h" diff --git a/targets/app/common/SaveManager.cpp b/targets/app/common/SaveManager.cpp index ae1fa00de..3b10dbe4a 100644 --- a/targets/app/common/SaveManager.cpp +++ b/targets/app/common/SaveManager.cpp @@ -4,7 +4,7 @@ #include "app/common/Game.h" #include "app/common/Network/GameNetworkManager.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "minecraft/server/MinecraftServer.h" #include "minecraft/server/ServerAction.h" #include "platform/profile/profile.h" diff --git a/targets/app/common/SkinManager.cpp b/targets/app/common/SkinManager.cpp index 4cc7a743c..ca6be829f 100644 --- a/targets/app/common/SkinManager.cpp +++ b/targets/app/common/SkinManager.cpp @@ -10,7 +10,7 @@ #include "app/common/DLC/DLCManager.h" #include "app/common/DLC/DLCPack.h" #include "app/common/DLC/DLCSkinFile.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "minecraft/Minecraft_Macros.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/model/geom/Model.h" diff --git a/targets/app/common/Tutorial/FullTutorial.cpp b/targets/app/common/Tutorial/FullTutorial.cpp index ca1f78ba3..c5213a11c 100644 --- a/targets/app/common/Tutorial/FullTutorial.cpp +++ b/targets/app/common/Tutorial/FullTutorial.cpp @@ -23,7 +23,7 @@ #include "app/common/Tutorial/Tasks/UseTileTask.h" #include "app/common/Tutorial/Tasks/XuiCraftingTask.h" #include "app/common/Tutorial/Tutorial.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.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/Tutorial/Tasks/ControllerTask.cpp b/targets/app/common/Tutorial/Tasks/ControllerTask.cpp index d58244009..7add2ad70 100644 --- a/targets/app/common/Tutorial/Tasks/ControllerTask.cpp +++ b/targets/app/common/Tutorial/Tasks/ControllerTask.cpp @@ -8,7 +8,7 @@ #include "app/common/Tutorial/Constraints/InputConstraint.h" #include "app/common/Tutorial/Tasks/TutorialTask.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "minecraft/GameEnums.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" diff --git a/targets/app/common/Tutorial/Tutorial.cpp b/targets/app/common/Tutorial/Tutorial.cpp index 3f3d9a24a..787dd344c 100644 --- a/targets/app/common/Tutorial/Tutorial.cpp +++ b/targets/app/common/Tutorial/Tutorial.cpp @@ -20,7 +20,7 @@ #include "app/common/Tutorial/Tasks/RideEntityTask.h" #include "app/common/Tutorial/Tasks/TutorialTask.h" #include "app/common/UI/All Platforms/UIStructs.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "app/linux/Linux_UIController.h" #include "java/Class.h" #include "minecraft/GameEnums.h" diff --git a/targets/app/common/Tutorial/TutorialMessage.cpp b/targets/app/common/Tutorial/TutorialMessage.cpp index 2f3e0f10a..f8eab5d63 100644 --- a/targets/app/common/Tutorial/TutorialMessage.cpp +++ b/targets/app/common/Tutorial/TutorialMessage.cpp @@ -1,6 +1,6 @@ #include "TutorialMessage.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" TutorialMessage::TutorialMessage( int messageId, bool limitRepeats /*= false*/, diff --git a/targets/app/common/UI/All Platforms/ArchiveFile.cpp b/targets/app/common/UI/All Platforms/ArchiveFile.cpp index e5a07e58a..4959be986 100644 --- a/targets/app/common/UI/All Platforms/ArchiveFile.cpp +++ b/targets/app/common/UI/All Platforms/ArchiveFile.cpp @@ -5,7 +5,7 @@ #include #include -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "java/InputOutputStream/ByteArrayInputStream.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/FileInputStream.h" diff --git a/targets/app/common/UI/All Platforms/IUIScene_AbstractContainerMenu.cpp b/targets/app/common/UI/All Platforms/IUIScene_AbstractContainerMenu.cpp index 532c29414..a66987e73 100644 --- a/targets/app/common/UI/All Platforms/IUIScene_AbstractContainerMenu.cpp +++ b/targets/app/common/UI/All Platforms/IUIScene_AbstractContainerMenu.cpp @@ -10,7 +10,7 @@ #include "app/common/Tutorial/Tutorial.h" #include "app/common/Tutorial/TutorialMode.h" #include "app/common/UI/All Platforms/UIStructs.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "app/linux/Linux_UIController.h" #include "minecraft/GameEnums.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/app/common/UI/All Platforms/IUIScene_AnvilMenu.cpp b/targets/app/common/UI/All Platforms/IUIScene_AnvilMenu.cpp index 6a4d6d9c2..effa9750f 100644 --- a/targets/app/common/UI/All Platforms/IUIScene_AnvilMenu.cpp +++ b/targets/app/common/UI/All Platforms/IUIScene_AnvilMenu.cpp @@ -4,7 +4,7 @@ #include #include "app/common/UI/All Platforms/IUIScene_AbstractContainerMenu.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "java/InputOutputStream/ByteArrayOutputStream.h" #include "java/InputOutputStream/DataOutputStream.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/app/common/UI/All Platforms/IUIScene_BeaconMenu.cpp b/targets/app/common/UI/All Platforms/IUIScene_BeaconMenu.cpp index ab5330c4b..b470964d3 100644 --- a/targets/app/common/UI/All Platforms/IUIScene_BeaconMenu.cpp +++ b/targets/app/common/UI/All Platforms/IUIScene_BeaconMenu.cpp @@ -7,7 +7,7 @@ #include "minecraft/GameEnums.h" #include "app/common/UI/All Platforms/IUIScene_AbstractContainerMenu.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "java/InputOutputStream/ByteArrayOutputStream.h" #include "java/InputOutputStream/DataOutputStream.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/app/common/UI/All Platforms/IUIScene_CraftingMenu.cpp b/targets/app/common/UI/All Platforms/IUIScene_CraftingMenu.cpp index 9e83cb9cc..2e30a139e 100644 --- a/targets/app/common/UI/All Platforms/IUIScene_CraftingMenu.cpp +++ b/targets/app/common/UI/All Platforms/IUIScene_CraftingMenu.cpp @@ -9,7 +9,7 @@ #include "app/common/Tutorial/Tutorial.h" #include "app/common/UI/All Platforms/UIEnums.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "app/linux/Linux_UIController.h" #include "minecraft/Console_Debug_enum.h" #include "minecraft/GameEnums.h" diff --git a/targets/app/common/UI/All Platforms/IUIScene_CreativeMenu.cpp b/targets/app/common/UI/All Platforms/IUIScene_CreativeMenu.cpp index 0a31ac168..a9805c187 100644 --- a/targets/app/common/UI/All Platforms/IUIScene_CreativeMenu.cpp +++ b/targets/app/common/UI/All Platforms/IUIScene_CreativeMenu.cpp @@ -7,7 +7,7 @@ #include #include "app/common/UI/All Platforms/IUIScene_AbstractContainerMenu.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "app/linux/Linux_UIController.h" #include "java/JavaMath.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/app/common/UI/All Platforms/IUIScene_HUD.cpp b/targets/app/common/UI/All Platforms/IUIScene_HUD.cpp index dc64e747a..6dd14c5a8 100644 --- a/targets/app/common/UI/All Platforms/IUIScene_HUD.cpp +++ b/targets/app/common/UI/All Platforms/IUIScene_HUD.cpp @@ -6,7 +6,7 @@ #include "platform/profile/profile.h" #include "platform/renderer/renderer.h" #include "minecraft/GameEnums.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "app/linux/Linux_UIController.h" #include "java/Class.h" #include "minecraft/SharedConstants.h" diff --git a/targets/app/common/UI/All Platforms/IUIScene_PauseMenu.cpp b/targets/app/common/UI/All Platforms/IUIScene_PauseMenu.cpp index bd3f67303..a504c5288 100644 --- a/targets/app/common/UI/All Platforms/IUIScene_PauseMenu.cpp +++ b/targets/app/common/UI/All Platforms/IUIScene_PauseMenu.cpp @@ -14,7 +14,7 @@ #include "app/common/GameRules/GameRuleManager.h" #include "app/common/Network/GameNetworkManager.h" #include "app/common/UI/UIScene.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "app/linux/Linux_UIController.h" #include "minecraft/GameEnums.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/app/common/UI/All Platforms/IUIScene_TradingMenu.cpp b/targets/app/common/UI/All Platforms/IUIScene_TradingMenu.cpp index 4b0b707b6..4cbf4ebf8 100644 --- a/targets/app/common/UI/All Platforms/IUIScene_TradingMenu.cpp +++ b/targets/app/common/UI/All Platforms/IUIScene_TradingMenu.cpp @@ -6,7 +6,7 @@ #include "app/common/Tutorial/Tutorial.h" #include "app/common/UI/All Platforms/UIEnums.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "app/linux/Linux_UIController.h" #include "util/StringHelpers.h" #include "java/InputOutputStream/ByteArrayOutputStream.h" diff --git a/targets/app/common/UI/Components/UIComponent_PressStartToPlay.cpp b/targets/app/common/UI/Components/UIComponent_PressStartToPlay.cpp index 4eb7ec5c2..45750ec78 100644 --- a/targets/app/common/UI/Components/UIComponent_PressStartToPlay.cpp +++ b/targets/app/common/UI/Components/UIComponent_PressStartToPlay.cpp @@ -2,7 +2,7 @@ #include "app/common/UI/Controls/UIControl_Label.h" #include "app/common/UI/UIScene.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "app/linux/Linux_UIController.h" #include "strings.h" diff --git a/targets/app/common/UI/Components/UIComponent_Tooltips.cpp b/targets/app/common/UI/Components/UIComponent_Tooltips.cpp index 1e9eb4716..999d19833 100644 --- a/targets/app/common/UI/Components/UIComponent_Tooltips.cpp +++ b/targets/app/common/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/LinuxGame.h" +#include "app/common/Game.h" #include "app/linux/Linux_UIController.h" #include "util/StringHelpers.h" diff --git a/targets/app/common/UI/Components/UIComponent_TutorialPopup.cpp b/targets/app/common/UI/Components/UIComponent_TutorialPopup.cpp index f5629a62d..fc69867cd 100644 --- a/targets/app/common/UI/Components/UIComponent_TutorialPopup.cpp +++ b/targets/app/common/UI/Components/UIComponent_TutorialPopup.cpp @@ -9,7 +9,7 @@ #include "app/common/UI/Controls/UIControl_Label.h" #include "app/common/UI/UILayer.h" #include "app/common/UI/UIScene.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "app/linux/Linux_UIController.h" #include "minecraft/GameEnums.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/app/common/UI/Components/UIScene_HUD.cpp b/targets/app/common/UI/Components/UIScene_HUD.cpp index 4d6fb58c7..90e923c20 100644 --- a/targets/app/common/UI/Components/UIScene_HUD.cpp +++ b/targets/app/common/UI/Components/UIScene_HUD.cpp @@ -8,7 +8,7 @@ #include "app/common/UI/Controls/UIControl_Label.h" #include "app/common/UI/UILayer.h" #include "app/common/UI/UIScene.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "app/linux/Linux_UIController.h" #include "minecraft/GameEnums.h" #include "minecraft/SharedConstants.h" diff --git a/targets/app/common/UI/Controls/UIControl.cpp b/targets/app/common/UI/Controls/UIControl.cpp index 691216a3e..dc3467158 100644 --- a/targets/app/common/UI/Controls/UIControl.cpp +++ b/targets/app/common/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/LinuxGame.h" +#include "app/common/Game.h" #include "java/JavaMath.h" UIControl::UIControl() { diff --git a/targets/app/common/UI/Controls/UIControl_EnchantmentButton.cpp b/targets/app/common/UI/Controls/UIControl_EnchantmentButton.cpp index 473029c07..10d5f67f3 100644 --- a/targets/app/common/UI/Controls/UIControl_EnchantmentButton.cpp +++ b/targets/app/common/UI/Controls/UIControl_EnchantmentButton.cpp @@ -15,7 +15,7 @@ #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" #endif -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/gui/Font.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" diff --git a/targets/app/common/UI/Controls/UIControl_PlayerSkinPreview.cpp b/targets/app/common/UI/Controls/UIControl_PlayerSkinPreview.cpp index 54b27ca61..8dba0e7db 100644 --- a/targets/app/common/UI/Controls/UIControl_PlayerSkinPreview.cpp +++ b/targets/app/common/UI/Controls/UIControl_PlayerSkinPreview.cpp @@ -13,7 +13,7 @@ #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" #endif -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "java/Class.h" #include "minecraft/client/Lighting.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/app/common/UI/Scenes/Debug/UIScene_DebugCreateSchematic.cpp b/targets/app/common/UI/Scenes/Debug/UIScene_DebugCreateSchematic.cpp index ead8d9ff0..6eef7e5e7 100644 --- a/targets/app/common/UI/Scenes/Debug/UIScene_DebugCreateSchematic.cpp +++ b/targets/app/common/UI/Scenes/Debug/UIScene_DebugCreateSchematic.cpp @@ -9,7 +9,7 @@ #include "app/common/UI/Controls/UIControl_TextInput.h" #include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/rrCore.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "app/linux/Linux_UIController.h" #include "minecraft/GameEnums.h" #include "minecraft/server/MinecraftServer.h" diff --git a/targets/app/common/UI/Scenes/Debug/UIScene_DebugOptions.cpp b/targets/app/common/UI/Scenes/Debug/UIScene_DebugOptions.cpp index 34485f76d..e615fb20a 100644 --- a/targets/app/common/UI/Scenes/Debug/UIScene_DebugOptions.cpp +++ b/targets/app/common/UI/Scenes/Debug/UIScene_DebugOptions.cpp @@ -6,7 +6,7 @@ #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" #endif -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "platform/input/InputConstants.h" class UILayer; diff --git a/targets/app/common/UI/Scenes/Debug/UIScene_DebugOverlay.cpp b/targets/app/common/UI/Scenes/Debug/UIScene_DebugOverlay.cpp index dcf252c21..fc1d3bde6 100644 --- a/targets/app/common/UI/Scenes/Debug/UIScene_DebugOverlay.cpp +++ b/targets/app/common/UI/Scenes/Debug/UIScene_DebugOverlay.cpp @@ -18,7 +18,7 @@ #include "app/linux/Stubs/iggy_stubs.h" #endif #include "app/linux/Iggy/include/rrCore.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.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/UI/Scenes/Debug/UIScene_DebugSetCamera.cpp b/targets/app/common/UI/Scenes/Debug/UIScene_DebugSetCamera.cpp index cc301bee4..556db92b3 100644 --- a/targets/app/common/UI/Scenes/Debug/UIScene_DebugSetCamera.cpp +++ b/targets/app/common/UI/Scenes/Debug/UIScene_DebugSetCamera.cpp @@ -11,7 +11,7 @@ #include "app/common/UI/Controls/UIControl_TextInput.h" #include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/rrCore.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "app/linux/Linux_UIController.h" #include "minecraft/GameEnums.h" #include "minecraft/world/phys/Vec3.h" diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.cpp index 65463dfd2..94946557b 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.cpp +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.cpp @@ -11,7 +11,7 @@ #include "app/common/UI/Controls/UIControl_TexturePackList.h" #include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/rrCore.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/skins/TexturePack.h" #include "minecraft/client/skins/TexturePackRepository.h" diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp index a1cfe1723..8e4b98cf7 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp @@ -17,7 +17,7 @@ #include "app/common/UI/Controls/UIControl_TextInput.h" #include "app/common/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.h" #include "app/common/UI/UILayer.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "app/linux/Linux_UIController.h" #include "minecraft/GameEnums.h" #include "minecraft/GameHostOptions.h" diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.cpp index 4cf330511..f7c1ad835 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.cpp +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.cpp @@ -5,7 +5,7 @@ #include "app/common/UI/Controls/UIControl_ButtonList.h" #include "app/common/UI/Controls/UIControl_Label.h" #include "app/common/UI/UIScene.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "app/linux/Linux_UIController.h" #include "minecraft/GameEnums.h" #include "strings.h" diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.cpp index e09f759df..0dd349d80 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.cpp +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.cpp @@ -8,7 +8,7 @@ #include "app/common/UI/Controls/UIControl_HTMLLabel.h" #include "app/common/UI/Controls/UIControl_Label.h" #include "app/common/UI/UIScene.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "app/linux/Linux_UIController.h" #include "platform/PlatformTypes.h" #include "platform/renderer/renderer.h" diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_EULA.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_EULA.cpp index fc81ac180..a49b71c0e 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_EULA.cpp +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_EULA.cpp @@ -7,7 +7,7 @@ #include "app/common/UI/Controls/UIControl_DynamicLabel.h" #include "app/common/UI/UILayer.h" #include "app/common/UI/UIScene.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "app/linux/Linux_UIController.h" #include "minecraft/GameEnums.h" #include "minecraft/GameTypes.h" diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.cpp index ea463c8e7..5c52cbf43 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.cpp +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.cpp @@ -11,7 +11,7 @@ #include "app/common/UI/Controls/UIControl_Label.h" #include "app/common/UI/UILayer.h" #include "app/common/UI/UIScene.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "app/linux/Linux_UIController.h" #include "minecraft/GameEnums.h" #include "minecraft/GameTypes.h" diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.cpp index 4e0fed476..b6fa51cc4 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.cpp +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.cpp @@ -11,7 +11,7 @@ #include "app/common/UI/Controls/UIControl_TextInput.h" #include "app/common/UI/UILayer.h" #include "app/common/UI/UIScene.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "app/linux/Linux_UIController.h" #include "minecraft/GameEnums.h" #include "minecraft/GameHostOptions.h" diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.cpp index ee23ecbff..b9abd7e14 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.cpp +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.cpp @@ -13,7 +13,7 @@ #include "app/common/UI/Controls/UIControl_LeaderboardList.h" #include "app/common/UI/UILayer.h" #include "app/common/UI/UIScene.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "app/linux/Linux_UIController.h" #include "minecraft/Console_Debug_enum.h" #include "app/common/Audio/SoundTypes.h" diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp index 2e5a1563f..c7437c20c 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp @@ -15,7 +15,7 @@ #include "app/common/UI/Controls/UIControl_Slider.h" #include "app/common/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.h" #include "app/common/UI/UILayer.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "app/linux/Linux_UIController.h" #include "minecraft/GameEnums.h" #include "minecraft/GameHostOptions.h" diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp index b2dbc5f2a..f67c7e15d 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp @@ -12,7 +12,7 @@ #include "app/common/UI/Controls/UIControl_SaveList.h" #include "app/common/UI/UILayer.h" #include "app/common/UI/UIScene.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "app/linux/Linux_UIController.h" #include "java/File.h" #include "java/InputOutputStream/FileInputStream.h" diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp index 8e8a10dfb..d576e4a74 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp @@ -15,7 +15,7 @@ #include "app/common/UI/UILayer.h" #include "app/common/UI/UIScene.h" #include "app/common/UI/UIString.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "app/linux/Linux_UIController.h" #include "java/InputOutputStream/BufferedReader.h" #include "java/InputOutputStream/ByteArrayInputStream.h" diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.cpp index c54819aa4..753e3d19c 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.cpp +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.cpp @@ -7,7 +7,7 @@ #include "app/common/UI/Controls/UIControl_DynamicLabel.h" #include "app/common/UI/UILayer.h" #include "app/common/UI/UIScene.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "app/linux/Linux_UIController.h" #include "minecraft/GameEnums.h" #include "minecraft/GameTypes.h" diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.cpp index 0d3487727..0a0baae81 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.cpp +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.cpp @@ -5,7 +5,7 @@ #include "app/common/UI/Controls/UIControl_Label.h" #include "app/common/UI/UILayer.h" #include "app/common/UI/UIScene.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "app/linux/Linux_UIController.h" #include "minecraft/GameTypes.h" #include "app/common/Audio/SoundTypes.h" diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.cpp index faad5c611..ec4d3efb6 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.cpp +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.cpp @@ -2,7 +2,7 @@ #include "UIScene_TrialExitUpsell.h" #include "app/common/UI/UIScene.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "app/linux/Linux_UIController.h" #include "minecraft/GameTypes.h" #include "app/common/Audio/SoundTypes.h" diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_ControlsMenu.cpp b/targets/app/common/UI/Scenes/Help & Options/UIScene_ControlsMenu.cpp index 51ba1cbae..f64d02436 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_ControlsMenu.cpp +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_ControlsMenu.cpp @@ -8,7 +8,7 @@ #include "app/common/UI/Controls/UIControl_CheckBox.h" #include "app/common/UI/Controls/UIControl_Label.h" #include "app/common/UI/UIScene.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "app/linux/Linux_UIController.h" #include "minecraft/BuildVer.h" #include "minecraft/GameEnums.h" diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_Credits.cpp b/targets/app/common/UI/Scenes/Help & Options/UIScene_Credits.cpp index d889687f3..08c780d9c 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_Credits.cpp +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_Credits.cpp @@ -6,7 +6,7 @@ #include "app/common/UI/UILayer.h" #include "app/common/UI/UIScene.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "app/linux/Linux_UIController.h" #include "strings.h" #include "util/StringHelpers.h" diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.cpp b/targets/app/common/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.cpp index c2759fdde..afa5c4b08 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.cpp +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.cpp @@ -4,7 +4,7 @@ #include "app/common/UI/Controls/UIControl_Button.h" #include "app/common/UI/UILayer.h" #include "app/common/UI/UIScene.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "app/linux/Linux_UIController.h" #include "minecraft/client/Minecraft.h" #include "app/common/Audio/SoundTypes.h" diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_HowToPlay.cpp b/targets/app/common/UI/Scenes/Help & Options/UIScene_HowToPlay.cpp index 7d5532895..91b10ee0a 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_HowToPlay.cpp +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_HowToPlay.cpp @@ -8,7 +8,7 @@ #include "app/common/UI/Controls/UIControl_Label.h" #include "app/common/UI/UIScene.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "app/linux/Linux_UIController.h" #include "minecraft/GameEnums.h" #include "app/common/Audio/SoundTypes.h" diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.cpp b/targets/app/common/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.cpp index 2bdca1cf2..cad506495 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.cpp +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.cpp @@ -6,7 +6,7 @@ #include "app/common/UI/Controls/UIControl_ButtonList.h" #include "app/common/UI/UILayer.h" #include "app/common/UI/UIScene.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "app/linux/Linux_UIController.h" #include "minecraft/client/Minecraft.h" #include "app/common/Audio/SoundTypes.h" diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_LanguageSelector.cpp b/targets/app/common/UI/Scenes/Help & Options/UIScene_LanguageSelector.cpp index 25310afc1..86edef6ff 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_LanguageSelector.cpp +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_LanguageSelector.cpp @@ -3,7 +3,7 @@ #include "app/common/UI/Controls/UIControl_ButtonList.h" #include "app/common/UI/UILayer.h" #include "app/common/UI/UIScene.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "app/linux/Linux_UIController.h" #include "minecraft/client/Minecraft.h" #include "app/common/Audio/SoundTypes.h" diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_ReinstallMenu.cpp b/targets/app/common/UI/Scenes/Help & Options/UIScene_ReinstallMenu.cpp index 9cd949d15..3c8640584 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_ReinstallMenu.cpp +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_ReinstallMenu.cpp @@ -3,7 +3,7 @@ #include "app/common/UI/UILayer.h" #include "app/common/UI/UIScene.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "app/linux/Linux_UIController.h" #include "minecraft/client/Minecraft.h" #include "strings.h" diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.cpp b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.cpp index 39804afc9..bee06ed79 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.cpp +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.cpp @@ -6,7 +6,7 @@ #include "app/common/UI/Controls/UIControl_Slider.h" #include "app/common/UI/UILayer.h" #include "app/common/UI/UIScene.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "app/linux/Linux_UIController.h" #include "minecraft/GameEnums.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.cpp b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.cpp index 33bc48fa2..9531e7de8 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.cpp +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.cpp @@ -5,7 +5,7 @@ #include "app/common/UI/Controls/UIControl_Slider.h" #include "app/common/UI/UILayer.h" #include "app/common/UI/UIScene.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "app/linux/Linux_UIController.h" #include "minecraft/GameEnums.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.cpp b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.cpp index ede1945ad..612624c13 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.cpp +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.cpp @@ -7,7 +7,7 @@ #include "app/common/UI/Controls/UIControl_Slider.h" #include "app/common/UI/UILayer.h" #include "app/common/UI/UIScene.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "app/linux/Linux_UIController.h" #include "minecraft/GameEnums.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsMenu.cpp b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsMenu.cpp index e610b9dbc..252388d10 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsMenu.cpp +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsMenu.cpp @@ -4,7 +4,7 @@ #include "app/common/UI/Controls/UIControl_Button.h" #include "app/common/UI/UILayer.h" #include "app/common/UI/UIScene.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "app/linux/Linux_UIController.h" #include "minecraft/client/Minecraft.h" #include "app/common/Audio/SoundTypes.h" diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.cpp b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.cpp index 8168a478f..f3feb408e 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.cpp +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.cpp @@ -10,7 +10,7 @@ #include "app/common/UI/Controls/UIControl_Slider.h" #include "app/common/UI/UILayer.h" #include "app/common/UI/UIScene.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "app/linux/Linux_UIController.h" #include "minecraft/GameEnums.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.cpp b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.cpp index 8e5bb788a..143264327 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.cpp +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.cpp @@ -7,7 +7,7 @@ #include "app/common/UI/Controls/UIControl_Slider.h" #include "app/common/UI/UILayer.h" #include "app/common/UI/UIScene.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "app/linux/Linux_UIController.h" #include "minecraft/GameEnums.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp b/targets/app/common/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp index 7df0b5562..17291e9a0 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp @@ -13,7 +13,7 @@ #include "app/common/UI/Controls/UIControl_PlayerSkinPreview.h" #include "app/common/UI/UILayer.h" #include "app/common/UI/UIScene.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "app/linux/Linux_UIController.h" #include "minecraft/Minecraft_Macros.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.cpp index 53bc88642..e8e8f40d0 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.cpp @@ -12,7 +12,7 @@ #include "app/common/UI/Controls/UIControl_SlotList.h" #include "app/common/UI/UILayer.h" #include "app/common/UI/UIScene.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "app/linux/Linux_UIController.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.cpp index cd8c5ddcf..b313afc82 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.cpp @@ -15,7 +15,7 @@ #include "app/common/UI/Controls/UIControl_SlotList.h" #include "app/common/UI/Controls/UIControl_TextInput.h" #include "app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "minecraft/world/entity/player/Abilities.h" diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.cpp index fa27ae1d8..328b196da 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.cpp @@ -12,7 +12,7 @@ #include "app/common/UI/Controls/UIControl_Label.h" #include "app/common/UI/Controls/UIControl_SlotList.h" #include "app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.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/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.cpp index f60eb9a07..a85be489c 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.cpp @@ -11,7 +11,7 @@ #include "app/common/UI/Controls/UIControl_Progress.h" #include "app/common/UI/Controls/UIControl_SlotList.h" #include "app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "minecraft/SharedConstants.h" #include "minecraft/client/Minecraft.h" #include "minecraft/world/inventory/BrewingStandMenu.h" diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.cpp index 0ee196de4..f57e6b61c 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.cpp @@ -11,7 +11,7 @@ #include "app/common/UI/Controls/UIControl_Label.h" #include "app/common/UI/Controls/UIControl_SlotList.h" #include "app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "minecraft/client/Minecraft.h" #include "minecraft/world/Container.h" #include "minecraft/world/inventory/AbstractContainerMenu.h" diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.cpp index 10653db19..18ca33f99 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.cpp +++ b/targets/app/common/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/LinuxGame.h" +#include "app/common/Game.h" #include "app/linux/Linux_UIController.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/player/LocalPlayer.h" diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.cpp index 7223240bd..09346d5df 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.cpp @@ -11,7 +11,7 @@ #include "app/common/UI/Controls/UIControl_Label.h" #include "app/common/UI/Controls/UIControl_SlotList.h" #include "app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.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/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.cpp index b9f80f605..49b281684 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.cpp @@ -14,7 +14,7 @@ #include "app/common/UI/Controls/UIControl_Label.h" #include "app/common/UI/Controls/UIControl_SlotList.h" #include "app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "app/linux/Linux_UIController.h" #include "minecraft/client/Minecraft.h" #include "minecraft/world/inventory/EnchantmentMenu.h" diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.cpp index 28d1eee2a..1cce87774 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.cpp @@ -10,7 +10,7 @@ #include "app/common/UI/Controls/UIControl_Label.h" #include "app/common/UI/Controls/UIControl_SlotList.h" #include "app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/player/LocalPlayer.h" #include "minecraft/world/inventory/FireworksMenu.h" diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.cpp index 1fd08f277..1ae2b33af 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.cpp @@ -11,7 +11,7 @@ #include "app/common/UI/Controls/UIControl_Progress.h" #include "app/common/UI/Controls/UIControl_SlotList.h" #include "app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.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/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.cpp index 294c5e91c..5221755d6 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.cpp @@ -11,7 +11,7 @@ #include "app/common/UI/Controls/UIControl_Label.h" #include "app/common/UI/Controls/UIControl_SlotList.h" #include "app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "minecraft/client/Minecraft.h" #include "minecraft/world/Container.h" #include "minecraft/world/entity/player/Inventory.h" diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.cpp index 9e9f9378f..1b5617952 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.cpp @@ -17,7 +17,7 @@ #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" #endif -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "app/linux/Linux_UIController.h" #include "minecraft/client/Minecraft.h" #include "minecraft/world/Container.h" diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.cpp index 67ebaf6b7..7632984c3 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.cpp @@ -13,7 +13,7 @@ #include "app/common/UI/Controls/UIControl_MinecraftPlayer.h" #include "app/common/UI/Controls/UIControl_SlotList.h" #include "app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "app/linux/Linux_UIController.h" #include "minecraft/SharedConstants.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.cpp index 44009e221..660cbfa89 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.cpp @@ -13,7 +13,7 @@ #include "app/common/UI/Controls/UIControl_Label.h" #include "app/common/UI/Controls/UIControl_SlotList.h" #include "app/common/UI/UIScene.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "app/linux/Linux_UIController.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.cpp index 1679c1108..1e812d402 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.cpp @@ -10,7 +10,7 @@ #include "app/common/UI/Controls/UIControl_Label.h" #include "app/common/UI/Controls/UIControl_SlotList.h" #include "app/common/UI/UIScene.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "app/linux/Linux_UIController.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.cpp index 4efb6e88b..35ee1b970 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.cpp @@ -10,7 +10,7 @@ #include "app/common/UI/Controls/UIControl_Button.h" #include "app/common/UI/Controls/UIControl_Label.h" #include "app/common/UI/UIScene.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "app/linux/Linux_UIController.h" #include "minecraft/GameEnums.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.cpp index 448650f9c..d0a6a0f6f 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.cpp @@ -8,7 +8,7 @@ #include "app/common/Tutorial/Tutorial.h" #include "app/common/UI/UIScene.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "app/linux/Linux_UIController.h" #include "java/Random.h" #include "minecraft/GameEnums.h" diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.cpp index f4fabe66a..8bcf0003b 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.cpp @@ -8,7 +8,7 @@ #include "app/common/UI/Controls/UIControl_Button.h" #include "app/common/UI/Controls/UIControl_CheckBox.h" #include "app/common/UI/UIScene.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "app/linux/Linux_UIController.h" #include "minecraft/GameEnums.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.cpp index 7022e00e1..e70348c78 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.cpp @@ -9,7 +9,7 @@ #include "app/common/UI/Controls/UIControl_PlayerList.h" #include "app/common/UI/UILayer.h" #include "app/common/UI/UIScene.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "app/linux/Linux_UIController.h" #include "minecraft/Console_Debug_enum.h" #include "minecraft/GameEnums.h" diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.cpp index e8eed0628..b24b04a03 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.cpp @@ -10,7 +10,7 @@ #include "app/common/UI/Controls/UIControl_Label.h" #include "app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.h" #include "app/common/UI/UIScene.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "app/linux/Linux_UIController.h" #include "minecraft/GameEnums.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.cpp index 3d2b50e5c..74fbd8308 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.cpp @@ -14,7 +14,7 @@ #include "app/common/UI/Controls/UIControl_Button.h" #include "app/common/UI/UILayer.h" #include "app/common/UI/UIScene.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "app/linux/Linux_UIController.h" #include "minecraft/GameEnums.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.cpp index 6817c4665..859212a35 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.cpp @@ -7,7 +7,7 @@ #include "app/common/UI/Controls/UIControl_TextInput.h" #include "app/common/UI/UILayer.h" #include "app/common/UI/UIScene.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "app/linux/Linux_UIController.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/ClientConnection.h" diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.cpp index 303d60426..761874e0a 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.cpp @@ -9,7 +9,7 @@ #include "app/common/UI/Controls/UIControl_PlayerList.h" #include "app/common/UI/UILayer.h" #include "app/common/UI/UIScene.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "app/linux/Linux_UIController.h" #include "minecraft/Console_Debug_enum.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/app/common/UI/Scenes/UIScene_ConnectingProgress.cpp b/targets/app/common/UI/Scenes/UIScene_ConnectingProgress.cpp index 76e61d5bf..bbecfb9b1 100644 --- a/targets/app/common/UI/Scenes/UIScene_ConnectingProgress.cpp +++ b/targets/app/common/UI/Scenes/UIScene_ConnectingProgress.cpp @@ -8,7 +8,7 @@ #include "app/common/UI/Controls/UIControl_Progress.h" #include "app/common/UI/UILayer.h" #include "app/common/UI/UIScene.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "app/linux/Linux_UIController.h" #include "java/System.h" #include "minecraft/GameEnums.h" diff --git a/targets/app/common/UI/Scenes/UIScene_FullscreenProgress.cpp b/targets/app/common/UI/Scenes/UIScene_FullscreenProgress.cpp index 1183838ac..123e3b2b9 100644 --- a/targets/app/common/UI/Scenes/UIScene_FullscreenProgress.cpp +++ b/targets/app/common/UI/Scenes/UIScene_FullscreenProgress.cpp @@ -11,7 +11,7 @@ #include "app/common/UI/Controls/UIControl_Progress.h" #include "app/common/UI/UILayer.h" #include "app/common/UI/UIScene.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "app/linux/Linux_UIController.h" #include "minecraft/GameEnums.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/app/common/UI/Scenes/UIScene_Keyboard.cpp b/targets/app/common/UI/Scenes/UIScene_Keyboard.cpp index 5959ed9e2..ae36113cb 100644 --- a/targets/app/common/UI/Scenes/UIScene_Keyboard.cpp +++ b/targets/app/common/UI/Scenes/UIScene_Keyboard.cpp @@ -5,7 +5,7 @@ #include "app/common/UI/Controls/UIControl_TextInput.h" #include "app/common/UI/UILayer.h" #include "app/common/UI/UIScene.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "app/linux/Linux_UIController.h" #include "minecraft/GameTypes.h" #include "strings.h" diff --git a/targets/app/common/UI/Scenes/UIScene_MessageBox.cpp b/targets/app/common/UI/Scenes/UIScene_MessageBox.cpp index 855e05dd3..124da3915 100644 --- a/targets/app/common/UI/Scenes/UIScene_MessageBox.cpp +++ b/targets/app/common/UI/Scenes/UIScene_MessageBox.cpp @@ -6,7 +6,7 @@ #include "app/common/UI/Controls/UIControl_Label.h" #include "app/common/UI/UILayer.h" #include "app/common/UI/UIScene.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "app/linux/Linux_UIController.h" #include "platform/PlatformTypes.h" #include "platform/profile/profile.h" diff --git a/targets/app/common/UI/Scenes/UIScene_QuadrantSignin.cpp b/targets/app/common/UI/Scenes/UIScene_QuadrantSignin.cpp index d7d002d32..7540fb51d 100644 --- a/targets/app/common/UI/Scenes/UIScene_QuadrantSignin.cpp +++ b/targets/app/common/UI/Scenes/UIScene_QuadrantSignin.cpp @@ -7,7 +7,7 @@ #include "app/common/UI/Controls/UIControl_Label.h" #include "app/common/UI/UILayer.h" #include "app/common/UI/UIScene.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "app/linux/Linux_UIController.h" #include "platform/PlatformTypes.h" #include "platform/input/input.h" diff --git a/targets/app/common/UI/UIController.cpp b/targets/app/common/UI/UIController.cpp index f4a1e559e..96b40f41d 100644 --- a/targets/app/common/UI/UIController.cpp +++ b/targets/app/common/UI/UIController.cpp @@ -34,7 +34,7 @@ #include "app/linux/Stubs/iggy_stubs.h" #endif #include "UIFontData.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "app/linux/Linux_UIController.h" #include "java/System.h" #include "minecraft/client/BufferedImage.h" diff --git a/targets/app/common/UI/UIFontData.cpp b/targets/app/common/UI/UIFontData.cpp index 5f4e53c9d..1d36d18dc 100644 --- a/targets/app/common/UI/UIFontData.cpp +++ b/targets/app/common/UI/UIFontData.cpp @@ -4,7 +4,7 @@ #include -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" ///////////////////////////////////////////////////// // --- -- --- THIS FILE IS IN UNICODE --- -- --- // diff --git a/targets/app/common/UI/UIGroup.cpp b/targets/app/common/UI/UIGroup.cpp index 58ad0bc69..2b8e35d65 100644 --- a/targets/app/common/UI/UIGroup.cpp +++ b/targets/app/common/UI/UIGroup.cpp @@ -5,7 +5,7 @@ #include "app/common/UI/All Platforms/UIEnums.h" #include "app/common/UI/UILayer.h" #include "app/linux/Iggy/include/rrCore.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "app/linux/Linux_UIController.h" #include "minecraft/client/MemoryTracker.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/app/common/UI/UILayer.cpp b/targets/app/common/UI/UILayer.cpp index a348916ba..7033e9aef 100644 --- a/targets/app/common/UI/UILayer.cpp +++ b/targets/app/common/UI/UILayer.cpp @@ -76,7 +76,7 @@ #include "app/common/UI/UIGroup.h" #include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/rrCore.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "app/linux/Linux_UIController.h" #include "platform/renderer/renderer.h" diff --git a/targets/app/common/UI/UIScene.cpp b/targets/app/common/UI/UIScene.cpp index 763dcf4bf..a551b2b81 100644 --- a/targets/app/common/UI/UIScene.cpp +++ b/targets/app/common/UI/UIScene.cpp @@ -18,7 +18,7 @@ #include "app/linux/Stubs/iggy_stubs.h" #endif #include "app/linux/Iggy/include/rrCore.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "app/linux/Linux_UIController.h" #include "java/System.h" #include "minecraft/client/Lighting.h" diff --git a/targets/app/common/UI/UIString.cpp b/targets/app/common/UI/UIString.cpp index 235e67a60..e08539d33 100644 --- a/targets/app/common/UI/UIString.cpp +++ b/targets/app/common/UI/UIString.cpp @@ -1,6 +1,6 @@ #include "UIString.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "platform/XboxStubs.h" #include "util/StringHelpers.h" diff --git a/targets/app/common/UI/UITTFFont.cpp b/targets/app/common/UI/UITTFFont.cpp index 2d09b2ad3..f4d29db88 100644 --- a/targets/app/common/UI/UITTFFont.cpp +++ b/targets/app/common/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/LinuxGame.h" +#include "app/common/Game.h" #include "platform/fs/fs.h" #include "util/StringHelpers.h" diff --git a/targets/app/linux/LinuxGame.cpp b/targets/app/linux/LinuxGame.cpp deleted file mode 100644 index 7dd6381a5..000000000 --- a/targets/app/linux/LinuxGame.cpp +++ /dev/null @@ -1,112 +0,0 @@ -#include "LinuxGame.h" -#include "platform/game/game.h" - -#include - -#include - -#include "app/common/Game.h" -#include "app/common/Network/GameNetworkManager.h" -#include "app/common/UI/All Platforms/UIStructs.h" -#include "minecraft/GameEnums.h" -#include "minecraft/client/Minecraft.h" -#include "minecraft/client/User.h" -#include "minecraft/server/MinecraftServer.h" -#include "minecraft/world/level/LevelSettings.h" -#include "platform/C4JThread.h" -#include "platform/profile/profile.h" -#include "platform/renderer/renderer.h" -#include "platform/storage/storage.h" - -LinuxGame app; - -#define CONTEXT_GAME_STATE 0 - -LinuxGame::LinuxGame() : Game() {} - -void LinuxGame::StoreLaunchData() {} -void LinuxGame::ExitGame() { - app.DebugPrintf("Linux_App LinuxGame::ExitGame AFTER START\n"); - PlatformRenderer.Close(); -} -void LinuxGame::FatalLoadError() { - app.DebugPrintf("LinuxGame::FatalLoadError - asserting 0 and dying...\n"); - assert(0); -} - -void LinuxGame::TemporaryCreateGameStart() { - ////////////////////////////////////////////////////////////////////////////////////////////// - /// From CScene_Main::OnInit - - app.setLevelGenerationOptions(nullptr); - - // From CScene_Main::RunPlayGame - Minecraft* pMinecraft = Minecraft::GetInstance(); - PlatformGame.ReleaseSaveThumbnail(); - PlatformProfile.SetLockedProfile(0); - pMinecraft->user->name = "Windows"; - app.ApplyGameSettingsChanged(0); - - ////////////////////////////////////////////////////////////////////////////////////////////// - /// From CScene_MultiGameJoinLoad::OnInit - MinecraftServer::resetFlags(); - - // From CScene_MultiGameJoinLoad::OnNotifyPressEx - app.SetTutorialMode(false); - app.SetCorruptSaveDeleted(false); - - ////////////////////////////////////////////////////////////////////////////////////////////// - /// From CScene_MultiGameCreate::CreateGame - - app.ClearTerrainFeaturePosition(); - std::string wWorldName = "TestWorld"; - - PlatformStorage.ResetSaveData(); - PlatformStorage.SetSaveTitle(wWorldName.c_str()); - - bool isFlat = false; - int64_t seedValue = - 0; // BiomeSource::findSeed(isFlat?LevelType::lvl_flat:LevelType::lvl_normal); - // // 4J - was (new Random())->nextLong() - now trying to actually - // find a seed to suit our requirements - - NetworkGameInitData* param = new NetworkGameInitData(); - param->seed = seedValue; - param->saveData = nullptr; - - app.SetGameHostOption(eGameHostOption_Difficulty, 0); - app.SetGameHostOption(eGameHostOption_FriendsOfFriends, 0); - app.SetGameHostOption(eGameHostOption_Gamertags, 1); - app.SetGameHostOption(eGameHostOption_BedrockFog, 1); - - app.SetGameHostOption( - eGameHostOption_GameType, - GameType::CREATIVE->getId()); // LevelSettings::GAMETYPE_SURVIVAL - app.SetGameHostOption(eGameHostOption_LevelType, 0); - app.SetGameHostOption(eGameHostOption_Structures, 1); - app.SetGameHostOption(eGameHostOption_BonusChest, 0); - - app.SetGameHostOption(eGameHostOption_PvP, 1); - app.SetGameHostOption(eGameHostOption_TrustPlayers, 1); - app.SetGameHostOption(eGameHostOption_FireSpreads, 1); - app.SetGameHostOption(eGameHostOption_TNT, 1); - app.SetGameHostOption(eGameHostOption_HostCanFly, 1); - app.SetGameHostOption(eGameHostOption_HostCanChangeHunger, 1); - app.SetGameHostOption(eGameHostOption_HostCanBeInvisible, 1); - - param->settings = app.GetGameHostOption(eGameHostOption_All); - - g_NetworkManager.FakeLocalPlayerJoined(); - - LoadingInputParams* loadingParams = new LoadingInputParams(); - loadingParams->func = &CGameNetworkManager::RunNetworkGameThreadProc; - loadingParams->lpParam = param; - - // Reset the autosave time - app.SetAutosaveTimerTime(); - - C4JThread* thread = new C4JThread(loadingParams->func, - loadingParams->lpParam, "RunNetworkGame"); - thread->run(); -} - diff --git a/targets/app/linux/LinuxGame.h b/targets/app/linux/LinuxGame.h deleted file mode 100644 index c2dab570d..000000000 --- a/targets/app/linux/LinuxGame.h +++ /dev/null @@ -1,22 +0,0 @@ -#pragma once - -#include "app/common/Game.h" - -class C4JStringTable; - -class LinuxGame : public Game { -public: - LinuxGame(); - - void StoreLaunchData() override; - void ExitGame() override; - void FatalLoadError() override; - - C4JStringTable* GetStringTable() { return nullptr; } - - // original code - virtual void TemporaryCreateGameStart(); -}; - -extern LinuxGame app; - diff --git a/targets/app/linux/Linux_Minecraft.cpp b/targets/app/linux/Linux_Minecraft.cpp index 44029ade7..1c5b93e94 100644 --- a/targets/app/linux/Linux_Minecraft.cpp +++ b/targets/app/linux/Linux_Minecraft.cpp @@ -61,7 +61,7 @@ static void sigsegv_handler(int sig) { #include "platform/profile/ProfileConstants.h" #include "app/common/Audio/SoundEngine.h" #include "app/common/Network/GameNetworkManager.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "app/linux/Linux_UIController.h" #include "minecraft/world/level/storage/ConsoleSaveFileIO/compression.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/app/linux/Linux_UIController.cpp b/targets/app/linux/Linux_UIController.cpp index 8d1871446..da18ce062 100644 --- a/targets/app/linux/Linux_UIController.cpp +++ b/targets/app/linux/Linux_UIController.cpp @@ -11,7 +11,7 @@ #include "app/linux/Stubs/iggy_stubs.h" #endif #include "app/linux/Iggy/include/rrCore.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "app/windows/Iggy/include/gdraw.h" ConsoleUIController ui; diff --git a/targets/app/linux_sources.txt b/targets/app/linux_sources.txt index 13d7459dc..2db425e4b 100644 --- a/targets/app/linux_sources.txt +++ b/targets/app/linux_sources.txt @@ -1,4 +1,3 @@ linux/Iggy/gdraw/gdraw.c -linux/LinuxGame.cpp linux/Linux_Minecraft.cpp linux/Linux_UIController.cpp diff --git a/targets/minecraft/stats/StatsCounter.cpp b/targets/minecraft/stats/StatsCounter.cpp index 02ea62c82..17fcd442e 100644 --- a/targets/minecraft/stats/StatsCounter.cpp +++ b/targets/minecraft/stats/StatsCounter.cpp @@ -10,7 +10,7 @@ #include #include "app/common/App_structs.h" -#include "app/linux/LinuxGame.h" +#include "app/common/Game.h" #include "platform/leaderboard/IPlatformLeaderboard.h" #include "minecraft/stats/Achievement.h" #include "minecraft/stats/Achievements.h"