remove remaining Linux implementations for common ones

targets/app/common/Audio/SoundEngine.cpp

@@ -11,7 +11,7 @@
 #include <vector>
 
 #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"

targets/app/common/Audio/SoundEngine.h

@@ -8,7 +8,7 @@ class Random;
 #include <string>
 
 #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"
 

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"

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"

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"

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"

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"

targets/app/common/Iggy/gdraw/gdraw.c

@@ -10,7 +10,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "app/linux/Iggy/include/iggy.h"
+#include "app/common/Iggy/include/iggy.h"
 #include "SDL_video.h"
 
 #ifndef _ENABLEIGGY

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"
 

targets/app/common/Iggy/iggy_stubs.h

@@ -6,7 +6,7 @@
 #include <cstdio>
 #include <cstring>
 
-#include "app/linux/Iggy/include/iggy.h"
+#include "app/common/Iggy/include/iggy.h"
 
 #define STUBBED \
     {}

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"
 

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;

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;
 

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;

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)

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;

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"

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;
 

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;

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;

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,

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;

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"

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;

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"

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;
 

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"
 

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 {

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"
 

targets/app/common/UI/Controls/UIControl.h

@@ -2,11 +2,11 @@
 
 #include <string>
 
-#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;
 

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() {

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

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() {

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"
 

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"
 

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"
 

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"
 

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"
 

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() {

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"
 

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() {}

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"
 

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() {}

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"
 

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,

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"
 

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() {}

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:

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"

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"

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"

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"

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() {}
 

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:

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"
 

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"
 

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"
 

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"
 

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"

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"
 

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"

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"
 

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,

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"
 

targets/app/common/UI/Controls/UIControl_PlayerSkinPreview.cpp

@@ -7,11 +7,11 @@
 #include <vector>
 
 #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"

targets/app/common/UI/Controls/UIControl_PlayerSkinPreview.h

@@ -6,9 +6,9 @@
 #include <vector>
 
 #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"

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"
 

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"
 

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,

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"
 

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"
 

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:

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; }

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"
 

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"
 

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"
 

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"
 

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"
 

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() {}

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:

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() {}

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"
 

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"

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;

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"