diff --git a/targets/app/common/src/UI/Components/UIComponent_Chat.cpp b/targets/app/common/src/UI/Components/UIComponent_Chat.cpp index a784d42db..4f4a63493 100644 --- a/targets/app/common/src/UI/Components/UIComponent_Chat.cpp +++ b/targets/app/common/src/UI/Components/UIComponent_Chat.cpp @@ -8,6 +8,9 @@ #include "app/common/src/UI/UILayer.h" #include "app/common/src/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif #include "app/linux/Iggy/include/rrCore.h" #include "app/linux/Linux_UIController.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/app/common/src/UI/Components/UIComponent_DebugUIMarketingGuide.cpp b/targets/app/common/src/UI/Components/UIComponent_DebugUIMarketingGuide.cpp index 61ae04449..68253c8b9 100644 --- a/targets/app/common/src/UI/Components/UIComponent_DebugUIMarketingGuide.cpp +++ b/targets/app/common/src/UI/Components/UIComponent_DebugUIMarketingGuide.cpp @@ -2,6 +2,9 @@ #include "app/common/src/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif #include "app/linux/Iggy/include/rrCore.h" class UILayer; diff --git a/targets/app/common/src/UI/Components/UIComponent_DebugUIMarketingGuide.h b/targets/app/common/src/UI/Components/UIComponent_DebugUIMarketingGuide.h index f969736ec..180474367 100644 --- a/targets/app/common/src/UI/Components/UIComponent_DebugUIMarketingGuide.h +++ b/targets/app/common/src/UI/Components/UIComponent_DebugUIMarketingGuide.h @@ -6,6 +6,9 @@ #include "app/common/src/UI/Controls/UIControl_Label.h" #include "app/common/src/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif class UILayer; diff --git a/targets/app/common/src/UI/Components/UIComponent_MenuBackground.cpp b/targets/app/common/src/UI/Components/UIComponent_MenuBackground.cpp index b4ed9897b..a6e5640ea 100644 --- a/targets/app/common/src/UI/Components/UIComponent_MenuBackground.cpp +++ b/targets/app/common/src/UI/Components/UIComponent_MenuBackground.cpp @@ -4,6 +4,9 @@ #include "app/common/src/UI/UILayer.h" #include "app/common/src/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif #include "app/linux/Iggy/include/rrCore.h" #include "app/linux/Linux_UIController.h" diff --git a/targets/app/common/src/UI/Components/UIComponent_Panorama.cpp b/targets/app/common/src/UI/Components/UIComponent_Panorama.cpp index bb9f6f746..cc449f243 100644 --- a/targets/app/common/src/UI/Components/UIComponent_Panorama.cpp +++ b/targets/app/common/src/UI/Components/UIComponent_Panorama.cpp @@ -8,6 +8,9 @@ #include "app/common/src/UI/UILayer.h" #include "app/common/src/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif #include "app/linux/Iggy/include/rrCore.h" #include "app/linux/Linux_UIController.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/app/common/src/UI/Components/UIComponent_Panorama.h b/targets/app/common/src/UI/Components/UIComponent_Panorama.h index 40fbdd131..43c761321 100644 --- a/targets/app/common/src/UI/Components/UIComponent_Panorama.h +++ b/targets/app/common/src/UI/Components/UIComponent_Panorama.h @@ -6,6 +6,9 @@ #include "app/common/src/UI/All Platforms/UIEnums.h" #include "app/common/src/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif #include "app/linux/Iggy/include/rrCore.h" class UILayer; diff --git a/targets/app/common/src/UI/Components/UIComponent_PressStartToPlay.h b/targets/app/common/src/UI/Components/UIComponent_PressStartToPlay.h index cadf81339..ca52c2a6f 100644 --- a/targets/app/common/src/UI/Components/UIComponent_PressStartToPlay.h +++ b/targets/app/common/src/UI/Components/UIComponent_PressStartToPlay.h @@ -8,6 +8,9 @@ #include "app/common/src/UI/Controls/UIControl_Label.h" #include "app/common/src/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif class UILayer; diff --git a/targets/app/common/src/UI/Components/UIComponent_Tooltips.cpp b/targets/app/common/src/UI/Components/UIComponent_Tooltips.cpp index 21b193c24..7abf7cca0 100644 --- a/targets/app/common/src/UI/Components/UIComponent_Tooltips.cpp +++ b/targets/app/common/src/UI/Components/UIComponent_Tooltips.cpp @@ -8,6 +8,9 @@ #include "app/common/src/UI/UIScene.h" #include "app/common/src/UI/UIString.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif #include "app/linux/Iggy/include/rrCore.h" #include "app/linux/Linux_App.h" #include "app/linux/Linux_UIController.h" diff --git a/targets/app/common/src/UI/Components/UIComponent_Tooltips.h b/targets/app/common/src/UI/Components/UIComponent_Tooltips.h index ea0e5fe99..dc263cddb 100644 --- a/targets/app/common/src/UI/Components/UIComponent_Tooltips.h +++ b/targets/app/common/src/UI/Components/UIComponent_Tooltips.h @@ -10,6 +10,9 @@ #include "app/common/src/UI/UIScene.h" #include "app/common/src/UI/UIString.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif #include "app/linux/Iggy/include/rrCore.h" class UILayer; diff --git a/targets/app/common/src/UI/Components/UIComponent_TutorialPopup.h b/targets/app/common/src/UI/Components/UIComponent_TutorialPopup.h index 8fbbd8f0c..82735f1da 100644 --- a/targets/app/common/src/UI/Components/UIComponent_TutorialPopup.h +++ b/targets/app/common/src/UI/Components/UIComponent_TutorialPopup.h @@ -10,6 +10,9 @@ #include "app/common/src/UI/Controls/UIControl_Label.h" #include "app/common/src/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif #include "app/linux/Iggy/include/rrCore.h" class ItemInstance; diff --git a/targets/app/common/src/UI/Components/UIScene_HUD.h b/targets/app/common/src/UI/Components/UIScene_HUD.h index b4a72d95b..a565b1da0 100644 --- a/targets/app/common/src/UI/Components/UIScene_HUD.h +++ b/targets/app/common/src/UI/Components/UIScene_HUD.h @@ -9,6 +9,9 @@ #include "app/common/src/UI/Controls/UIControl_Label.h" #include "app/common/src/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif #include "app/linux/Iggy/include/rrCore.h" class UILayer; diff --git a/targets/app/common/src/UI/Controls/UIControl.cpp b/targets/app/common/src/UI/Controls/UIControl.cpp index bb61a84ad..c647c460f 100644 --- a/targets/app/common/src/UI/Controls/UIControl.cpp +++ b/targets/app/common/src/UI/Controls/UIControl.cpp @@ -2,12 +2,12 @@ #include "app/common/src/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif #include "app/linux/Iggy/include/rrCore.h" #include "app/linux/Linux_App.h" #include "java/JavaMath.h" -#ifndef _ENABLESHIGGY -#include "app/linux/Stubs/iggy_stubs.h" -#endif UIControl::UIControl() { m_parentScene = nullptr; diff --git a/targets/app/common/src/UI/Controls/UIControl.h b/targets/app/common/src/UI/Controls/UIControl.h index 1d57c74da..fd8d57ab3 100644 --- a/targets/app/common/src/UI/Controls/UIControl.h +++ b/targets/app/common/src/UI/Controls/UIControl.h @@ -3,6 +3,9 @@ #include #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif #include "app/linux/Iggy/include/rrCore.h" class UIScene; diff --git a/targets/app/common/src/UI/Controls/UIControl_Base.cpp b/targets/app/common/src/UI/Controls/UIControl_Base.cpp index c5c3caf65..b2cf3d497 100644 --- a/targets/app/common/src/UI/Controls/UIControl_Base.cpp +++ b/targets/app/common/src/UI/Controls/UIControl_Base.cpp @@ -7,6 +7,9 @@ #include "app/common/src/UI/UIScene.h" #include "app/common/src/UI/UIString.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif #include "app/linux/Iggy/include/rrCore.h" #include "console_helpers/StringHelpers.h" diff --git a/targets/app/common/src/UI/Controls/UIControl_Base.h b/targets/app/common/src/UI/Controls/UIControl_Base.h index 2ba58b458..352a88ab0 100644 --- a/targets/app/common/src/UI/Controls/UIControl_Base.h +++ b/targets/app/common/src/UI/Controls/UIControl_Base.h @@ -6,6 +6,9 @@ #include "app/common/src/UI/UIScene.h" #include "app/common/src/UI/UIString.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif // This class maps to the FJ_Base class in actionscript class UIControl_Base : public UIControl { diff --git a/targets/app/common/src/UI/Controls/UIControl_BeaconEffectButton.cpp b/targets/app/common/src/UI/Controls/UIControl_BeaconEffectButton.cpp index 201a460df..ed88a0bc9 100644 --- a/targets/app/common/src/UI/Controls/UIControl_BeaconEffectButton.cpp +++ b/targets/app/common/src/UI/Controls/UIControl_BeaconEffectButton.cpp @@ -3,6 +3,9 @@ #include "app/common/src/UI/Controls/UIControl.h" #include "app/common/src/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif UIControl_BeaconEffectButton::UIControl_BeaconEffectButton() { m_data = 0; diff --git a/targets/app/common/src/UI/Controls/UIControl_BeaconEffectButton.h b/targets/app/common/src/UI/Controls/UIControl_BeaconEffectButton.h index 1b1dd4101..eb4db2422 100644 --- a/targets/app/common/src/UI/Controls/UIControl_BeaconEffectButton.h +++ b/targets/app/common/src/UI/Controls/UIControl_BeaconEffectButton.h @@ -6,6 +6,9 @@ #include "app/common/src/UI/Controls/UIControl_BeaconEffectButton.h" #include "app/common/src/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif #include "UIControl.h" class UIControl_BeaconEffectButton : public UIControl { diff --git a/targets/app/common/src/UI/Controls/UIControl_BitmapIcon.cpp b/targets/app/common/src/UI/Controls/UIControl_BitmapIcon.cpp index 29b113f6d..526a1de01 100644 --- a/targets/app/common/src/UI/Controls/UIControl_BitmapIcon.cpp +++ b/targets/app/common/src/UI/Controls/UIControl_BitmapIcon.cpp @@ -3,6 +3,9 @@ #include "app/common/src/UI/Controls/UIControl.h" #include "app/common/src/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif #include "console_helpers/StringHelpers.h" bool UIControl_BitmapIcon::setupControl(UIScene* scene, IggyValuePath* parent, diff --git a/targets/app/common/src/UI/Controls/UIControl_BitmapIcon.h b/targets/app/common/src/UI/Controls/UIControl_BitmapIcon.h index 8a89f4069..f6b037a59 100644 --- a/targets/app/common/src/UI/Controls/UIControl_BitmapIcon.h +++ b/targets/app/common/src/UI/Controls/UIControl_BitmapIcon.h @@ -6,6 +6,9 @@ #include "app/common/src/UI/Controls/UIControl_BitmapIcon.h" #include "app/common/src/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif #include "UIControl.h" class UIControl_BitmapIcon : public UIControl { diff --git a/targets/app/common/src/UI/Controls/UIControl_Button.cpp b/targets/app/common/src/UI/Controls/UIControl_Button.cpp index 6f5ff5ad0..da428eed4 100644 --- a/targets/app/common/src/UI/Controls/UIControl_Button.cpp +++ b/targets/app/common/src/UI/Controls/UIControl_Button.cpp @@ -5,6 +5,9 @@ #include "app/common/src/UI/UIScene.h" #include "app/common/src/UI/UIString.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif #include "console_helpers/StringHelpers.h" UIControl_Button::UIControl_Button() {} diff --git a/targets/app/common/src/UI/Controls/UIControl_Button.h b/targets/app/common/src/UI/Controls/UIControl_Button.h index a568fb743..54260d16a 100644 --- a/targets/app/common/src/UI/Controls/UIControl_Button.h +++ b/targets/app/common/src/UI/Controls/UIControl_Button.h @@ -7,6 +7,9 @@ #include "app/common/src/UI/UIScene.h" #include "app/common/src/UI/UIString.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif #include "UIControl_Base.h" class UIControl_Button : public UIControl_Base { diff --git a/targets/app/common/src/UI/Controls/UIControl_ButtonList.cpp b/targets/app/common/src/UI/Controls/UIControl_ButtonList.cpp index 4e46679a6..5e9c72962 100644 --- a/targets/app/common/src/UI/Controls/UIControl_ButtonList.cpp +++ b/targets/app/common/src/UI/Controls/UIControl_ButtonList.cpp @@ -5,6 +5,9 @@ #include "app/common/src/UI/UIScene.h" #include "app/common/src/UI/UIString.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif #include "app/linux/Iggy/include/rrCore.h" #include "console_helpers/StringHelpers.h" diff --git a/targets/app/common/src/UI/Controls/UIControl_ButtonList.h b/targets/app/common/src/UI/Controls/UIControl_ButtonList.h index 6dc895fd2..144cff072 100644 --- a/targets/app/common/src/UI/Controls/UIControl_ButtonList.h +++ b/targets/app/common/src/UI/Controls/UIControl_ButtonList.h @@ -8,6 +8,9 @@ #include "app/common/src/UI/UIScene.h" #include "app/common/src/UI/UIString.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif #include "UIControl_Base.h" class UIControl_ButtonList : public UIControl_Base { diff --git a/targets/app/common/src/UI/Controls/UIControl_CheckBox.cpp b/targets/app/common/src/UI/Controls/UIControl_CheckBox.cpp index 52bf1132c..65183b184 100644 --- a/targets/app/common/src/UI/Controls/UIControl_CheckBox.cpp +++ b/targets/app/common/src/UI/Controls/UIControl_CheckBox.cpp @@ -5,6 +5,9 @@ #include "app/common/src/UI/UIScene.h" #include "app/common/src/UI/UIString.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif #include "app/linux/Iggy/include/rrCore.h" #include "console_helpers/StringHelpers.h" diff --git a/targets/app/common/src/UI/Controls/UIControl_CheckBox.h b/targets/app/common/src/UI/Controls/UIControl_CheckBox.h index 3f54e1d5b..3c846d90a 100644 --- a/targets/app/common/src/UI/Controls/UIControl_CheckBox.h +++ b/targets/app/common/src/UI/Controls/UIControl_CheckBox.h @@ -7,6 +7,9 @@ #include "app/common/src/UI/UIScene.h" #include "app/common/src/UI/UIString.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif #include "UIControl_Base.h" class UIControl_CheckBox : public UIControl_Base { diff --git a/targets/app/common/src/UI/Controls/UIControl_Cursor.cpp b/targets/app/common/src/UI/Controls/UIControl_Cursor.cpp index 33816bede..74a8b0c3e 100644 --- a/targets/app/common/src/UI/Controls/UIControl_Cursor.cpp +++ b/targets/app/common/src/UI/Controls/UIControl_Cursor.cpp @@ -3,6 +3,9 @@ #include "app/common/src/UI/Controls/UIControl.h" #include "app/common/src/UI/Controls/UIControl_Base.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif UIControl_Cursor::UIControl_Cursor() {} diff --git a/targets/app/common/src/UI/Controls/UIControl_Cursor.h b/targets/app/common/src/UI/Controls/UIControl_Cursor.h index 727b09eec..353bff3b8 100644 --- a/targets/app/common/src/UI/Controls/UIControl_Cursor.h +++ b/targets/app/common/src/UI/Controls/UIControl_Cursor.h @@ -6,6 +6,9 @@ #include "app/common/src/UI/Controls/UIControl_Cursor.h" #include "app/common/src/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif #include "UIControl_Base.h" class UIControl_Cursor : public UIControl_Base { diff --git a/targets/app/common/src/UI/Controls/UIControl_DLCList.cpp b/targets/app/common/src/UI/Controls/UIControl_DLCList.cpp index e95abbb27..95ecfbddc 100644 --- a/targets/app/common/src/UI/Controls/UIControl_DLCList.cpp +++ b/targets/app/common/src/UI/Controls/UIControl_DLCList.cpp @@ -4,6 +4,9 @@ #include "app/common/src/UI/Controls/UIControl_ButtonList.h" #include "app/common/src/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif #include "app/linux/Iggy/include/rrCore.h" #include "console_helpers/StringHelpers.h" diff --git a/targets/app/common/src/UI/Controls/UIControl_DLCList.h b/targets/app/common/src/UI/Controls/UIControl_DLCList.h index 7ad28b3de..959be49ce 100644 --- a/targets/app/common/src/UI/Controls/UIControl_DLCList.h +++ b/targets/app/common/src/UI/Controls/UIControl_DLCList.h @@ -5,6 +5,9 @@ #include "app/common/src/UI/Controls/UIControl_DLCList.h" #include "app/common/src/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif #include "UIControl_ButtonList.h" class UIControl_DLCList : public UIControl_ButtonList { diff --git a/targets/app/common/src/UI/Controls/UIControl_DynamicLabel.cpp b/targets/app/common/src/UI/Controls/UIControl_DynamicLabel.cpp index e5cae77e4..3ae950fc7 100644 --- a/targets/app/common/src/UI/Controls/UIControl_DynamicLabel.cpp +++ b/targets/app/common/src/UI/Controls/UIControl_DynamicLabel.cpp @@ -4,6 +4,9 @@ #include "app/common/src/UI/Controls/UIControl_Base.h" #include "app/common/src/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif #include "app/linux/Iggy/include/rrCore.h" #include "console_helpers/StringHelpers.h" diff --git a/targets/app/common/src/UI/Controls/UIControl_DynamicLabel.h b/targets/app/common/src/UI/Controls/UIControl_DynamicLabel.h index 74b5469d5..f715db092 100644 --- a/targets/app/common/src/UI/Controls/UIControl_DynamicLabel.h +++ b/targets/app/common/src/UI/Controls/UIControl_DynamicLabel.h @@ -6,6 +6,9 @@ #include "app/common/src/UI/Controls/UIControl_Label.h" #include "app/common/src/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif #include "app/linux/Iggy/include/rrCore.h" #include "UIControl_Base.h" diff --git a/targets/app/common/src/UI/Controls/UIControl_EnchantmentBook.cpp b/targets/app/common/src/UI/Controls/UIControl_EnchantmentBook.cpp index 22f887232..4942d20ea 100644 --- a/targets/app/common/src/UI/Controls/UIControl_EnchantmentBook.cpp +++ b/targets/app/common/src/UI/Controls/UIControl_EnchantmentBook.cpp @@ -6,7 +6,10 @@ #include "app/common/src/UI/Controls/UIControl.h" #include "app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.h" #include "app/linux/Iggy/include/iggy.h" -#include "gl3_loader.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif + #include "java/Class.h" #include "minecraft/client/Lighting.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/app/common/src/UI/Controls/UIControl_EnchantmentBook.h b/targets/app/common/src/UI/Controls/UIControl_EnchantmentBook.h index 0709e7316..eab4e9c59 100644 --- a/targets/app/common/src/UI/Controls/UIControl_EnchantmentBook.h +++ b/targets/app/common/src/UI/Controls/UIControl_EnchantmentBook.h @@ -6,6 +6,9 @@ #include "app/common/src/UI/Controls/UIControl_EnchantmentBook.h" #include "app/common/src/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif #include "UIControl.h" #include "java/Random.h" diff --git a/targets/app/common/src/UI/Controls/UIControl_EnchantmentButton.cpp b/targets/app/common/src/UI/Controls/UIControl_EnchantmentButton.cpp index 14e5a5934..68c72955b 100644 --- a/targets/app/common/src/UI/Controls/UIControl_EnchantmentButton.cpp +++ b/targets/app/common/src/UI/Controls/UIControl_EnchantmentButton.cpp @@ -12,9 +12,12 @@ #include "app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.h" #include "app/common/src/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif #include "app/linux/Linux_App.h" #include "console_helpers/StringHelpers.h" -#include "gl3_loader.h" + #include "minecraft/client/Minecraft.h" #include "minecraft/client/gui/Font.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" diff --git a/targets/app/common/src/UI/Controls/UIControl_EnchantmentButton.h b/targets/app/common/src/UI/Controls/UIControl_EnchantmentButton.h index ebe161f16..7be2c5825 100644 --- a/targets/app/common/src/UI/Controls/UIControl_EnchantmentButton.h +++ b/targets/app/common/src/UI/Controls/UIControl_EnchantmentButton.h @@ -6,6 +6,9 @@ #include "app/common/src/UI/Controls/UIControl_EnchantmentButton.h" #include "app/common/src/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif #include "UIControl_Button.h" #include "java/Random.h" diff --git a/targets/app/common/src/UI/Controls/UIControl_HTMLLabel.cpp b/targets/app/common/src/UI/Controls/UIControl_HTMLLabel.cpp index b7d1a55c2..79f783cb5 100644 --- a/targets/app/common/src/UI/Controls/UIControl_HTMLLabel.cpp +++ b/targets/app/common/src/UI/Controls/UIControl_HTMLLabel.cpp @@ -4,6 +4,9 @@ #include "app/common/src/UI/Controls/UIControl_Base.h" #include "app/common/src/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif #include "app/linux/Iggy/include/rrCore.h" UIControl_HTMLLabel::UIControl_HTMLLabel() {} diff --git a/targets/app/common/src/UI/Controls/UIControl_HTMLLabel.h b/targets/app/common/src/UI/Controls/UIControl_HTMLLabel.h index bafbe3fb1..5267e2386 100644 --- a/targets/app/common/src/UI/Controls/UIControl_HTMLLabel.h +++ b/targets/app/common/src/UI/Controls/UIControl_HTMLLabel.h @@ -7,6 +7,9 @@ #include "app/common/src/UI/Controls/UIControl_Label.h" #include "app/common/src/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif #include "app/linux/Iggy/include/rrCore.h" #include "UIControl_Base.h" diff --git a/targets/app/common/src/UI/Controls/UIControl_Label.cpp b/targets/app/common/src/UI/Controls/UIControl_Label.cpp index da9f4eac3..b7209e059 100644 --- a/targets/app/common/src/UI/Controls/UIControl_Label.cpp +++ b/targets/app/common/src/UI/Controls/UIControl_Label.cpp @@ -5,6 +5,9 @@ #include "app/common/src/UI/UIScene.h" #include "app/common/src/UI/UIString.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif #include "console_helpers/StringHelpers.h" UIControl_Label::UIControl_Label() {} diff --git a/targets/app/common/src/UI/Controls/UIControl_Label.h b/targets/app/common/src/UI/Controls/UIControl_Label.h index 6f9dafe25..fa4d935b6 100644 --- a/targets/app/common/src/UI/Controls/UIControl_Label.h +++ b/targets/app/common/src/UI/Controls/UIControl_Label.h @@ -7,6 +7,9 @@ #include "app/common/src/UI/UIScene.h" #include "app/common/src/UI/UIString.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif #include "UIControl_Base.h" class UIControl_Label : public UIControl_Base { diff --git a/targets/app/common/src/UI/Controls/UIControl_LeaderboardList.cpp b/targets/app/common/src/UI/Controls/UIControl_LeaderboardList.cpp index 6a4aa09a7..ae1520d71 100644 --- a/targets/app/common/src/UI/Controls/UIControl_LeaderboardList.cpp +++ b/targets/app/common/src/UI/Controls/UIControl_LeaderboardList.cpp @@ -4,6 +4,9 @@ #include "app/common/src/UI/Controls/UIControl_Base.h" #include "app/common/src/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif #include "console_helpers/StringHelpers.h" UIControl_LeaderboardList::UIControl_LeaderboardList() {} diff --git a/targets/app/common/src/UI/Controls/UIControl_LeaderboardList.h b/targets/app/common/src/UI/Controls/UIControl_LeaderboardList.h index 52391382b..09b0ac687 100644 --- a/targets/app/common/src/UI/Controls/UIControl_LeaderboardList.h +++ b/targets/app/common/src/UI/Controls/UIControl_LeaderboardList.h @@ -6,6 +6,9 @@ #include "app/common/src/UI/Controls/UIControl_LeaderboardList.h" #include "app/common/src/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif #include "UIControl_Base.h" class UIControl_LeaderboardList : public UIControl_Base { diff --git a/targets/app/common/src/UI/Controls/UIControl_MinecraftHorse.cpp b/targets/app/common/src/UI/Controls/UIControl_MinecraftHorse.cpp index f559a63ae..b785e2a02 100644 --- a/targets/app/common/src/UI/Controls/UIControl_MinecraftHorse.cpp +++ b/targets/app/common/src/UI/Controls/UIControl_MinecraftHorse.cpp @@ -9,6 +9,9 @@ #include "app/common/src/UI/Controls/UIControl.h" #include "app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif #include "minecraft/client/Lighting.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/Options.h" diff --git a/targets/app/common/src/UI/Controls/UIControl_MinecraftHorse.h b/targets/app/common/src/UI/Controls/UIControl_MinecraftHorse.h index 11243289a..8aea1d504 100644 --- a/targets/app/common/src/UI/Controls/UIControl_MinecraftHorse.h +++ b/targets/app/common/src/UI/Controls/UIControl_MinecraftHorse.h @@ -2,6 +2,9 @@ #include "app/common/src/UI/Controls/UIControl_MinecraftHorse.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif #include "UIControl.h" class UIControl_MinecraftHorse : public UIControl { diff --git a/targets/app/common/src/UI/Controls/UIControl_MinecraftPlayer.cpp b/targets/app/common/src/UI/Controls/UIControl_MinecraftPlayer.cpp index 457cf1b0b..4a025068b 100644 --- a/targets/app/common/src/UI/Controls/UIControl_MinecraftPlayer.cpp +++ b/targets/app/common/src/UI/Controls/UIControl_MinecraftPlayer.cpp @@ -9,6 +9,9 @@ #include "app/common/src/UI/Controls/UIControl.h" #include "app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif #include "minecraft/client/Lighting.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/Options.h" diff --git a/targets/app/common/src/UI/Controls/UIControl_MinecraftPlayer.h b/targets/app/common/src/UI/Controls/UIControl_MinecraftPlayer.h index a91952fba..341d161bf 100644 --- a/targets/app/common/src/UI/Controls/UIControl_MinecraftPlayer.h +++ b/targets/app/common/src/UI/Controls/UIControl_MinecraftPlayer.h @@ -2,6 +2,9 @@ #include "app/common/src/UI/Controls/UIControl_MinecraftPlayer.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif #include "UIControl.h" class UIControl_MinecraftPlayer : public UIControl { diff --git a/targets/app/common/src/UI/Controls/UIControl_PlayerList.cpp b/targets/app/common/src/UI/Controls/UIControl_PlayerList.cpp index 5dba457e7..b0d8cad1b 100644 --- a/targets/app/common/src/UI/Controls/UIControl_PlayerList.cpp +++ b/targets/app/common/src/UI/Controls/UIControl_PlayerList.cpp @@ -4,6 +4,9 @@ #include "app/common/src/UI/Controls/UIControl_ButtonList.h" #include "app/common/src/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif #include "app/linux/Iggy/include/rrCore.h" #include "console_helpers/StringHelpers.h" diff --git a/targets/app/common/src/UI/Controls/UIControl_PlayerList.h b/targets/app/common/src/UI/Controls/UIControl_PlayerList.h index 01703b33a..714eef50d 100644 --- a/targets/app/common/src/UI/Controls/UIControl_PlayerList.h +++ b/targets/app/common/src/UI/Controls/UIControl_PlayerList.h @@ -5,6 +5,9 @@ #include "app/common/src/UI/Controls/UIControl_PlayerList.h" #include "app/common/src/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif #include "UIControl_ButtonList.h" class UIControl_PlayerList : public UIControl_ButtonList { diff --git a/targets/app/common/src/UI/Controls/UIControl_PlayerSkinPreview.cpp b/targets/app/common/src/UI/Controls/UIControl_PlayerSkinPreview.cpp index dcb4eaefa..49ff7e1f2 100644 --- a/targets/app/common/src/UI/Controls/UIControl_PlayerSkinPreview.cpp +++ b/targets/app/common/src/UI/Controls/UIControl_PlayerSkinPreview.cpp @@ -10,8 +10,11 @@ #include "app/common/App_enums.h" #include "app/common/src/UI/Controls/UIControl.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif #include "app/linux/Linux_App.h" -#include "gl3_loader.h" + #include "java/Class.h" #include "minecraft/client/Lighting.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/app/common/src/UI/Controls/UIControl_PlayerSkinPreview.h b/targets/app/common/src/UI/Controls/UIControl_PlayerSkinPreview.h index 46d3b88dc..9d599a52e 100644 --- a/targets/app/common/src/UI/Controls/UIControl_PlayerSkinPreview.h +++ b/targets/app/common/src/UI/Controls/UIControl_PlayerSkinPreview.h @@ -7,6 +7,9 @@ #include "app/common/src/UI/Controls/UIControl_PlayerSkinPreview.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif #include "UIControl.h" #include "minecraft/client/renderer/Textures.h" diff --git a/targets/app/common/src/UI/Controls/UIControl_Progress.cpp b/targets/app/common/src/UI/Controls/UIControl_Progress.cpp index 73c92cbdd..059953f11 100644 --- a/targets/app/common/src/UI/Controls/UIControl_Progress.cpp +++ b/targets/app/common/src/UI/Controls/UIControl_Progress.cpp @@ -5,6 +5,9 @@ #include "app/common/src/UI/UIScene.h" #include "app/common/src/UI/UIString.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif #include "console_helpers/StringHelpers.h" UIControl_Progress::UIControl_Progress() { diff --git a/targets/app/common/src/UI/Controls/UIControl_Progress.h b/targets/app/common/src/UI/Controls/UIControl_Progress.h index 4983c95f8..50b921854 100644 --- a/targets/app/common/src/UI/Controls/UIControl_Progress.h +++ b/targets/app/common/src/UI/Controls/UIControl_Progress.h @@ -7,6 +7,9 @@ #include "app/common/src/UI/UIScene.h" #include "app/common/src/UI/UIString.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif #include "UIControl_Base.h" class UIControl_Progress : public UIControl_Base { diff --git a/targets/app/common/src/UI/Controls/UIControl_SaveList.cpp b/targets/app/common/src/UI/Controls/UIControl_SaveList.cpp index d80e4b1d6..cb57b4e35 100644 --- a/targets/app/common/src/UI/Controls/UIControl_SaveList.cpp +++ b/targets/app/common/src/UI/Controls/UIControl_SaveList.cpp @@ -4,6 +4,9 @@ #include "app/common/src/UI/Controls/UIControl_ButtonList.h" #include "app/common/src/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif #include "app/linux/Iggy/include/rrCore.h" #include "console_helpers/StringHelpers.h" diff --git a/targets/app/common/src/UI/Controls/UIControl_SaveList.h b/targets/app/common/src/UI/Controls/UIControl_SaveList.h index 5aeed0b41..c6bc50cb5 100644 --- a/targets/app/common/src/UI/Controls/UIControl_SaveList.h +++ b/targets/app/common/src/UI/Controls/UIControl_SaveList.h @@ -5,6 +5,9 @@ #include "app/common/src/UI/Controls/UIControl_SaveList.h" #include "app/common/src/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif #include "UIControl_ButtonList.h" class UIControl_SaveList : public UIControl_ButtonList { diff --git a/targets/app/common/src/UI/Controls/UIControl_Slider.cpp b/targets/app/common/src/UI/Controls/UIControl_Slider.cpp index 18d2c4af1..d538e3a9f 100644 --- a/targets/app/common/src/UI/Controls/UIControl_Slider.cpp +++ b/targets/app/common/src/UI/Controls/UIControl_Slider.cpp @@ -5,6 +5,9 @@ #include "app/common/src/UI/UIScene.h" #include "app/common/src/UI/UIString.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif #include "app/linux/Iggy/include/rrCore.h" #include "app/linux/Linux_UIController.h" #include "console_helpers/StringHelpers.h" diff --git a/targets/app/common/src/UI/Controls/UIControl_Slider.h b/targets/app/common/src/UI/Controls/UIControl_Slider.h index d0e4b762c..dd26125eb 100644 --- a/targets/app/common/src/UI/Controls/UIControl_Slider.h +++ b/targets/app/common/src/UI/Controls/UIControl_Slider.h @@ -8,6 +8,9 @@ #include "app/common/src/UI/UIScene.h" #include "app/common/src/UI/UIString.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif #include "app/linux/Iggy/include/rrCore.h" #include "UIControl_Base.h" diff --git a/targets/app/common/src/UI/Controls/UIControl_SlotList.cpp b/targets/app/common/src/UI/Controls/UIControl_SlotList.cpp index 249521f00..b6714e551 100644 --- a/targets/app/common/src/UI/Controls/UIControl_SlotList.cpp +++ b/targets/app/common/src/UI/Controls/UIControl_SlotList.cpp @@ -4,6 +4,9 @@ #include "app/common/src/UI/Controls/UIControl_Base.h" #include "app/common/src/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif UIControl_SlotList::UIControl_SlotList() { m_lastHighlighted = -1; } diff --git a/targets/app/common/src/UI/Controls/UIControl_SlotList.h b/targets/app/common/src/UI/Controls/UIControl_SlotList.h index 312a6f426..2d470273c 100644 --- a/targets/app/common/src/UI/Controls/UIControl_SlotList.h +++ b/targets/app/common/src/UI/Controls/UIControl_SlotList.h @@ -6,6 +6,9 @@ #include "app/common/src/UI/Controls/UIControl_SlotList.h" #include "app/common/src/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif #include "UIControl_Base.h" class UIControl_SlotList : public UIControl_Base { diff --git a/targets/app/common/src/UI/Controls/UIControl_SpaceIndicatorBar.cpp b/targets/app/common/src/UI/Controls/UIControl_SpaceIndicatorBar.cpp index 6878cbcd8..276eb6499 100644 --- a/targets/app/common/src/UI/Controls/UIControl_SpaceIndicatorBar.cpp +++ b/targets/app/common/src/UI/Controls/UIControl_SpaceIndicatorBar.cpp @@ -5,6 +5,9 @@ #include "app/common/src/UI/UIScene.h" #include "app/common/src/UI/UIString.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif #include "console_helpers/StringHelpers.h" UIControl_SpaceIndicatorBar::UIControl_SpaceIndicatorBar() { diff --git a/targets/app/common/src/UI/Controls/UIControl_SpaceIndicatorBar.h b/targets/app/common/src/UI/Controls/UIControl_SpaceIndicatorBar.h index 97133aac6..cb08bf528 100644 --- a/targets/app/common/src/UI/Controls/UIControl_SpaceIndicatorBar.h +++ b/targets/app/common/src/UI/Controls/UIControl_SpaceIndicatorBar.h @@ -12,6 +12,9 @@ #include "app/common/src/UI/UIScene.h" #include "app/common/src/UI/UIString.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif #include "UIControl_Base.h" class UIControl_SpaceIndicatorBar : public UIControl_Base { diff --git a/targets/app/common/src/UI/Controls/UIControl_TextInput.cpp b/targets/app/common/src/UI/Controls/UIControl_TextInput.cpp index 8ddab0111..4bde4f53a 100644 --- a/targets/app/common/src/UI/Controls/UIControl_TextInput.cpp +++ b/targets/app/common/src/UI/Controls/UIControl_TextInput.cpp @@ -5,6 +5,9 @@ #include "app/common/src/UI/UIScene.h" #include "app/common/src/UI/UIString.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif #include "console_helpers/StringHelpers.h" UIControl_TextInput::UIControl_TextInput() { m_bHasFocus = false; } diff --git a/targets/app/common/src/UI/Controls/UIControl_TextInput.h b/targets/app/common/src/UI/Controls/UIControl_TextInput.h index 5aa54ba8a..5032eb142 100644 --- a/targets/app/common/src/UI/Controls/UIControl_TextInput.h +++ b/targets/app/common/src/UI/Controls/UIControl_TextInput.h @@ -7,6 +7,9 @@ #include "app/common/src/UI/UIScene.h" #include "app/common/src/UI/UIString.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif #include "UIControl_Base.h" class UIControl_TextInput : public UIControl_Base { diff --git a/targets/app/common/src/UI/Controls/UIControl_TexturePackList.cpp b/targets/app/common/src/UI/Controls/UIControl_TexturePackList.cpp index 4dedcf21a..43b01d5aa 100644 --- a/targets/app/common/src/UI/Controls/UIControl_TexturePackList.cpp +++ b/targets/app/common/src/UI/Controls/UIControl_TexturePackList.cpp @@ -5,6 +5,9 @@ #include "app/common/src/UI/UIScene.h" #include "app/common/src/UI/UIString.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif #include "app/linux/Iggy/include/rrCore.h" #include "console_helpers/StringHelpers.h" diff --git a/targets/app/common/src/UI/Controls/UIControl_TexturePackList.h b/targets/app/common/src/UI/Controls/UIControl_TexturePackList.h index 5aa3d1532..c233ef40a 100644 --- a/targets/app/common/src/UI/Controls/UIControl_TexturePackList.h +++ b/targets/app/common/src/UI/Controls/UIControl_TexturePackList.h @@ -6,6 +6,9 @@ #include "app/common/src/UI/Controls/UIControl_TexturePackList.h" #include "app/common/src/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif #include "app/linux/Iggy/include/rrCore.h" #include "UIControl_Base.h" diff --git a/targets/app/common/src/UI/Controls/UIControl_Touch.cpp b/targets/app/common/src/UI/Controls/UIControl_Touch.cpp index 4cf6e9dc4..280031183 100644 --- a/targets/app/common/src/UI/Controls/UIControl_Touch.cpp +++ b/targets/app/common/src/UI/Controls/UIControl_Touch.cpp @@ -3,6 +3,9 @@ #include "app/common/src/UI/Controls/UIControl.h" #include "app/common/src/UI/Controls/UIControl_Base.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif UIControl_Touch::UIControl_Touch() {} diff --git a/targets/app/common/src/UI/Controls/UIControl_Touch.h b/targets/app/common/src/UI/Controls/UIControl_Touch.h index 808083618..90619683a 100644 --- a/targets/app/common/src/UI/Controls/UIControl_Touch.h +++ b/targets/app/common/src/UI/Controls/UIControl_Touch.h @@ -6,6 +6,9 @@ #include "app/common/src/UI/Controls/UIControl_Touch.h" #include "app/common/src/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif #include "UIControl_Base.h" class UIControl_Touch : public UIControl_Base { diff --git a/targets/app/common/src/UI/Scenes/Debug/UIScene_DebugOptions.cpp b/targets/app/common/src/UI/Scenes/Debug/UIScene_DebugOptions.cpp index 1f9625b02..5efbeb8ed 100644 --- a/targets/app/common/src/UI/Scenes/Debug/UIScene_DebugOptions.cpp +++ b/targets/app/common/src/UI/Scenes/Debug/UIScene_DebugOptions.cpp @@ -5,6 +5,9 @@ #include "app/common/src/UI/Controls/UIControl_CheckBox.h" #include "app/common/src/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif #include "app/linux/Linux_App.h" class UILayer; diff --git a/targets/app/common/src/UI/Scenes/Debug/UIScene_DebugOverlay.cpp b/targets/app/common/src/UI/Scenes/Debug/UIScene_DebugOverlay.cpp index 8526414d4..16b665004 100644 --- a/targets/app/common/src/UI/Scenes/Debug/UIScene_DebugOverlay.cpp +++ b/targets/app/common/src/UI/Scenes/Debug/UIScene_DebugOverlay.cpp @@ -15,6 +15,9 @@ #include "app/common/src/UI/Controls/UIControl_Slider.h" #include "app/common/src/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif #include "app/linux/Iggy/include/rrCore.h" #include "app/linux/Linux_App.h" #include "app/linux/Linux_UIController.h" diff --git a/targets/app/common/src/UI/Scenes/Debug/UIScene_DebugOverlay.h b/targets/app/common/src/UI/Scenes/Debug/UIScene_DebugOverlay.h index aaeea9ff8..0e250e099 100644 --- a/targets/app/common/src/UI/Scenes/Debug/UIScene_DebugOverlay.h +++ b/targets/app/common/src/UI/Scenes/Debug/UIScene_DebugOverlay.h @@ -11,6 +11,9 @@ #include "app/common/src/UI/Controls/UIControl_Slider.h" #include "app/common/src/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif #include "app/linux/Iggy/include/rrCore.h" #include "java/Class.h" diff --git a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_Intro.h b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_Intro.h index 8d065ddee..101b98b44 100644 --- a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_Intro.h +++ b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_Intro.h @@ -5,6 +5,9 @@ #include "app/common/src/UI/All Platforms/UIEnums.h" #include "app/common/src/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif class UILayer; diff --git a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.h b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.h index 4f27615e7..73857bdd8 100644 --- a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.h +++ b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.h @@ -12,6 +12,9 @@ #include "app/common/src/UI/Controls/UIControl_TextInput.h" #include "app/common/src/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif #include "app/linux/Iggy/include/rrCore.h" class UILayer; diff --git a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.h b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.h index 71f22110c..0221c116c 100644 --- a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.h +++ b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.h @@ -12,6 +12,9 @@ #include "app/common/src/UI/Controls/UIControl_LeaderboardList.h" #include "app/common/src/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif #include "app/linux/Iggy/include/rrCore.h" class UILayer; diff --git a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp index 9b94bd304..468093c5a 100644 --- a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp +++ b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp @@ -22,7 +22,7 @@ #include "app/linux/Stubs/winapi_stubs.h" #include "app/include/NetTypes.h" #include "console_helpers/StringHelpers.h" -#include "gl3_loader.h" + #include "java/InputOutputStream/BufferedReader.h" #include "java/InputOutputStream/ByteArrayInputStream.h" #include "java/InputOutputStream/InputStreamReader.h" diff --git a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.h b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.h index f1ec86cf1..d38764194 100644 --- a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.h +++ b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.h @@ -11,6 +11,9 @@ #include "app/common/src/UI/Controls/UIControl_Button.h" #include "app/common/src/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif #include "app/linux/Iggy/include/rrCore.h" #include "java/Random.h" diff --git a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.h b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.h index 87f8c03f5..27d7b08e6 100644 --- a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.h +++ b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.h @@ -7,6 +7,9 @@ #include "app/common/src/UI/Controls/UIControl_Label.h" #include "app/common/src/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif #include "app/linux/Iggy/include/rrCore.h" class UILayer; diff --git a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_ControlsMenu.h b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_ControlsMenu.h index 125cc3caf..81083eb94 100644 --- a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_ControlsMenu.h +++ b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_ControlsMenu.h @@ -9,6 +9,9 @@ #include "app/common/src/UI/Controls/UIControl_Label.h" #include "app/common/src/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif #include "app/linux/Iggy/include/rrCore.h" class UILayer; diff --git a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_Credits.h b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_Credits.h index d3a03a3cd..008f012c4 100644 --- a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_Credits.h +++ b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_Credits.h @@ -6,6 +6,9 @@ #include "app/common/src/UI/All Platforms/UIStructs.h" #include "app/common/src/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif #include "app/linux/Iggy/include/rrCore.h" class UILayer; diff --git a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_HowToPlay.h b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_HowToPlay.h index 361d5ba94..7c8a7595a 100644 --- a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_HowToPlay.h +++ b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_HowToPlay.h @@ -7,6 +7,9 @@ #include "app/common/src/UI/Controls/UIControl_Label.h" #include "app/common/src/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif class UILayer; diff --git a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp index 0b03e74fe..7b03feccc 100644 --- a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp +++ b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp @@ -22,7 +22,7 @@ #include "app/linux/Linux_UIController.h" #include "SkinBox.h" #include "console_helpers/StringHelpers.h" -#include "gl3_loader.h" + #include "minecraft/client/Minecraft.h" #include "minecraft/sounds/SoundTypes.h" #include "strings.h" diff --git a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.h b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.h index a20063195..94c79f901 100644 --- a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.h +++ b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.h @@ -11,6 +11,9 @@ #include "app/common/src/UI/Controls/UIControl_PlayerSkinPreview.h" #include "app/common/src/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif #include "app/linux/Iggy/include/rrCore.h" #include "app/include/SkinBox.h" #include "console_helpers/Definitions.h" diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h index af61a17bc..e5d72ef0d 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h @@ -10,6 +10,9 @@ #include "app/common/src/UI/Controls/UIControl_SlotList.h" #include "app/common/src/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif #include "app/linux/Iggy/include/rrCore.h" class AbstractContainerMenu; diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.h b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.h index b6055d98e..ce59fba99 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.h +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.h @@ -13,6 +13,9 @@ #include "app/common/src/UI/Controls/UIControl_TextInput.h" #include "app/common/src/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif #include "UIScene_AbstractContainerMenu.h" #include "minecraft/world/inventory/MerchantMenu.h" diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.h b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.h index 3fa56b6af..a7dcb4b30 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.h +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.h @@ -11,6 +11,9 @@ #include "app/common/src/UI/Controls/UIControl_SlotList.h" #include "app/common/src/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif #include "UIScene_AbstractContainerMenu.h" class UILayer; diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.cpp b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.cpp index 55316a758..5c58aaba3 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.cpp +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.cpp @@ -13,6 +13,9 @@ #include "app/common/src/UI/Controls/UIControl_SlotList.h" #include "app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif #include "app/linux/Iggy/include/rrCore.h" #include "app/linux/Linux_App.h" #include "app/linux/Linux_UIController.h" diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.h b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.h index 106bc7b32..e9e0cc217 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.h +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.h @@ -10,6 +10,9 @@ #include "app/common/src/UI/Controls/UIControl_SlotList.h" #include "app/common/src/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif #include "UIScene_AbstractContainerMenu.h" class UILayer; diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.h b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.h index ee47ad97f..8370c4236 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.h +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.h @@ -10,6 +10,9 @@ #include "app/common/src/UI/Controls/UIControl_SlotList.h" #include "app/common/src/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif #include "UIScene_AbstractContainerMenu.h" class InventoryMenu; diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.cpp b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.cpp index 679e8c8a9..21ad5c8d7 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.cpp +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.cpp @@ -13,6 +13,9 @@ #include "app/common/src/UI/Controls/UIControl_SlotList.h" #include "app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif #include "app/linux/Linux_App.h" #include "app/linux/Linux_UIController.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.h b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.h index 20f6a8ced..3819b9184 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.h +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.h @@ -11,6 +11,9 @@ #include "app/common/src/UI/Controls/UIControl_SlotList.h" #include "app/common/src/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif #include "UIScene_AbstractContainerMenu.h" class InventoryMenu; diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.h b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.h index d2b98ec6e..a47a6524d 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.h +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.h @@ -10,6 +10,9 @@ #include "app/common/src/UI/Controls/UIControl_SlotList.h" #include "app/common/src/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif #include "UIScene_AbstractContainerMenu.h" #include "minecraft/world/effect/MobEffect.h" diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.h b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.h index b2bcc3564..c64f2eb0c 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.h +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.h @@ -10,6 +10,9 @@ #include "app/common/src/UI/UILayer.h" #include "app/common/src/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif class InventoryMenu; class UILayer; diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.h b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.h index e8c8eb74c..15c651658 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.h +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.h @@ -11,6 +11,9 @@ #include "app/common/src/UI/Controls/UIControl_SlotList.h" #include "app/common/src/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif class AbstractContainerMenu; class ItemInstance; diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.h b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.h index 939edc8c9..7d31736fe 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.h +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.h @@ -6,6 +6,9 @@ #include "app/common/src/UI/All Platforms/UIEnums.h" #include "app/common/src/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif #include "app/linux/Iggy/include/rrCore.h" class UILayer; diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.h b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.h index b51679d9b..b74347a80 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.h +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.h @@ -11,6 +11,9 @@ #include "app/common/src/UI/Controls/UIControl_Label.h" #include "app/common/src/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif #include "app/linux/Iggy/include/rrCore.h" class INetworkPlayer; diff --git a/targets/app/common/src/UI/Scenes/UIScene_Keyboard.h b/targets/app/common/src/UI/Scenes/UIScene_Keyboard.h index 66e5be7f7..2ace04f7c 100644 --- a/targets/app/common/src/UI/Scenes/UIScene_Keyboard.h +++ b/targets/app/common/src/UI/Scenes/UIScene_Keyboard.h @@ -8,6 +8,9 @@ #include "app/common/src/UI/Controls/UIControl_TextInput.h" #include "app/common/src/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif #include "app/linux/Iggy/include/rrCore.h" class UILayer; diff --git a/targets/app/common/src/UI/Scenes/UIScene_MessageBox.h b/targets/app/common/src/UI/Scenes/UIScene_MessageBox.h index 4f4c340b7..de4d0d2cc 100644 --- a/targets/app/common/src/UI/Scenes/UIScene_MessageBox.h +++ b/targets/app/common/src/UI/Scenes/UIScene_MessageBox.h @@ -8,6 +8,9 @@ #include "app/common/src/UI/Controls/UIControl_Label.h" #include "app/common/src/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif #include "app/linux/Iggy/include/rrCore.h" class UILayer; diff --git a/targets/app/common/src/UI/Scenes/UIScene_QuadrantSignin.h b/targets/app/common/src/UI/Scenes/UIScene_QuadrantSignin.h index e09f5a78d..02196ad87 100644 --- a/targets/app/common/src/UI/Scenes/UIScene_QuadrantSignin.h +++ b/targets/app/common/src/UI/Scenes/UIScene_QuadrantSignin.h @@ -10,6 +10,9 @@ #include "app/common/src/UI/Controls/UIControl_Label.h" #include "app/common/src/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif class UILayer; diff --git a/targets/app/common/src/UI/UIBitmapFont.cpp b/targets/app/common/src/UI/UIBitmapFont.cpp index 1570e84cb..651ce19b9 100644 --- a/targets/app/common/src/UI/UIBitmapFont.cpp +++ b/targets/app/common/src/UI/UIBitmapFont.cpp @@ -1,6 +1,9 @@ #include "UIBitmapFont.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif #include "app/linux/Iggy/include/rrCore.h" #include "app/include/BufferedImage.h" #include "UIFontData.h" diff --git a/targets/app/common/src/UI/UIBitmapFont.h b/targets/app/common/src/UI/UIBitmapFont.h index c18d1bc5b..48d8ed9ce 100644 --- a/targets/app/common/src/UI/UIBitmapFont.h +++ b/targets/app/common/src/UI/UIBitmapFont.h @@ -3,6 +3,9 @@ #include #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif #include "app/linux/Iggy/include/rrCore.h" struct SFontData; diff --git a/targets/app/common/src/UI/UIController.cpp b/targets/app/common/src/UI/UIController.cpp index 6e5fd2d69..3085a107b 100644 --- a/targets/app/common/src/UI/UIController.cpp +++ b/targets/app/common/src/UI/UIController.cpp @@ -30,6 +30,9 @@ #include "app/common/src/UI/UIString.h" #include "app/common/src/UI/UITTFFont.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif #include "app/linux/Linux_App.h" #include "app/linux/Linux_UIController.h" #include "app/include/BufferedImage.h" @@ -39,7 +42,7 @@ #include "console_helpers/PerformanceTimer.h" #include "console_helpers/PlatformTime.h" #include "console_helpers/StringHelpers.h" -#include "gl3_loader.h" + #include "java/System.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" diff --git a/targets/app/common/src/UI/UIController.h b/targets/app/common/src/UI/UIController.h index ae776d28f..8db798a0a 100644 --- a/targets/app/common/src/UI/UIController.h +++ b/targets/app/common/src/UI/UIController.h @@ -10,6 +10,9 @@ #ifdef __linux__ #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif #include "app/linux/Stubs/d3d11_stubs.h" #elif defined(_WINDOWS64) #include "app/windows/Iggy/include/iggy.h" diff --git a/targets/app/common/src/UI/UIScene.cpp b/targets/app/common/src/UI/UIScene.cpp index a53ea7b9b..48215e96f 100644 --- a/targets/app/common/src/UI/UIScene.cpp +++ b/targets/app/common/src/UI/UIScene.cpp @@ -15,12 +15,14 @@ #include "app/common/src/UI/UIGroup.h" #include "app/common/src/UI/UILayer.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif #include "app/linux/Iggy/include/rrCore.h" #include "app/linux/Linux_App.h" #include "app/linux/Linux_UIController.h" #include "app/linux/Stubs/winapi_stubs.h" #include "console_helpers/StringHelpers.h" -#include "gl3_loader.h" #include "java/System.h" #include "minecraft/client/Lighting.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/app/common/src/UI/UIScene.h b/targets/app/common/src/UI/UIScene.h index 629da33e8..765e3947e 100644 --- a/targets/app/common/src/UI/UIScene.h +++ b/targets/app/common/src/UI/UIScene.h @@ -18,6 +18,9 @@ #include "app/common/src/UI/All Platforms/UIStructs.h" #include "app/common/src/UI/Controls/UIControl_Base.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif #include "app/linux/Iggy/include/rrCore.h" class ItemRenderer; diff --git a/targets/app/common/src/UI/UITTFFont.cpp b/targets/app/common/src/UI/UITTFFont.cpp index 810377f71..fb7a1a97e 100644 --- a/targets/app/common/src/UI/UITTFFont.cpp +++ b/targets/app/common/src/UI/UITTFFont.cpp @@ -5,6 +5,9 @@ #include #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif #include "app/linux/Iggy/include/rrCore.h" #include "app/linux/Linux_App.h" #include "console_helpers/PortableFileIO.h" diff --git a/targets/app/linux/LinuxGL.cpp b/targets/app/linux/LinuxGL.cpp index 6c2a565f1..19a3ea8c0 100644 --- a/targets/app/linux/LinuxGL.cpp +++ b/targets/app/linux/LinuxGL.cpp @@ -2,7 +2,7 @@ #include "platform/sdl2/Render.h" #include "app/include/stubs.h" -#include "gl3_loader.h" + #include "java/ByteBuffer.h" #include "java/FloatBuffer.h" #include "java/IntBuffer.h" diff --git a/targets/app/linux/Linux_UIController.cpp b/targets/app/linux/Linux_UIController.cpp index 593215171..a95f0482f 100644 --- a/targets/app/linux/Linux_UIController.cpp +++ b/targets/app/linux/Linux_UIController.cpp @@ -6,6 +6,9 @@ #include "app/common/src/UI/All Platforms/UIStructs.h" #include "app/linux/Iggy/gdraw/gdraw.h" #include "app/linux/Iggy/include/iggy.h" +#ifndef _ENABLEIGGY +#include "app/linux/Stubs/iggy_stubs.h" +#endif #include "app/linux/Iggy/include/rrCore.h" #include "app/linux/Linux_App.h" #include "app/windows/Iggy/include/gdraw.h" diff --git a/targets/app/linux/Stubs/LinuxStubs.h b/targets/app/linux/Stubs/LinuxStubs.h index 48a6a7c20..eb7f8065a 100644 --- a/targets/app/linux/Stubs/LinuxStubs.h +++ b/targets/app/linux/Stubs/LinuxStubs.h @@ -2,38 +2,10 @@ #define STUBS_H #pragma once - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - #include "d3d11_stubs.h" #include "winapi_stubs.h" #include "xbox_stubs.h" - #ifndef _ENABLEIGGY #include "iggy_stubs.h" #endif - #endif // STUBS_H \ No newline at end of file diff --git a/targets/app/linux/Stubs/iggy_stubs.h b/targets/app/linux/Stubs/iggy_stubs.h index ef593a44e..dc9d7a0d8 100644 --- a/targets/app/linux/Stubs/iggy_stubs.h +++ b/targets/app/linux/Stubs/iggy_stubs.h @@ -5,6 +5,9 @@ #include "app/linux/Iggy/include/iggy.h" +#include +#include + #define STUBBED \ { \ } diff --git a/targets/minecraft/client/Minecraft.cpp b/targets/minecraft/client/Minecraft.cpp index fa6d1ff53..4304a7d61 100644 --- a/targets/minecraft/client/Minecraft.cpp +++ b/targets/minecraft/client/Minecraft.cpp @@ -34,11 +34,12 @@ #include "User.h" #include "console_helpers/Definitions.h" #include "console_helpers/compression.h" -#include "gl3_loader.h" #include "java/Class.h" #include "java/Random.h" #include "minecraft/client/gui/DeathScreen.h" #include "minecraft/client/gui/ErrorScreen.h" +#include "minecraft/client/gui/PauseScreen.h" +#include "minecraft/client/gui/inventory/InventoryScreen.h" #include "minecraft/client/gui/Screen.h" #include "minecraft/client/gui/particle/GuiParticles.h" #include "minecraft/client/model/HumanoidModel.h" diff --git a/targets/minecraft/client/gui/Gui.cpp b/targets/minecraft/client/gui/Gui.cpp index facc81a74..9c27e3f33 100644 --- a/targets/minecraft/client/gui/Gui.cpp +++ b/targets/minecraft/client/gui/Gui.cpp @@ -12,9 +12,7 @@ #include "app/linux/Linux_App.h" #include "app/linux/Linux_UIController.h" #include "app/include/XboxStubs.h" -#include "app/include/stdafx.h" #include "console_helpers/StringHelpers.h" -#include "gl3_loader.h" #include "java/JavaMath.h" #include "java/Random.h" #include "java/System.h" @@ -45,6 +43,9 @@ #include "minecraft/world/entity/player/Abilities.h" #include "minecraft/world/entity/player/Inventory.h" #include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/entity/ai/attributes/AttributeInstance.h" +#include "minecraft/world/entity/monster/SharedMonsterAttributes.h" +#include "minecraft/world/food/FoodConstants.h" #include "minecraft/world/item/ItemInstance.h" @@ -54,7 +55,7 @@ #include "minecraft/world/level/storage/LevelData.h" #include "minecraft/world/level/tile/PortalTile.h" #include "minecraft/world/level/tile/Tile.h" - +#include "app/include/stubs.h" #include "strings.h" diff --git a/targets/minecraft/client/gui/Screen.cpp b/targets/minecraft/client/gui/Screen.cpp index 84e3e720a..277cdc99b 100644 --- a/targets/minecraft/client/gui/Screen.cpp +++ b/targets/minecraft/client/gui/Screen.cpp @@ -13,6 +13,8 @@ #include "minecraft/client/gui/Screen.h" #include "minecraft/client/gui/particle/GuiParticles.h" #include "minecraft/sounds/SoundTypes.h" +#include "minecraft/client/gui/ScreenSizeCalculator.h" +#include "minecraft/client/renderer/Tesselator.h" Screen::Screen() // 4J added { diff --git a/targets/minecraft/client/gui/inventory/AbstractBeaconButton.cpp b/targets/minecraft/client/gui/inventory/AbstractBeaconButton.cpp index 4a2373667..48ef6a7aa 100644 --- a/targets/minecraft/client/gui/inventory/AbstractBeaconButton.cpp +++ b/targets/minecraft/client/gui/inventory/AbstractBeaconButton.cpp @@ -6,6 +6,7 @@ #include "minecraft/client/gui/Button.h" #include "minecraft/client/renderer/Textures.h" #include "minecraft/client/resources/ResourceLocation.h" +#include "minecraft/client/Minecraft.h" // 4jcraft: referenced from MCP 8.11 (JE 1.6.4) #ifdef ENABLE_JAVA_GUIS diff --git a/targets/minecraft/client/gui/inventory/AbstractContainerScreen.cpp b/targets/minecraft/client/gui/inventory/AbstractContainerScreen.cpp index 697a82cb6..469826d70 100644 --- a/targets/minecraft/client/gui/inventory/AbstractContainerScreen.cpp +++ b/targets/minecraft/client/gui/inventory/AbstractContainerScreen.cpp @@ -19,6 +19,7 @@ #include "minecraft/world/inventory/Slot.h" #include "minecraft/world/item/ItemInstance.h" #include "minecraft/world/item/Rarity.h" +#include "minecraft/world/entity/player/Inventory.h" ItemRenderer* AbstractContainerScreen::itemRenderer = new ItemRenderer(); diff --git a/targets/minecraft/client/gui/inventory/BeaconPowerButton.cpp b/targets/minecraft/client/gui/inventory/BeaconPowerButton.cpp index 813f2e2fa..bdfc42631 100644 --- a/targets/minecraft/client/gui/inventory/BeaconPowerButton.cpp +++ b/targets/minecraft/client/gui/inventory/BeaconPowerButton.cpp @@ -6,6 +6,8 @@ #include "app/linux/Linux_App.h" #include "minecraft/client/gui/inventory/AbstractBeaconButton.h" #include "minecraft/world/effect/MobEffect.h" +#include "minecraft/client/renderer/Textures.h" +#include "minecraft/client/resources/ResourceLocation.h" // 4jcraft: referenced from MCP 8.11 (JE 1.6.4) #ifdef ENABLE_JAVA_GUIS diff --git a/targets/minecraft/client/gui/inventory/BrewingStandScreen.cpp b/targets/minecraft/client/gui/inventory/BrewingStandScreen.cpp index 6167f03f2..ce758fc4c 100644 --- a/targets/minecraft/client/gui/inventory/BrewingStandScreen.cpp +++ b/targets/minecraft/client/gui/inventory/BrewingStandScreen.cpp @@ -1,13 +1,15 @@ #include "BrewingStandScreen.h" #include -#include #include "minecraft/client/gui/Font.h" #include "minecraft/client/gui/inventory/AbstractContainerScreen.h" #include "minecraft/world/entity/player/Inventory.h" #include "minecraft/world/inventory/BrewingStandMenu.h" #include "minecraft/world/level/tile/entity/BrewingStandTileEntity.h" +#include "minecraft/client/renderer/Textures.h" +#include "minecraft/client/resources/ResourceLocation.h" +#include "minecraft/client/Minecraft.h" // 4jcraft: referenced from MCP 8.11 (JE 1.6.4) and the existing // container classes diff --git a/targets/minecraft/client/gui/inventory/ContainerScreen.cpp b/targets/minecraft/client/gui/inventory/ContainerScreen.cpp index 843633fe9..87d7d5cbf 100644 --- a/targets/minecraft/client/gui/inventory/ContainerScreen.cpp +++ b/targets/minecraft/client/gui/inventory/ContainerScreen.cpp @@ -1,7 +1,9 @@ #include "ContainerScreen.h" #include "minecraft/client/gui/inventory/AbstractContainerScreen.h" +#include "minecraft/client/Minecraft.h" #include "minecraft/world/Container.h" +#include "minecraft/client/renderer/Textures.h" #include "minecraft/world/inventory/ContainerMenu.h" ContainerScreen::ContainerScreen(std::shared_ptr inventory, diff --git a/targets/minecraft/client/gui/inventory/CreativeInventoryScreen.cpp b/targets/minecraft/client/gui/inventory/CreativeInventoryScreen.cpp index 2a5c2a645..f1b530c6b 100644 --- a/targets/minecraft/client/gui/inventory/CreativeInventoryScreen.cpp +++ b/targets/minecraft/client/gui/inventory/CreativeInventoryScreen.cpp @@ -13,11 +13,13 @@ #include "app/linux/Linux_App.h" #include "app/include/stubs.h" #include "minecraft/client/Minecraft.h" +#include "minecraft/client/Lighting.h" #include "minecraft/client/gui/Screen.h" #include "minecraft/client/gui/inventory/AbstractContainerScreen.h" #include "minecraft/client/multiplayer/MultiPlayerGameMode.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "minecraft/client/renderer/entity/ItemRenderer.h" +#include "minecraft/client/gui/Font.h" #include "minecraft/world/SimpleContainer.h" #include "minecraft/world/entity/player/Inventory.h" #include "minecraft/world/entity/player/Player.h" diff --git a/targets/minecraft/client/gui/inventory/FurnaceScreen.cpp b/targets/minecraft/client/gui/inventory/FurnaceScreen.cpp index d47a16921..a1823b4c5 100644 --- a/targets/minecraft/client/gui/inventory/FurnaceScreen.cpp +++ b/targets/minecraft/client/gui/inventory/FurnaceScreen.cpp @@ -7,6 +7,9 @@ #include "minecraft/world/entity/player/Inventory.h" #include "minecraft/world/inventory/FurnaceMenu.h" #include "minecraft/world/level/tile/entity/FurnaceTileEntity.h" +#include "minecraft/client/renderer/Textures.h" +#include "minecraft/client/resources/ResourceLocation.h" +#include "minecraft/client/Minecraft.h" #ifdef ENABLE_JAVA_GUIS ResourceLocation GUI_FURNACE_LOCATION = ResourceLocation(TN_GUI_FURNACE); diff --git a/targets/minecraft/client/gui/inventory/HopperScreen.cpp b/targets/minecraft/client/gui/inventory/HopperScreen.cpp index 4e2241668..fb3f5611e 100644 --- a/targets/minecraft/client/gui/inventory/HopperScreen.cpp +++ b/targets/minecraft/client/gui/inventory/HopperScreen.cpp @@ -1,12 +1,12 @@ #include "HopperScreen.h" -#include - #include "minecraft/client/gui/Font.h" #include "minecraft/client/gui/inventory/AbstractContainerScreen.h" #include "minecraft/world/Container.h" #include "minecraft/world/entity/player/Inventory.h" #include "minecraft/world/inventory/HopperMenu.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/renderer/Textures.h" // 4jcraft: referenced from MCP 8.11 (JE 1.6.4) and the existing // container classes diff --git a/targets/minecraft/client/gui/inventory/HorseInventoryScreen.cpp b/targets/minecraft/client/gui/inventory/HorseInventoryScreen.cpp index dc09c0821..74e97146a 100644 --- a/targets/minecraft/client/gui/inventory/HorseInventoryScreen.cpp +++ b/targets/minecraft/client/gui/inventory/HorseInventoryScreen.cpp @@ -11,6 +11,7 @@ #include "minecraft/client/renderer/entity/EntityRenderDispatcher.h" #include "minecraft/client/resources/ResourceLocation.h" #include "minecraft/world/Container.h" +#include "minecraft/world/entity/animal/EntityHorse.h" #include "minecraft/world/entity/player/Inventory.h" #include "minecraft/world/inventory/HorseInventoryMenu.h" diff --git a/targets/minecraft/client/gui/inventory/MerchantScreen.cpp b/targets/minecraft/client/gui/inventory/MerchantScreen.cpp index e5a077a4c..e98e244cc 100644 --- a/targets/minecraft/client/gui/inventory/MerchantScreen.cpp +++ b/targets/minecraft/client/gui/inventory/MerchantScreen.cpp @@ -22,6 +22,7 @@ #include "minecraft/world/inventory/MerchantMenu.h" #include "minecraft/world/item/trading/Merchant.h" #include "minecraft/world/item/trading/MerchantRecipeList.h" +#include "minecraft/world/item/trading/MerchantRecipe.h" class Level; diff --git a/targets/minecraft/client/gui/inventory/TrapScreen.cpp b/targets/minecraft/client/gui/inventory/TrapScreen.cpp index 1ab57f0c9..98fdcaab4 100644 --- a/targets/minecraft/client/gui/inventory/TrapScreen.cpp +++ b/targets/minecraft/client/gui/inventory/TrapScreen.cpp @@ -7,6 +7,8 @@ #include "minecraft/world/entity/player/Inventory.h" #include "minecraft/world/inventory/TrapMenu.h" #include "minecraft/world/level/tile/entity/DispenserTileEntity.h" +#include "minecraft/client/renderer/Textures.h" +#include "minecraft/client/resources/ResourceLocation.h" #ifdef ENABLE_JAVA_GUIS ResourceLocation GUI_TRAP_LOCATION = ResourceLocation(TN_GUI_TRAP); diff --git a/targets/minecraft/client/model/dragon/DragonModel.cpp b/targets/minecraft/client/model/dragon/DragonModel.cpp index 19a2cd7b3..1a764de7e 100644 --- a/targets/minecraft/client/model/dragon/DragonModel.cpp +++ b/targets/minecraft/client/model/dragon/DragonModel.cpp @@ -8,7 +8,7 @@ #include #include "platform/sdl2/Render.h" -#include "gl3_loader.h" + #include "minecraft/client/model/geom/Model.h" #include "minecraft/client/model/geom/ModelPart.h" #include "minecraft/world/entity/Entity.h" diff --git a/targets/minecraft/client/multiplayer/ClientConnection.cpp b/targets/minecraft/client/multiplayer/ClientConnection.cpp index 42dad4a2e..befc3994d 100644 --- a/targets/minecraft/client/multiplayer/ClientConnection.cpp +++ b/targets/minecraft/client/multiplayer/ClientConnection.cpp @@ -57,6 +57,7 @@ #include "minecraft/client/renderer/LevelRenderer.h" #include "minecraft/client/skins/DLCTexturePack.h" #include "minecraft/client/skins/TexturePackRepository.h" +#include "minecraft/client/gui/inventory/MerchantScreen.h" #include "minecraft/core/particles/ParticleTypes.h" #include "minecraft/network/packet/AddEntityPacket.h" #include "minecraft/network/packet/AddExperienceOrbPacket.h" diff --git a/targets/minecraft/client/player/LocalPlayer.cpp b/targets/minecraft/client/player/LocalPlayer.cpp index 5a4e30d87..ee9f8a46a 100644 --- a/targets/minecraft/client/player/LocalPlayer.cpp +++ b/targets/minecraft/client/player/LocalPlayer.cpp @@ -81,6 +81,7 @@ #include "minecraft/world/level/dimension/Dimension.h" #include "minecraft/world/level/tile/entity/CommandBlockEntity.h" #include "minecraft/world/level/tile/entity/SignTileEntity.h" +#include "minecraft/world/level/tile/entity/HopperTileEntity.h" #include "minecraft/world/phys/AABB.h" #include "minecraft/world/phys/HitResult.h" #include "minecraft/world/phys/Vec3.h" diff --git a/targets/minecraft/client/renderer/GameRenderer.cpp b/targets/minecraft/client/renderer/GameRenderer.cpp index ae546106f..1e9ce5ee5 100644 --- a/targets/minecraft/client/renderer/GameRenderer.cpp +++ b/targets/minecraft/client/renderer/GameRenderer.cpp @@ -23,7 +23,7 @@ #include "app/include/stubs.h" #include "Tesselator.h" #include "console_helpers/compression.h" -#include "gl3_loader.h" + #include "java/Class.h" #include "java/FloatBuffer.h" #include "java/JavaMath.h" diff --git a/targets/minecraft/client/renderer/Textures.cpp b/targets/minecraft/client/renderer/Textures.cpp index d8c631212..97d7311c9 100644 --- a/targets/minecraft/client/renderer/Textures.cpp +++ b/targets/minecraft/client/renderer/Textures.cpp @@ -15,7 +15,7 @@ #include "app/include/MemTextureProcessor.h" #include "app/include/MobSkinMemTextureProcessor.h" #include "console_helpers/StringHelpers.h" -#include "gl3_loader.h" + #include "java/Buffer.h" #include "java/ByteBuffer.h" #include "minecraft/client/MemoryTracker.h" diff --git a/targets/minecraft/client/renderer/entity/ArrowRenderer.cpp b/targets/minecraft/client/renderer/entity/ArrowRenderer.cpp index 38ed2372c..9fab5bf3f 100644 --- a/targets/minecraft/client/renderer/entity/ArrowRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/ArrowRenderer.cpp @@ -5,7 +5,7 @@ #include #include "platform/sdl2/Render.h" -#include "gl3_loader.h" + #include "minecraft/client/renderer/Tesselator.h" #include "minecraft/client/renderer/Textures.h" #include "minecraft/client/resources/ResourceLocation.h" diff --git a/targets/minecraft/client/renderer/entity/CreeperRenderer.cpp b/targets/minecraft/client/renderer/entity/CreeperRenderer.cpp index 6efd57455..88807dfb9 100644 --- a/targets/minecraft/client/renderer/entity/CreeperRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/CreeperRenderer.cpp @@ -5,7 +5,7 @@ #include #include "platform/sdl2/Render.h" -#include "gl3_loader.h" + #include "minecraft/client/model/CreeperModel.h" #include "minecraft/client/renderer/Textures.h" #include "minecraft/client/renderer/entity/MobRenderer.h" diff --git a/targets/minecraft/client/renderer/entity/EnderDragonRenderer.cpp b/targets/minecraft/client/renderer/entity/EnderDragonRenderer.cpp index e5b9bb4de..775409b6f 100644 --- a/targets/minecraft/client/renderer/entity/EnderDragonRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/EnderDragonRenderer.cpp @@ -7,7 +7,7 @@ #include "platform/sdl2/Render.h" #include "SharedConstants.h" -#include "gl3_loader.h" + #include "java/Random.h" #include "minecraft/client/Lighting.h" #include "minecraft/client/model/dragon/DragonModel.h" diff --git a/targets/minecraft/client/renderer/entity/EndermanRenderer.cpp b/targets/minecraft/client/renderer/entity/EndermanRenderer.cpp index fb35bf5ba..84902f09d 100644 --- a/targets/minecraft/client/renderer/entity/EndermanRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/EndermanRenderer.cpp @@ -3,7 +3,7 @@ #include #include "platform/sdl2/Render.h" -#include "gl3_loader.h" + #include "minecraft/SharedConstants.h" #include "minecraft/client/model/EndermanModel.h" #include "minecraft/client/renderer/Textures.h" diff --git a/targets/minecraft/client/renderer/entity/EntityRenderDispatcher.cpp b/targets/minecraft/client/renderer/entity/EntityRenderDispatcher.cpp index 0c160d166..4e023e014 100644 --- a/targets/minecraft/client/renderer/entity/EntityRenderDispatcher.cpp +++ b/targets/minecraft/client/renderer/entity/EntityRenderDispatcher.cpp @@ -58,7 +58,7 @@ #include "WitherSkullRenderer.h" #include "WolfRenderer.h" #include "ZombieRenderer.h" -#include "gl3_loader.h" + #include "minecraft/client/model/ChickenModel.h" #include "minecraft/client/model/CowModel.h" #include "minecraft/client/model/HumanoidModel.h" diff --git a/targets/minecraft/client/renderer/entity/EntityRenderer.cpp b/targets/minecraft/client/renderer/entity/EntityRenderer.cpp index 068bc5384..e23fa047f 100644 --- a/targets/minecraft/client/renderer/entity/EntityRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/EntityRenderer.cpp @@ -4,7 +4,7 @@ #include "platform/sdl2/Render.h" #include "EntityRenderDispatcher.h" -#include "gl3_loader.h" + #include "java/Class.h" #include "minecraft/client/Options.h" #include "minecraft/client/renderer/Tesselator.h" diff --git a/targets/minecraft/client/renderer/entity/ExperienceOrbRenderer.cpp b/targets/minecraft/client/renderer/entity/ExperienceOrbRenderer.cpp index 15c110f6a..a99c8f097 100644 --- a/targets/minecraft/client/renderer/entity/ExperienceOrbRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/ExperienceOrbRenderer.cpp @@ -7,7 +7,7 @@ #include "platform/sdl2/Render.h" #include "EntityRenderDispatcher.h" -#include "gl3_loader.h" + #include "minecraft/SharedConstants.h" #include "minecraft/client/renderer/Tesselator.h" #include "minecraft/client/renderer/Textures.h" diff --git a/targets/minecraft/client/renderer/entity/FallingTileRenderer.cpp b/targets/minecraft/client/renderer/entity/FallingTileRenderer.cpp index c1bc2e4fc..24c6bc8e6 100644 --- a/targets/minecraft/client/renderer/entity/FallingTileRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/FallingTileRenderer.cpp @@ -4,7 +4,7 @@ #include #include "platform/sdl2/Render.h" -#include "gl3_loader.h" + #include "minecraft/client/renderer/Tesselator.h" #include "minecraft/client/renderer/TileRenderer.h" #include "minecraft/client/renderer/entity/EntityRenderer.h" diff --git a/targets/minecraft/client/renderer/entity/FireballRenderer.cpp b/targets/minecraft/client/renderer/entity/FireballRenderer.cpp index 8dc94a890..8bdbd0d45 100644 --- a/targets/minecraft/client/renderer/entity/FireballRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/FireballRenderer.cpp @@ -4,7 +4,7 @@ #include "platform/sdl2/Render.h" #include "EntityRenderDispatcher.h" -#include "gl3_loader.h" + #include "java/Class.h" #include "minecraft/client/renderer/Tesselator.h" #include "minecraft/client/renderer/texture/TextureAtlas.h" diff --git a/targets/minecraft/client/renderer/entity/FishingHookRenderer.cpp b/targets/minecraft/client/renderer/entity/FishingHookRenderer.cpp index ca1b974f3..f2449308b 100644 --- a/targets/minecraft/client/renderer/entity/FishingHookRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/FishingHookRenderer.cpp @@ -6,7 +6,7 @@ #include "platform/sdl2/Render.h" #include "EntityRenderDispatcher.h" -#include "gl3_loader.h" + #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "minecraft/client/renderer/Tesselator.h" diff --git a/targets/minecraft/client/renderer/entity/ItemRenderer.cpp b/targets/minecraft/client/renderer/entity/ItemRenderer.cpp index 3bf03f177..e9e5bdcdf 100644 --- a/targets/minecraft/client/renderer/entity/ItemRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/ItemRenderer.cpp @@ -7,7 +7,7 @@ #include "platform/sdl2/Render.h" #include "EntityRenderDispatcher.h" #include "console_helpers/StringHelpers.h" -#include "gl3_loader.h" + #include "java/JavaMath.h" #include "java/Random.h" #include "minecraft/SharedConstants.h" diff --git a/targets/minecraft/client/renderer/entity/ItemSpriteRenderer.cpp b/targets/minecraft/client/renderer/entity/ItemSpriteRenderer.cpp index 76180f22c..9776e0b3c 100644 --- a/targets/minecraft/client/renderer/entity/ItemSpriteRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/ItemSpriteRenderer.cpp @@ -4,7 +4,7 @@ #include "platform/sdl2/Render.h" #include "EntityRenderDispatcher.h" -#include "gl3_loader.h" + #include "minecraft/client/renderer/Tesselator.h" #include "minecraft/client/renderer/entity/EntityRenderer.h" #include "minecraft/client/renderer/texture/TextureAtlas.h" diff --git a/targets/minecraft/client/renderer/entity/LeashKnotRenderer.cpp b/targets/minecraft/client/renderer/entity/LeashKnotRenderer.cpp index 8ba35454b..ade46a95a 100644 --- a/targets/minecraft/client/renderer/entity/LeashKnotRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/LeashKnotRenderer.cpp @@ -3,7 +3,7 @@ #include #include "platform/sdl2/Render.h" -#include "gl3_loader.h" + #include "minecraft/client/model/LeashKnotModel.h" #include "minecraft/client/renderer/Textures.h" #include "minecraft/client/renderer/entity/EntityRenderer.h" diff --git a/targets/minecraft/client/renderer/entity/LightningBoltRenderer.cpp b/targets/minecraft/client/renderer/entity/LightningBoltRenderer.cpp index 69c664577..912b660f1 100644 --- a/targets/minecraft/client/renderer/entity/LightningBoltRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/LightningBoltRenderer.cpp @@ -3,7 +3,7 @@ #include #include "platform/sdl2/Render.h" -#include "gl3_loader.h" + #include "java/Random.h" #include "minecraft/client/renderer/Tesselator.h" #include "minecraft/world/entity/Entity.h" diff --git a/targets/minecraft/client/renderer/entity/LivingEntityRenderer.cpp b/targets/minecraft/client/renderer/entity/LivingEntityRenderer.cpp index ec775817a..38d5972f3 100644 --- a/targets/minecraft/client/renderer/entity/LivingEntityRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/LivingEntityRenderer.cpp @@ -8,7 +8,7 @@ #include "EntityRenderDispatcher.h" #include "app/common/App_enums.h" #include "app/linux/Linux_App.h" -#include "gl3_loader.h" + #include "java/Class.h" #include "java/Random.h" #include "minecraft/client/Lighting.h" diff --git a/targets/minecraft/client/renderer/entity/MobRenderer.cpp b/targets/minecraft/client/renderer/entity/MobRenderer.cpp index e3426244b..c694e55eb 100644 --- a/targets/minecraft/client/renderer/entity/MobRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/MobRenderer.cpp @@ -9,7 +9,7 @@ #include "LivingEntityRenderer.h" #include "app/common/App_enums.h" #include "app/common/src/Colours/ColourTable.h" -#include "gl3_loader.h" + #include "java/Class.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/renderer/Tesselator.h" diff --git a/targets/minecraft/client/renderer/entity/MushroomCowRenderer.cpp b/targets/minecraft/client/renderer/entity/MushroomCowRenderer.cpp index 0187ff02f..e1ecad57d 100644 --- a/targets/minecraft/client/renderer/entity/MushroomCowRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/MushroomCowRenderer.cpp @@ -3,7 +3,7 @@ #include #include "platform/sdl2/Render.h" -#include "gl3_loader.h" + #include "minecraft/client/model/QuadrupedModel.h" #include "minecraft/client/model/geom/ModelPart.h" #include "minecraft/client/renderer/Textures.h" diff --git a/targets/minecraft/client/renderer/entity/PaintingRenderer.cpp b/targets/minecraft/client/renderer/entity/PaintingRenderer.cpp index 81ca589ad..db12d33f1 100644 --- a/targets/minecraft/client/renderer/entity/PaintingRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/PaintingRenderer.cpp @@ -4,7 +4,7 @@ #include "platform/sdl2/Render.h" #include "EntityRenderDispatcher.h" -#include "gl3_loader.h" + #include "java/Random.h" #include "minecraft/client/renderer/Tesselator.h" #include "minecraft/client/renderer/Textures.h" diff --git a/targets/minecraft/client/renderer/entity/SlimeRenderer.cpp b/targets/minecraft/client/renderer/entity/SlimeRenderer.cpp index 3331c1476..d02b18e86 100644 --- a/targets/minecraft/client/renderer/entity/SlimeRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/SlimeRenderer.cpp @@ -3,7 +3,7 @@ #include #include "platform/sdl2/Render.h" -#include "gl3_loader.h" + #include "minecraft/client/renderer/Textures.h" #include "minecraft/client/renderer/entity/MobRenderer.h" #include "minecraft/client/resources/ResourceLocation.h" diff --git a/targets/minecraft/client/renderer/entity/SpiderRenderer.cpp b/targets/minecraft/client/renderer/entity/SpiderRenderer.cpp index ce26a6822..ca7f309bb 100644 --- a/targets/minecraft/client/renderer/entity/SpiderRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/SpiderRenderer.cpp @@ -3,7 +3,7 @@ #include #include "platform/sdl2/Render.h" -#include "gl3_loader.h" + #include "minecraft/SharedConstants.h" #include "minecraft/client/model/SpiderModel.h" #include "minecraft/client/renderer/Textures.h" diff --git a/targets/minecraft/client/renderer/entity/TntMinecartRenderer.cpp b/targets/minecraft/client/renderer/entity/TntMinecartRenderer.cpp index 4b5001808..96c26708d 100644 --- a/targets/minecraft/client/renderer/entity/TntMinecartRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/TntMinecartRenderer.cpp @@ -3,7 +3,7 @@ #include #include "platform/sdl2/Render.h" -#include "gl3_loader.h" + #include "minecraft/client/renderer/TileRenderer.h" #include "minecraft/client/renderer/entity/MinecartRenderer.h" #include "minecraft/world/entity/item/Minecart.h" diff --git a/targets/minecraft/client/renderer/entity/TntRenderer.cpp b/targets/minecraft/client/renderer/entity/TntRenderer.cpp index df83fdad4..eae22f2c0 100644 --- a/targets/minecraft/client/renderer/entity/TntRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/TntRenderer.cpp @@ -3,7 +3,7 @@ #include #include "platform/sdl2/Render.h" -#include "gl3_loader.h" + #include "minecraft/SharedConstants.h" #include "minecraft/client/renderer/TileRenderer.h" #include "minecraft/client/renderer/texture/TextureAtlas.h" diff --git a/targets/minecraft/client/renderer/entity/VillagerGolemRenderer.cpp b/targets/minecraft/client/renderer/entity/VillagerGolemRenderer.cpp index 8603a1bb2..3cfd771cb 100644 --- a/targets/minecraft/client/renderer/entity/VillagerGolemRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/VillagerGolemRenderer.cpp @@ -5,7 +5,7 @@ #include #include "platform/sdl2/Render.h" -#include "gl3_loader.h" + #include "minecraft/SharedConstants.h" #include "minecraft/client/model/VillagerGolemModel.h" #include "minecraft/client/model/geom/ModelPart.h" diff --git a/targets/minecraft/client/renderer/entity/WitherBossRenderer.cpp b/targets/minecraft/client/renderer/entity/WitherBossRenderer.cpp index d91f3d04a..73eb7617e 100644 --- a/targets/minecraft/client/renderer/entity/WitherBossRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/WitherBossRenderer.cpp @@ -6,7 +6,7 @@ #include "platform/sdl2/Render.h" #include "MobRenderer.h" #include "SharedConstants.h" -#include "gl3_loader.h" + #include "minecraft/client/model/WitherBossModel.h" #include "minecraft/client/model/geom/Model.h" #include "minecraft/client/renderer/BossMobGuiInfo.h" diff --git a/targets/minecraft/client/renderer/entity/WitherSkullRenderer.cpp b/targets/minecraft/client/renderer/entity/WitherSkullRenderer.cpp index c0673e1bf..633cdb6f2 100644 --- a/targets/minecraft/client/renderer/entity/WitherSkullRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/WitherSkullRenderer.cpp @@ -3,7 +3,7 @@ #include #include "platform/sdl2/Render.h" -#include "gl3_loader.h" + #include "minecraft/client/model/SkeletonHeadModel.h" #include "minecraft/client/renderer/Textures.h" #include "minecraft/client/resources/ResourceLocation.h" diff --git a/targets/minecraft/client/renderer/tileentity/BeaconRenderer.cpp b/targets/minecraft/client/renderer/tileentity/BeaconRenderer.cpp index 1a7418316..37ae02ed3 100644 --- a/targets/minecraft/client/renderer/tileentity/BeaconRenderer.cpp +++ b/targets/minecraft/client/renderer/tileentity/BeaconRenderer.cpp @@ -5,7 +5,7 @@ #include #include "platform/sdl2/Render.h" -#include "gl3_loader.h" + #include "minecraft/client/renderer/Tesselator.h" #include "minecraft/client/renderer/Textures.h" #include "minecraft/client/resources/ResourceLocation.h" diff --git a/targets/minecraft/client/renderer/tileentity/ChestRenderer.cpp b/targets/minecraft/client/renderer/tileentity/ChestRenderer.cpp index 5af17a888..603ae8902 100644 --- a/targets/minecraft/client/renderer/tileentity/ChestRenderer.cpp +++ b/targets/minecraft/client/renderer/tileentity/ChestRenderer.cpp @@ -4,7 +4,7 @@ #include #include "platform/sdl2/Render.h" -#include "gl3_loader.h" + #include "minecraft/client/model/ChestModel.h" #include "minecraft/client/model/LargeChestModel.h" #include "minecraft/client/model/geom/ModelPart.h" diff --git a/targets/minecraft/client/renderer/tileentity/EnchantTableRenderer.cpp b/targets/minecraft/client/renderer/tileentity/EnchantTableRenderer.cpp index a7e3d67d4..bcc00e45a 100644 --- a/targets/minecraft/client/renderer/tileentity/EnchantTableRenderer.cpp +++ b/targets/minecraft/client/renderer/tileentity/EnchantTableRenderer.cpp @@ -5,7 +5,7 @@ #include #include "platform/sdl2/Render.h" -#include "gl3_loader.h" + #include "minecraft/client/model/BookModel.h" #include "minecraft/client/renderer/Textures.h" #include "minecraft/client/resources/ResourceLocation.h" diff --git a/targets/minecraft/client/renderer/tileentity/EnderChestRenderer.cpp b/targets/minecraft/client/renderer/tileentity/EnderChestRenderer.cpp index 59e3009ba..a902fe534 100644 --- a/targets/minecraft/client/renderer/tileentity/EnderChestRenderer.cpp +++ b/targets/minecraft/client/renderer/tileentity/EnderChestRenderer.cpp @@ -4,7 +4,7 @@ #include #include "platform/sdl2/Render.h" -#include "gl3_loader.h" + #include "minecraft/client/model/ChestModel.h" #include "minecraft/client/model/geom/ModelPart.h" #include "minecraft/client/renderer/Textures.h" diff --git a/targets/minecraft/client/renderer/tileentity/PistonPieceRenderer.cpp b/targets/minecraft/client/renderer/tileentity/PistonPieceRenderer.cpp index 1a6cadd97..82f77a691 100644 --- a/targets/minecraft/client/renderer/tileentity/PistonPieceRenderer.cpp +++ b/targets/minecraft/client/renderer/tileentity/PistonPieceRenderer.cpp @@ -3,7 +3,7 @@ #include #include "platform/sdl2/Render.h" -#include "gl3_loader.h" + #include "minecraft/client/Lighting.h" #include "minecraft/client/renderer/Tesselator.h" #include "minecraft/client/renderer/Textures.h" diff --git a/targets/minecraft/client/renderer/tileentity/SignRenderer.cpp b/targets/minecraft/client/renderer/tileentity/SignRenderer.cpp index ace5ff64b..30bd06dfd 100644 --- a/targets/minecraft/client/renderer/tileentity/SignRenderer.cpp +++ b/targets/minecraft/client/renderer/tileentity/SignRenderer.cpp @@ -9,7 +9,7 @@ #include "app/common/src/Colours/ColourTable.h" #include "app/linux/Linux_App.h" #include "app/include/XboxStubs.h" -#include "gl3_loader.h" + #include "minecraft/client/Minecraft.h" #include "minecraft/client/gui/Font.h" #include "minecraft/client/model/SignModel.h" diff --git a/targets/minecraft/client/renderer/tileentity/SkullTileRenderer.cpp b/targets/minecraft/client/renderer/tileentity/SkullTileRenderer.cpp index 6a7cdf3c9..2604cfb61 100644 --- a/targets/minecraft/client/renderer/tileentity/SkullTileRenderer.cpp +++ b/targets/minecraft/client/renderer/tileentity/SkullTileRenderer.cpp @@ -3,7 +3,7 @@ #include #include "platform/sdl2/Render.h" -#include "gl3_loader.h" + #include "minecraft/Facing.h" #include "minecraft/client/model/SkeletonHeadModel.h" #include "minecraft/client/model/geom/Model.h" diff --git a/targets/minecraft/client/renderer/tileentity/TheEndPortalRenderer.cpp b/targets/minecraft/client/renderer/tileentity/TheEndPortalRenderer.cpp index c48d4db64..34432f1b5 100644 --- a/targets/minecraft/client/renderer/tileentity/TheEndPortalRenderer.cpp +++ b/targets/minecraft/client/renderer/tileentity/TheEndPortalRenderer.cpp @@ -4,7 +4,7 @@ #include "platform/sdl2/Render.h" #include "TileEntityRenderDispatcher.h" -#include "gl3_loader.h" + #include "java/FloatBuffer.h" #include "java/Random.h" #include "java/System.h" diff --git a/targets/minecraft/client/renderer/tileentity/TileEntityRenderDispatcher.cpp b/targets/minecraft/client/renderer/tileentity/TileEntityRenderDispatcher.cpp index 554eb8ce7..e52ec019b 100644 --- a/targets/minecraft/client/renderer/tileentity/TileEntityRenderDispatcher.cpp +++ b/targets/minecraft/client/renderer/tileentity/TileEntityRenderDispatcher.cpp @@ -13,7 +13,7 @@ #include "SkullTileRenderer.h" #include "TheEndPortalRenderer.h" #include "TileEntityRenderer.h" -#include "gl3_loader.h" + #include "minecraft/SharedConstants.h" #include "minecraft/world/entity/LivingEntity.h" #include "minecraft/world/level/Level.h"