From 224fd9dacc0492ce7ebd5298e0a74439cd69e428 Mon Sep 17 00:00:00 2001 From: Tropical <42101043+tropicaaal@users.noreply.github.com> Date: Thu, 9 Apr 2026 22:42:17 -0500 Subject: [PATCH] remove remaining Linux implementations for common ones --- targets/app/common/Audio/SoundEngine.cpp | 2 +- targets/app/common/Audio/SoundEngine.h | 2 +- targets/app/common/DLC/DLCManager.cpp | 2 +- targets/app/common/DLCController.cpp | 2 +- targets/app/common/Game.cpp | 2 +- targets/app/common/GameSettingsManager.cpp | 2 +- targets/app/common/Game_XuiActions.cpp | 2 +- targets/app/{linux => common}/Iggy/gdraw/gdraw.c | 2 +- targets/app/{linux => common}/Iggy/gdraw/gdraw.h | 2 +- targets/app/{linux/Stubs => common/Iggy}/iggy_stubs.h | 2 +- targets/app/{linux => common}/Iggy/include/gdraw.h | 0 targets/app/{linux => common}/Iggy/include/iggy.h | 0 targets/app/{linux => common}/Iggy/include/rrCore.h | 0 targets/app/common/MenuController.cpp | 2 +- targets/app/common/Network/GameNetworkManager.cpp | 2 +- targets/app/common/NetworkController.cpp | 2 +- targets/app/common/Tutorial/Tasks/ChoiceTask.cpp | 2 +- targets/app/common/Tutorial/Tasks/InfoTask.cpp | 2 +- targets/app/common/Tutorial/Tutorial.cpp | 2 +- .../All Platforms/IUIScene_AbstractContainerMenu.cpp | 2 +- .../common/UI/All Platforms/IUIScene_CraftingMenu.cpp | 2 +- .../common/UI/All Platforms/IUIScene_CreativeMenu.cpp | 2 +- targets/app/common/UI/All Platforms/IUIScene_HUD.cpp | 2 +- .../app/common/UI/All Platforms/IUIScene_PauseMenu.cpp | 2 +- .../common/UI/All Platforms/IUIScene_TradingMenu.cpp | 2 +- targets/app/common/UI/Components/UIComponent_Chat.cpp | 8 ++++---- targets/app/common/UI/Components/UIComponent_Chat.h | 2 +- .../Components/UIComponent_DebugUIMarketingGuide.cpp | 6 +++--- .../UI/Components/UIComponent_DebugUIMarketingGuide.h | 4 ++-- .../UI/Components/UIComponent_MenuBackground.cpp | 8 ++++---- .../common/UI/Components/UIComponent_MenuBackground.h | 2 +- .../app/common/UI/Components/UIComponent_Panorama.cpp | 8 ++++---- .../app/common/UI/Components/UIComponent_Panorama.h | 6 +++--- .../UI/Components/UIComponent_PressStartToPlay.cpp | 2 +- .../UI/Components/UIComponent_PressStartToPlay.h | 4 ++-- .../app/common/UI/Components/UIComponent_Tooltips.cpp | 8 ++++---- .../app/common/UI/Components/UIComponent_Tooltips.h | 6 +++--- .../common/UI/Components/UIComponent_TutorialPopup.cpp | 2 +- .../common/UI/Components/UIComponent_TutorialPopup.h | 6 +++--- targets/app/common/UI/Components/UIScene_HUD.cpp | 2 +- targets/app/common/UI/Components/UIScene_HUD.h | 6 +++--- .../UI/ConsoleUIController.cpp} | 10 +++++----- .../UI/ConsoleUIController.h} | 4 ++-- targets/app/common/UI/Controls/UIControl.cpp | 6 +++--- targets/app/common/UI/Controls/UIControl.h | 6 +++--- targets/app/common/UI/Controls/UIControl_Base.cpp | 6 +++--- targets/app/common/UI/Controls/UIControl_Base.h | 4 ++-- .../UI/Controls/UIControl_BeaconEffectButton.cpp | 4 ++-- .../common/UI/Controls/UIControl_BeaconEffectButton.h | 4 ++-- .../app/common/UI/Controls/UIControl_BitmapIcon.cpp | 4 ++-- targets/app/common/UI/Controls/UIControl_BitmapIcon.h | 4 ++-- targets/app/common/UI/Controls/UIControl_Button.cpp | 4 ++-- targets/app/common/UI/Controls/UIControl_Button.h | 4 ++-- .../app/common/UI/Controls/UIControl_ButtonList.cpp | 6 +++--- targets/app/common/UI/Controls/UIControl_ButtonList.h | 4 ++-- targets/app/common/UI/Controls/UIControl_CheckBox.cpp | 6 +++--- targets/app/common/UI/Controls/UIControl_CheckBox.h | 4 ++-- targets/app/common/UI/Controls/UIControl_Cursor.cpp | 4 ++-- targets/app/common/UI/Controls/UIControl_Cursor.h | 4 ++-- targets/app/common/UI/Controls/UIControl_DLCList.cpp | 6 +++--- targets/app/common/UI/Controls/UIControl_DLCList.h | 4 ++-- .../app/common/UI/Controls/UIControl_DynamicLabel.cpp | 6 +++--- .../app/common/UI/Controls/UIControl_DynamicLabel.h | 6 +++--- .../common/UI/Controls/UIControl_EnchantmentBook.cpp | 4 ++-- .../app/common/UI/Controls/UIControl_EnchantmentBook.h | 4 ++-- .../common/UI/Controls/UIControl_EnchantmentButton.cpp | 4 ++-- .../common/UI/Controls/UIControl_EnchantmentButton.h | 4 ++-- targets/app/common/UI/Controls/UIControl_HTMLLabel.cpp | 6 +++--- targets/app/common/UI/Controls/UIControl_HTMLLabel.h | 6 +++--- targets/app/common/UI/Controls/UIControl_Label.cpp | 4 ++-- targets/app/common/UI/Controls/UIControl_Label.h | 4 ++-- .../common/UI/Controls/UIControl_LeaderboardList.cpp | 4 ++-- .../app/common/UI/Controls/UIControl_LeaderboardList.h | 4 ++-- .../common/UI/Controls/UIControl_MinecraftHorse.cpp | 4 ++-- .../app/common/UI/Controls/UIControl_MinecraftHorse.h | 4 ++-- .../common/UI/Controls/UIControl_MinecraftPlayer.cpp | 4 ++-- .../app/common/UI/Controls/UIControl_MinecraftPlayer.h | 4 ++-- .../app/common/UI/Controls/UIControl_PlayerList.cpp | 6 +++--- targets/app/common/UI/Controls/UIControl_PlayerList.h | 4 ++-- .../common/UI/Controls/UIControl_PlayerSkinPreview.cpp | 4 ++-- .../common/UI/Controls/UIControl_PlayerSkinPreview.h | 4 ++-- targets/app/common/UI/Controls/UIControl_Progress.cpp | 4 ++-- targets/app/common/UI/Controls/UIControl_Progress.h | 4 ++-- targets/app/common/UI/Controls/UIControl_SaveList.cpp | 6 +++--- targets/app/common/UI/Controls/UIControl_SaveList.h | 4 ++-- targets/app/common/UI/Controls/UIControl_Slider.cpp | 8 ++++---- targets/app/common/UI/Controls/UIControl_Slider.h | 6 +++--- targets/app/common/UI/Controls/UIControl_SlotList.cpp | 4 ++-- targets/app/common/UI/Controls/UIControl_SlotList.h | 4 ++-- .../common/UI/Controls/UIControl_SpaceIndicatorBar.cpp | 4 ++-- .../common/UI/Controls/UIControl_SpaceIndicatorBar.h | 4 ++-- targets/app/common/UI/Controls/UIControl_TextInput.cpp | 4 ++-- targets/app/common/UI/Controls/UIControl_TextInput.h | 4 ++-- .../common/UI/Controls/UIControl_TexturePackList.cpp | 6 +++--- .../app/common/UI/Controls/UIControl_TexturePackList.h | 6 +++--- targets/app/common/UI/Controls/UIControl_Touch.cpp | 4 ++-- targets/app/common/UI/Controls/UIControl_Touch.h | 4 ++-- .../UI/Scenes/Debug/UIScene_DebugCreateSchematic.cpp | 4 ++-- .../UI/Scenes/Debug/UIScene_DebugCreateSchematic.h | 2 +- .../common/UI/Scenes/Debug/UIScene_DebugOptions.cpp | 4 ++-- .../common/UI/Scenes/Debug/UIScene_DebugOverlay.cpp | 8 ++++---- .../app/common/UI/Scenes/Debug/UIScene_DebugOverlay.h | 6 +++--- .../common/UI/Scenes/Debug/UIScene_DebugSetCamera.cpp | 4 ++-- .../common/UI/Scenes/Debug/UIScene_DebugSetCamera.h | 2 +- .../Frontend Menu screens/IUIScene_StartGame.cpp | 2 +- .../Scenes/Frontend Menu screens/IUIScene_StartGame.h | 2 +- .../Frontend Menu screens/UIScene_CreateWorldMenu.cpp | 2 +- .../Frontend Menu screens/UIScene_CreateWorldMenu.h | 2 +- .../Frontend Menu screens/UIScene_DLCMainMenu.cpp | 2 +- .../Scenes/Frontend Menu screens/UIScene_DLCMainMenu.h | 2 +- .../Frontend Menu screens/UIScene_DLCOffersMenu.cpp | 2 +- .../Frontend Menu screens/UIScene_DLCOffersMenu.h | 2 +- .../UI/Scenes/Frontend Menu screens/UIScene_EULA.cpp | 2 +- .../UI/Scenes/Frontend Menu screens/UIScene_EULA.h | 2 +- .../UI/Scenes/Frontend Menu screens/UIScene_Intro.cpp | 4 ++-- .../UI/Scenes/Frontend Menu screens/UIScene_Intro.h | 4 ++-- .../Scenes/Frontend Menu screens/UIScene_JoinMenu.cpp | 2 +- .../UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.h | 2 +- .../UIScene_LaunchMoreOptionsMenu.cpp | 2 +- .../UIScene_LaunchMoreOptionsMenu.h | 6 +++--- .../Frontend Menu screens/UIScene_LeaderboardsMenu.cpp | 2 +- .../Frontend Menu screens/UIScene_LeaderboardsMenu.h | 6 +++--- .../Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp | 2 +- .../UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.h | 2 +- .../Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp | 2 +- .../Frontend Menu screens/UIScene_LoadOrJoinMenu.h | 2 +- .../Scenes/Frontend Menu screens/UIScene_MainMenu.cpp | 2 +- .../UI/Scenes/Frontend Menu screens/UIScene_MainMenu.h | 6 +++--- .../Frontend Menu screens/UIScene_NewUpdateMessage.cpp | 2 +- .../Frontend Menu screens/UIScene_NewUpdateMessage.h | 2 +- .../Frontend Menu screens/UIScene_SaveMessage.cpp | 2 +- .../Scenes/Frontend Menu screens/UIScene_SaveMessage.h | 6 +++--- .../Frontend Menu screens/UIScene_TrialExitUpsell.cpp | 2 +- .../UI/Scenes/Help & Options/UIScene_ControlsMenu.cpp | 2 +- .../UI/Scenes/Help & Options/UIScene_ControlsMenu.h | 6 +++--- .../UI/Scenes/Help & Options/UIScene_Credits.cpp | 2 +- .../common/UI/Scenes/Help & Options/UIScene_Credits.h | 6 +++--- .../Help & Options/UIScene_HelpAndOptionsMenu.cpp | 2 +- .../Scenes/Help & Options/UIScene_HelpAndOptionsMenu.h | 2 +- .../UI/Scenes/Help & Options/UIScene_HowToPlay.cpp | 2 +- .../UI/Scenes/Help & Options/UIScene_HowToPlay.h | 4 ++-- .../UI/Scenes/Help & Options/UIScene_HowToPlayMenu.cpp | 2 +- .../UI/Scenes/Help & Options/UIScene_HowToPlayMenu.h | 2 +- .../Scenes/Help & Options/UIScene_LanguageSelector.cpp | 2 +- .../Scenes/Help & Options/UIScene_LanguageSelector.h | 2 +- .../UI/Scenes/Help & Options/UIScene_ReinstallMenu.cpp | 2 +- .../UI/Scenes/Help & Options/UIScene_ReinstallMenu.h | 2 +- .../Help & Options/UIScene_SettingsAudioMenu.cpp | 2 +- .../Scenes/Help & Options/UIScene_SettingsAudioMenu.h | 2 +- .../Help & Options/UIScene_SettingsControlMenu.cpp | 2 +- .../Help & Options/UIScene_SettingsControlMenu.h | 2 +- .../Help & Options/UIScene_SettingsGraphicsMenu.cpp | 2 +- .../Help & Options/UIScene_SettingsGraphicsMenu.h | 2 +- .../UI/Scenes/Help & Options/UIScene_SettingsMenu.cpp | 2 +- .../UI/Scenes/Help & Options/UIScene_SettingsMenu.h | 2 +- .../Help & Options/UIScene_SettingsOptionsMenu.cpp | 2 +- .../Help & Options/UIScene_SettingsOptionsMenu.h | 2 +- .../Scenes/Help & Options/UIScene_SettingsUIMenu.cpp | 2 +- .../UI/Scenes/Help & Options/UIScene_SettingsUIMenu.h | 2 +- .../Scenes/Help & Options/UIScene_SkinSelectMenu.cpp | 2 +- .../UI/Scenes/Help & Options/UIScene_SkinSelectMenu.h | 6 +++--- .../Containers/UIScene_AbstractContainerMenu.cpp | 2 +- .../Containers/UIScene_AbstractContainerMenu.h | 6 +++--- .../Containers/UIScene_AnvilMenu.h | 4 ++-- .../Containers/UIScene_BeaconMenu.h | 4 ++-- .../Containers/UIScene_CreativeMenu.cpp | 8 ++++---- .../Containers/UIScene_CreativeMenu.h | 4 ++-- .../Containers/UIScene_EnchantingMenu.cpp | 2 +- .../Containers/UIScene_EnchantingMenu.h | 2 +- .../Containers/UIScene_FireworksMenu.h | 4 ++-- .../Containers/UIScene_HorseInventoryMenu.cpp | 6 +++--- .../Containers/UIScene_HorseInventoryMenu.h | 4 ++-- .../Containers/UIScene_InventoryMenu.cpp | 2 +- .../Containers/UIScene_InventoryMenu.h | 4 ++-- .../Containers/UIScene_TradingMenu.cpp | 2 +- .../Containers/UIScene_TradingMenu.h | 4 ++-- .../In-Game Menu Screens/UIScene_CraftingMenu.cpp | 2 +- .../Scenes/In-Game Menu Screens/UIScene_CraftingMenu.h | 4 ++-- .../Scenes/In-Game Menu Screens/UIScene_DeathMenu.cpp | 2 +- .../UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.h | 2 +- .../UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.cpp | 2 +- .../UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.h | 6 +++--- .../UIScene_InGameHostOptionsMenu.cpp | 2 +- .../UIScene_InGameHostOptionsMenu.h | 2 +- .../In-Game Menu Screens/UIScene_InGameInfoMenu.cpp | 2 +- .../In-Game Menu Screens/UIScene_InGameInfoMenu.h | 2 +- .../UIScene_InGamePlayerOptionsMenu.cpp | 2 +- .../UIScene_InGamePlayerOptionsMenu.h | 6 +++--- .../Scenes/In-Game Menu Screens/UIScene_PauseMenu.cpp | 2 +- .../UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h | 2 +- .../In-Game Menu Screens/UIScene_SignEntryMenu.cpp | 2 +- .../In-Game Menu Screens/UIScene_SignEntryMenu.h | 2 +- .../In-Game Menu Screens/UIScene_TeleportMenu.cpp | 2 +- .../Scenes/In-Game Menu Screens/UIScene_TeleportMenu.h | 2 +- .../common/UI/Scenes/UIScene_ConnectingProgress.cpp | 2 +- .../app/common/UI/Scenes/UIScene_ConnectingProgress.h | 2 +- .../common/UI/Scenes/UIScene_FullscreenProgress.cpp | 2 +- .../app/common/UI/Scenes/UIScene_FullscreenProgress.h | 2 +- targets/app/common/UI/Scenes/UIScene_Keyboard.cpp | 2 +- targets/app/common/UI/Scenes/UIScene_Keyboard.h | 6 +++--- targets/app/common/UI/Scenes/UIScene_MessageBox.cpp | 2 +- targets/app/common/UI/Scenes/UIScene_MessageBox.h | 6 +++--- .../app/common/UI/Scenes/UIScene_QuadrantSignin.cpp | 2 +- targets/app/common/UI/Scenes/UIScene_QuadrantSignin.h | 4 ++-- targets/app/common/UI/UIBitmapFont.cpp | 6 +++--- targets/app/common/UI/UIBitmapFont.h | 6 +++--- targets/app/common/UI/UIController.cpp | 6 +++--- targets/app/common/UI/UIController.h | 6 +++--- targets/app/common/UI/UIGroup.cpp | 4 ++-- targets/app/common/UI/UIGroup.h | 2 +- targets/app/common/UI/UILayer.cpp | 4 ++-- targets/app/common/UI/UILayer.h | 2 +- targets/app/common/UI/UIScene.cpp | 8 ++++---- targets/app/common/UI/UIScene.h | 6 +++--- targets/app/common/UI/UITTFFont.cpp | 6 +++--- targets/app/common/UI/UITTFFont.h | 2 +- targets/app/common_sources.txt | 2 ++ targets/app/linux/Linux_Minecraft.cpp | 2 +- targets/app/linux_sources.txt | 2 -- targets/minecraft/client/Minecraft.cpp | 2 +- targets/minecraft/client/gui/CreateWorldScreen.cpp | 2 +- targets/minecraft/client/gui/Gui.cpp | 2 +- .../minecraft/client/multiplayer/ClientConnection.cpp | 2 +- targets/minecraft/client/player/LocalPlayer.cpp | 2 +- targets/minecraft/client/skins/AbstractTexturePack.cpp | 2 +- targets/minecraft/client/skins/DLCTexturePack.cpp | 2 +- .../minecraft/client/skins/TexturePackRepository.cpp | 2 +- 227 files changed, 390 insertions(+), 390 deletions(-) rename targets/app/{linux => common}/Iggy/gdraw/gdraw.c (99%) rename targets/app/{linux => common}/Iggy/gdraw/gdraw.h (97%) rename targets/app/{linux/Stubs => common/Iggy}/iggy_stubs.h (99%) rename targets/app/{linux => common}/Iggy/include/gdraw.h (100%) rename targets/app/{linux => common}/Iggy/include/iggy.h (100%) rename targets/app/{linux => common}/Iggy/include/rrCore.h (100%) rename targets/app/{linux/Linux_UIController.cpp => common/UI/ConsoleUIController.cpp} (95%) rename targets/app/{linux/Linux_UIController.h => common/UI/ConsoleUIController.h} (92%) diff --git a/targets/app/common/Audio/SoundEngine.cpp b/targets/app/common/Audio/SoundEngine.cpp index 7a63e2171..c782ae6de 100644 --- a/targets/app/common/Audio/SoundEngine.cpp +++ b/targets/app/common/Audio/SoundEngine.cpp @@ -11,7 +11,7 @@ #include #include "app/common/Audio/ConsoleSoundEngine.h" -#include "app/linux/Iggy/include/rrCore.h" +#include "app/common/Iggy/include/rrCore.h" #include "app/common/Game.h" #include "java/Random.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/app/common/Audio/SoundEngine.h b/targets/app/common/Audio/SoundEngine.h index 66403ea07..f00833434 100644 --- a/targets/app/common/Audio/SoundEngine.h +++ b/targets/app/common/Audio/SoundEngine.h @@ -8,7 +8,7 @@ class Random; #include #include "app/common/Audio/ConsoleSoundEngine.h" -#include "app/linux/Iggy/include/rrCore.h" +#include "app/common/Iggy/include/rrCore.h" #include "app/common/Audio/SoundTypes.h" #include "platform/PlatformTypes.h" diff --git a/targets/app/common/DLC/DLCManager.cpp b/targets/app/common/DLC/DLCManager.cpp index 365c701b0..efedd845c 100644 --- a/targets/app/common/DLC/DLCManager.cpp +++ b/targets/app/common/DLC/DLCManager.cpp @@ -17,7 +17,7 @@ #include "DLCPack.h" #include "app/common/GameRules/GameRuleManager.h" #include "app/common/Game.h" -#include "app/linux/Linux_UIController.h" +#include "app/common/UI/ConsoleUIController.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/skins/TexturePackRepository.h" #include "platform/fs/fs.h" diff --git a/targets/app/common/DLCController.cpp b/targets/app/common/DLCController.cpp index 5b74a5a06..5205beae1 100644 --- a/targets/app/common/DLCController.cpp +++ b/targets/app/common/DLCController.cpp @@ -8,7 +8,7 @@ #include "app/common/DLC/DLCSkinFile.h" #include "app/common/Game.h" #include "app/common/Game.h" -#include "app/linux/Linux_UIController.h" +#include "app/common/UI/ConsoleUIController.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/skins/TexturePack.h" #include "minecraft/client/skins/TexturePackRepository.h" diff --git a/targets/app/common/Game.cpp b/targets/app/common/Game.cpp index 091ec8cc8..c04daa4aa 100644 --- a/targets/app/common/Game.cpp +++ b/targets/app/common/Game.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/Linux_UIController.h" +#include "app/common/UI/ConsoleUIController.h" #include "java/Class.h" #include "java/File.h" #include "java/Random.h" diff --git a/targets/app/common/GameSettingsManager.cpp b/targets/app/common/GameSettingsManager.cpp index cc9794a14..1b7c87741 100644 --- a/targets/app/common/GameSettingsManager.cpp +++ b/targets/app/common/GameSettingsManager.cpp @@ -6,7 +6,7 @@ #include "app/common/Game.h" #include "app/common/Network/GameNetworkManager.h" #include "app/common/Game.h" -#include "app/linux/Linux_UIController.h" +#include "app/common/UI/ConsoleUIController.h" #include "minecraft/Console_Debug_enum.h" #include "minecraft/GameEnums.h" #include "minecraft/GameHostOptions.h" diff --git a/targets/app/common/Game_XuiActions.cpp b/targets/app/common/Game_XuiActions.cpp index a342f9415..34c5a8c9b 100644 --- a/targets/app/common/Game_XuiActions.cpp +++ b/targets/app/common/Game_XuiActions.cpp @@ -9,7 +9,7 @@ #include "app/common/UI/All Platforms/UIStructs.h" #include "app/common/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h" #include "app/common/Game.h" -#include "app/linux/Linux_UIController.h" +#include "app/common/UI/ConsoleUIController.h" #include "minecraft/GameEnums.h" #include "minecraft/GameTypes.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/app/linux/Iggy/gdraw/gdraw.c b/targets/app/common/Iggy/gdraw/gdraw.c similarity index 99% rename from targets/app/linux/Iggy/gdraw/gdraw.c rename to targets/app/common/Iggy/gdraw/gdraw.c index 8b9f716ea..eeb97c02a 100644 --- a/targets/app/linux/Iggy/gdraw/gdraw.c +++ b/targets/app/common/Iggy/gdraw/gdraw.c @@ -10,7 +10,7 @@ #include #include -#include "app/linux/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #include "SDL_video.h" #ifndef _ENABLEIGGY diff --git a/targets/app/linux/Iggy/gdraw/gdraw.h b/targets/app/common/Iggy/gdraw/gdraw.h similarity index 97% rename from targets/app/linux/Iggy/gdraw/gdraw.h rename to targets/app/common/Iggy/gdraw/gdraw.h index e8ab9566d..3f99cf6ec 100644 --- a/targets/app/linux/Iggy/gdraw/gdraw.h +++ b/targets/app/common/Iggy/gdraw/gdraw.h @@ -1,7 +1,7 @@ #ifndef __LINUX_IGGY_GDRAW_H__ #define __LINUX_IGGY_GDRAW_H__ -#include "app/linux/Iggy/include/rrCore.h" +#include "app/common/Iggy/include/rrCore.h" #include "app/windows/Iggy/include/gdraw.h" #include "app/windows/Iggy/include/iggy.h" diff --git a/targets/app/linux/Stubs/iggy_stubs.h b/targets/app/common/Iggy/iggy_stubs.h similarity index 99% rename from targets/app/linux/Stubs/iggy_stubs.h rename to targets/app/common/Iggy/iggy_stubs.h index 16ac44909..5df1121e1 100644 --- a/targets/app/linux/Stubs/iggy_stubs.h +++ b/targets/app/common/Iggy/iggy_stubs.h @@ -6,7 +6,7 @@ #include #include -#include "app/linux/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #define STUBBED \ {} diff --git a/targets/app/linux/Iggy/include/gdraw.h b/targets/app/common/Iggy/include/gdraw.h similarity index 100% rename from targets/app/linux/Iggy/include/gdraw.h rename to targets/app/common/Iggy/include/gdraw.h diff --git a/targets/app/linux/Iggy/include/iggy.h b/targets/app/common/Iggy/include/iggy.h similarity index 100% rename from targets/app/linux/Iggy/include/iggy.h rename to targets/app/common/Iggy/include/iggy.h diff --git a/targets/app/linux/Iggy/include/rrCore.h b/targets/app/common/Iggy/include/rrCore.h similarity index 100% rename from targets/app/linux/Iggy/include/rrCore.h rename to targets/app/common/Iggy/include/rrCore.h diff --git a/targets/app/common/MenuController.cpp b/targets/app/common/MenuController.cpp index 5742082e3..865d138c8 100644 --- a/targets/app/common/MenuController.cpp +++ b/targets/app/common/MenuController.cpp @@ -10,7 +10,7 @@ #include "app/common/UI/All Platforms/UIStructs.h" #include "app/common/UI/Scenes/UIScene_FullscreenProgress.h" #include "app/common/Game.h" -#include "app/linux/Linux_UIController.h" +#include "app/common/UI/ConsoleUIController.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/ProgressRenderer.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" diff --git a/targets/app/common/Network/GameNetworkManager.cpp b/targets/app/common/Network/GameNetworkManager.cpp index 690cc343c..2206784c6 100644 --- a/targets/app/common/Network/GameNetworkManager.cpp +++ b/targets/app/common/Network/GameNetworkManager.cpp @@ -17,7 +17,7 @@ #include "app/common/UI/All Platforms/UIStructs.h" #include "app/common/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h" #include "app/common/Game.h" -#include "app/linux/Linux_UIController.h" +#include "app/common/UI/ConsoleUIController.h" #include "java/File.h" #include "minecraft/GameEnums.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/app/common/NetworkController.cpp b/targets/app/common/NetworkController.cpp index a7a4bfa94..d4b4618f0 100644 --- a/targets/app/common/NetworkController.cpp +++ b/targets/app/common/NetworkController.cpp @@ -8,7 +8,7 @@ #include "app/common/Game.h" #include "app/common/Network/GameNetworkManager.h" #include "app/common/Game.h" -#include "app/linux/Linux_UIController.h" +#include "app/common/UI/ConsoleUIController.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/ProgressRenderer.h" #include "minecraft/client/multiplayer/MultiPlayerLevel.h" diff --git a/targets/app/common/Tutorial/Tasks/ChoiceTask.cpp b/targets/app/common/Tutorial/Tasks/ChoiceTask.cpp index 036b1be28..0c178167a 100644 --- a/targets/app/common/Tutorial/Tasks/ChoiceTask.cpp +++ b/targets/app/common/Tutorial/Tasks/ChoiceTask.cpp @@ -7,7 +7,7 @@ #include "app/common/Tutorial/Tasks/TutorialTask.h" #include "app/common/Tutorial/Tutorial.h" #include "minecraft/world/tutorial/TutorialEnum.h" -#include "app/linux/Linux_UIController.h" +#include "app/common/UI/ConsoleUIController.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "minecraft/world/level/material/Material.h" diff --git a/targets/app/common/Tutorial/Tasks/InfoTask.cpp b/targets/app/common/Tutorial/Tasks/InfoTask.cpp index 588ac0686..a3ef7f19e 100644 --- a/targets/app/common/Tutorial/Tasks/InfoTask.cpp +++ b/targets/app/common/Tutorial/Tasks/InfoTask.cpp @@ -8,7 +8,7 @@ #include "app/common/Tutorial/Constraints/InputConstraint.h" #include "app/common/Tutorial/Tasks/TutorialTask.h" #include "app/common/Tutorial/Tutorial.h" -#include "app/linux/Linux_UIController.h" +#include "app/common/UI/ConsoleUIController.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "minecraft/world/level/material/Material.h" diff --git a/targets/app/common/Tutorial/Tutorial.cpp b/targets/app/common/Tutorial/Tutorial.cpp index 787dd344c..957520108 100644 --- a/targets/app/common/Tutorial/Tutorial.cpp +++ b/targets/app/common/Tutorial/Tutorial.cpp @@ -21,7 +21,7 @@ #include "app/common/Tutorial/Tasks/TutorialTask.h" #include "app/common/UI/All Platforms/UIStructs.h" #include "app/common/Game.h" -#include "app/linux/Linux_UIController.h" +#include "app/common/UI/ConsoleUIController.h" #include "java/Class.h" #include "minecraft/GameEnums.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/app/common/UI/All Platforms/IUIScene_AbstractContainerMenu.cpp b/targets/app/common/UI/All Platforms/IUIScene_AbstractContainerMenu.cpp index a66987e73..3bfbb9ba9 100644 --- a/targets/app/common/UI/All Platforms/IUIScene_AbstractContainerMenu.cpp +++ b/targets/app/common/UI/All Platforms/IUIScene_AbstractContainerMenu.cpp @@ -11,7 +11,7 @@ #include "app/common/Tutorial/TutorialMode.h" #include "app/common/UI/All Platforms/UIStructs.h" #include "app/common/Game.h" -#include "app/linux/Linux_UIController.h" +#include "app/common/UI/ConsoleUIController.h" #include "minecraft/GameEnums.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/MultiPlayerGameMode.h" diff --git a/targets/app/common/UI/All Platforms/IUIScene_CraftingMenu.cpp b/targets/app/common/UI/All Platforms/IUIScene_CraftingMenu.cpp index 2e30a139e..99afc9955 100644 --- a/targets/app/common/UI/All Platforms/IUIScene_CraftingMenu.cpp +++ b/targets/app/common/UI/All Platforms/IUIScene_CraftingMenu.cpp @@ -10,7 +10,7 @@ #include "app/common/Tutorial/Tutorial.h" #include "app/common/UI/All Platforms/UIEnums.h" #include "app/common/Game.h" -#include "app/linux/Linux_UIController.h" +#include "app/common/UI/ConsoleUIController.h" #include "minecraft/Console_Debug_enum.h" #include "minecraft/GameEnums.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/app/common/UI/All Platforms/IUIScene_CreativeMenu.cpp b/targets/app/common/UI/All Platforms/IUIScene_CreativeMenu.cpp index a9805c187..66a5348e4 100644 --- a/targets/app/common/UI/All Platforms/IUIScene_CreativeMenu.cpp +++ b/targets/app/common/UI/All Platforms/IUIScene_CreativeMenu.cpp @@ -8,7 +8,7 @@ #include "app/common/UI/All Platforms/IUIScene_AbstractContainerMenu.h" #include "app/common/Game.h" -#include "app/linux/Linux_UIController.h" +#include "app/common/UI/ConsoleUIController.h" #include "java/JavaMath.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/MultiPlayerGameMode.h" diff --git a/targets/app/common/UI/All Platforms/IUIScene_HUD.cpp b/targets/app/common/UI/All Platforms/IUIScene_HUD.cpp index 6dd14c5a8..f8b3d944d 100644 --- a/targets/app/common/UI/All Platforms/IUIScene_HUD.cpp +++ b/targets/app/common/UI/All Platforms/IUIScene_HUD.cpp @@ -7,7 +7,7 @@ #include "platform/renderer/renderer.h" #include "minecraft/GameEnums.h" #include "app/common/Game.h" -#include "app/linux/Linux_UIController.h" +#include "app/common/UI/ConsoleUIController.h" #include "java/Class.h" #include "minecraft/SharedConstants.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/app/common/UI/All Platforms/IUIScene_PauseMenu.cpp b/targets/app/common/UI/All Platforms/IUIScene_PauseMenu.cpp index a504c5288..015a83b6b 100644 --- a/targets/app/common/UI/All Platforms/IUIScene_PauseMenu.cpp +++ b/targets/app/common/UI/All Platforms/IUIScene_PauseMenu.cpp @@ -15,7 +15,7 @@ #include "app/common/Network/GameNetworkManager.h" #include "app/common/UI/UIScene.h" #include "app/common/Game.h" -#include "app/linux/Linux_UIController.h" +#include "app/common/UI/ConsoleUIController.h" #include "minecraft/GameEnums.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/ProgressRenderer.h" diff --git a/targets/app/common/UI/All Platforms/IUIScene_TradingMenu.cpp b/targets/app/common/UI/All Platforms/IUIScene_TradingMenu.cpp index 4cbf4ebf8..f01c72940 100644 --- a/targets/app/common/UI/All Platforms/IUIScene_TradingMenu.cpp +++ b/targets/app/common/UI/All Platforms/IUIScene_TradingMenu.cpp @@ -7,7 +7,7 @@ #include "app/common/Tutorial/Tutorial.h" #include "app/common/UI/All Platforms/UIEnums.h" #include "app/common/Game.h" -#include "app/linux/Linux_UIController.h" +#include "app/common/UI/ConsoleUIController.h" #include "util/StringHelpers.h" #include "java/InputOutputStream/ByteArrayOutputStream.h" #include "java/InputOutputStream/DataOutputStream.h" diff --git a/targets/app/common/UI/Components/UIComponent_Chat.cpp b/targets/app/common/UI/Components/UIComponent_Chat.cpp index daed9d34d..2dbc61780 100644 --- a/targets/app/common/UI/Components/UIComponent_Chat.cpp +++ b/targets/app/common/UI/Components/UIComponent_Chat.cpp @@ -6,13 +6,13 @@ #include "app/common/UI/Controls/UIControl_Label.h" #include "app/common/UI/UILayer.h" #include "app/common/UI/UIScene.h" -#include "app/linux/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #include "platform/renderer/renderer.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif -#include "app/linux/Iggy/include/rrCore.h" -#include "app/linux/Linux_UIController.h" +#include "app/common/Iggy/include/rrCore.h" +#include "app/common/UI/ConsoleUIController.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/gui/Gui.h" diff --git a/targets/app/common/UI/Components/UIComponent_Chat.h b/targets/app/common/UI/Components/UIComponent_Chat.h index e99098640..68333ce51 100644 --- a/targets/app/common/UI/Components/UIComponent_Chat.h +++ b/targets/app/common/UI/Components/UIComponent_Chat.h @@ -6,7 +6,7 @@ #include "app/common/UI/Controls/UIControl.h" #include "app/common/UI/Controls/UIControl_Label.h" #include "app/common/UI/UIScene.h" -#include "app/linux/Iggy/include/rrCore.h" +#include "app/common/Iggy/include/rrCore.h" #include "platform/renderer/renderer.h" class UILayer; diff --git a/targets/app/common/UI/Components/UIComponent_DebugUIMarketingGuide.cpp b/targets/app/common/UI/Components/UIComponent_DebugUIMarketingGuide.cpp index 21d50ba9e..a3c966828 100644 --- a/targets/app/common/UI/Components/UIComponent_DebugUIMarketingGuide.cpp +++ b/targets/app/common/UI/Components/UIComponent_DebugUIMarketingGuide.cpp @@ -1,11 +1,11 @@ #include "UIComponent_DebugUIMarketingGuide.h" #include "app/common/UI/UIScene.h" -#include "app/linux/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif -#include "app/linux/Iggy/include/rrCore.h" +#include "app/common/Iggy/include/rrCore.h" class UILayer; diff --git a/targets/app/common/UI/Components/UIComponent_DebugUIMarketingGuide.h b/targets/app/common/UI/Components/UIComponent_DebugUIMarketingGuide.h index cf45d8a71..88681a955 100644 --- a/targets/app/common/UI/Components/UIComponent_DebugUIMarketingGuide.h +++ b/targets/app/common/UI/Components/UIComponent_DebugUIMarketingGuide.h @@ -5,9 +5,9 @@ #include "app/common/UI/All Platforms/UIEnums.h" #include "app/common/UI/Controls/UIControl_Label.h" #include "app/common/UI/UIScene.h" -#include "app/linux/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif class UILayer; diff --git a/targets/app/common/UI/Components/UIComponent_MenuBackground.cpp b/targets/app/common/UI/Components/UIComponent_MenuBackground.cpp index badb6e95b..8f8e1a866 100644 --- a/targets/app/common/UI/Components/UIComponent_MenuBackground.cpp +++ b/targets/app/common/UI/Components/UIComponent_MenuBackground.cpp @@ -2,13 +2,13 @@ #include "app/common/UI/UILayer.h" #include "app/common/UI/UIScene.h" -#include "app/linux/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #include "platform/renderer/renderer.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif -#include "app/linux/Iggy/include/rrCore.h" -#include "app/linux/Linux_UIController.h" +#include "app/common/Iggy/include/rrCore.h" +#include "app/common/UI/ConsoleUIController.h" UIComponent_MenuBackground::UIComponent_MenuBackground(int iPad, void* initData, UILayer* parentLayer) diff --git a/targets/app/common/UI/Components/UIComponent_MenuBackground.h b/targets/app/common/UI/Components/UIComponent_MenuBackground.h index 1a9f8a985..02beeb6b6 100644 --- a/targets/app/common/UI/Components/UIComponent_MenuBackground.h +++ b/targets/app/common/UI/Components/UIComponent_MenuBackground.h @@ -4,7 +4,7 @@ #include "app/common/UI/All Platforms/UIEnums.h" #include "app/common/UI/UIScene.h" -#include "app/linux/Iggy/include/rrCore.h" +#include "app/common/Iggy/include/rrCore.h" #include "platform/renderer/renderer.h" class UILayer; diff --git a/targets/app/common/UI/Components/UIComponent_Panorama.cpp b/targets/app/common/UI/Components/UIComponent_Panorama.cpp index 06c93c0d5..c22ec72c8 100644 --- a/targets/app/common/UI/Components/UIComponent_Panorama.cpp +++ b/targets/app/common/UI/Components/UIComponent_Panorama.cpp @@ -6,13 +6,13 @@ #include "app/common/UI/UILayer.h" #include "app/common/UI/UIScene.h" -#include "app/linux/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #include "platform/renderer/renderer.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif -#include "app/linux/Iggy/include/rrCore.h" -#include "app/linux/Linux_UIController.h" +#include "app/common/Iggy/include/rrCore.h" +#include "app/common/UI/ConsoleUIController.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/MultiPlayerLevel.h" #include "minecraft/world/level/dimension/Dimension.h" diff --git a/targets/app/common/UI/Components/UIComponent_Panorama.h b/targets/app/common/UI/Components/UIComponent_Panorama.h index 976f6c462..fcf16038c 100644 --- a/targets/app/common/UI/Components/UIComponent_Panorama.h +++ b/targets/app/common/UI/Components/UIComponent_Panorama.h @@ -4,12 +4,12 @@ #include "app/common/UI/All Platforms/UIEnums.h" #include "app/common/UI/UIScene.h" -#include "app/linux/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #include "platform/renderer/renderer.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif -#include "app/linux/Iggy/include/rrCore.h" +#include "app/common/Iggy/include/rrCore.h" class UILayer; diff --git a/targets/app/common/UI/Components/UIComponent_PressStartToPlay.cpp b/targets/app/common/UI/Components/UIComponent_PressStartToPlay.cpp index 45750ec78..ba45d5cac 100644 --- a/targets/app/common/UI/Components/UIComponent_PressStartToPlay.cpp +++ b/targets/app/common/UI/Components/UIComponent_PressStartToPlay.cpp @@ -3,7 +3,7 @@ #include "app/common/UI/Controls/UIControl_Label.h" #include "app/common/UI/UIScene.h" #include "app/common/Game.h" -#include "app/linux/Linux_UIController.h" +#include "app/common/UI/ConsoleUIController.h" #include "strings.h" class UILayer; diff --git a/targets/app/common/UI/Components/UIComponent_PressStartToPlay.h b/targets/app/common/UI/Components/UIComponent_PressStartToPlay.h index 364cc3845..020c887ef 100644 --- a/targets/app/common/UI/Components/UIComponent_PressStartToPlay.h +++ b/targets/app/common/UI/Components/UIComponent_PressStartToPlay.h @@ -6,10 +6,10 @@ #include "app/common/UI/Controls/UIControl.h" #include "app/common/UI/Controls/UIControl_Label.h" #include "app/common/UI/UIScene.h" -#include "app/linux/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #include "platform/PlatformTypes.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif class UILayer; diff --git a/targets/app/common/UI/Components/UIComponent_Tooltips.cpp b/targets/app/common/UI/Components/UIComponent_Tooltips.cpp index 999d19833..1ebda0182 100644 --- a/targets/app/common/UI/Components/UIComponent_Tooltips.cpp +++ b/targets/app/common/UI/Components/UIComponent_Tooltips.cpp @@ -4,16 +4,16 @@ #include "app/common/UI/UILayer.h" #include "app/common/UI/UIScene.h" #include "app/common/UI/UIString.h" -#include "app/linux/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #include "minecraft/GameEnums.h" #include "platform/profile/profile.h" #include "platform/renderer/renderer.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif -#include "app/linux/Iggy/include/rrCore.h" +#include "app/common/Iggy/include/rrCore.h" #include "app/common/Game.h" -#include "app/linux/Linux_UIController.h" +#include "app/common/UI/ConsoleUIController.h" #include "util/StringHelpers.h" UIComponent_Tooltips::UIComponent_Tooltips(int iPad, void* initData, diff --git a/targets/app/common/UI/Components/UIComponent_Tooltips.h b/targets/app/common/UI/Components/UIComponent_Tooltips.h index 1c0b0dd8b..33cb096dc 100644 --- a/targets/app/common/UI/Components/UIComponent_Tooltips.h +++ b/targets/app/common/UI/Components/UIComponent_Tooltips.h @@ -5,14 +5,14 @@ #include "app/common/UI/All Platforms/UIEnums.h" #include "app/common/UI/UIScene.h" #include "app/common/UI/UIString.h" -#include "app/linux/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #include "minecraft/GameEnums.h" #include "platform/PlatformTypes.h" #include "platform/renderer/renderer.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif -#include "app/linux/Iggy/include/rrCore.h" +#include "app/common/Iggy/include/rrCore.h" #include "platform/input/InputConstants.h" class UILayer; diff --git a/targets/app/common/UI/Components/UIComponent_TutorialPopup.cpp b/targets/app/common/UI/Components/UIComponent_TutorialPopup.cpp index fc69867cd..15d352d61 100644 --- a/targets/app/common/UI/Components/UIComponent_TutorialPopup.cpp +++ b/targets/app/common/UI/Components/UIComponent_TutorialPopup.cpp @@ -10,7 +10,7 @@ #include "app/common/UI/UILayer.h" #include "app/common/UI/UIScene.h" #include "app/common/Game.h" -#include "app/linux/Linux_UIController.h" +#include "app/common/UI/ConsoleUIController.h" #include "minecraft/GameEnums.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" diff --git a/targets/app/common/UI/Components/UIComponent_TutorialPopup.h b/targets/app/common/UI/Components/UIComponent_TutorialPopup.h index 36d2d2aca..70362f144 100644 --- a/targets/app/common/UI/Components/UIComponent_TutorialPopup.h +++ b/targets/app/common/UI/Components/UIComponent_TutorialPopup.h @@ -8,12 +8,12 @@ #include "app/common/UI/Controls/UIControl.h" #include "app/common/UI/Controls/UIControl_Label.h" #include "app/common/UI/UIScene.h" -#include "app/linux/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #include "platform/renderer/renderer.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif -#include "app/linux/Iggy/include/rrCore.h" +#include "app/common/Iggy/include/rrCore.h" class ItemInstance; class Tutorial; diff --git a/targets/app/common/UI/Components/UIScene_HUD.cpp b/targets/app/common/UI/Components/UIScene_HUD.cpp index 90e923c20..e1f77974c 100644 --- a/targets/app/common/UI/Components/UIScene_HUD.cpp +++ b/targets/app/common/UI/Components/UIScene_HUD.cpp @@ -9,7 +9,7 @@ #include "app/common/UI/UILayer.h" #include "app/common/UI/UIScene.h" #include "app/common/Game.h" -#include "app/linux/Linux_UIController.h" +#include "app/common/UI/ConsoleUIController.h" #include "minecraft/GameEnums.h" #include "minecraft/SharedConstants.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/app/common/UI/Components/UIScene_HUD.h b/targets/app/common/UI/Components/UIScene_HUD.h index adca8d77a..464a6c0af 100644 --- a/targets/app/common/UI/Components/UIScene_HUD.h +++ b/targets/app/common/UI/Components/UIScene_HUD.h @@ -7,12 +7,12 @@ #include "app/common/UI/Controls/UIControl.h" #include "app/common/UI/Controls/UIControl_Label.h" #include "app/common/UI/UIScene.h" -#include "app/linux/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #include "platform/renderer/renderer.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif -#include "app/linux/Iggy/include/rrCore.h" +#include "app/common/Iggy/include/rrCore.h" class UILayer; diff --git a/targets/app/linux/Linux_UIController.cpp b/targets/app/common/UI/ConsoleUIController.cpp similarity index 95% rename from targets/app/linux/Linux_UIController.cpp rename to targets/app/common/UI/ConsoleUIController.cpp index da18ce062..030342608 100644 --- a/targets/app/linux/Linux_UIController.cpp +++ b/targets/app/common/UI/ConsoleUIController.cpp @@ -3,14 +3,14 @@ // GDraw GL backend for Linux #include "platform/renderer/renderer.h" #include "renderer/gl/gl_compat.h" -#include "Linux_UIController.h" +#include "ConsoleUIController.h" #include "app/common/UI/All Platforms/UIStructs.h" -#include "app/linux/Iggy/gdraw/gdraw.h" -#include "app/linux/Iggy/include/iggy.h" +#include "app/common/Iggy/gdraw/gdraw.h" +#include "app/common/Iggy/include/iggy.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif -#include "app/linux/Iggy/include/rrCore.h" +#include "app/common/Iggy/include/rrCore.h" #include "app/common/Game.h" #include "app/windows/Iggy/include/gdraw.h" diff --git a/targets/app/linux/Linux_UIController.h b/targets/app/common/UI/ConsoleUIController.h similarity index 92% rename from targets/app/linux/Linux_UIController.h rename to targets/app/common/UI/ConsoleUIController.h index ca59ed540..624a2c501 100644 --- a/targets/app/linux/Linux_UIController.h +++ b/targets/app/common/UI/ConsoleUIController.h @@ -2,8 +2,8 @@ #include "app/common/UI/All Platforms/UIStructs.h" #include "app/common/UI/UIController.h" -#include "app/linux/Iggy/include/iggy.h" -#include "app/linux/Iggy/include/rrCore.h" +#include "app/common/Iggy/include/iggy.h" +#include "app/common/Iggy/include/rrCore.h" #include "platform/profile/profile.h" class ConsoleUIController : public UIController { diff --git a/targets/app/common/UI/Controls/UIControl.cpp b/targets/app/common/UI/Controls/UIControl.cpp index dc3467158..66e38ee68 100644 --- a/targets/app/common/UI/Controls/UIControl.cpp +++ b/targets/app/common/UI/Controls/UIControl.cpp @@ -1,11 +1,11 @@ #include "UIControl.h" #include "app/common/UI/UIScene.h" -#include "app/linux/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif -#include "app/linux/Iggy/include/rrCore.h" +#include "app/common/Iggy/include/rrCore.h" #include "app/common/Game.h" #include "java/JavaMath.h" diff --git a/targets/app/common/UI/Controls/UIControl.h b/targets/app/common/UI/Controls/UIControl.h index 0c1c73133..0b019c198 100644 --- a/targets/app/common/UI/Controls/UIControl.h +++ b/targets/app/common/UI/Controls/UIControl.h @@ -2,11 +2,11 @@ #include -#include "app/linux/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif -#include "app/linux/Iggy/include/rrCore.h" +#include "app/common/Iggy/include/rrCore.h" class UIScene; diff --git a/targets/app/common/UI/Controls/UIControl_Base.cpp b/targets/app/common/UI/Controls/UIControl_Base.cpp index 2bea9da0b..8efd3d9a5 100644 --- a/targets/app/common/UI/Controls/UIControl_Base.cpp +++ b/targets/app/common/UI/Controls/UIControl_Base.cpp @@ -6,11 +6,11 @@ #include "app/common/UI/Controls/UIControl.h" #include "app/common/UI/UIScene.h" #include "app/common/UI/UIString.h" -#include "app/linux/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif -#include "app/linux/Iggy/include/rrCore.h" +#include "app/common/Iggy/include/rrCore.h" #include "util/StringHelpers.h" UIControl_Base::UIControl_Base() { diff --git a/targets/app/common/UI/Controls/UIControl_Base.h b/targets/app/common/UI/Controls/UIControl_Base.h index 3c64dc5bb..0f4c75e54 100644 --- a/targets/app/common/UI/Controls/UIControl_Base.h +++ b/targets/app/common/UI/Controls/UIControl_Base.h @@ -5,9 +5,9 @@ #include "app/common/UI/Controls/UIControl.h" #include "app/common/UI/UIScene.h" #include "app/common/UI/UIString.h" -#include "app/linux/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif // This class maps to the FJ_Base class in actionscript diff --git a/targets/app/common/UI/Controls/UIControl_BeaconEffectButton.cpp b/targets/app/common/UI/Controls/UIControl_BeaconEffectButton.cpp index 0d05bee90..c950d6e59 100644 --- a/targets/app/common/UI/Controls/UIControl_BeaconEffectButton.cpp +++ b/targets/app/common/UI/Controls/UIControl_BeaconEffectButton.cpp @@ -2,9 +2,9 @@ #include "app/common/UI/Controls/UIControl.h" #include "app/common/UI/UIScene.h" -#include "app/linux/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif UIControl_BeaconEffectButton::UIControl_BeaconEffectButton() { diff --git a/targets/app/common/UI/Controls/UIControl_BeaconEffectButton.h b/targets/app/common/UI/Controls/UIControl_BeaconEffectButton.h index bdc889568..ddaf7166a 100644 --- a/targets/app/common/UI/Controls/UIControl_BeaconEffectButton.h +++ b/targets/app/common/UI/Controls/UIControl_BeaconEffectButton.h @@ -5,9 +5,9 @@ #include "app/common/UI/Controls/UIControl.h" #include "app/common/UI/Controls/UIControl_BeaconEffectButton.h" #include "app/common/UI/UIScene.h" -#include "app/linux/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif #include "UIControl.h" diff --git a/targets/app/common/UI/Controls/UIControl_BitmapIcon.cpp b/targets/app/common/UI/Controls/UIControl_BitmapIcon.cpp index 0142039b1..df0bf0200 100644 --- a/targets/app/common/UI/Controls/UIControl_BitmapIcon.cpp +++ b/targets/app/common/UI/Controls/UIControl_BitmapIcon.cpp @@ -2,9 +2,9 @@ #include "app/common/UI/Controls/UIControl.h" #include "app/common/UI/UIScene.h" -#include "app/linux/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif #include "util/StringHelpers.h" diff --git a/targets/app/common/UI/Controls/UIControl_BitmapIcon.h b/targets/app/common/UI/Controls/UIControl_BitmapIcon.h index 452ce45ee..f114dc331 100644 --- a/targets/app/common/UI/Controls/UIControl_BitmapIcon.h +++ b/targets/app/common/UI/Controls/UIControl_BitmapIcon.h @@ -5,9 +5,9 @@ #include "app/common/UI/Controls/UIControl.h" #include "app/common/UI/Controls/UIControl_BitmapIcon.h" #include "app/common/UI/UIScene.h" -#include "app/linux/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif #include "UIControl.h" diff --git a/targets/app/common/UI/Controls/UIControl_Button.cpp b/targets/app/common/UI/Controls/UIControl_Button.cpp index 1419a1bda..9ff0647c3 100644 --- a/targets/app/common/UI/Controls/UIControl_Button.cpp +++ b/targets/app/common/UI/Controls/UIControl_Button.cpp @@ -4,9 +4,9 @@ #include "app/common/UI/Controls/UIControl_Base.h" #include "app/common/UI/UIScene.h" #include "app/common/UI/UIString.h" -#include "app/linux/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif #include "util/StringHelpers.h" diff --git a/targets/app/common/UI/Controls/UIControl_Button.h b/targets/app/common/UI/Controls/UIControl_Button.h index 2f5abee9c..f20bdd6eb 100644 --- a/targets/app/common/UI/Controls/UIControl_Button.h +++ b/targets/app/common/UI/Controls/UIControl_Button.h @@ -6,9 +6,9 @@ #include "app/common/UI/Controls/UIControl_Button.h" #include "app/common/UI/UIScene.h" #include "app/common/UI/UIString.h" -#include "app/linux/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif #include "UIControl_Base.h" diff --git a/targets/app/common/UI/Controls/UIControl_ButtonList.cpp b/targets/app/common/UI/Controls/UIControl_ButtonList.cpp index 54e6bb157..94cf3950b 100644 --- a/targets/app/common/UI/Controls/UIControl_ButtonList.cpp +++ b/targets/app/common/UI/Controls/UIControl_ButtonList.cpp @@ -4,11 +4,11 @@ #include "app/common/UI/Controls/UIControl_Base.h" #include "app/common/UI/UIScene.h" #include "app/common/UI/UIString.h" -#include "app/linux/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif -#include "app/linux/Iggy/include/rrCore.h" +#include "app/common/Iggy/include/rrCore.h" #include "util/StringHelpers.h" UIControl_ButtonList::UIControl_ButtonList() { diff --git a/targets/app/common/UI/Controls/UIControl_ButtonList.h b/targets/app/common/UI/Controls/UIControl_ButtonList.h index e1f164916..f46ea438b 100644 --- a/targets/app/common/UI/Controls/UIControl_ButtonList.h +++ b/targets/app/common/UI/Controls/UIControl_ButtonList.h @@ -7,9 +7,9 @@ #include "app/common/UI/Controls/UIControl_ButtonList.h" #include "app/common/UI/UIScene.h" #include "app/common/UI/UIString.h" -#include "app/linux/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif #include "UIControl_Base.h" diff --git a/targets/app/common/UI/Controls/UIControl_CheckBox.cpp b/targets/app/common/UI/Controls/UIControl_CheckBox.cpp index 2b5956013..c3d382d1e 100644 --- a/targets/app/common/UI/Controls/UIControl_CheckBox.cpp +++ b/targets/app/common/UI/Controls/UIControl_CheckBox.cpp @@ -4,11 +4,11 @@ #include "app/common/UI/Controls/UIControl_Base.h" #include "app/common/UI/UIScene.h" #include "app/common/UI/UIString.h" -#include "app/linux/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif -#include "app/linux/Iggy/include/rrCore.h" +#include "app/common/Iggy/include/rrCore.h" #include "util/StringHelpers.h" UIControl_CheckBox::UIControl_CheckBox() {} diff --git a/targets/app/common/UI/Controls/UIControl_CheckBox.h b/targets/app/common/UI/Controls/UIControl_CheckBox.h index da891a56b..f349efb40 100644 --- a/targets/app/common/UI/Controls/UIControl_CheckBox.h +++ b/targets/app/common/UI/Controls/UIControl_CheckBox.h @@ -6,9 +6,9 @@ #include "app/common/UI/Controls/UIControl_CheckBox.h" #include "app/common/UI/UIScene.h" #include "app/common/UI/UIString.h" -#include "app/linux/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif #include "UIControl_Base.h" diff --git a/targets/app/common/UI/Controls/UIControl_Cursor.cpp b/targets/app/common/UI/Controls/UIControl_Cursor.cpp index 3a5c44f4b..c0a9bc31a 100644 --- a/targets/app/common/UI/Controls/UIControl_Cursor.cpp +++ b/targets/app/common/UI/Controls/UIControl_Cursor.cpp @@ -2,9 +2,9 @@ #include "app/common/UI/Controls/UIControl.h" #include "app/common/UI/Controls/UIControl_Base.h" -#include "app/linux/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif UIControl_Cursor::UIControl_Cursor() {} diff --git a/targets/app/common/UI/Controls/UIControl_Cursor.h b/targets/app/common/UI/Controls/UIControl_Cursor.h index 8488628d0..52397d65d 100644 --- a/targets/app/common/UI/Controls/UIControl_Cursor.h +++ b/targets/app/common/UI/Controls/UIControl_Cursor.h @@ -5,9 +5,9 @@ #include "app/common/UI/Controls/UIControl_Base.h" #include "app/common/UI/Controls/UIControl_Cursor.h" #include "app/common/UI/UIScene.h" -#include "app/linux/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif #include "UIControl_Base.h" diff --git a/targets/app/common/UI/Controls/UIControl_DLCList.cpp b/targets/app/common/UI/Controls/UIControl_DLCList.cpp index a1d7b083e..3bc119b9e 100644 --- a/targets/app/common/UI/Controls/UIControl_DLCList.cpp +++ b/targets/app/common/UI/Controls/UIControl_DLCList.cpp @@ -3,11 +3,11 @@ #include "app/common/UI/Controls/UIControl.h" #include "app/common/UI/Controls/UIControl_ButtonList.h" #include "app/common/UI/UIScene.h" -#include "app/linux/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif -#include "app/linux/Iggy/include/rrCore.h" +#include "app/common/Iggy/include/rrCore.h" #include "util/StringHelpers.h" bool UIControl_DLCList::setupControl(UIScene* scene, IggyValuePath* parent, diff --git a/targets/app/common/UI/Controls/UIControl_DLCList.h b/targets/app/common/UI/Controls/UIControl_DLCList.h index 9b2ebf1bc..8a63aa730 100644 --- a/targets/app/common/UI/Controls/UIControl_DLCList.h +++ b/targets/app/common/UI/Controls/UIControl_DLCList.h @@ -4,9 +4,9 @@ #include "app/common/UI/Controls/UIControl_DLCList.h" #include "app/common/UI/UIScene.h" -#include "app/linux/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif #include "UIControl_ButtonList.h" diff --git a/targets/app/common/UI/Controls/UIControl_DynamicLabel.cpp b/targets/app/common/UI/Controls/UIControl_DynamicLabel.cpp index 27eee671d..93250ad5a 100644 --- a/targets/app/common/UI/Controls/UIControl_DynamicLabel.cpp +++ b/targets/app/common/UI/Controls/UIControl_DynamicLabel.cpp @@ -3,11 +3,11 @@ #include "app/common/UI/Controls/UIControl.h" #include "app/common/UI/Controls/UIControl_Base.h" #include "app/common/UI/UIScene.h" -#include "app/linux/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif -#include "app/linux/Iggy/include/rrCore.h" +#include "app/common/Iggy/include/rrCore.h" #include "util/StringHelpers.h" UIControl_DynamicLabel::UIControl_DynamicLabel() {} diff --git a/targets/app/common/UI/Controls/UIControl_DynamicLabel.h b/targets/app/common/UI/Controls/UIControl_DynamicLabel.h index ab45fb6b3..622ef07e2 100644 --- a/targets/app/common/UI/Controls/UIControl_DynamicLabel.h +++ b/targets/app/common/UI/Controls/UIControl_DynamicLabel.h @@ -5,12 +5,12 @@ #include "app/common/UI/Controls/UIControl_DynamicLabel.h" #include "app/common/UI/Controls/UIControl_Label.h" #include "app/common/UI/UIScene.h" -#include "app/linux/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif #include "UIControl_Base.h" -#include "app/linux/Iggy/include/rrCore.h" +#include "app/common/Iggy/include/rrCore.h" class UIControl_DynamicLabel : public UIControl_Label { private: diff --git a/targets/app/common/UI/Controls/UIControl_EnchantmentBook.cpp b/targets/app/common/UI/Controls/UIControl_EnchantmentBook.cpp index d4a30af59..6e30bc79c 100644 --- a/targets/app/common/UI/Controls/UIControl_EnchantmentBook.cpp +++ b/targets/app/common/UI/Controls/UIControl_EnchantmentBook.cpp @@ -4,10 +4,10 @@ #include "app/common/UI/Controls/UIControl.h" #include "app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.h" -#include "app/linux/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #include "platform/renderer/renderer.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif #include "java/Class.h" diff --git a/targets/app/common/UI/Controls/UIControl_EnchantmentBook.h b/targets/app/common/UI/Controls/UIControl_EnchantmentBook.h index 31e0ff88d..1820d27dd 100644 --- a/targets/app/common/UI/Controls/UIControl_EnchantmentBook.h +++ b/targets/app/common/UI/Controls/UIControl_EnchantmentBook.h @@ -5,9 +5,9 @@ #include "app/common/UI/Controls/UIControl.h" #include "app/common/UI/Controls/UIControl_EnchantmentBook.h" #include "app/common/UI/UIScene.h" -#include "app/linux/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif #include "UIControl.h" #include "java/Random.h" diff --git a/targets/app/common/UI/Controls/UIControl_EnchantmentButton.cpp b/targets/app/common/UI/Controls/UIControl_EnchantmentButton.cpp index 10d5f67f3..ec1ceaf30 100644 --- a/targets/app/common/UI/Controls/UIControl_EnchantmentButton.cpp +++ b/targets/app/common/UI/Controls/UIControl_EnchantmentButton.cpp @@ -9,11 +9,11 @@ #include "app/common/UI/Controls/UIControl_Button.h" #include "app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.h" #include "app/common/UI/UIScene.h" -#include "app/linux/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #include "minecraft/GameEnums.h" #include "platform/renderer/renderer.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif #include "app/common/Game.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/app/common/UI/Controls/UIControl_EnchantmentButton.h b/targets/app/common/UI/Controls/UIControl_EnchantmentButton.h index 26363f586..2bfd154b3 100644 --- a/targets/app/common/UI/Controls/UIControl_EnchantmentButton.h +++ b/targets/app/common/UI/Controls/UIControl_EnchantmentButton.h @@ -5,9 +5,9 @@ #include "app/common/UI/Controls/UIControl_EnchantmentButton.h" #include "app/common/UI/UIScene.h" -#include "app/linux/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif #include "UIControl_Button.h" #include "java/Random.h" diff --git a/targets/app/common/UI/Controls/UIControl_HTMLLabel.cpp b/targets/app/common/UI/Controls/UIControl_HTMLLabel.cpp index 57f25b015..9b37206ed 100644 --- a/targets/app/common/UI/Controls/UIControl_HTMLLabel.cpp +++ b/targets/app/common/UI/Controls/UIControl_HTMLLabel.cpp @@ -3,11 +3,11 @@ #include "app/common/UI/Controls/UIControl.h" #include "app/common/UI/Controls/UIControl_Base.h" #include "app/common/UI/UIScene.h" -#include "app/linux/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif -#include "app/linux/Iggy/include/rrCore.h" +#include "app/common/Iggy/include/rrCore.h" UIControl_HTMLLabel::UIControl_HTMLLabel() {} diff --git a/targets/app/common/UI/Controls/UIControl_HTMLLabel.h b/targets/app/common/UI/Controls/UIControl_HTMLLabel.h index 0fad90b1c..7f82d9902 100644 --- a/targets/app/common/UI/Controls/UIControl_HTMLLabel.h +++ b/targets/app/common/UI/Controls/UIControl_HTMLLabel.h @@ -6,12 +6,12 @@ #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/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif #include "UIControl_Base.h" -#include "app/linux/Iggy/include/rrCore.h" +#include "app/common/Iggy/include/rrCore.h" class UIControl_HTMLLabel : public UIControl_Label { private: diff --git a/targets/app/common/UI/Controls/UIControl_Label.cpp b/targets/app/common/UI/Controls/UIControl_Label.cpp index 128eb7a99..d05165c4d 100644 --- a/targets/app/common/UI/Controls/UIControl_Label.cpp +++ b/targets/app/common/UI/Controls/UIControl_Label.cpp @@ -4,9 +4,9 @@ #include "app/common/UI/Controls/UIControl_Base.h" #include "app/common/UI/UIScene.h" #include "app/common/UI/UIString.h" -#include "app/linux/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif #include "util/StringHelpers.h" diff --git a/targets/app/common/UI/Controls/UIControl_Label.h b/targets/app/common/UI/Controls/UIControl_Label.h index ff2e86f00..a91daeb63 100644 --- a/targets/app/common/UI/Controls/UIControl_Label.h +++ b/targets/app/common/UI/Controls/UIControl_Label.h @@ -6,9 +6,9 @@ #include "app/common/UI/Controls/UIControl_Label.h" #include "app/common/UI/UIScene.h" #include "app/common/UI/UIString.h" -#include "app/linux/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif #include "UIControl_Base.h" diff --git a/targets/app/common/UI/Controls/UIControl_LeaderboardList.cpp b/targets/app/common/UI/Controls/UIControl_LeaderboardList.cpp index fbd71e762..be5a218c6 100644 --- a/targets/app/common/UI/Controls/UIControl_LeaderboardList.cpp +++ b/targets/app/common/UI/Controls/UIControl_LeaderboardList.cpp @@ -3,9 +3,9 @@ #include "app/common/UI/Controls/UIControl.h" #include "app/common/UI/Controls/UIControl_Base.h" #include "app/common/UI/UIScene.h" -#include "app/linux/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif #include "util/StringHelpers.h" diff --git a/targets/app/common/UI/Controls/UIControl_LeaderboardList.h b/targets/app/common/UI/Controls/UIControl_LeaderboardList.h index 9129443f7..0843c9ef8 100644 --- a/targets/app/common/UI/Controls/UIControl_LeaderboardList.h +++ b/targets/app/common/UI/Controls/UIControl_LeaderboardList.h @@ -5,9 +5,9 @@ #include "app/common/UI/Controls/UIControl_Base.h" #include "app/common/UI/Controls/UIControl_LeaderboardList.h" #include "app/common/UI/UIScene.h" -#include "app/linux/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif #include "UIControl_Base.h" diff --git a/targets/app/common/UI/Controls/UIControl_MinecraftHorse.cpp b/targets/app/common/UI/Controls/UIControl_MinecraftHorse.cpp index ac1faa19f..8b6c42a35 100644 --- a/targets/app/common/UI/Controls/UIControl_MinecraftHorse.cpp +++ b/targets/app/common/UI/Controls/UIControl_MinecraftHorse.cpp @@ -5,10 +5,10 @@ #include "app/common/UI/Controls/UIControl.h" #include "app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.h" -#include "app/linux/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #include "platform/renderer/renderer.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif #include "minecraft/client/Lighting.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/app/common/UI/Controls/UIControl_MinecraftHorse.h b/targets/app/common/UI/Controls/UIControl_MinecraftHorse.h index 31e824f60..e353401e8 100644 --- a/targets/app/common/UI/Controls/UIControl_MinecraftHorse.h +++ b/targets/app/common/UI/Controls/UIControl_MinecraftHorse.h @@ -1,9 +1,9 @@ #pragma once #include "app/common/UI/Controls/UIControl_MinecraftHorse.h" -#include "app/linux/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif #include "UIControl.h" diff --git a/targets/app/common/UI/Controls/UIControl_MinecraftPlayer.cpp b/targets/app/common/UI/Controls/UIControl_MinecraftPlayer.cpp index 29d4bee4a..d60571d4b 100644 --- a/targets/app/common/UI/Controls/UIControl_MinecraftPlayer.cpp +++ b/targets/app/common/UI/Controls/UIControl_MinecraftPlayer.cpp @@ -5,10 +5,10 @@ #include "app/common/UI/Controls/UIControl.h" #include "app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.h" -#include "app/linux/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #include "platform/renderer/renderer.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif #include "minecraft/client/Lighting.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/app/common/UI/Controls/UIControl_MinecraftPlayer.h b/targets/app/common/UI/Controls/UIControl_MinecraftPlayer.h index 89d94f366..3bb87792a 100644 --- a/targets/app/common/UI/Controls/UIControl_MinecraftPlayer.h +++ b/targets/app/common/UI/Controls/UIControl_MinecraftPlayer.h @@ -1,9 +1,9 @@ #pragma once #include "app/common/UI/Controls/UIControl_MinecraftPlayer.h" -#include "app/linux/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif #include "UIControl.h" diff --git a/targets/app/common/UI/Controls/UIControl_PlayerList.cpp b/targets/app/common/UI/Controls/UIControl_PlayerList.cpp index 4151d193e..49094c335 100644 --- a/targets/app/common/UI/Controls/UIControl_PlayerList.cpp +++ b/targets/app/common/UI/Controls/UIControl_PlayerList.cpp @@ -3,11 +3,11 @@ #include "app/common/UI/Controls/UIControl.h" #include "app/common/UI/Controls/UIControl_ButtonList.h" #include "app/common/UI/UIScene.h" -#include "app/linux/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif -#include "app/linux/Iggy/include/rrCore.h" +#include "app/common/Iggy/include/rrCore.h" #include "util/StringHelpers.h" bool UIControl_PlayerList::setupControl(UIScene* scene, IggyValuePath* parent, diff --git a/targets/app/common/UI/Controls/UIControl_PlayerList.h b/targets/app/common/UI/Controls/UIControl_PlayerList.h index a9941b8c8..277a298cf 100644 --- a/targets/app/common/UI/Controls/UIControl_PlayerList.h +++ b/targets/app/common/UI/Controls/UIControl_PlayerList.h @@ -4,9 +4,9 @@ #include "app/common/UI/Controls/UIControl_PlayerList.h" #include "app/common/UI/UIScene.h" -#include "app/linux/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif #include "UIControl_ButtonList.h" diff --git a/targets/app/common/UI/Controls/UIControl_PlayerSkinPreview.cpp b/targets/app/common/UI/Controls/UIControl_PlayerSkinPreview.cpp index 8dba0e7db..7d5ab5f02 100644 --- a/targets/app/common/UI/Controls/UIControl_PlayerSkinPreview.cpp +++ b/targets/app/common/UI/Controls/UIControl_PlayerSkinPreview.cpp @@ -7,11 +7,11 @@ #include #include "app/common/UI/Controls/UIControl.h" -#include "app/linux/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #include "minecraft/GameEnums.h" #include "platform/renderer/renderer.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif #include "app/common/Game.h" #include "java/Class.h" diff --git a/targets/app/common/UI/Controls/UIControl_PlayerSkinPreview.h b/targets/app/common/UI/Controls/UIControl_PlayerSkinPreview.h index 76f2a683b..e32732b85 100644 --- a/targets/app/common/UI/Controls/UIControl_PlayerSkinPreview.h +++ b/targets/app/common/UI/Controls/UIControl_PlayerSkinPreview.h @@ -6,9 +6,9 @@ #include #include "app/common/UI/Controls/UIControl_PlayerSkinPreview.h" -#include "app/linux/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif #include "UIControl.h" #include "minecraft/client/renderer/Textures.h" diff --git a/targets/app/common/UI/Controls/UIControl_Progress.cpp b/targets/app/common/UI/Controls/UIControl_Progress.cpp index e8d5cb48a..466922f69 100644 --- a/targets/app/common/UI/Controls/UIControl_Progress.cpp +++ b/targets/app/common/UI/Controls/UIControl_Progress.cpp @@ -4,9 +4,9 @@ #include "app/common/UI/Controls/UIControl_Base.h" #include "app/common/UI/UIScene.h" #include "app/common/UI/UIString.h" -#include "app/linux/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif #include "util/StringHelpers.h" diff --git a/targets/app/common/UI/Controls/UIControl_Progress.h b/targets/app/common/UI/Controls/UIControl_Progress.h index d1a1c4348..d4d715585 100644 --- a/targets/app/common/UI/Controls/UIControl_Progress.h +++ b/targets/app/common/UI/Controls/UIControl_Progress.h @@ -6,9 +6,9 @@ #include "app/common/UI/Controls/UIControl_Progress.h" #include "app/common/UI/UIScene.h" #include "app/common/UI/UIString.h" -#include "app/linux/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif #include "UIControl_Base.h" diff --git a/targets/app/common/UI/Controls/UIControl_SaveList.cpp b/targets/app/common/UI/Controls/UIControl_SaveList.cpp index e583f60db..f92ad5467 100644 --- a/targets/app/common/UI/Controls/UIControl_SaveList.cpp +++ b/targets/app/common/UI/Controls/UIControl_SaveList.cpp @@ -3,11 +3,11 @@ #include "app/common/UI/Controls/UIControl.h" #include "app/common/UI/Controls/UIControl_ButtonList.h" #include "app/common/UI/UIScene.h" -#include "app/linux/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif -#include "app/linux/Iggy/include/rrCore.h" +#include "app/common/Iggy/include/rrCore.h" #include "util/StringHelpers.h" bool UIControl_SaveList::setupControl(UIScene* scene, IggyValuePath* parent, diff --git a/targets/app/common/UI/Controls/UIControl_SaveList.h b/targets/app/common/UI/Controls/UIControl_SaveList.h index 1ceca021a..fef3b7fca 100644 --- a/targets/app/common/UI/Controls/UIControl_SaveList.h +++ b/targets/app/common/UI/Controls/UIControl_SaveList.h @@ -4,9 +4,9 @@ #include "app/common/UI/Controls/UIControl_SaveList.h" #include "app/common/UI/UIScene.h" -#include "app/linux/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif #include "UIControl_ButtonList.h" diff --git a/targets/app/common/UI/Controls/UIControl_Slider.cpp b/targets/app/common/UI/Controls/UIControl_Slider.cpp index 799a0fde6..b5272faff 100644 --- a/targets/app/common/UI/Controls/UIControl_Slider.cpp +++ b/targets/app/common/UI/Controls/UIControl_Slider.cpp @@ -4,12 +4,12 @@ #include "app/common/UI/Controls/UIControl_Base.h" #include "app/common/UI/UIScene.h" #include "app/common/UI/UIString.h" -#include "app/linux/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif -#include "app/linux/Iggy/include/rrCore.h" -#include "app/linux/Linux_UIController.h" +#include "app/common/Iggy/include/rrCore.h" +#include "app/common/UI/ConsoleUIController.h" #include "app/common/Audio/SoundTypes.h" #include "util/StringHelpers.h" diff --git a/targets/app/common/UI/Controls/UIControl_Slider.h b/targets/app/common/UI/Controls/UIControl_Slider.h index 823e55290..830028174 100644 --- a/targets/app/common/UI/Controls/UIControl_Slider.h +++ b/targets/app/common/UI/Controls/UIControl_Slider.h @@ -7,12 +7,12 @@ #include "app/common/UI/Controls/UIControl_Slider.h" #include "app/common/UI/UIScene.h" #include "app/common/UI/UIString.h" -#include "app/linux/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif #include "UIControl_Base.h" -#include "app/linux/Iggy/include/rrCore.h" +#include "app/common/Iggy/include/rrCore.h" class UIControl_Slider : public UIControl_Base { private: diff --git a/targets/app/common/UI/Controls/UIControl_SlotList.cpp b/targets/app/common/UI/Controls/UIControl_SlotList.cpp index 9e46bd740..dcedc81e6 100644 --- a/targets/app/common/UI/Controls/UIControl_SlotList.cpp +++ b/targets/app/common/UI/Controls/UIControl_SlotList.cpp @@ -3,9 +3,9 @@ #include "app/common/UI/Controls/UIControl.h" #include "app/common/UI/Controls/UIControl_Base.h" #include "app/common/UI/UIScene.h" -#include "app/linux/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif UIControl_SlotList::UIControl_SlotList() { m_lastHighlighted = -1; } diff --git a/targets/app/common/UI/Controls/UIControl_SlotList.h b/targets/app/common/UI/Controls/UIControl_SlotList.h index 6a77d7608..85f9cccba 100644 --- a/targets/app/common/UI/Controls/UIControl_SlotList.h +++ b/targets/app/common/UI/Controls/UIControl_SlotList.h @@ -5,9 +5,9 @@ #include "app/common/UI/Controls/UIControl_Base.h" #include "app/common/UI/Controls/UIControl_SlotList.h" #include "app/common/UI/UIScene.h" -#include "app/linux/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif #include "UIControl_Base.h" diff --git a/targets/app/common/UI/Controls/UIControl_SpaceIndicatorBar.cpp b/targets/app/common/UI/Controls/UIControl_SpaceIndicatorBar.cpp index 3ea91d2e4..7361929d5 100644 --- a/targets/app/common/UI/Controls/UIControl_SpaceIndicatorBar.cpp +++ b/targets/app/common/UI/Controls/UIControl_SpaceIndicatorBar.cpp @@ -4,9 +4,9 @@ #include "app/common/UI/Controls/UIControl_Base.h" #include "app/common/UI/UIScene.h" #include "app/common/UI/UIString.h" -#include "app/linux/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif #include "util/StringHelpers.h" diff --git a/targets/app/common/UI/Controls/UIControl_SpaceIndicatorBar.h b/targets/app/common/UI/Controls/UIControl_SpaceIndicatorBar.h index c7323f452..4604e411e 100644 --- a/targets/app/common/UI/Controls/UIControl_SpaceIndicatorBar.h +++ b/targets/app/common/UI/Controls/UIControl_SpaceIndicatorBar.h @@ -11,9 +11,9 @@ #include "app/common/UI/Controls/UIControl_SpaceIndicatorBar.h" #include "app/common/UI/UIScene.h" #include "app/common/UI/UIString.h" -#include "app/linux/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif #include "UIControl_Base.h" diff --git a/targets/app/common/UI/Controls/UIControl_TextInput.cpp b/targets/app/common/UI/Controls/UIControl_TextInput.cpp index 98156e1fd..94c093a10 100644 --- a/targets/app/common/UI/Controls/UIControl_TextInput.cpp +++ b/targets/app/common/UI/Controls/UIControl_TextInput.cpp @@ -4,9 +4,9 @@ #include "app/common/UI/Controls/UIControl_Base.h" #include "app/common/UI/UIScene.h" #include "app/common/UI/UIString.h" -#include "app/linux/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif #include "util/StringHelpers.h" diff --git a/targets/app/common/UI/Controls/UIControl_TextInput.h b/targets/app/common/UI/Controls/UIControl_TextInput.h index 5a272ebbc..81cce8103 100644 --- a/targets/app/common/UI/Controls/UIControl_TextInput.h +++ b/targets/app/common/UI/Controls/UIControl_TextInput.h @@ -6,9 +6,9 @@ #include "app/common/UI/Controls/UIControl_TextInput.h" #include "app/common/UI/UIScene.h" #include "app/common/UI/UIString.h" -#include "app/linux/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif #include "UIControl_Base.h" diff --git a/targets/app/common/UI/Controls/UIControl_TexturePackList.cpp b/targets/app/common/UI/Controls/UIControl_TexturePackList.cpp index a91292bee..5fa272f0d 100644 --- a/targets/app/common/UI/Controls/UIControl_TexturePackList.cpp +++ b/targets/app/common/UI/Controls/UIControl_TexturePackList.cpp @@ -4,11 +4,11 @@ #include "app/common/UI/Controls/UIControl_Base.h" #include "app/common/UI/UIScene.h" #include "app/common/UI/UIString.h" -#include "app/linux/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif -#include "app/linux/Iggy/include/rrCore.h" +#include "app/common/Iggy/include/rrCore.h" #include "util/StringHelpers.h" UIControl_TexturePackList::UIControl_TexturePackList() {} diff --git a/targets/app/common/UI/Controls/UIControl_TexturePackList.h b/targets/app/common/UI/Controls/UIControl_TexturePackList.h index 8972fd657..564ffa6fd 100644 --- a/targets/app/common/UI/Controls/UIControl_TexturePackList.h +++ b/targets/app/common/UI/Controls/UIControl_TexturePackList.h @@ -5,12 +5,12 @@ #include "app/common/UI/Controls/UIControl_Base.h" #include "app/common/UI/Controls/UIControl_TexturePackList.h" #include "app/common/UI/UIScene.h" -#include "app/linux/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif #include "UIControl_Base.h" -#include "app/linux/Iggy/include/rrCore.h" +#include "app/common/Iggy/include/rrCore.h" class UIControl_TexturePackList : public UIControl_Base { private: diff --git a/targets/app/common/UI/Controls/UIControl_Touch.cpp b/targets/app/common/UI/Controls/UIControl_Touch.cpp index 09da5f198..05993b64f 100644 --- a/targets/app/common/UI/Controls/UIControl_Touch.cpp +++ b/targets/app/common/UI/Controls/UIControl_Touch.cpp @@ -2,9 +2,9 @@ #include "app/common/UI/Controls/UIControl.h" #include "app/common/UI/Controls/UIControl_Base.h" -#include "app/linux/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif UIControl_Touch::UIControl_Touch() {} diff --git a/targets/app/common/UI/Controls/UIControl_Touch.h b/targets/app/common/UI/Controls/UIControl_Touch.h index 74329f663..7002d3832 100644 --- a/targets/app/common/UI/Controls/UIControl_Touch.h +++ b/targets/app/common/UI/Controls/UIControl_Touch.h @@ -5,9 +5,9 @@ #include "app/common/UI/Controls/UIControl_Base.h" #include "app/common/UI/Controls/UIControl_Touch.h" #include "app/common/UI/UIScene.h" -#include "app/linux/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif #include "UIControl_Base.h" diff --git a/targets/app/common/UI/Scenes/Debug/UIScene_DebugCreateSchematic.cpp b/targets/app/common/UI/Scenes/Debug/UIScene_DebugCreateSchematic.cpp index 6eef7e5e7..a20f7146f 100644 --- a/targets/app/common/UI/Scenes/Debug/UIScene_DebugCreateSchematic.cpp +++ b/targets/app/common/UI/Scenes/Debug/UIScene_DebugCreateSchematic.cpp @@ -8,9 +8,9 @@ #include "app/common/UI/Controls/UIControl_Label.h" #include "app/common/UI/Controls/UIControl_TextInput.h" #include "app/common/UI/UIScene.h" -#include "app/linux/Iggy/include/rrCore.h" +#include "app/common/Iggy/include/rrCore.h" #include "app/common/Game.h" -#include "app/linux/Linux_UIController.h" +#include "app/common/UI/ConsoleUIController.h" #include "minecraft/GameEnums.h" #include "minecraft/server/MinecraftServer.h" #include "minecraft/server/ServerAction.h" diff --git a/targets/app/common/UI/Scenes/Debug/UIScene_DebugCreateSchematic.h b/targets/app/common/UI/Scenes/Debug/UIScene_DebugCreateSchematic.h index cf96543d1..827070346 100644 --- a/targets/app/common/UI/Scenes/Debug/UIScene_DebugCreateSchematic.h +++ b/targets/app/common/UI/Scenes/Debug/UIScene_DebugCreateSchematic.h @@ -8,7 +8,7 @@ #include "app/common/UI/Controls/UIControl_Label.h" #include "app/common/UI/Controls/UIControl_TextInput.h" #include "app/common/UI/UIScene.h" -#include "app/linux/Iggy/include/rrCore.h" +#include "app/common/Iggy/include/rrCore.h" #include "minecraft/server/ServerAction.h" class UILayer; diff --git a/targets/app/common/UI/Scenes/Debug/UIScene_DebugOptions.cpp b/targets/app/common/UI/Scenes/Debug/UIScene_DebugOptions.cpp index e615fb20a..48fe9c309 100644 --- a/targets/app/common/UI/Scenes/Debug/UIScene_DebugOptions.cpp +++ b/targets/app/common/UI/Scenes/Debug/UIScene_DebugOptions.cpp @@ -1,10 +1,10 @@ #include "UIScene_DebugOptions.h" #include "app/common/UI/UIScene.h" -#include "app/linux/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #include "minecraft/Console_Debug_enum.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif #include "app/common/Game.h" #include "platform/input/InputConstants.h" diff --git a/targets/app/common/UI/Scenes/Debug/UIScene_DebugOverlay.cpp b/targets/app/common/UI/Scenes/Debug/UIScene_DebugOverlay.cpp index fc1d3bde6..5866dfb34 100644 --- a/targets/app/common/UI/Scenes/Debug/UIScene_DebugOverlay.cpp +++ b/targets/app/common/UI/Scenes/Debug/UIScene_DebugOverlay.cpp @@ -11,15 +11,15 @@ #include "app/common/UI/Controls/UIControl_ButtonList.h" #include "app/common/UI/Controls/UIControl_Slider.h" #include "app/common/UI/UIScene.h" -#include "app/linux/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #include "minecraft/GameEnums.h" #include "platform/profile/profile.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif -#include "app/linux/Iggy/include/rrCore.h" +#include "app/common/Iggy/include/rrCore.h" #include "app/common/Game.h" -#include "app/linux/Linux_UIController.h" +#include "app/common/UI/ConsoleUIController.h" #include "minecraft/commands/common/EnchantItemCommand.h" #include "minecraft/commands/common/GiveItemCommand.h" #include "minecraft/commands/common/TimeCommand.h" diff --git a/targets/app/common/UI/Scenes/Debug/UIScene_DebugOverlay.h b/targets/app/common/UI/Scenes/Debug/UIScene_DebugOverlay.h index c331ce0b9..b5c71b8d8 100644 --- a/targets/app/common/UI/Scenes/Debug/UIScene_DebugOverlay.h +++ b/targets/app/common/UI/Scenes/Debug/UIScene_DebugOverlay.h @@ -10,11 +10,11 @@ #include "app/common/UI/Controls/UIControl_ButtonList.h" #include "app/common/UI/Controls/UIControl_Slider.h" #include "app/common/UI/UIScene.h" -#include "app/linux/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif -#include "app/linux/Iggy/include/rrCore.h" +#include "app/common/Iggy/include/rrCore.h" #include "java/Class.h" class UILayer; diff --git a/targets/app/common/UI/Scenes/Debug/UIScene_DebugSetCamera.cpp b/targets/app/common/UI/Scenes/Debug/UIScene_DebugSetCamera.cpp index 556db92b3..d8c0e299c 100644 --- a/targets/app/common/UI/Scenes/Debug/UIScene_DebugSetCamera.cpp +++ b/targets/app/common/UI/Scenes/Debug/UIScene_DebugSetCamera.cpp @@ -10,9 +10,9 @@ #include "app/common/UI/Controls/UIControl_Label.h" #include "app/common/UI/Controls/UIControl_TextInput.h" #include "app/common/UI/UIScene.h" -#include "app/linux/Iggy/include/rrCore.h" +#include "app/common/Iggy/include/rrCore.h" #include "app/common/Game.h" -#include "app/linux/Linux_UIController.h" +#include "app/common/UI/ConsoleUIController.h" #include "minecraft/GameEnums.h" #include "minecraft/world/phys/Vec3.h" #include "platform/input/input.h" diff --git a/targets/app/common/UI/Scenes/Debug/UIScene_DebugSetCamera.h b/targets/app/common/UI/Scenes/Debug/UIScene_DebugSetCamera.h index aaf5ffd84..9c43f482c 100644 --- a/targets/app/common/UI/Scenes/Debug/UIScene_DebugSetCamera.h +++ b/targets/app/common/UI/Scenes/Debug/UIScene_DebugSetCamera.h @@ -8,7 +8,7 @@ #include "app/common/UI/Controls/UIControl_Label.h" #include "app/common/UI/Controls/UIControl_TextInput.h" #include "app/common/UI/UIScene.h" -#include "app/linux/Iggy/include/rrCore.h" +#include "app/common/Iggy/include/rrCore.h" class UILayer; 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 94946557b..cbe183937 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 @@ -10,7 +10,7 @@ #include "app/common/UI/Controls/UIControl_Label.h" #include "app/common/UI/Controls/UIControl_TexturePackList.h" #include "app/common/UI/UIScene.h" -#include "app/linux/Iggy/include/rrCore.h" +#include "app/common/Iggy/include/rrCore.h" #include "app/common/Game.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/skins/TexturePack.h" diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.h b/targets/app/common/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.h index 8fbf9ff13..67e4c1729 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.h +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.h @@ -8,7 +8,7 @@ #include "app/common/UI/Controls/UIControl_Label.h" #include "app/common/UI/Controls/UIControl_TexturePackList.h" #include "app/common/UI/UIScene.h" -#include "app/linux/Iggy/include/rrCore.h" +#include "app/common/Iggy/include/rrCore.h" #include "platform/storage/storage.h" class UILayer; 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 8e4b98cf7..7da5d9084 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 @@ -18,7 +18,7 @@ #include "app/common/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.h" #include "app/common/UI/UILayer.h" #include "app/common/Game.h" -#include "app/linux/Linux_UIController.h" +#include "app/common/UI/ConsoleUIController.h" #include "minecraft/GameEnums.h" #include "minecraft/GameHostOptions.h" #include "minecraft/GameTypes.h" diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.h b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.h index efd4827b6..f48be57a3 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.h +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.h @@ -16,7 +16,7 @@ #include "app/common/UI/Controls/UIControl_TextInput.h" #include "app/common/UI/Controls/UIControl_TexturePackList.h" #include "app/common/UI/UIScene.h" -#include "app/linux/Iggy/include/rrCore.h" +#include "app/common/Iggy/include/rrCore.h" #include "platform/storage/storage.h" class DLCPack; 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 f7c1ad835..135c020f9 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 @@ -6,7 +6,7 @@ #include "app/common/UI/Controls/UIControl_Label.h" #include "app/common/UI/UIScene.h" #include "app/common/Game.h" -#include "app/linux/Linux_UIController.h" +#include "app/common/UI/ConsoleUIController.h" #include "minecraft/GameEnums.h" #include "strings.h" diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.h b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.h index ee8f07798..e21e4713a 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.h +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.h @@ -7,7 +7,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/Iggy/include/rrCore.h" +#include "app/common/Iggy/include/rrCore.h" #include "platform/storage/storage.h" class UILayer; 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 0dd349d80..5857d64fe 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 @@ -9,7 +9,7 @@ #include "app/common/UI/Controls/UIControl_Label.h" #include "app/common/UI/UIScene.h" #include "app/common/Game.h" -#include "app/linux/Linux_UIController.h" +#include "app/common/UI/ConsoleUIController.h" #include "platform/PlatformTypes.h" #include "platform/renderer/renderer.h" #include "strings.h" diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.h b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.h index cd8e03fc6..e03f4eaa2 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.h +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.h @@ -9,7 +9,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/Iggy/include/rrCore.h" +#include "app/common/Iggy/include/rrCore.h" #include "platform/storage/storage.h" class UILayer; 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 a49b71c0e..296d44c1a 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 @@ -8,7 +8,7 @@ #include "app/common/UI/UILayer.h" #include "app/common/UI/UIScene.h" #include "app/common/Game.h" -#include "app/linux/Linux_UIController.h" +#include "app/common/UI/ConsoleUIController.h" #include "minecraft/GameEnums.h" #include "minecraft/GameTypes.h" #include "app/common/Audio/SoundTypes.h" diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_EULA.h b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_EULA.h index 84172be8b..c544dcd38 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_EULA.h +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_EULA.h @@ -6,7 +6,7 @@ #include "app/common/UI/Controls/UIControl_Button.h" #include "app/common/UI/Controls/UIControl_DynamicLabel.h" #include "app/common/UI/UIScene.h" -#include "app/linux/Iggy/include/rrCore.h" +#include "app/common/Iggy/include/rrCore.h" class UILayer; diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_Intro.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_Intro.cpp index 66c74e7e3..81fdff7c3 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_Intro.cpp +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_Intro.cpp @@ -2,8 +2,8 @@ #include "app/common/UI/All Platforms/UIEnums.h" #include "app/common/UI/UIScene.h" -#include "app/linux/Iggy/include/iggy.h" -#include "app/linux/Linux_UIController.h" +#include "app/common/Iggy/include/iggy.h" +#include "app/common/UI/ConsoleUIController.h" class UILayer; diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_Intro.h b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_Intro.h index 473342785..417b939d2 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_Intro.h +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_Intro.h @@ -4,9 +4,9 @@ #include "app/common/UI/All Platforms/UIEnums.h" #include "app/common/UI/UIScene.h" -#include "app/linux/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif class UILayer; 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 5c52cbf43..e78e29497 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 @@ -12,7 +12,7 @@ #include "app/common/UI/UILayer.h" #include "app/common/UI/UIScene.h" #include "app/common/Game.h" -#include "app/linux/Linux_UIController.h" +#include "app/common/UI/ConsoleUIController.h" #include "minecraft/GameEnums.h" #include "minecraft/GameTypes.h" #include "platform/network/network.h" diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.h b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.h index 9f65aceba..348534ad7 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.h +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.h @@ -7,7 +7,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/Iggy/include/rrCore.h" +#include "app/common/Iggy/include/rrCore.h" #include "platform/storage/storage.h" class FriendSessionInfo; 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 b6fa51cc4..e983ff248 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 @@ -12,7 +12,7 @@ #include "app/common/UI/UILayer.h" #include "app/common/UI/UIScene.h" #include "app/common/Game.h" -#include "app/linux/Linux_UIController.h" +#include "app/common/UI/ConsoleUIController.h" #include "minecraft/GameEnums.h" #include "minecraft/GameHostOptions.h" #include "minecraft/GameTypes.h" diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.h b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.h index 228865ead..ed9c2d703 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.h +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.h @@ -11,11 +11,11 @@ #include "app/common/UI/Controls/UIControl_Slider.h" #include "app/common/UI/Controls/UIControl_TextInput.h" #include "app/common/UI/UIScene.h" -#include "app/linux/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif -#include "app/linux/Iggy/include/rrCore.h" +#include "app/common/Iggy/include/rrCore.h" class UILayer; 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 b9abd7e14..e4177b3a0 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 @@ -14,7 +14,7 @@ #include "app/common/UI/UILayer.h" #include "app/common/UI/UIScene.h" #include "app/common/Game.h" -#include "app/linux/Linux_UIController.h" +#include "app/common/UI/ConsoleUIController.h" #include "minecraft/Console_Debug_enum.h" #include "app/common/Audio/SoundTypes.h" #include "minecraft/world/item/Item.h" diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.h b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.h index 5660dc573..c3534bb47 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.h +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.h @@ -7,15 +7,15 @@ #include "app/common/UI/Controls/UIControl_Label.h" #include "app/common/UI/Controls/UIControl_LeaderboardList.h" #include "app/common/UI/UIScene.h" -#include "app/linux/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #include "platform/PlatformTypes.h" #include "platform/storage/storage.h" #include "platform/leaderboard/leaderboard.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif -#include "app/linux/Iggy/include/rrCore.h" +#include "app/common/Iggy/include/rrCore.h" class UILayer; 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 c7437c20c..590695afc 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 @@ -16,7 +16,7 @@ #include "app/common/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.h" #include "app/common/UI/UILayer.h" #include "app/common/Game.h" -#include "app/linux/Linux_UIController.h" +#include "app/common/UI/ConsoleUIController.h" #include "minecraft/GameEnums.h" #include "minecraft/GameHostOptions.h" #include "minecraft/GameTypes.h" diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.h b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.h index cb50cb64b..1ccabe697 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.h +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.h @@ -14,7 +14,7 @@ #include "app/common/UI/Controls/UIControl_Slider.h" #include "app/common/UI/Controls/UIControl_TexturePackList.h" #include "app/common/UI/UIScene.h" -#include "app/linux/Iggy/include/rrCore.h" +#include "app/common/Iggy/include/rrCore.h" #include "platform/storage/storage.h" class DLCPack; 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 f67c7e15d..9b419a500 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 @@ -13,7 +13,7 @@ #include "app/common/UI/UILayer.h" #include "app/common/UI/UIScene.h" #include "app/common/Game.h" -#include "app/linux/Linux_UIController.h" +#include "app/common/UI/ConsoleUIController.h" #include "java/File.h" #include "java/InputOutputStream/FileInputStream.h" #include "minecraft/GameEnums.h" diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.h b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.h index 41618e4aa..3c89fa2e4 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.h +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.h @@ -11,7 +11,7 @@ #include "app/common/UI/Controls/UIControl_Label.h" #include "app/common/UI/Controls/UIControl_SaveList.h" #include "app/common/UI/UIScene.h" -#include "app/linux/Iggy/include/rrCore.h" +#include "app/common/Iggy/include/rrCore.h" #include "java/File.h" #include "minecraft/client/Minecraft.h" #include "minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.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 d576e4a74..0283787eb 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 @@ -16,7 +16,7 @@ #include "app/common/UI/UIScene.h" #include "app/common/UI/UIString.h" #include "app/common/Game.h" -#include "app/linux/Linux_UIController.h" +#include "app/common/UI/ConsoleUIController.h" #include "java/InputOutputStream/BufferedReader.h" #include "java/InputOutputStream/ByteArrayInputStream.h" #include "java/InputOutputStream/InputStreamReader.h" diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.h b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.h index 990f35ae8..687e70d31 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.h +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.h @@ -9,12 +9,12 @@ #include "app/common/UI/Controls/UIControl.h" #include "app/common/UI/Controls/UIControl_Button.h" #include "app/common/UI/UIScene.h" -#include "app/linux/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #include "platform/storage/storage.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif -#include "app/linux/Iggy/include/rrCore.h" +#include "app/common/Iggy/include/rrCore.h" #include "java/Random.h" class Random; 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 753e3d19c..805722248 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 @@ -8,7 +8,7 @@ #include "app/common/UI/UILayer.h" #include "app/common/UI/UIScene.h" #include "app/common/Game.h" -#include "app/linux/Linux_UIController.h" +#include "app/common/UI/ConsoleUIController.h" #include "minecraft/GameEnums.h" #include "minecraft/GameTypes.h" #include "app/common/Audio/SoundTypes.h" diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.h b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.h index 741e00729..f7490622f 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.h +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.h @@ -6,7 +6,7 @@ #include "app/common/UI/Controls/UIControl_Button.h" #include "app/common/UI/Controls/UIControl_DynamicLabel.h" #include "app/common/UI/UIScene.h" -#include "app/linux/Iggy/include/rrCore.h" +#include "app/common/Iggy/include/rrCore.h" class UILayer; 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 0a0baae81..aba3cb3e9 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 @@ -6,7 +6,7 @@ #include "app/common/UI/UILayer.h" #include "app/common/UI/UIScene.h" #include "app/common/Game.h" -#include "app/linux/Linux_UIController.h" +#include "app/common/UI/ConsoleUIController.h" #include "minecraft/GameTypes.h" #include "app/common/Audio/SoundTypes.h" #include "platform/PlatformTypes.h" diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.h b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.h index 1e9752efc..a62ab5c40 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.h +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.h @@ -6,11 +6,11 @@ #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/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif -#include "app/linux/Iggy/include/rrCore.h" +#include "app/common/Iggy/include/rrCore.h" class UILayer; 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 ec4d3efb6..6d6d771e1 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 @@ -3,7 +3,7 @@ #include "app/common/UI/UIScene.h" #include "app/common/Game.h" -#include "app/linux/Linux_UIController.h" +#include "app/common/UI/ConsoleUIController.h" #include "minecraft/GameTypes.h" #include "app/common/Audio/SoundTypes.h" #include "platform/profile/profile.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 f64d02436..9765e1ea5 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_ControlsMenu.cpp +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_ControlsMenu.cpp @@ -9,7 +9,7 @@ #include "app/common/UI/Controls/UIControl_Label.h" #include "app/common/UI/UIScene.h" #include "app/common/Game.h" -#include "app/linux/Linux_UIController.h" +#include "app/common/UI/ConsoleUIController.h" #include "minecraft/BuildVer.h" #include "minecraft/GameEnums.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_ControlsMenu.h b/targets/app/common/UI/Scenes/Help & Options/UIScene_ControlsMenu.h index 01a5ccd68..8a2f3f97c 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_ControlsMenu.h +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_ControlsMenu.h @@ -8,11 +8,11 @@ #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/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif -#include "app/linux/Iggy/include/rrCore.h" +#include "app/common/Iggy/include/rrCore.h" class UILayer; 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 08c780d9c..b8a4602df 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_Credits.cpp +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_Credits.cpp @@ -7,7 +7,7 @@ #include "app/common/UI/UILayer.h" #include "app/common/UI/UIScene.h" #include "app/common/Game.h" -#include "app/linux/Linux_UIController.h" +#include "app/common/UI/ConsoleUIController.h" #include "strings.h" #include "util/StringHelpers.h" diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_Credits.h b/targets/app/common/UI/Scenes/Help & Options/UIScene_Credits.h index 4920654df..3ba6f6151 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_Credits.h +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_Credits.h @@ -5,11 +5,11 @@ #include "app/common/UI/All Platforms/UIEnums.h" #include "app/common/UI/All Platforms/UIStructs.h" #include "app/common/UI/UIScene.h" -#include "app/linux/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif -#include "app/linux/Iggy/include/rrCore.h" +#include "app/common/Iggy/include/rrCore.h" class UILayer; 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 afa5c4b08..897f778b4 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.cpp +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.cpp @@ -5,7 +5,7 @@ #include "app/common/UI/UILayer.h" #include "app/common/UI/UIScene.h" #include "app/common/Game.h" -#include "app/linux/Linux_UIController.h" +#include "app/common/UI/ConsoleUIController.h" #include "minecraft/client/Minecraft.h" #include "app/common/Audio/SoundTypes.h" #include "platform/profile/profile.h" diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.h b/targets/app/common/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.h index ea34f974b..769d0dd88 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.h +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.h @@ -5,7 +5,7 @@ #include "app/common/UI/All Platforms/UIEnums.h" #include "app/common/UI/Controls/UIControl_Button.h" #include "app/common/UI/UIScene.h" -#include "app/linux/Iggy/include/rrCore.h" +#include "app/common/Iggy/include/rrCore.h" class UILayer; 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 91b10ee0a..05b239820 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_HowToPlay.cpp +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_HowToPlay.cpp @@ -9,7 +9,7 @@ #include "app/common/UI/Controls/UIControl_Label.h" #include "app/common/UI/UIScene.h" #include "app/common/Game.h" -#include "app/linux/Linux_UIController.h" +#include "app/common/UI/ConsoleUIController.h" #include "minecraft/GameEnums.h" #include "app/common/Audio/SoundTypes.h" #include "strings.h" diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_HowToPlay.h b/targets/app/common/UI/Scenes/Help & Options/UIScene_HowToPlay.h index f068baf2e..a04b6c215 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_HowToPlay.h +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_HowToPlay.h @@ -6,9 +6,9 @@ #include "app/common/UI/Controls/UIControl_DynamicLabel.h" #include "app/common/UI/Controls/UIControl_Label.h" #include "app/common/UI/UIScene.h" -#include "app/linux/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif class UILayer; 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 cad506495..ac71449da 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.cpp +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.cpp @@ -7,7 +7,7 @@ #include "app/common/UI/UILayer.h" #include "app/common/UI/UIScene.h" #include "app/common/Game.h" -#include "app/linux/Linux_UIController.h" +#include "app/common/UI/ConsoleUIController.h" #include "minecraft/client/Minecraft.h" #include "app/common/Audio/SoundTypes.h" #include "strings.h" diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.h b/targets/app/common/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.h index a49e14d5e..e47fa6825 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.h +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.h @@ -5,7 +5,7 @@ #include "app/common/UI/All Platforms/UIEnums.h" #include "app/common/UI/Controls/UIControl_ButtonList.h" #include "app/common/UI/UIScene.h" -#include "app/linux/Iggy/include/rrCore.h" +#include "app/common/Iggy/include/rrCore.h" class UILayer; 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 86edef6ff..d34d56dac 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_LanguageSelector.cpp +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_LanguageSelector.cpp @@ -4,7 +4,7 @@ #include "app/common/UI/UILayer.h" #include "app/common/UI/UIScene.h" #include "app/common/Game.h" -#include "app/linux/Linux_UIController.h" +#include "app/common/UI/ConsoleUIController.h" #include "minecraft/client/Minecraft.h" #include "app/common/Audio/SoundTypes.h" #include "strings.h" diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_LanguageSelector.h b/targets/app/common/UI/Scenes/Help & Options/UIScene_LanguageSelector.h index d6e8946d4..e7913966a 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_LanguageSelector.h +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_LanguageSelector.h @@ -6,7 +6,7 @@ #include "app/common/UI/Controls/UIControl.h" #include "app/common/UI/Controls/UIControl_ButtonList.h" #include "app/common/UI/UIScene.h" -#include "app/linux/Iggy/include/rrCore.h" +#include "app/common/Iggy/include/rrCore.h" #include "minecraft/client/model/SkinBox.h" #include "platform/network/NetTypes.h" #include "platform/XboxStubs.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 3c8640584..258808d44 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_ReinstallMenu.cpp +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_ReinstallMenu.cpp @@ -4,7 +4,7 @@ #include "app/common/UI/UILayer.h" #include "app/common/UI/UIScene.h" #include "app/common/Game.h" -#include "app/linux/Linux_UIController.h" +#include "app/common/UI/ConsoleUIController.h" #include "minecraft/client/Minecraft.h" #include "strings.h" diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_ReinstallMenu.h b/targets/app/common/UI/Scenes/Help & Options/UIScene_ReinstallMenu.h index 764686419..7ccb555cd 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_ReinstallMenu.h +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_ReinstallMenu.h @@ -5,7 +5,7 @@ #include "app/common/UI/All Platforms/UIEnums.h" #include "app/common/UI/Controls/UIControl_Button.h" #include "app/common/UI/UIScene.h" -#include "app/linux/Iggy/include/rrCore.h" +#include "app/common/Iggy/include/rrCore.h" class UILayer; 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 bee06ed79..15fb016e8 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.cpp +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.cpp @@ -7,7 +7,7 @@ #include "app/common/UI/UILayer.h" #include "app/common/UI/UIScene.h" #include "app/common/Game.h" -#include "app/linux/Linux_UIController.h" +#include "app/common/UI/ConsoleUIController.h" #include "minecraft/GameEnums.h" #include "minecraft/client/Minecraft.h" #include "strings.h" diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.h b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.h index 35b3cc41f..b3a5fcaf1 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.h +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.h @@ -5,7 +5,7 @@ #include "app/common/UI/All Platforms/UIEnums.h" #include "app/common/UI/Controls/UIControl_Slider.h" #include "app/common/UI/UIScene.h" -#include "app/linux/Iggy/include/rrCore.h" +#include "app/common/Iggy/include/rrCore.h" class UILayer; 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 9531e7de8..6a51d1e9c 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.cpp +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.cpp @@ -6,7 +6,7 @@ #include "app/common/UI/UILayer.h" #include "app/common/UI/UIScene.h" #include "app/common/Game.h" -#include "app/linux/Linux_UIController.h" +#include "app/common/UI/ConsoleUIController.h" #include "minecraft/GameEnums.h" #include "minecraft/client/Minecraft.h" #include "strings.h" diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.h b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.h index 325fbdd9a..06752c112 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.h +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.h @@ -5,7 +5,7 @@ #include "app/common/UI/All Platforms/UIEnums.h" #include "app/common/UI/Controls/UIControl_Slider.h" #include "app/common/UI/UIScene.h" -#include "app/linux/Iggy/include/rrCore.h" +#include "app/common/Iggy/include/rrCore.h" class UILayer; 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 612624c13..8a8ae7b89 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.cpp +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.cpp @@ -8,7 +8,7 @@ #include "app/common/UI/UILayer.h" #include "app/common/UI/UIScene.h" #include "app/common/Game.h" -#include "app/linux/Linux_UIController.h" +#include "app/common/UI/ConsoleUIController.h" #include "minecraft/GameEnums.h" #include "minecraft/client/Minecraft.h" #include "platform/profile/profile.h" diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.h b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.h index 967ce1aea..205dccd66 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.h +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.h @@ -6,7 +6,7 @@ #include "app/common/UI/Controls/UIControl_CheckBox.h" #include "app/common/UI/Controls/UIControl_Slider.h" #include "app/common/UI/UIScene.h" -#include "app/linux/Iggy/include/rrCore.h" +#include "app/common/Iggy/include/rrCore.h" class UILayer; 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 252388d10..48488c295 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsMenu.cpp +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsMenu.cpp @@ -5,7 +5,7 @@ #include "app/common/UI/UILayer.h" #include "app/common/UI/UIScene.h" #include "app/common/Game.h" -#include "app/linux/Linux_UIController.h" +#include "app/common/UI/ConsoleUIController.h" #include "minecraft/client/Minecraft.h" #include "app/common/Audio/SoundTypes.h" #include "platform/profile/profile.h" diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsMenu.h b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsMenu.h index bd5e1eae5..87faa8070 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsMenu.h +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsMenu.h @@ -5,7 +5,7 @@ #include "app/common/UI/All Platforms/UIEnums.h" #include "app/common/UI/Controls/UIControl_Button.h" #include "app/common/UI/UIScene.h" -#include "app/linux/Iggy/include/rrCore.h" +#include "app/common/Iggy/include/rrCore.h" #include "platform/storage/storage.h" class UILayer; 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 f3feb408e..98cf633f9 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.cpp +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.cpp @@ -11,7 +11,7 @@ #include "app/common/UI/UILayer.h" #include "app/common/UI/UIScene.h" #include "app/common/Game.h" -#include "app/linux/Linux_UIController.h" +#include "app/common/UI/ConsoleUIController.h" #include "minecraft/GameEnums.h" #include "minecraft/client/Minecraft.h" #include "app/common/Audio/SoundTypes.h" diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.h b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.h index 5046ba223..71e67acb6 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.h +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.h @@ -8,7 +8,7 @@ #include "app/common/UI/Controls/UIControl_Label.h" #include "app/common/UI/Controls/UIControl_Slider.h" #include "app/common/UI/UIScene.h" -#include "app/linux/Iggy/include/rrCore.h" +#include "app/common/Iggy/include/rrCore.h" class UILayer; 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 143264327..ac43c3c69 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.cpp +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.cpp @@ -8,7 +8,7 @@ #include "app/common/UI/UILayer.h" #include "app/common/UI/UIScene.h" #include "app/common/Game.h" -#include "app/linux/Linux_UIController.h" +#include "app/common/UI/ConsoleUIController.h" #include "minecraft/GameEnums.h" #include "minecraft/client/Minecraft.h" #include "platform/profile/profile.h" diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.h b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.h index ac245c6cf..26a8a9c19 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.h +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.h @@ -6,7 +6,7 @@ #include "app/common/UI/Controls/UIControl_CheckBox.h" #include "app/common/UI/Controls/UIControl_Slider.h" #include "app/common/UI/UIScene.h" -#include "app/linux/Iggy/include/rrCore.h" +#include "app/common/Iggy/include/rrCore.h" class UILayer; 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 17291e9a0..2f241c1fa 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp @@ -14,7 +14,7 @@ #include "app/common/UI/UILayer.h" #include "app/common/UI/UIScene.h" #include "app/common/Game.h" -#include "app/linux/Linux_UIController.h" +#include "app/common/UI/ConsoleUIController.h" #include "minecraft/Minecraft_Macros.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/model/SkinBox.h" diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.h b/targets/app/common/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.h index 6da39709a..f186e6286 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.h +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.h @@ -9,12 +9,12 @@ #include "app/common/UI/Controls/UIControl_Label.h" #include "app/common/UI/Controls/UIControl_PlayerSkinPreview.h" #include "app/common/UI/UIScene.h" -#include "app/linux/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #include "platform/storage/storage.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif -#include "app/linux/Iggy/include/rrCore.h" +#include "app/common/Iggy/include/rrCore.h" #include "minecraft/client/model/SkinBox.h" #include "minecraft/client/renderer/Textures.h" #include "minecraft/world/entity/player/SkinTypes.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 e8e8f40d0..06f2f0e32 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 @@ -13,7 +13,7 @@ #include "app/common/UI/UILayer.h" #include "app/common/UI/UIScene.h" #include "app/common/Game.h" -#include "app/linux/Linux_UIController.h" +#include "app/common/UI/ConsoleUIController.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "minecraft/util/HtmlString.h" diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h index 5e5187797..1791c2a82 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h @@ -8,12 +8,12 @@ #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/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #include "platform/renderer/renderer.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif -#include "app/linux/Iggy/include/rrCore.h" +#include "app/common/Iggy/include/rrCore.h" class AbstractContainerMenu; class UILayer; diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.h b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.h index 48f0425e6..d373e7c36 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.h +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.h @@ -11,10 +11,10 @@ #include "app/common/UI/Controls/UIControl_SlotList.h" #include "app/common/UI/Controls/UIControl_TextInput.h" #include "app/common/UI/UIScene.h" -#include "app/linux/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #include "platform/input/input.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif #include "UIScene_AbstractContainerMenu.h" #include "minecraft/world/inventory/MerchantMenu.h" diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.h b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.h index 173a4f0cb..d0f1f53a1 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.h +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.h @@ -10,9 +10,9 @@ #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/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif #include "UIScene_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 18ca33f99..26aaa6096 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 @@ -12,13 +12,13 @@ #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/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif -#include "app/linux/Iggy/include/rrCore.h" +#include "app/common/Iggy/include/rrCore.h" #include "app/common/Game.h" -#include "app/linux/Linux_UIController.h" +#include "app/common/UI/ConsoleUIController.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/player/LocalPlayer.h" #include "app/common/Audio/SoundTypes.h" diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.h b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.h index d96c3ba37..001372706 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.h +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.h @@ -9,9 +9,9 @@ #include "app/common/UI/Controls/UIControl_Base.h" #include "app/common/UI/Controls/UIControl_SlotList.h" #include "app/common/UI/UIScene.h" -#include "app/linux/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif #include "UIScene_AbstractContainerMenu.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 49b281684..2f94b1942 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 @@ -15,7 +15,7 @@ #include "app/common/UI/Controls/UIControl_SlotList.h" #include "app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" #include "app/common/Game.h" -#include "app/linux/Linux_UIController.h" +#include "app/common/UI/ConsoleUIController.h" #include "minecraft/client/Minecraft.h" #include "minecraft/world/inventory/EnchantmentMenu.h" #include "platform/profile/profile.h" diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.h b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.h index 34c28fe3b..ad96ee171 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.h +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.h @@ -12,7 +12,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/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" class InventoryMenu; class UILayer; diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.h b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.h index b457fb614..b9f4aeba9 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.h +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.h @@ -9,9 +9,9 @@ #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/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif #include "UIScene_AbstractContainerMenu.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 1b5617952..095bee858 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 @@ -13,12 +13,12 @@ #include "app/common/UI/Controls/UIControl_MinecraftHorse.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/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif #include "app/common/Game.h" -#include "app/linux/Linux_UIController.h" +#include "app/common/UI/ConsoleUIController.h" #include "minecraft/client/Minecraft.h" #include "minecraft/world/Container.h" #include "minecraft/world/entity/animal/EntityHorse.h" diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.h b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.h index 04a880fdc..c54f491fc 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.h +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.h @@ -10,9 +10,9 @@ #include "app/common/UI/Controls/UIControl_MinecraftHorse.h" #include "app/common/UI/Controls/UIControl_SlotList.h" #include "app/common/UI/UIScene.h" -#include "app/linux/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif #include "UIScene_AbstractContainerMenu.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 7632984c3..4e5c4e3fc 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 @@ -14,7 +14,7 @@ #include "app/common/UI/Controls/UIControl_SlotList.h" #include "app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" #include "app/common/Game.h" -#include "app/linux/Linux_UIController.h" +#include "app/common/UI/ConsoleUIController.h" #include "minecraft/SharedConstants.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_InventoryMenu.h b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.h index b5c7548c1..d2d0c012c 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.h +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.h @@ -9,9 +9,9 @@ #include "app/common/UI/Controls/UIControl_MinecraftPlayer.h" #include "app/common/UI/Controls/UIControl_SlotList.h" #include "app/common/UI/UIScene.h" -#include "app/linux/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif #include "UIScene_AbstractContainerMenu.h" #include "minecraft/world/effect/MobEffect.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 660cbfa89..2a55d0f5a 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 @@ -14,7 +14,7 @@ #include "app/common/UI/Controls/UIControl_SlotList.h" #include "app/common/UI/UIScene.h" #include "app/common/Game.h" -#include "app/linux/Linux_UIController.h" +#include "app/common/UI/ConsoleUIController.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "minecraft/util/HtmlString.h" diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.h b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.h index 736c01d1f..172b6c31d 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.h +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.h @@ -9,9 +9,9 @@ #include "app/common/UI/Controls/UIControl_SlotList.h" #include "app/common/UI/UILayer.h" #include "app/common/UI/UIScene.h" -#include "app/linux/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif class InventoryMenu; 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 1e812d402..a941f5264 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 @@ -11,7 +11,7 @@ #include "app/common/UI/Controls/UIControl_SlotList.h" #include "app/common/UI/UIScene.h" #include "app/common/Game.h" -#include "app/linux/Linux_UIController.h" +#include "app/common/UI/ConsoleUIController.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "minecraft/client/player/LocalPlayer.h" diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.h b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.h index 134f67da8..0f0f2fea9 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.h +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.h @@ -10,9 +10,9 @@ #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/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif class AbstractContainerMenu; 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 35ee1b970..a06577e42 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 @@ -11,7 +11,7 @@ #include "app/common/UI/Controls/UIControl_Label.h" #include "app/common/UI/UIScene.h" #include "app/common/Game.h" -#include "app/linux/Linux_UIController.h" +#include "app/common/UI/ConsoleUIController.h" #include "minecraft/GameEnums.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.h b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.h index e1d9bce0c..957c007e8 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.h +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.h @@ -6,7 +6,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/Iggy/include/rrCore.h" +#include "app/common/Iggy/include/rrCore.h" class UILayer; 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 d0a6a0f6f..5973ec0c5 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 @@ -9,7 +9,7 @@ #include "app/common/Tutorial/Tutorial.h" #include "app/common/UI/UIScene.h" #include "app/common/Game.h" -#include "app/linux/Linux_UIController.h" +#include "app/common/UI/ConsoleUIController.h" #include "java/Random.h" #include "minecraft/GameEnums.h" #include "minecraft/SharedConstants.h" diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.h b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.h index 9d5f13c9d..b3e84ac73 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.h +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.h @@ -5,11 +5,11 @@ #include "app/common/UI/All Platforms/UIEnums.h" #include "app/common/UI/UIScene.h" -#include "app/linux/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif -#include "app/linux/Iggy/include/rrCore.h" +#include "app/common/Iggy/include/rrCore.h" class UILayer; 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 8bcf0003b..8810fe807 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 @@ -9,7 +9,7 @@ #include "app/common/UI/Controls/UIControl_CheckBox.h" #include "app/common/UI/UIScene.h" #include "app/common/Game.h" -#include "app/linux/Linux_UIController.h" +#include "app/common/UI/ConsoleUIController.h" #include "minecraft/GameEnums.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_InGameHostOptionsMenu.h b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.h index 193153e68..56cf2932b 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.h +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.h @@ -6,7 +6,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/Iggy/include/rrCore.h" +#include "app/common/Iggy/include/rrCore.h" class UILayer; 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 e70348c78..1f593e443 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 @@ -10,7 +10,7 @@ #include "app/common/UI/UILayer.h" #include "app/common/UI/UIScene.h" #include "app/common/Game.h" -#include "app/linux/Linux_UIController.h" +#include "app/common/UI/ConsoleUIController.h" #include "minecraft/Console_Debug_enum.h" #include "minecraft/GameEnums.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.h b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.h index aa3dce319..881c31800 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.h +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.h @@ -10,7 +10,7 @@ #include "app/common/UI/Controls/UIControl_Label.h" #include "app/common/UI/Controls/UIControl_PlayerList.h" #include "app/common/UI/UIScene.h" -#include "app/linux/Iggy/include/rrCore.h" +#include "app/common/Iggy/include/rrCore.h" #include "platform/storage/storage.h" class INetworkPlayer; 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 b24b04a03..0ac04f288 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 @@ -11,7 +11,7 @@ #include "app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.h" #include "app/common/UI/UIScene.h" #include "app/common/Game.h" -#include "app/linux/Linux_UIController.h" +#include "app/common/UI/ConsoleUIController.h" #include "minecraft/GameEnums.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_InGamePlayerOptionsMenu.h b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.h index 1ce577898..eca332c3a 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.h +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.h @@ -9,12 +9,12 @@ #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/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #include "platform/storage/storage.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif -#include "app/linux/Iggy/include/rrCore.h" +#include "app/common/Iggy/include/rrCore.h" class INetworkPlayer; class UILayer; 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 74fbd8308..2c8c5332c 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 @@ -15,7 +15,7 @@ #include "app/common/UI/UILayer.h" #include "app/common/UI/UIScene.h" #include "app/common/Game.h" -#include "app/linux/Linux_UIController.h" +#include "app/common/UI/ConsoleUIController.h" #include "minecraft/GameEnums.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_PauseMenu.h b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h index 7ec51ef6c..67a5235dc 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h @@ -6,7 +6,7 @@ #include "app/common/UI/All Platforms/UIEnums.h" #include "app/common/UI/Controls/UIControl_Button.h" #include "app/common/UI/UIScene.h" -#include "app/linux/Iggy/include/rrCore.h" +#include "app/common/Iggy/include/rrCore.h" #include "platform/storage/storage.h" class UILayer; 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 859212a35..78c10f4f8 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 @@ -8,7 +8,7 @@ #include "app/common/UI/UILayer.h" #include "app/common/UI/UIScene.h" #include "app/common/Game.h" -#include "app/linux/Linux_UIController.h" +#include "app/common/UI/ConsoleUIController.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/ClientConnection.h" #include "minecraft/client/multiplayer/MultiPlayerLevel.h" diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.h b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.h index 6a7c356a4..7c970c6e6 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.h +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.h @@ -8,7 +8,7 @@ #include "app/common/UI/Controls/UIControl_Label.h" #include "app/common/UI/Controls/UIControl_TextInput.h" #include "app/common/UI/UIScene.h" -#include "app/linux/Iggy/include/rrCore.h" +#include "app/common/Iggy/include/rrCore.h" class SignTileEntity; class UILayer; 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 761874e0a..7001ea596 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 @@ -10,7 +10,7 @@ #include "app/common/UI/UILayer.h" #include "app/common/UI/UIScene.h" #include "app/common/Game.h" -#include "app/linux/Linux_UIController.h" +#include "app/common/UI/ConsoleUIController.h" #include "minecraft/Console_Debug_enum.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.h b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.h index a49e80444..6fd744c92 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.h +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.h @@ -8,7 +8,7 @@ #include "app/common/UI/Controls/UIControl_Label.h" #include "app/common/UI/Controls/UIControl_PlayerList.h" #include "app/common/UI/UIScene.h" -#include "app/linux/Iggy/include/rrCore.h" +#include "app/common/Iggy/include/rrCore.h" #include "platform/network/NetTypes.h" class INetworkPlayer; diff --git a/targets/app/common/UI/Scenes/UIScene_ConnectingProgress.cpp b/targets/app/common/UI/Scenes/UIScene_ConnectingProgress.cpp index bbecfb9b1..68f002824 100644 --- a/targets/app/common/UI/Scenes/UIScene_ConnectingProgress.cpp +++ b/targets/app/common/UI/Scenes/UIScene_ConnectingProgress.cpp @@ -9,7 +9,7 @@ #include "app/common/UI/UILayer.h" #include "app/common/UI/UIScene.h" #include "app/common/Game.h" -#include "app/linux/Linux_UIController.h" +#include "app/common/UI/ConsoleUIController.h" #include "java/System.h" #include "minecraft/GameEnums.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/app/common/UI/Scenes/UIScene_ConnectingProgress.h b/targets/app/common/UI/Scenes/UIScene_ConnectingProgress.h index 7ede9166d..77142221c 100644 --- a/targets/app/common/UI/Scenes/UIScene_ConnectingProgress.h +++ b/targets/app/common/UI/Scenes/UIScene_ConnectingProgress.h @@ -8,7 +8,7 @@ #include "app/common/UI/Controls/UIControl_Label.h" #include "app/common/UI/Controls/UIControl_Progress.h" #include "app/common/UI/UIScene.h" -#include "app/linux/Iggy/include/rrCore.h" +#include "app/common/Iggy/include/rrCore.h" class UILayer; diff --git a/targets/app/common/UI/Scenes/UIScene_FullscreenProgress.cpp b/targets/app/common/UI/Scenes/UIScene_FullscreenProgress.cpp index 123e3b2b9..5b267ba42 100644 --- a/targets/app/common/UI/Scenes/UIScene_FullscreenProgress.cpp +++ b/targets/app/common/UI/Scenes/UIScene_FullscreenProgress.cpp @@ -12,7 +12,7 @@ #include "app/common/UI/UILayer.h" #include "app/common/UI/UIScene.h" #include "app/common/Game.h" -#include "app/linux/Linux_UIController.h" +#include "app/common/UI/ConsoleUIController.h" #include "minecraft/GameEnums.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/ProgressRenderer.h" diff --git a/targets/app/common/UI/Scenes/UIScene_FullscreenProgress.h b/targets/app/common/UI/Scenes/UIScene_FullscreenProgress.h index ad2e219c7..7fd8730cf 100644 --- a/targets/app/common/UI/Scenes/UIScene_FullscreenProgress.h +++ b/targets/app/common/UI/Scenes/UIScene_FullscreenProgress.h @@ -9,7 +9,7 @@ #include "app/common/UI/Controls/UIControl_Label.h" #include "app/common/UI/Controls/UIControl_Progress.h" #include "app/common/UI/UIScene.h" -#include "app/linux/Iggy/include/rrCore.h" +#include "app/common/Iggy/include/rrCore.h" class C4JThread; class UILayer; diff --git a/targets/app/common/UI/Scenes/UIScene_Keyboard.cpp b/targets/app/common/UI/Scenes/UIScene_Keyboard.cpp index ae36113cb..e81b0e72e 100644 --- a/targets/app/common/UI/Scenes/UIScene_Keyboard.cpp +++ b/targets/app/common/UI/Scenes/UIScene_Keyboard.cpp @@ -6,7 +6,7 @@ #include "app/common/UI/UILayer.h" #include "app/common/UI/UIScene.h" #include "app/common/Game.h" -#include "app/linux/Linux_UIController.h" +#include "app/common/UI/ConsoleUIController.h" #include "minecraft/GameTypes.h" #include "strings.h" #include "util/StringHelpers.h" diff --git a/targets/app/common/UI/Scenes/UIScene_Keyboard.h b/targets/app/common/UI/Scenes/UIScene_Keyboard.h index 83eb9b4d6..3c1cd0e57 100644 --- a/targets/app/common/UI/Scenes/UIScene_Keyboard.h +++ b/targets/app/common/UI/Scenes/UIScene_Keyboard.h @@ -7,11 +7,11 @@ #include "app/common/UI/Controls/UIControl_Label.h" #include "app/common/UI/Controls/UIControl_TextInput.h" #include "app/common/UI/UIScene.h" -#include "app/linux/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif -#include "app/linux/Iggy/include/rrCore.h" +#include "app/common/Iggy/include/rrCore.h" class UILayer; diff --git a/targets/app/common/UI/Scenes/UIScene_MessageBox.cpp b/targets/app/common/UI/Scenes/UIScene_MessageBox.cpp index 124da3915..6d232223f 100644 --- a/targets/app/common/UI/Scenes/UIScene_MessageBox.cpp +++ b/targets/app/common/UI/Scenes/UIScene_MessageBox.cpp @@ -7,7 +7,7 @@ #include "app/common/UI/UILayer.h" #include "app/common/UI/UIScene.h" #include "app/common/Game.h" -#include "app/linux/Linux_UIController.h" +#include "app/common/UI/ConsoleUIController.h" #include "platform/PlatformTypes.h" #include "platform/profile/profile.h" #include "strings.h" diff --git a/targets/app/common/UI/Scenes/UIScene_MessageBox.h b/targets/app/common/UI/Scenes/UIScene_MessageBox.h index aaf07e0bd..7f086b4b0 100644 --- a/targets/app/common/UI/Scenes/UIScene_MessageBox.h +++ b/targets/app/common/UI/Scenes/UIScene_MessageBox.h @@ -6,12 +6,12 @@ #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/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #include "platform/storage/storage.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif -#include "app/linux/Iggy/include/rrCore.h" +#include "app/common/Iggy/include/rrCore.h" class UILayer; diff --git a/targets/app/common/UI/Scenes/UIScene_QuadrantSignin.cpp b/targets/app/common/UI/Scenes/UIScene_QuadrantSignin.cpp index 7540fb51d..a3515f42a 100644 --- a/targets/app/common/UI/Scenes/UIScene_QuadrantSignin.cpp +++ b/targets/app/common/UI/Scenes/UIScene_QuadrantSignin.cpp @@ -8,7 +8,7 @@ #include "app/common/UI/UILayer.h" #include "app/common/UI/UIScene.h" #include "app/common/Game.h" -#include "app/linux/Linux_UIController.h" +#include "app/common/UI/ConsoleUIController.h" #include "platform/PlatformTypes.h" #include "platform/input/input.h" #include "platform/profile/profile.h" diff --git a/targets/app/common/UI/Scenes/UIScene_QuadrantSignin.h b/targets/app/common/UI/Scenes/UIScene_QuadrantSignin.h index 88f52f472..dc7a4c684 100644 --- a/targets/app/common/UI/Scenes/UIScene_QuadrantSignin.h +++ b/targets/app/common/UI/Scenes/UIScene_QuadrantSignin.h @@ -9,9 +9,9 @@ #include "app/common/UI/Controls/UIControl_BitmapIcon.h" #include "app/common/UI/Controls/UIControl_Label.h" #include "app/common/UI/UIScene.h" -#include "app/linux/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif class UILayer; diff --git a/targets/app/common/UI/UIBitmapFont.cpp b/targets/app/common/UI/UIBitmapFont.cpp index c6fe24590..2ba16f8d4 100644 --- a/targets/app/common/UI/UIBitmapFont.cpp +++ b/targets/app/common/UI/UIBitmapFont.cpp @@ -1,11 +1,11 @@ #include "UIBitmapFont.h" -#include "app/linux/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif #include "UIFontData.h" -#include "app/linux/Iggy/include/rrCore.h" +#include "app/common/Iggy/include/rrCore.h" #include "minecraft/client/BufferedImage.h" ///////////////////////////// diff --git a/targets/app/common/UI/UIBitmapFont.h b/targets/app/common/UI/UIBitmapFont.h index 48d8ed9ce..2d0baf83b 100644 --- a/targets/app/common/UI/UIBitmapFont.h +++ b/targets/app/common/UI/UIBitmapFont.h @@ -2,11 +2,11 @@ #include -#include "app/linux/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif -#include "app/linux/Iggy/include/rrCore.h" +#include "app/common/Iggy/include/rrCore.h" struct SFontData; class CFontData; diff --git a/targets/app/common/UI/UIController.cpp b/targets/app/common/UI/UIController.cpp index 96b40f41d..2b6551edc 100644 --- a/targets/app/common/UI/UIController.cpp +++ b/targets/app/common/UI/UIController.cpp @@ -26,16 +26,16 @@ #include "app/common/UI/UIScene.h" #include "app/common/UI/UIString.h" #include "app/common/UI/UITTFFont.h" -#include "app/linux/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #include "minecraft/GameEnums.h" #include "platform/input/input.h" #include "platform/profile/profile.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif #include "UIFontData.h" #include "app/common/Game.h" -#include "app/linux/Linux_UIController.h" +#include "app/common/UI/ConsoleUIController.h" #include "java/System.h" #include "minecraft/client/BufferedImage.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/app/common/UI/UIController.h b/targets/app/common/UI/UIController.h index 7a76de829..ade585821 100644 --- a/targets/app/common/UI/UIController.h +++ b/targets/app/common/UI/UIController.h @@ -12,9 +12,9 @@ #ifdef __linux__ -#include "app/linux/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif #elif defined(_WINDOWS64) @@ -26,7 +26,7 @@ #include "app/common/UI/All Platforms/UIEnums.h" #include "app/common/UI/All Platforms/UIStructs.h" #include "app/common/UI/Controls/UIControl.h" -#include "app/linux/Iggy/include/rrCore.h" +#include "app/common/Iggy/include/rrCore.h" #include "app/common/Audio/SoundTypes.h" #include "platform/PlatformTypes.h" #include "platform/input/input.h" diff --git a/targets/app/common/UI/UIGroup.cpp b/targets/app/common/UI/UIGroup.cpp index 2b8e35d65..9a9b62e7a 100644 --- a/targets/app/common/UI/UIGroup.cpp +++ b/targets/app/common/UI/UIGroup.cpp @@ -4,9 +4,9 @@ #include "app/common/Tutorial/TutorialMode.h" #include "app/common/UI/All Platforms/UIEnums.h" #include "app/common/UI/UILayer.h" -#include "app/linux/Iggy/include/rrCore.h" +#include "app/common/Iggy/include/rrCore.h" #include "app/common/Game.h" -#include "app/linux/Linux_UIController.h" +#include "app/common/UI/ConsoleUIController.h" #include "minecraft/client/MemoryTracker.h" #include "minecraft/client/Minecraft.h" #include "platform/profile/profile.h" diff --git a/targets/app/common/UI/UIGroup.h b/targets/app/common/UI/UIGroup.h index 162369f53..0cbec519c 100644 --- a/targets/app/common/UI/UIGroup.h +++ b/targets/app/common/UI/UIGroup.h @@ -3,7 +3,7 @@ #include "UILayer.h" #include "app/common/UI/All Platforms/UIEnums.h" -#include "app/linux/Iggy/include/rrCore.h" +#include "app/common/Iggy/include/rrCore.h" #include "platform/renderer/renderer.h" class UIComponent_Tooltips; diff --git a/targets/app/common/UI/UILayer.cpp b/targets/app/common/UI/UILayer.cpp index 7033e9aef..29d82b0ee 100644 --- a/targets/app/common/UI/UILayer.cpp +++ b/targets/app/common/UI/UILayer.cpp @@ -75,9 +75,9 @@ #include "app/common/UI/Scenes/UIScene_Timer.h" #include "app/common/UI/UIGroup.h" #include "app/common/UI/UIScene.h" -#include "app/linux/Iggy/include/rrCore.h" +#include "app/common/Iggy/include/rrCore.h" #include "app/common/Game.h" -#include "app/linux/Linux_UIController.h" +#include "app/common/UI/ConsoleUIController.h" #include "platform/renderer/renderer.h" UILayer::UILayer(UIGroup* parent) { diff --git a/targets/app/common/UI/UILayer.h b/targets/app/common/UI/UILayer.h index 8e6d7fe5b..c5c06cb6e 100644 --- a/targets/app/common/UI/UILayer.h +++ b/targets/app/common/UI/UILayer.h @@ -7,7 +7,7 @@ #include #include "app/common/UI/All Platforms/UIEnums.h" -#include "app/linux/Iggy/include/rrCore.h" +#include "app/common/Iggy/include/rrCore.h" #include "platform/renderer/renderer.h" // using namespace std; diff --git a/targets/app/common/UI/UIScene.cpp b/targets/app/common/UI/UIScene.cpp index a551b2b81..f4434a368 100644 --- a/targets/app/common/UI/UIScene.cpp +++ b/targets/app/common/UI/UIScene.cpp @@ -11,15 +11,15 @@ #include "app/common/UI/UIController.h" #include "app/common/UI/UIGroup.h" #include "app/common/UI/UILayer.h" -#include "app/linux/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #include "platform/PlatformTypes.h" #include "platform/renderer/renderer.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif -#include "app/linux/Iggy/include/rrCore.h" +#include "app/common/Iggy/include/rrCore.h" #include "app/common/Game.h" -#include "app/linux/Linux_UIController.h" +#include "app/common/UI/ConsoleUIController.h" #include "java/System.h" #include "minecraft/client/Lighting.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/app/common/UI/UIScene.h b/targets/app/common/UI/UIScene.h index a597b5735..72dad25a9 100644 --- a/targets/app/common/UI/UIScene.h +++ b/targets/app/common/UI/UIScene.h @@ -16,12 +16,12 @@ #include "app/common/UI/All Platforms/UIEnums.h" #include "app/common/UI/All Platforms/UIStructs.h" #include "app/common/UI/Controls/UIControl_Base.h" -#include "app/linux/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #include "platform/renderer/renderer.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif -#include "app/linux/Iggy/include/rrCore.h" +#include "app/common/Iggy/include/rrCore.h" class ItemRenderer; class UILayer; diff --git a/targets/app/common/UI/UITTFFont.cpp b/targets/app/common/UI/UITTFFont.cpp index f4d29db88..aeffffb07 100644 --- a/targets/app/common/UI/UITTFFont.cpp +++ b/targets/app/common/UI/UITTFFont.cpp @@ -2,11 +2,11 @@ #include -#include "app/linux/Iggy/include/iggy.h" +#include "app/common/Iggy/include/iggy.h" #ifndef _ENABLEIGGY -#include "app/linux/Stubs/iggy_stubs.h" +#include "app/common/Iggy/iggy_stubs.h" #endif -#include "app/linux/Iggy/include/rrCore.h" +#include "app/common/Iggy/include/rrCore.h" #include "app/common/Game.h" #include "platform/fs/fs.h" #include "util/StringHelpers.h" diff --git a/targets/app/common/UI/UITTFFont.h b/targets/app/common/UI/UITTFFont.h index 736ed9ba6..b5df051b6 100644 --- a/targets/app/common/UI/UITTFFont.h +++ b/targets/app/common/UI/UITTFFont.h @@ -3,7 +3,7 @@ #include #include -#include "app/linux/Iggy/include/rrCore.h" +#include "app/common/Iggy/include/rrCore.h" class UITTFFont { private: diff --git a/targets/app/common_sources.txt b/targets/app/common_sources.txt index 03640563a..14600167c 100644 --- a/targets/app/common_sources.txt +++ b/targets/app/common_sources.txt @@ -86,6 +86,8 @@ common/Tutorial/Tasks/XuiCraftingTask.cpp common/Tutorial/Tutorial.cpp common/Tutorial/TutorialMessage.cpp common/Tutorial/TutorialMode.cpp +common/Iggy/gdraw/gdraw.c +common/UI/ConsoleUIController.cpp common/UI/All Platforms/ArchiveFile.cpp common/UI/All Platforms/IUIScene_AbstractContainerMenu.cpp common/UI/All Platforms/IUIScene_AnvilMenu.cpp diff --git a/targets/app/linux/Linux_Minecraft.cpp b/targets/app/linux/Linux_Minecraft.cpp index 1c5b93e94..b51a2c55f 100644 --- a/targets/app/linux/Linux_Minecraft.cpp +++ b/targets/app/linux/Linux_Minecraft.cpp @@ -62,7 +62,7 @@ static void sigsegv_handler(int sig) { #include "app/common/Audio/SoundEngine.h" #include "app/common/Network/GameNetworkManager.h" #include "app/common/Game.h" -#include "app/linux/Linux_UIController.h" +#include "app/common/UI/ConsoleUIController.h" #include "minecraft/world/level/storage/ConsoleSaveFileIO/compression.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/renderer/Tesselator.h" diff --git a/targets/app/linux_sources.txt b/targets/app/linux_sources.txt index 2db425e4b..5028fdf92 100644 --- a/targets/app/linux_sources.txt +++ b/targets/app/linux_sources.txt @@ -1,3 +1 @@ -linux/Iggy/gdraw/gdraw.c linux/Linux_Minecraft.cpp -linux/Linux_UIController.cpp diff --git a/targets/minecraft/client/Minecraft.cpp b/targets/minecraft/client/Minecraft.cpp index 2ab42b8fa..025965413 100644 --- a/targets/minecraft/client/Minecraft.cpp +++ b/targets/minecraft/client/Minecraft.cpp @@ -20,7 +20,7 @@ #include "minecraft/world/tutorial/ITutorial.h" #include "app/common/UI/All Platforms/UIEnums.h" #include "app/common/UI/All Platforms/UIStructs.h" -#include "app/linux/Linux_UIController.h" +#include "app/common/UI/ConsoleUIController.h" #include "java/Class.h" #include "java/Random.h" #include "minecraft/GameEnums.h" diff --git a/targets/minecraft/client/gui/CreateWorldScreen.cpp b/targets/minecraft/client/gui/CreateWorldScreen.cpp index f4f76b0af..341baec9c 100644 --- a/targets/minecraft/client/gui/CreateWorldScreen.cpp +++ b/targets/minecraft/client/gui/CreateWorldScreen.cpp @@ -19,7 +19,7 @@ // concrete type include. #include "app/common/Network/GameNetworkManager.h" #include "app/common/UI/All Platforms/UIStructs.h" -#include "app/linux/Linux_UIController.h" +#include "app/common/UI/ConsoleUIController.h" #include "minecraft/SharedConstants.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/Options.h" diff --git a/targets/minecraft/client/gui/Gui.cpp b/targets/minecraft/client/gui/Gui.cpp index 14266d9ef..e9d83a348 100644 --- a/targets/minecraft/client/gui/Gui.cpp +++ b/targets/minecraft/client/gui/Gui.cpp @@ -4,7 +4,7 @@ #include #include "Facing.h" -#include "app/linux/Linux_UIController.h" +#include "app/common/UI/ConsoleUIController.h" #include "java/Color.h" #include "java/JavaMath.h" #include "java/Random.h" diff --git a/targets/minecraft/client/multiplayer/ClientConnection.cpp b/targets/minecraft/client/multiplayer/ClientConnection.cpp index c03b834fe..ea16096e3 100644 --- a/targets/minecraft/client/multiplayer/ClientConnection.cpp +++ b/targets/minecraft/client/multiplayer/ClientConnection.cpp @@ -19,7 +19,7 @@ #include "minecraft/world/tutorial/ITutorial.h" #include "app/common/UI/All Platforms/UIStructs.h" #include "app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.h" -#include "app/linux/Linux_UIController.h" +#include "app/common/UI/ConsoleUIController.h" #include "java/Class.h" #include "java/InputOutputStream/ByteArrayInputStream.h" #include "java/InputOutputStream/DataInputStream.h" diff --git a/targets/minecraft/client/player/LocalPlayer.cpp b/targets/minecraft/client/player/LocalPlayer.cpp index 0ce1edcfa..63173838c 100644 --- a/targets/minecraft/client/player/LocalPlayer.cpp +++ b/targets/minecraft/client/player/LocalPlayer.cpp @@ -33,7 +33,7 @@ #include "app/common/Audio/ConsoleSoundEngine.h" #include "platform/profile/ProfileConstants.h" #include "minecraft/world/tutorial/ITutorial.h" -#include "app/linux/Linux_UIController.h" +#include "app/common/UI/ConsoleUIController.h" #include "minecraft/SharedConstants.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/gui/Gui.h" diff --git a/targets/minecraft/client/skins/AbstractTexturePack.cpp b/targets/minecraft/client/skins/AbstractTexturePack.cpp index cf5e77f24..af529e6e5 100644 --- a/targets/minecraft/client/skins/AbstractTexturePack.cpp +++ b/targets/minecraft/client/skins/AbstractTexturePack.cpp @@ -5,7 +5,7 @@ #include #include -#include "app/linux/Linux_UIController.h" +#include "app/common/UI/ConsoleUIController.h" #include "java/File.h" #include "java/InputOutputStream/BufferedReader.h" #include "java/InputOutputStream/FileInputStream.h" diff --git a/targets/minecraft/client/skins/DLCTexturePack.cpp b/targets/minecraft/client/skins/DLCTexturePack.cpp index f5562b547..da9b38edd 100644 --- a/targets/minecraft/client/skins/DLCTexturePack.cpp +++ b/targets/minecraft/client/skins/DLCTexturePack.cpp @@ -15,7 +15,7 @@ #include "app/common/DLC/DLCTextureFile.h" #include "app/common/DLC/DLCUIDataFile.h" #include "app/common/UI/All Platforms/ArchiveFile.h" -#include "app/linux/Linux_UIController.h" +#include "app/common/UI/ConsoleUIController.h" #include "java/File.h" #include "minecraft/GameEnums.h" #include "minecraft/IGameServices.h" diff --git a/targets/minecraft/client/skins/TexturePackRepository.cpp b/targets/minecraft/client/skins/TexturePackRepository.cpp index bfb56647e..c04c55476 100644 --- a/targets/minecraft/client/skins/TexturePackRepository.cpp +++ b/targets/minecraft/client/skins/TexturePackRepository.cpp @@ -9,7 +9,7 @@ #include "DefaultTexturePack.h" #include "app/common/DLC/DLCManager.h" #include "app/common/DLC/DLCPack.h" -#include "app/linux/Linux_UIController.h" +#include "app/common/UI/ConsoleUIController.h" #include "java/File.h" #include "minecraft/GameEnums.h" #include "minecraft/IGameServices.h"