diff --git a/targets/4J.Common/4J_Compat.h b/targets/4J.Common/4J_Compat.h deleted file mode 100644 index 97dfa4469..000000000 --- a/targets/4J.Common/4J_Compat.h +++ /dev/null @@ -1,129 +0,0 @@ -#pragma once - -#include - -// The extracted 4J public headers only need the generic Linux/Windows-style -// compatibility surface. Console backends still own their platform-specific -// identity/content definitions elsewhere. -#if !defined(__ORBIS__) && !defined(__PS3__) && !defined(__PSVITA__) && \ - !defined(_DURANGO) -#ifndef XUSER_INDEX_ANY -inline constexpr int XUSER_INDEX_ANY = 255; -#endif - -#ifndef XUSER_MAX_COUNT -inline constexpr int XUSER_MAX_COUNT = 4; -#endif - -#ifndef XUSER_NAME_SIZE -inline constexpr int XUSER_NAME_SIZE = 32; -#endif - -#ifndef XUSER_INDEX_FOCUS -inline constexpr int XUSER_INDEX_FOCUS = 254; -#endif - -#ifndef FOURJ_COMMON_PLAYER_UID_DEFINED -#define FOURJ_COMMON_PLAYER_UID_DEFINED -using PlayerUID = unsigned long long; -using PPlayerUID = PlayerUID*; -inline constexpr PlayerUID INVALID_XUID = 0; -#endif -#endif - -class CXuiStringTable; - -#if !defined(__ORBIS__) && !defined(__PS3__) && !defined(__PSVITA__) && \ - !defined(_DURANGO) -#ifndef XCONTENT_MAX_DISPLAYNAME_LENGTH -inline constexpr int XCONTENT_MAX_DISPLAYNAME_LENGTH = 256; -#endif - -#ifndef XCONTENT_MAX_FILENAME_LENGTH -inline constexpr int XCONTENT_MAX_FILENAME_LENGTH = 256; -#endif - -#ifndef FOURJ_COMMON_XCONTENT_DATA_DEFINED -#define FOURJ_COMMON_XCONTENT_DATA_DEFINED -using XCONTENTDEVICEID = int; - -struct XCONTENT_DATA { - XCONTENTDEVICEID DeviceID; - std::uint32_t dwContentType; - wchar_t szDisplayName[XCONTENT_MAX_DISPLAYNAME_LENGTH]; - char szFileName[XCONTENT_MAX_FILENAME_LENGTH]; -}; -using PXCONTENT_DATA = XCONTENT_DATA*; -#endif - -#ifndef XMARKETPLACE_CONTENT_ID_LEN -inline constexpr int XMARKETPLACE_CONTENT_ID_LEN = 4; -#endif - -#ifndef FOURJ_COMMON_XMARKETPLACE_DEFINED -#define FOURJ_COMMON_XMARKETPLACE_DEFINED -struct XMARKETPLACE_CONTENTOFFER_INFO { - std::uint64_t qwOfferID; - std::uint64_t qwPreviewOfferID; - std::uint32_t dwOfferNameLength; - wchar_t* wszOfferName; - std::uint32_t dwOfferType; - std::uint8_t contentId[XMARKETPLACE_CONTENT_ID_LEN]; - bool fIsUnrestrictedLicense; - std::uint32_t dwLicenseMask; - std::uint32_t dwTitleID; - std::uint32_t dwContentCategory; - std::uint32_t dwTitleNameLength; - wchar_t* wszTitleName; - bool fUserHasPurchased; - std::uint32_t dwPackageSize; - std::uint32_t dwInstallSize; - std::uint32_t dwSellTextLength; - wchar_t* wszSellText; - std::uint32_t dwAssetID; - std::uint32_t dwPurchaseQuantity; - std::uint32_t dwPointsPrice; -}; -using PXMARKETPLACE_CONTENTOFFER_INFO = XMARKETPLACE_CONTENTOFFER_INFO*; -#endif - -#ifndef XMARKETPLACE_OFFERING_TYPE_CONTENT -inline constexpr std::uint32_t XMARKETPLACE_OFFERING_TYPE_CONTENT = 0x00000002; -#endif - -#ifndef XMARKETPLACE_OFFERING_TYPE_GAME_DEMO -inline constexpr std::uint32_t XMARKETPLACE_OFFERING_TYPE_GAME_DEMO = - 0x00000020; -#endif - -#ifndef XMARKETPLACE_OFFERING_TYPE_GAME_TRAILER -inline constexpr std::uint32_t XMARKETPLACE_OFFERING_TYPE_GAME_TRAILER = - 0x00000040; -#endif - -#ifndef XMARKETPLACE_OFFERING_TYPE_THEME -inline constexpr std::uint32_t XMARKETPLACE_OFFERING_TYPE_THEME = 0x00000080; -#endif - -#ifndef XMARKETPLACE_OFFERING_TYPE_TILE -inline constexpr std::uint32_t XMARKETPLACE_OFFERING_TYPE_TILE = 0x00000800; -#endif - -#ifndef XMARKETPLACE_OFFERING_TYPE_ARCADE -inline constexpr std::uint32_t XMARKETPLACE_OFFERING_TYPE_ARCADE = 0x00002000; -#endif - -#ifndef XMARKETPLACE_OFFERING_TYPE_VIDEO -inline constexpr std::uint32_t XMARKETPLACE_OFFERING_TYPE_VIDEO = 0x00004000; -#endif - -#ifndef XMARKETPLACE_OFFERING_TYPE_CONSUMABLE -inline constexpr std::uint32_t XMARKETPLACE_OFFERING_TYPE_CONSUMABLE = - 0x00010000; -#endif - -#ifndef XMARKETPLACE_OFFERING_TYPE_AVATARITEM -inline constexpr std::uint32_t XMARKETPLACE_OFFERING_TYPE_AVATARITEM = - 0x00100000; -#endif -#endif diff --git a/targets/app/common/Consoles_App.cpp b/targets/app/common/Consoles_App.cpp index c03be09ab..77fedc5cc 100644 --- a/targets/app/common/Consoles_App.cpp +++ b/targets/app/common/Consoles_App.cpp @@ -1,7 +1,7 @@ #include "app/common/Consoles_App.h" -#include "4J.Common/4J_Compat.h" -#include "4J.Common/4J_InputActions.h" +#include "platform/PlatformTypes.h" +#include "platform/InputActions.h" #include "platform/sdl2/Profile.h" #include "platform/sdl2/Render.h" #include "platform/sdl2/Storage.h" diff --git a/targets/app/common/src/Audio/SoundEngine.cpp b/targets/app/common/src/Audio/SoundEngine.cpp index ba71c8281..fe513a3fd 100644 --- a/targets/app/common/src/Audio/SoundEngine.cpp +++ b/targets/app/common/src/Audio/SoundEngine.cpp @@ -11,7 +11,7 @@ #include #include -#include "4J.Common/4J_Compat.h" +#include "platform/PlatformTypes.h" #include "app/common/App_Defines.h" #include "app/common/src/Audio/Consoles_SoundEngine.h" #include "app/linux/Iggy/include/rrCore.h" diff --git a/targets/app/common/src/DLC/DLCPack.h b/targets/app/common/src/DLC/DLCPack.h index 0b9fdfec0..996afa32a 100644 --- a/targets/app/common/src/DLC/DLCPack.h +++ b/targets/app/common/src/DLC/DLCPack.h @@ -5,7 +5,7 @@ #include #include -#include "4J.Common/4J_Compat.h" +#include "platform/PlatformTypes.h" #include "DLCManager.h" #include "app/common/src/DLC/DLCSkinFile.h" diff --git a/targets/app/common/src/Leaderboards/LeaderboardInterface.h b/targets/app/common/src/Leaderboards/LeaderboardInterface.h index fcdb1df8e..0b689ba0a 100644 --- a/targets/app/common/src/Leaderboards/LeaderboardInterface.h +++ b/targets/app/common/src/Leaderboards/LeaderboardInterface.h @@ -1,6 +1,6 @@ #pragma once -#include "4J.Common/4J_Compat.h" +#include "platform/PlatformTypes.h" #include "LeaderboardManager.h" // 4J-JEV: Simple interface for handling ReadStat failures. diff --git a/targets/app/common/src/Network/GameNetworkManager.h b/targets/app/common/src/Network/GameNetworkManager.h index 3783b33ca..16441a670 100644 --- a/targets/app/common/src/Network/GameNetworkManager.h +++ b/targets/app/common/src/Network/GameNetworkManager.h @@ -7,7 +7,7 @@ #if !defined(__linux__) #include #endif -#include "4J.Common/4J_Compat.h" +#include "platform/PlatformTypes.h" #include "platform/IPlatformNetwork.h" #include "app/include/NetTypes.h" #include "NetworkPlayerInterface.h" diff --git a/targets/app/common/src/Network/NetworkPlayerQNet.h b/targets/app/common/src/Network/NetworkPlayerQNet.h index dcf095603..db2cdd720 100644 --- a/targets/app/common/src/Network/NetworkPlayerQNet.h +++ b/targets/app/common/src/Network/NetworkPlayerQNet.h @@ -4,7 +4,7 @@ #include -#include "4J.Common/4J_Compat.h" +#include "platform/PlatformTypes.h" #include "NetworkPlayerInterface.h" class IQNetPlayer; diff --git a/targets/app/common/src/Network/PlatformNetworkManagerStub.h b/targets/app/common/src/Network/PlatformNetworkManagerStub.h index 4068f6b65..802c6830f 100644 --- a/targets/app/common/src/Network/PlatformNetworkManagerStub.h +++ b/targets/app/common/src/Network/PlatformNetworkManagerStub.h @@ -4,7 +4,7 @@ #include #include -#include "4J.Common/4J_Compat.h" +#include "platform/PlatformTypes.h" #include "app/include/NetTypes.h" #include "app/include/SkinBox.h" #include "app/include/XboxStubs.h" diff --git a/targets/app/common/src/Tutorial/Constraints/InputConstraint.cpp b/targets/app/common/src/Tutorial/Constraints/InputConstraint.cpp index 032f324a7..e09a1a667 100644 --- a/targets/app/common/src/Tutorial/Constraints/InputConstraint.cpp +++ b/targets/app/common/src/Tutorial/Constraints/InputConstraint.cpp @@ -1,6 +1,6 @@ #include "InputConstraint.h" -#include "4J.Common/4J_InputActions.h" +#include "platform/InputActions.h" #include "platform/sdl2/Input.h" bool InputConstraint::isMappingConstrained(int iPad, int mapping) { diff --git a/targets/app/common/src/Tutorial/FullTutorial.cpp b/targets/app/common/src/Tutorial/FullTutorial.cpp index 68df8fe74..900ac498f 100644 --- a/targets/app/common/src/Tutorial/FullTutorial.cpp +++ b/targets/app/common/src/Tutorial/FullTutorial.cpp @@ -3,7 +3,7 @@ #include #include -#include "4J.Common/4J_InputActions.h" +#include "platform/InputActions.h" #include "app/common/src/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h" #include "app/common/src/Tutorial/Constraints/AreaConstraint.h" #include "app/common/src/Tutorial/Constraints/ChangeStateConstraint.h" diff --git a/targets/app/common/src/Tutorial/Tutorial.cpp b/targets/app/common/src/Tutorial/Tutorial.cpp index 612960555..4191f9852 100644 --- a/targets/app/common/src/Tutorial/Tutorial.cpp +++ b/targets/app/common/src/Tutorial/Tutorial.cpp @@ -6,7 +6,7 @@ #include #include -#include "4J.Common/4J_InputActions.h" +#include "platform/InputActions.h" #include "platform/sdl2/Profile.h" #include "app/common/App_enums.h" #include "app/common/App_structs.h" diff --git a/targets/app/common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.cpp b/targets/app/common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.cpp index e8703a381..3c6b654aa 100644 --- a/targets/app/common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.cpp +++ b/targets/app/common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.cpp @@ -7,7 +7,7 @@ #include #include -#include "4J.Common/4J_InputActions.h" +#include "platform/InputActions.h" #include "platform/sdl2/Input.h" #include "platform/sdl2/Render.h" #include "app/common/App_enums.h" diff --git a/targets/app/common/src/UI/All Platforms/IUIScene_CraftingMenu.cpp b/targets/app/common/src/UI/All Platforms/IUIScene_CraftingMenu.cpp index 8cd670144..12cafee81 100644 --- a/targets/app/common/src/UI/All Platforms/IUIScene_CraftingMenu.cpp +++ b/targets/app/common/src/UI/All Platforms/IUIScene_CraftingMenu.cpp @@ -7,7 +7,7 @@ #include #include -#include "4J.Common/4J_InputActions.h" +#include "platform/InputActions.h" #include "platform/sdl2/Profile.h" #include "platform/sdl2/Render.h" #include "app/common/App_enums.h" diff --git a/targets/app/common/src/UI/All Platforms/IUIScene_CreativeMenu.cpp b/targets/app/common/src/UI/All Platforms/IUIScene_CreativeMenu.cpp index 0103e8e36..becc4eecc 100644 --- a/targets/app/common/src/UI/All Platforms/IUIScene_CreativeMenu.cpp +++ b/targets/app/common/src/UI/All Platforms/IUIScene_CreativeMenu.cpp @@ -6,7 +6,7 @@ #include #include -#include "4J.Common/4J_InputActions.h" +#include "platform/InputActions.h" #include "app/common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h" #include "app/linux/Linux_App.h" #include "app/linux/Linux_UIController.h" diff --git a/targets/app/common/src/UI/All Platforms/IUIScene_TradingMenu.cpp b/targets/app/common/src/UI/All Platforms/IUIScene_TradingMenu.cpp index f11bfdd52..d19fefb2b 100644 --- a/targets/app/common/src/UI/All Platforms/IUIScene_TradingMenu.cpp +++ b/targets/app/common/src/UI/All Platforms/IUIScene_TradingMenu.cpp @@ -4,7 +4,7 @@ #include -#include "4J.Common/4J_InputActions.h" +#include "platform/InputActions.h" #include "app/common/src/Tutorial/Tutorial.h" #include "app/common/src/UI/All Platforms/UIEnums.h" #include "app/linux/Linux_App.h" diff --git a/targets/app/common/src/UI/Components/UIComponent_PressStartToPlay.h b/targets/app/common/src/UI/Components/UIComponent_PressStartToPlay.h index a02f04325..cadf81339 100644 --- a/targets/app/common/src/UI/Components/UIComponent_PressStartToPlay.h +++ b/targets/app/common/src/UI/Components/UIComponent_PressStartToPlay.h @@ -2,7 +2,7 @@ #include -#include "4J.Common/4J_Compat.h" +#include "platform/PlatformTypes.h" #include "app/common/src/UI/All Platforms/UIEnums.h" #include "app/common/src/UI/Controls/UIControl.h" #include "app/common/src/UI/Controls/UIControl_Label.h" diff --git a/targets/app/common/src/UI/Components/UIComponent_Tooltips.h b/targets/app/common/src/UI/Components/UIComponent_Tooltips.h index 5a3bc8edc..ea0e5fe99 100644 --- a/targets/app/common/src/UI/Components/UIComponent_Tooltips.h +++ b/targets/app/common/src/UI/Components/UIComponent_Tooltips.h @@ -2,8 +2,8 @@ #include -#include "4J.Common/4J_Compat.h" -#include "4J.Common/4J_InputActions.h" +#include "platform/PlatformTypes.h" +#include "platform/InputActions.h" #include "platform/sdl2/Render.h" #include "app/common/App_enums.h" #include "app/common/src/UI/All Platforms/UIEnums.h" diff --git a/targets/app/common/src/UI/Scenes/Debug/UIScene_DebugCreateSchematic.cpp b/targets/app/common/src/UI/Scenes/Debug/UIScene_DebugCreateSchematic.cpp index e4991e5f9..c5ab1ab3a 100644 --- a/targets/app/common/src/UI/Scenes/Debug/UIScene_DebugCreateSchematic.cpp +++ b/targets/app/common/src/UI/Scenes/Debug/UIScene_DebugCreateSchematic.cpp @@ -3,7 +3,7 @@ #include -#include "4J.Common/4J_InputActions.h" +#include "platform/InputActions.h" #include "platform/sdl2/Input.h" #include "platform/sdl2/Profile.h" #include "app/common/App_enums.h" diff --git a/targets/app/common/src/UI/Scenes/Debug/UIScene_DebugOptions.cpp b/targets/app/common/src/UI/Scenes/Debug/UIScene_DebugOptions.cpp index 6dc729eae..1f9625b02 100644 --- a/targets/app/common/src/UI/Scenes/Debug/UIScene_DebugOptions.cpp +++ b/targets/app/common/src/UI/Scenes/Debug/UIScene_DebugOptions.cpp @@ -1,6 +1,6 @@ #include "UIScene_DebugOptions.h" -#include "4J.Common/4J_InputActions.h" +#include "platform/InputActions.h" #include "app/common/src/Console_Debug_enum.h" #include "app/common/src/UI/Controls/UIControl_CheckBox.h" #include "app/common/src/UI/UIScene.h" 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 ea369d873..8526414d4 100644 --- a/targets/app/common/src/UI/Scenes/Debug/UIScene_DebugOverlay.cpp +++ b/targets/app/common/src/UI/Scenes/Debug/UIScene_DebugOverlay.cpp @@ -5,7 +5,7 @@ #include -#include "4J.Common/4J_InputActions.h" +#include "platform/InputActions.h" #include "platform/sdl2/Profile.h" #include "app/common/App_enums.h" #include "app/common/src/Tutorial/Tutorial.h" diff --git a/targets/app/common/src/UI/Scenes/Debug/UIScene_DebugSetCamera.cpp b/targets/app/common/src/UI/Scenes/Debug/UIScene_DebugSetCamera.cpp index e2f5492c3..0e00d4895 100644 --- a/targets/app/common/src/UI/Scenes/Debug/UIScene_DebugSetCamera.cpp +++ b/targets/app/common/src/UI/Scenes/Debug/UIScene_DebugSetCamera.cpp @@ -5,7 +5,7 @@ #include -#include "4J.Common/4J_InputActions.h" +#include "platform/InputActions.h" #include "platform/sdl2/Input.h" #include "platform/sdl2/Profile.h" #include "app/common/App_enums.h" diff --git a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp index c93a40b7f..f1b737430 100644 --- a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp +++ b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp @@ -6,8 +6,8 @@ #include #include -#include "4J.Common/4J_Compat.h" -#include "4J.Common/4J_InputActions.h" +#include "platform/PlatformTypes.h" +#include "platform/InputActions.h" #include "platform/sdl2/Input.h" #include "platform/sdl2/Profile.h" #include "app/common/App_Defines.h" diff --git a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.cpp b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.cpp index 8c7f7a192..4f6614b4b 100644 --- a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.cpp +++ b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.cpp @@ -1,7 +1,7 @@ #include "UIScene_DLCMainMenu.h" -#include "4J.Common/4J_InputActions.h" +#include "platform/InputActions.h" #include "app/common/App_enums.h" #include "app/common/src/UI/All Platforms/UIStructs.h" #include "app/common/src/UI/Controls/UIControl_ButtonList.h" diff --git a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.cpp b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.cpp index c2675727a..1509ee9b1 100644 --- a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.cpp +++ b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.cpp @@ -3,8 +3,8 @@ #include -#include "4J.Common/4J_Compat.h" -#include "4J.Common/4J_InputActions.h" +#include "platform/PlatformTypes.h" +#include "platform/InputActions.h" #include "platform/sdl2/Render.h" #include "app/common/src/UI/All Platforms/UIStructs.h" #include "app/common/src/UI/Controls/UIControl_DLCList.h" diff --git a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_EULA.cpp b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_EULA.cpp index f795cdae6..8305dd73d 100644 --- a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_EULA.cpp +++ b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_EULA.cpp @@ -3,8 +3,8 @@ #include -#include "4J.Common/4J_Compat.h" -#include "4J.Common/4J_InputActions.h" +#include "platform/PlatformTypes.h" +#include "platform/InputActions.h" #include "platform/sdl2/Input.h" #include "platform/sdl2/Profile.h" #include "app/common/App_Defines.h" diff --git a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_Intro.cpp b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_Intro.cpp index bc0d286cf..6bf36a4f4 100644 --- a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_Intro.cpp +++ b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_Intro.cpp @@ -1,6 +1,6 @@ #include "UIScene_Intro.h" -#include "4J.Common/4J_InputActions.h" +#include "platform/InputActions.h" #include "app/common/src/UI/All Platforms/UIEnums.h" #include "app/common/src/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" diff --git a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.cpp b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.cpp index 5115b47e5..6224b44c4 100644 --- a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.cpp +++ b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.cpp @@ -4,8 +4,8 @@ #include #include -#include "4J.Common/4J_Compat.h" -#include "4J.Common/4J_InputActions.h" +#include "platform/PlatformTypes.h" +#include "platform/InputActions.h" #include "platform/sdl2/Profile.h" #include "app/common/App_Defines.h" #include "app/common/App_enums.h" diff --git a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.cpp b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.cpp index 86c7f8274..e86f50582 100644 --- a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.cpp +++ b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.cpp @@ -4,7 +4,7 @@ #include -#include "4J.Common/4J_InputActions.h" +#include "platform/InputActions.h" #include "platform/sdl2/Input.h" #include "platform/sdl2/Profile.h" #include "platform/sdl2/Render.h" diff --git a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.cpp b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.cpp index 2cd90177a..e3a5eb834 100644 --- a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.cpp +++ b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.cpp @@ -8,7 +8,7 @@ #include -#include "4J.Common/4J_InputActions.h" +#include "platform/InputActions.h" #include "platform/sdl2/Profile.h" #include "app/common/src/Console_Debug_enum.h" #include "app/common/src/Leaderboards/LeaderboardInterface.h" 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 8002f5eb2..71f22110c 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 @@ -3,7 +3,7 @@ #include #include -#include "4J.Common/4J_Compat.h" +#include "platform/PlatformTypes.h" #include "platform/sdl2/Storage.h" #include "app/common/src/Leaderboards/LeaderboardInterface.h" #include "app/common/src/Leaderboards/LeaderboardManager.h" diff --git a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp index 4ff4d5981..d13fef001 100644 --- a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp +++ b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp @@ -4,8 +4,8 @@ #include #include -#include "4J.Common/4J_Compat.h" -#include "4J.Common/4J_InputActions.h" +#include "platform/PlatformTypes.h" +#include "platform/InputActions.h" #include "platform/sdl2/Profile.h" #include "platform/sdl2/Render.h" #include "app/common/App_Defines.h" diff --git a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp index 6b472ba3b..a4468a1a5 100644 --- a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp +++ b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp @@ -6,7 +6,7 @@ #include -#include "4J.Common/4J_InputActions.h" +#include "platform/InputActions.h" #include "platform/sdl2/Input.h" #include "platform/sdl2/Profile.h" #include "app/common/App_Defines.h" diff --git a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp index b6695b4cf..9b94bd304 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 @@ -5,8 +5,8 @@ #include #include -#include "4J.Common/4J_Compat.h" -#include "4J.Common/4J_InputActions.h" +#include "platform/PlatformTypes.h" +#include "platform/InputActions.h" #include "platform/sdl2/Profile.h" #include "platform/sdl2/Render.h" #include "app/common/App_Defines.h" diff --git a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.cpp b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.cpp index 95f6507bd..cc9de7026 100644 --- a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.cpp +++ b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.cpp @@ -3,7 +3,7 @@ #include -#include "4J.Common/4J_InputActions.h" +#include "platform/InputActions.h" #include "app/common/App_Defines.h" #include "app/common/App_enums.h" #include "app/common/src/UI/Controls/UIControl_Button.h" diff --git a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.cpp b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.cpp index c9e82a935..4a72db8cd 100644 --- a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.cpp +++ b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.cpp @@ -1,8 +1,8 @@ #include "UIScene_SaveMessage.h" -#include "4J.Common/4J_Compat.h" -#include "4J.Common/4J_InputActions.h" +#include "platform/PlatformTypes.h" +#include "platform/InputActions.h" #include "platform/sdl2/Input.h" #include "platform/sdl2/Profile.h" #include "app/common/App_Defines.h" diff --git a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.cpp b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.cpp index c49652bc6..9f9228647 100644 --- a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.cpp +++ b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.cpp @@ -1,7 +1,7 @@ #include "UIScene_TrialExitUpsell.h" -#include "4J.Common/4J_InputActions.h" +#include "platform/InputActions.h" #include "platform/sdl2/Profile.h" #include "app/common/App_Defines.h" #include "app/common/src/UI/UIScene.h" diff --git a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_ControlsMenu.cpp b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_ControlsMenu.cpp index 384eec959..5af9b8577 100644 --- a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_ControlsMenu.cpp +++ b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_ControlsMenu.cpp @@ -4,7 +4,7 @@ #include -#include "4J.Common/4J_InputActions.h" +#include "platform/InputActions.h" #include "platform/sdl2/Input.h" #include "app/common/App_enums.h" #include "app/common/src/BuildVer/BuildVer.h" diff --git a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_Credits.cpp b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_Credits.cpp index b1ae270a6..0160d460e 100644 --- a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_Credits.cpp +++ b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_Credits.cpp @@ -4,7 +4,7 @@ #include #include -#include "4J.Common/4J_InputActions.h" +#include "platform/InputActions.h" #include "app/common/src/UI/UILayer.h" #include "app/common/src/UI/UIScene.h" #include "app/linux/Linux_App.h" diff --git a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.cpp b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.cpp index 7de55caf9..da55bf399 100644 --- a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.cpp +++ b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.cpp @@ -1,7 +1,7 @@ #include "UIScene_HelpAndOptionsMenu.h" -#include "4J.Common/4J_InputActions.h" +#include "platform/InputActions.h" #include "platform/sdl2/Profile.h" #include "app/common/src/UI/Controls/UIControl_Button.h" #include "app/common/src/UI/UILayer.h" diff --git a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_HowToPlay.cpp b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_HowToPlay.cpp index 77fd1fb7a..5a7793544 100644 --- a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_HowToPlay.cpp +++ b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_HowToPlay.cpp @@ -6,7 +6,7 @@ #include -#include "4J.Common/4J_InputActions.h" +#include "platform/InputActions.h" #include "app/common/App_enums.h" #include "app/common/src/UI/Controls/UIControl_Label.h" #include "app/common/src/UI/UIScene.h" diff --git a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.cpp b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.cpp index bd18779c1..5f563f49a 100644 --- a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.cpp +++ b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.cpp @@ -3,7 +3,7 @@ #include -#include "4J.Common/4J_InputActions.h" +#include "platform/InputActions.h" #include "app/common/src/UI/Controls/UIControl_ButtonList.h" #include "app/common/src/UI/UILayer.h" #include "app/common/src/UI/UIScene.h" diff --git a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_LanguageSelector.cpp b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_LanguageSelector.cpp index 319b3fe7e..a74859bc1 100644 --- a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_LanguageSelector.cpp +++ b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_LanguageSelector.cpp @@ -1,6 +1,6 @@ #include "UIScene_LanguageSelector.h" -#include "4J.Common/4J_InputActions.h" +#include "platform/InputActions.h" #include "app/common/src/UI/Controls/UIControl_ButtonList.h" #include "app/common/src/UI/UILayer.h" #include "app/common/src/UI/UIScene.h" diff --git a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_ReinstallMenu.cpp b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_ReinstallMenu.cpp index 85c2d391b..745e7552e 100644 --- a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_ReinstallMenu.cpp +++ b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_ReinstallMenu.cpp @@ -1,7 +1,7 @@ #include "UIScene_ReinstallMenu.h" -#include "4J.Common/4J_InputActions.h" +#include "platform/InputActions.h" #include "app/common/src/UI/UILayer.h" #include "app/common/src/UI/UIScene.h" #include "app/linux/Linux_App.h" diff --git a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.cpp b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.cpp index c4064f9a6..20e08f631 100644 --- a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.cpp +++ b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.cpp @@ -3,7 +3,7 @@ #include -#include "4J.Common/4J_InputActions.h" +#include "platform/InputActions.h" #include "app/common/App_enums.h" #include "app/common/src/UI/Controls/UIControl_Slider.h" #include "app/common/src/UI/UILayer.h" diff --git a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.cpp b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.cpp index 0afff076e..ecb01da08 100644 --- a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.cpp +++ b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.cpp @@ -2,7 +2,7 @@ #include -#include "4J.Common/4J_InputActions.h" +#include "platform/InputActions.h" #include "app/common/App_enums.h" #include "app/common/src/UI/Controls/UIControl_Slider.h" #include "app/common/src/UI/UILayer.h" diff --git a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.cpp b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.cpp index c1e936f95..dd41f5356 100644 --- a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.cpp +++ b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.cpp @@ -2,7 +2,7 @@ #include -#include "4J.Common/4J_InputActions.h" +#include "platform/InputActions.h" #include "platform/sdl2/Profile.h" #include "app/common/App_enums.h" #include "app/common/src/Network/GameNetworkManager.h" diff --git a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsMenu.cpp b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsMenu.cpp index 331e0d5de..8dbb1de6a 100644 --- a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsMenu.cpp +++ b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsMenu.cpp @@ -1,7 +1,7 @@ #include "UIScene_SettingsMenu.h" -#include "4J.Common/4J_InputActions.h" +#include "platform/InputActions.h" #include "platform/sdl2/Profile.h" #include "app/common/src/UI/Controls/UIControl_Button.h" #include "app/common/src/UI/UILayer.h" diff --git a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.cpp b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.cpp index ae07422fb..63689253b 100644 --- a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.cpp +++ b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.cpp @@ -3,7 +3,7 @@ #include -#include "4J.Common/4J_InputActions.h" +#include "platform/InputActions.h" #include "platform/sdl2/Profile.h" #include "platform/sdl2/Render.h" #include "app/common/App_enums.h" diff --git a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.cpp b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.cpp index bdca8770f..e3136db17 100644 --- a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.cpp +++ b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.cpp @@ -3,7 +3,7 @@ #include -#include "4J.Common/4J_InputActions.h" +#include "platform/InputActions.h" #include "platform/sdl2/Profile.h" #include "app/common/App_enums.h" #include "app/common/src/UI/Controls/UIControl_CheckBox.h" diff --git a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp index b6b932adf..0b03e74fe 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 @@ -5,7 +5,7 @@ #include -#include "4J.Common/4J_InputActions.h" +#include "platform/InputActions.h" #include "platform/sdl2/Profile.h" #include "platform/sdl2/Render.h" #include "app/common/App_Defines.h" diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.cpp b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.cpp index bc4881a7c..341613a47 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.cpp +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.cpp @@ -4,7 +4,7 @@ #include #include -#include "4J.Common/4J_InputActions.h" +#include "platform/InputActions.h" #include "app/common/src/Tutorial/Tutorial.h" #include "app/common/src/Tutorial/TutorialMode.h" #include "app/common/src/UI/All Platforms/UIStructs.h" diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.cpp b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.cpp index 77848b372..d6428251b 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.cpp +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.cpp @@ -5,7 +5,7 @@ #include #include -#include "4J.Common/4J_InputActions.h" +#include "platform/InputActions.h" #include "platform/sdl2/Profile.h" #include "app/common/src/Tutorial/Tutorial.h" #include "app/common/src/Tutorial/TutorialEnum.h" diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.cpp b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.cpp index 32b538ed1..3c014d7b3 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.cpp +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.cpp @@ -1,7 +1,7 @@ #include "UIScene_CraftingMenu.h" -#include "4J.Common/4J_InputActions.h" +#include "platform/InputActions.h" #include "platform/sdl2/Profile.h" #include "app/common/src/Tutorial/Tutorial.h" #include "app/common/src/Tutorial/TutorialEnum.h" diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.cpp b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.cpp index 3b1324a3a..b3d04a370 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.cpp +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.cpp @@ -3,7 +3,7 @@ #include -#include "4J.Common/4J_InputActions.h" +#include "platform/InputActions.h" #include "platform/sdl2/Profile.h" #include "platform/sdl2/Storage.h" #include "app/common/App_enums.h" diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.cpp b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.cpp index 2472f729e..ed3e0469a 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.cpp +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.cpp @@ -6,8 +6,8 @@ #include -#include "4J.Common/4J_Compat.h" -#include "4J.Common/4J_InputActions.h" +#include "platform/PlatformTypes.h" +#include "platform/InputActions.h" #include "platform/sdl2/Profile.h" #include "app/common/App_enums.h" #include "app/common/src/Tutorial/Tutorial.h" diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.cpp b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.cpp index ef06d5753..6c0c423e2 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.cpp +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.cpp @@ -3,7 +3,7 @@ #include -#include "4J.Common/4J_InputActions.h" +#include "platform/InputActions.h" #include "app/common/App_enums.h" #include "app/common/src/Network/GameNetworkManager.h" #include "app/common/src/Network/NetworkPlayerInterface.h" diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.cpp b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.cpp index e8b19da16..ab660bd32 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.cpp +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.cpp @@ -2,8 +2,8 @@ #include -#include "4J.Common/4J_Compat.h" -#include "4J.Common/4J_InputActions.h" +#include "platform/PlatformTypes.h" +#include "platform/InputActions.h" #include "platform/sdl2/Profile.h" #include "app/common/App_enums.h" #include "app/common/src/Console_Debug_enum.h" diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.cpp b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.cpp index 61d6aca9d..0ee841983 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.cpp +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.cpp @@ -3,7 +3,7 @@ #include -#include "4J.Common/4J_InputActions.h" +#include "platform/InputActions.h" #include "app/common/App_enums.h" #include "app/common/src/Network/GameNetworkManager.h" #include "app/common/src/Network/NetworkPlayerInterface.h" diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.cpp b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.cpp index edf0986d7..9aaf92783 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.cpp +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.cpp @@ -5,7 +5,7 @@ #include -#include "4J.Common/4J_InputActions.h" +#include "platform/InputActions.h" #include "platform/sdl2/Profile.h" #include "app/common/App_enums.h" #include "app/common/src/DLC/DLCManager.h" diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.cpp b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.cpp index f98889b04..2452b5f8c 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.cpp +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.cpp @@ -1,7 +1,7 @@ #include "UIScene_SignEntryMenu.h" -#include "4J.Common/4J_InputActions.h" +#include "platform/InputActions.h" #include "platform/sdl2/Input.h" #include "app/common/src/UI/All Platforms/UIStructs.h" #include "app/common/src/UI/Controls/UIControl_Button.h" diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.cpp b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.cpp index 0f7245ed9..a3f0c9cd8 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.cpp +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.cpp @@ -3,7 +3,7 @@ #include -#include "4J.Common/4J_InputActions.h" +#include "platform/InputActions.h" #include "app/common/src/Console_Debug_enum.h" #include "app/common/src/Network/GameNetworkManager.h" #include "app/common/src/Network/NetworkPlayerInterface.h" diff --git a/targets/app/common/src/UI/Scenes/UIScene_ConnectingProgress.cpp b/targets/app/common/src/UI/Scenes/UIScene_ConnectingProgress.cpp index af310e054..7725535fb 100644 --- a/targets/app/common/src/UI/Scenes/UIScene_ConnectingProgress.cpp +++ b/targets/app/common/src/UI/Scenes/UIScene_ConnectingProgress.cpp @@ -1,7 +1,7 @@ #include "UIScene_ConnectingProgress.h" -#include "4J.Common/4J_InputActions.h" +#include "platform/InputActions.h" #include "platform/sdl2/Profile.h" #include "app/common/App_enums.h" #include "app/common/src/Network/GameNetworkManager.h" diff --git a/targets/app/common/src/UI/Scenes/UIScene_FullscreenProgress.cpp b/targets/app/common/src/UI/Scenes/UIScene_FullscreenProgress.cpp index 83e4e0770..fb3a021f8 100644 --- a/targets/app/common/src/UI/Scenes/UIScene_FullscreenProgress.cpp +++ b/targets/app/common/src/UI/Scenes/UIScene_FullscreenProgress.cpp @@ -4,8 +4,8 @@ #include #include -#include "4J.Common/4J_Compat.h" -#include "4J.Common/4J_InputActions.h" +#include "platform/PlatformTypes.h" +#include "platform/InputActions.h" #include "platform/sdl2/Profile.h" #include "app/common/App_enums.h" #include "app/common/src/Network/GameNetworkManager.h" diff --git a/targets/app/common/src/UI/Scenes/UIScene_Keyboard.cpp b/targets/app/common/src/UI/Scenes/UIScene_Keyboard.cpp index aa5633e16..a33801285 100644 --- a/targets/app/common/src/UI/Scenes/UIScene_Keyboard.cpp +++ b/targets/app/common/src/UI/Scenes/UIScene_Keyboard.cpp @@ -1,6 +1,6 @@ #include "UIScene_Keyboard.h" -#include "4J.Common/4J_InputActions.h" +#include "platform/InputActions.h" #include "app/common/App_Defines.h" #include "app/common/src/UI/Controls/UIControl_Button.h" #include "app/common/src/UI/Controls/UIControl_Label.h" diff --git a/targets/app/common/src/UI/Scenes/UIScene_MessageBox.cpp b/targets/app/common/src/UI/Scenes/UIScene_MessageBox.cpp index 050b5e247..440ad4304 100644 --- a/targets/app/common/src/UI/Scenes/UIScene_MessageBox.cpp +++ b/targets/app/common/src/UI/Scenes/UIScene_MessageBox.cpp @@ -1,8 +1,8 @@ #include "UIScene_MessageBox.h" -#include "4J.Common/4J_Compat.h" -#include "4J.Common/4J_InputActions.h" +#include "platform/PlatformTypes.h" +#include "platform/InputActions.h" #include "platform/sdl2/Profile.h" #include "app/common/src/UI/All Platforms/UIStructs.h" #include "app/common/src/UI/Controls/UIControl_Button.h" diff --git a/targets/app/common/src/UI/Scenes/UIScene_QuadrantSignin.cpp b/targets/app/common/src/UI/Scenes/UIScene_QuadrantSignin.cpp index 273387817..840669627 100644 --- a/targets/app/common/src/UI/Scenes/UIScene_QuadrantSignin.cpp +++ b/targets/app/common/src/UI/Scenes/UIScene_QuadrantSignin.cpp @@ -3,8 +3,8 @@ #include -#include "4J.Common/4J_Compat.h" -#include "4J.Common/4J_InputActions.h" +#include "platform/PlatformTypes.h" +#include "platform/InputActions.h" #include "platform/sdl2/Input.h" #include "platform/sdl2/Profile.h" #include "app/common/src/UI/Controls/UIControl_BitmapIcon.h" diff --git a/targets/app/common/src/UI/UIController.h b/targets/app/common/src/UI/UIController.h index 57cb8594e..ae776d28f 100644 --- a/targets/app/common/src/UI/UIController.h +++ b/targets/app/common/src/UI/UIController.h @@ -15,8 +15,8 @@ #include "app/windows/Iggy/include/iggy.h" #endif -#include "4J.Common/4J_Compat.h" -#include "4J.Common/4J_InputActions.h" +#include "platform/PlatformTypes.h" +#include "platform/InputActions.h" #include "platform/sdl2/Render.h" #include "platform/sdl2/Storage.h" #include "app/common/src/UI/All Platforms/IUIController.h" diff --git a/targets/app/common/src/UI/UIScene.cpp b/targets/app/common/src/UI/UIScene.cpp index 7263304f4..a53ea7b9b 100644 --- a/targets/app/common/src/UI/UIScene.cpp +++ b/targets/app/common/src/UI/UIScene.cpp @@ -4,8 +4,8 @@ #include #include -#include "4J.Common/4J_Compat.h" -#include "4J.Common/4J_InputActions.h" +#include "platform/PlatformTypes.h" +#include "platform/InputActions.h" #include "platform/sdl2/Render.h" #include "app/common/src/UI/All Platforms/UIEnums.h" #include "app/common/src/UI/All Platforms/UIStructs.h" diff --git a/targets/app/include/NetTypes.h b/targets/app/include/NetTypes.h index 4c03bd353..a57baee6d 100644 --- a/targets/app/include/NetTypes.h +++ b/targets/app/include/NetTypes.h @@ -5,7 +5,7 @@ #include #include -#include "../../4J.Common/4J_Compat.h" +#include "platform/PlatformTypes.h" inline constexpr int MINECRAFT_NET_MAX_PLAYERS = 8; diff --git a/targets/app/include/XboxStubs.h b/targets/app/include/XboxStubs.h index aa431167f..6237e83f1 100644 --- a/targets/app/include/XboxStubs.h +++ b/targets/app/include/XboxStubs.h @@ -3,7 +3,7 @@ #include #include -#include "../../4J.Common/4J_Compat.h" +#include "platform/PlatformTypes.h" // XUI forward declarations typedef struct _XUIOBJ* HXUIOBJ; diff --git a/targets/app/linux/Leaderboards/LinuxLeaderboardManager.h b/targets/app/linux/Leaderboards/LinuxLeaderboardManager.h index f1c2bffac..b831d8e28 100644 --- a/targets/app/linux/Leaderboards/LinuxLeaderboardManager.h +++ b/targets/app/linux/Leaderboards/LinuxLeaderboardManager.h @@ -1,6 +1,6 @@ #pragma once -#include "4J.Common/4J_Compat.h" +#include "platform/PlatformTypes.h" #include "app/common/src/Leaderboards/LeaderboardManager.h" class LinuxLeaderboardManager : public LeaderboardManager { diff --git a/targets/app/linux/Linux_Minecraft.cpp b/targets/app/linux/Linux_Minecraft.cpp index 4171acb86..909c47f16 100644 --- a/targets/app/linux/Linux_Minecraft.cpp +++ b/targets/app/linux/Linux_Minecraft.cpp @@ -49,8 +49,8 @@ static void sigsegv_handler(int sig) { // #include "app/common/src/Leaderboards/LeaderboardManager.h" // #include "../Common/XUI/XUI_Scene_Container.h" // #include "NetworkManager.h" -#include "4J.Common/4J_Compat.h" -#include "4J.Common/4J_InputActions.h" +#include "platform/PlatformTypes.h" +#include "platform/InputActions.h" #include "platform/sdl2/Input.h" #include "platform/sdl2/Profile.h" #include "platform/sdl2/Render.h" diff --git a/targets/app/src/Extrax64Stubs.cpp b/targets/app/src/Extrax64Stubs.cpp index 198aa13d1..c8f5d44dc 100644 --- a/targets/app/src/Extrax64Stubs.cpp +++ b/targets/app/src/Extrax64Stubs.cpp @@ -4,7 +4,7 @@ #include #include -#include "4J.Common/4J_Compat.h" +#include "platform/PlatformTypes.h" #include "app/linux/Stubs/winapi_stubs.h" #include "app/include/NetTypes.h" #include "app/include/XboxStubs.h" diff --git a/targets/minecraft/client/Minecraft.cpp b/targets/minecraft/client/Minecraft.cpp index 3eca2e7e8..fa6d1ff53 100644 --- a/targets/minecraft/client/Minecraft.cpp +++ b/targets/minecraft/client/Minecraft.cpp @@ -10,7 +10,7 @@ #include #include -#include "4J.Common/4J_InputActions.h" +#include "platform/InputActions.h" #include "platform/sdl2/Profile.h" #include "platform/sdl2/Render.h" #include "platform/sdl2/Storage.h" diff --git a/targets/minecraft/client/Minecraft.h b/targets/minecraft/client/Minecraft.h index 20925681a..9c03c44a6 100644 --- a/targets/minecraft/client/Minecraft.h +++ b/targets/minecraft/client/Minecraft.h @@ -6,7 +6,7 @@ #include #include -#include "4J.Common/4J_Compat.h" +#include "platform/PlatformTypes.h" #include "console_helpers/C4JThread.h" #include "java/File.h" #include "minecraft/client/resources/ResourceLocation.h" diff --git a/targets/minecraft/client/gui/Gui.cpp b/targets/minecraft/client/gui/Gui.cpp index ca0ac4cb7..374c171af 100644 --- a/targets/minecraft/client/gui/Gui.cpp +++ b/targets/minecraft/client/gui/Gui.cpp @@ -2,7 +2,7 @@ #include -#include "4J.Common/4J_Compat.h" +#include "platform/PlatformTypes.h" #include "platform/sdl2/Input.h" #include "platform/sdl2/Render.h" #include "Facing.h" diff --git a/targets/minecraft/client/gui/Gui.h b/targets/minecraft/client/gui/Gui.h index 02b1b446e..d6300fe51 100644 --- a/targets/minecraft/client/gui/Gui.h +++ b/targets/minecraft/client/gui/Gui.h @@ -6,7 +6,7 @@ #include #include -#include "4J.Common/4J_Compat.h" +#include "platform/PlatformTypes.h" #include "GuiComponent.h" #include "minecraft/client/GuiMessage.h" #include "minecraft/client/renderer/entity/ItemRenderer.h" diff --git a/targets/minecraft/client/gui/Screen.cpp b/targets/minecraft/client/gui/Screen.cpp index 3c1a1e50d..84e3e720a 100644 --- a/targets/minecraft/client/gui/Screen.cpp +++ b/targets/minecraft/client/gui/Screen.cpp @@ -1,6 +1,6 @@ #include "Screen.h" -#include "4J.Common/4J_InputActions.h" +#include "platform/InputActions.h" #include "platform/sdl2/Input.h" #include "platform/sdl2/Profile.h" #include "Button.h" diff --git a/targets/minecraft/client/gui/inventory/CreativeInventoryScreen.cpp b/targets/minecraft/client/gui/inventory/CreativeInventoryScreen.cpp index 978cf5495..2a5c2a645 100644 --- a/targets/minecraft/client/gui/inventory/CreativeInventoryScreen.cpp +++ b/targets/minecraft/client/gui/inventory/CreativeInventoryScreen.cpp @@ -5,7 +5,7 @@ #include #include -#include "4J.Common/4J_InputActions.h" +#include "platform/InputActions.h" #include "platform/sdl2/Input.h" #include "platform/sdl2/Render.h" #include "AbstractContainerScreen.h" diff --git a/targets/minecraft/client/multiplayer/ClientConnection.cpp b/targets/minecraft/client/multiplayer/ClientConnection.cpp index 4de4cc6fb..42dad4a2e 100644 --- a/targets/minecraft/client/multiplayer/ClientConnection.cpp +++ b/targets/minecraft/client/multiplayer/ClientConnection.cpp @@ -10,7 +10,7 @@ #include #include -#include "4J.Common/4J_Compat.h" +#include "platform/PlatformTypes.h" #include "platform/sdl2/Input.h" #include "platform/sdl2/Profile.h" #include "app/common/App_enums.h" diff --git a/targets/minecraft/client/multiplayer/MultiPlayerLevel.cpp b/targets/minecraft/client/multiplayer/MultiPlayerLevel.cpp index 846e224cc..acbe623c0 100644 --- a/targets/minecraft/client/multiplayer/MultiPlayerLevel.cpp +++ b/targets/minecraft/client/multiplayer/MultiPlayerLevel.cpp @@ -9,7 +9,7 @@ #include #include -#include "4J.Common/4J_Compat.h" +#include "platform/PlatformTypes.h" #include "platform/sdl2/Input.h" #include "ClientConnection.h" #include "app/common/src/Audio/SoundEngine.h" diff --git a/targets/minecraft/client/player/Input.cpp b/targets/minecraft/client/player/Input.cpp index fd005146e..1bcd5f75a 100644 --- a/targets/minecraft/client/player/Input.cpp +++ b/targets/minecraft/client/player/Input.cpp @@ -2,7 +2,7 @@ #include -#include "4J.Common/4J_InputActions.h" +#include "platform/InputActions.h" #include "platform/sdl2/Input.h" #include "LocalPlayer.h" #include "app/common/App_enums.h" diff --git a/targets/minecraft/client/player/LocalPlayer.cpp b/targets/minecraft/client/player/LocalPlayer.cpp index c6b57e059..1461a1f31 100644 --- a/targets/minecraft/client/player/LocalPlayer.cpp +++ b/targets/minecraft/client/player/LocalPlayer.cpp @@ -25,7 +25,7 @@ #include "minecraft/world/item/Item.h" #include "minecraft/world/level/tile/Tile.h" // 4J Stu - Added for tutorial callbacks -#include "4J.Common/4J_InputActions.h" +#include "platform/InputActions.h" #include "platform/sdl2/Input.h" #include "platform/sdl2/Profile.h" #include "platform/sdl2/Render.h" diff --git a/targets/minecraft/client/renderer/GameRenderer.cpp b/targets/minecraft/client/renderer/GameRenderer.cpp index ccfd4b040..ae546106f 100644 --- a/targets/minecraft/client/renderer/GameRenderer.cpp +++ b/targets/minecraft/client/renderer/GameRenderer.cpp @@ -6,7 +6,7 @@ #include #include -#include "4J.Common/4J_Compat.h" +#include "platform/PlatformTypes.h" #include "platform/sdl2/Input.h" #include "platform/sdl2/Render.h" #include "BossMobGuiInfo.h" diff --git a/targets/minecraft/client/renderer/LevelRenderer.cpp b/targets/minecraft/client/renderer/LevelRenderer.cpp index 4283aa082..29761166b 100644 --- a/targets/minecraft/client/renderer/LevelRenderer.cpp +++ b/targets/minecraft/client/renderer/LevelRenderer.cpp @@ -13,7 +13,7 @@ #include #include -#include "4J.Common/4J_Compat.h" +#include "platform/PlatformTypes.h" #include "platform/sdl2/Input.h" #include "platform/sdl2/Render.h" #include "Chunk.h" diff --git a/targets/minecraft/client/renderer/texture/custom/ClockTexture.cpp b/targets/minecraft/client/renderer/texture/custom/ClockTexture.cpp index 596149baa..1d1d22e5c 100644 --- a/targets/minecraft/client/renderer/texture/custom/ClockTexture.cpp +++ b/targets/minecraft/client/renderer/texture/custom/ClockTexture.cpp @@ -4,7 +4,7 @@ #include #include -#include "4J.Common/4J_Compat.h" +#include "platform/PlatformTypes.h" #include "java/JavaMath.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" diff --git a/targets/minecraft/client/renderer/texture/custom/CompassTexture.cpp b/targets/minecraft/client/renderer/texture/custom/CompassTexture.cpp index ca0661efa..edc17baa2 100644 --- a/targets/minecraft/client/renderer/texture/custom/CompassTexture.cpp +++ b/targets/minecraft/client/renderer/texture/custom/CompassTexture.cpp @@ -7,7 +7,7 @@ #include #include -#include "4J.Common/4J_Compat.h" +#include "platform/PlatformTypes.h" #include "java/JavaMath.h" #include "minecraft/Pos.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/minecraft/client/skins/DLCTexturePack.h b/targets/minecraft/client/skins/DLCTexturePack.h index 4fb0791ca..7580028b1 100644 --- a/targets/minecraft/client/skins/DLCTexturePack.h +++ b/targets/minecraft/client/skins/DLCTexturePack.h @@ -3,7 +3,7 @@ #include #include -#include "4J.Common/4J_Compat.h" +#include "platform/PlatformTypes.h" #include "AbstractTexturePack.h" #include "app/common/src/Localisation/StringTable.h" diff --git a/targets/minecraft/commands/Command.h b/targets/minecraft/commands/Command.h index da6f8345d..2e1d05d91 100644 --- a/targets/minecraft/commands/Command.h +++ b/targets/minecraft/commands/Command.h @@ -9,7 +9,7 @@ #include #include -#include "4J.Common/4J_Compat.h" +#include "platform/PlatformTypes.h" #include "CommandsEnum.h" #include "minecraft/network/packet/ChatPacket.h" diff --git a/targets/minecraft/commands/common/EnchantItemCommand.cpp b/targets/minecraft/commands/common/EnchantItemCommand.cpp index ddb089037..b24927a27 100644 --- a/targets/minecraft/commands/common/EnchantItemCommand.cpp +++ b/targets/minecraft/commands/common/EnchantItemCommand.cpp @@ -3,7 +3,7 @@ #include #include -#include "4J.Common/4J_Compat.h" +#include "platform/PlatformTypes.h" #include "java/InputOutputStream/ByteArrayInputStream.h" #include "java/InputOutputStream/ByteArrayOutputStream.h" #include "java/InputOutputStream/DataInputStream.h" diff --git a/targets/minecraft/commands/common/GiveItemCommand.cpp b/targets/minecraft/commands/common/GiveItemCommand.cpp index 7a2459312..19d31d589 100644 --- a/targets/minecraft/commands/common/GiveItemCommand.cpp +++ b/targets/minecraft/commands/common/GiveItemCommand.cpp @@ -2,7 +2,7 @@ #include -#include "4J.Common/4J_Compat.h" +#include "platform/PlatformTypes.h" #include "java/InputOutputStream/ByteArrayInputStream.h" #include "java/InputOutputStream/ByteArrayOutputStream.h" #include "java/InputOutputStream/DataInputStream.h" diff --git a/targets/minecraft/network/packet/AddPlayerPacket.h b/targets/minecraft/network/packet/AddPlayerPacket.h index f06c97790..abf1d9f8a 100644 --- a/targets/minecraft/network/packet/AddPlayerPacket.h +++ b/targets/minecraft/network/packet/AddPlayerPacket.h @@ -6,7 +6,7 @@ #include #include -#include "4J.Common/4J_Compat.h" +#include "platform/PlatformTypes.h" #include "Packet.h" #include "minecraft/network/packet/Packet.h" #include "minecraft/world/entity/SyncedEntityData.h" diff --git a/targets/minecraft/network/packet/LoginPacket.h b/targets/minecraft/network/packet/LoginPacket.h index 318e801cb..a098e0706 100644 --- a/targets/minecraft/network/packet/LoginPacket.h +++ b/targets/minecraft/network/packet/LoginPacket.h @@ -4,7 +4,7 @@ #include #include -#include "4J.Common/4J_Compat.h" +#include "platform/PlatformTypes.h" #include "Packet.h" #include "minecraft/network/packet/Packet.h" diff --git a/targets/minecraft/network/packet/PreLoginPacket.h b/targets/minecraft/network/packet/PreLoginPacket.h index 42e622022..c096ab247 100644 --- a/targets/minecraft/network/packet/PreLoginPacket.h +++ b/targets/minecraft/network/packet/PreLoginPacket.h @@ -4,7 +4,7 @@ #include #include -#include "4J.Common/4J_Compat.h" +#include "platform/PlatformTypes.h" #include "Packet.h" #include "minecraft/network/packet/Packet.h" diff --git a/targets/minecraft/server/MinecraftServer.cpp b/targets/minecraft/server/MinecraftServer.cpp index 6b0cd0415..3a0466b3f 100644 --- a/targets/minecraft/server/MinecraftServer.cpp +++ b/targets/minecraft/server/MinecraftServer.cpp @@ -10,7 +10,7 @@ #include #include -#include "4J.Common/4J_Compat.h" +#include "platform/PlatformTypes.h" #include "platform/sdl2/Profile.h" #include "platform/sdl2/Storage.h" #include "ConsoleInput.h" diff --git a/targets/minecraft/server/PlayerList.h b/targets/minecraft/server/PlayerList.h index 1aea67862..620483afe 100644 --- a/targets/minecraft/server/PlayerList.h +++ b/targets/minecraft/server/PlayerList.h @@ -8,7 +8,7 @@ #include #include -#include "4J.Common/4J_Compat.h" +#include "platform/PlatformTypes.h" #include "nbt/CompoundTag.h" class ServerPlayer; diff --git a/targets/minecraft/server/commands/TeleportCommand.h b/targets/minecraft/server/commands/TeleportCommand.h index 43c8592f3..7eb654cd6 100644 --- a/targets/minecraft/server/commands/TeleportCommand.h +++ b/targets/minecraft/server/commands/TeleportCommand.h @@ -4,7 +4,7 @@ #include -#include "4J.Common/4J_Compat.h" +#include "platform/PlatformTypes.h" #include "minecraft/commands/Command.h" #include "minecraft/commands/CommandsEnum.h" #include "minecraft/network/packet/GameCommandPacket.h" diff --git a/targets/minecraft/server/level/TrackedEntity.cpp b/targets/minecraft/server/level/TrackedEntity.cpp index 7e4800ff5..3a5a84cda 100644 --- a/targets/minecraft/server/level/TrackedEntity.cpp +++ b/targets/minecraft/server/level/TrackedEntity.cpp @@ -8,7 +8,7 @@ #include #include -#include "4J.Common/4J_Compat.h" +#include "platform/PlatformTypes.h" #include "EntityTracker.h" #include "app/common/src/Network/NetworkPlayerInterface.h" #include "app/linux/Linux_App.h" diff --git a/targets/minecraft/server/network/PendingConnection.cpp b/targets/minecraft/server/network/PendingConnection.cpp index 43651766f..739890738 100644 --- a/targets/minecraft/server/network/PendingConnection.cpp +++ b/targets/minecraft/server/network/PendingConnection.cpp @@ -5,7 +5,7 @@ #include #include -#include "4J.Common/4J_Compat.h" +#include "platform/PlatformTypes.h" #include "platform/sdl2/Storage.h" #include "app/common/App_enums.h" #include "app/common/src/BuildVer/BuildVer.h" diff --git a/targets/minecraft/server/network/PlayerConnection.h b/targets/minecraft/server/network/PlayerConnection.h index 07e140654..9133a8cba 100644 --- a/targets/minecraft/server/network/PlayerConnection.h +++ b/targets/minecraft/server/network/PlayerConnection.h @@ -7,7 +7,7 @@ #include #include -#include "4J.Common/4J_Compat.h" +#include "platform/PlatformTypes.h" #include "java/JavaIntHash.h" #include "minecraft/network/packet/DisconnectPacket.h" #include "minecraft/network/packet/PacketListener.h" diff --git a/targets/minecraft/world/entity/player/Player.h b/targets/minecraft/world/entity/player/Player.h index f0310f329..0a3b1a691 100644 --- a/targets/minecraft/world/entity/player/Player.h +++ b/targets/minecraft/world/entity/player/Player.h @@ -6,7 +6,7 @@ #include #include -#include "4J.Common/4J_Compat.h" +#include "platform/PlatformTypes.h" #include "Abilities.h" #include "console_helpers/Definitions.h" #include "java/Class.h" diff --git a/targets/minecraft/world/item/ClockItem.h b/targets/minecraft/world/item/ClockItem.h index a0e035a3d..3631c95a3 100644 --- a/targets/minecraft/world/item/ClockItem.h +++ b/targets/minecraft/world/item/ClockItem.h @@ -4,7 +4,7 @@ #include -#include "4J.Common/4J_Compat.h" +#include "platform/PlatformTypes.h" #include "Item.h" class Icon; diff --git a/targets/minecraft/world/item/CompassItem.h b/targets/minecraft/world/item/CompassItem.h index 9df65ec01..ebc2977c5 100644 --- a/targets/minecraft/world/item/CompassItem.h +++ b/targets/minecraft/world/item/CompassItem.h @@ -4,7 +4,7 @@ #include -#include "4J.Common/4J_Compat.h" +#include "platform/PlatformTypes.h" #include "Item.h" class Icon; diff --git a/targets/minecraft/world/item/crafting/ArmorDyeRecipe.cpp b/targets/minecraft/world/item/crafting/ArmorDyeRecipe.cpp index 6df5abff5..7f8fa3ad3 100644 --- a/targets/minecraft/world/item/crafting/ArmorDyeRecipe.cpp +++ b/targets/minecraft/world/item/crafting/ArmorDyeRecipe.cpp @@ -5,7 +5,7 @@ #include #include -#include "4J.Common/4J_Compat.h" +#include "platform/PlatformTypes.h" #include "minecraft/world/entity/animal/Sheep.h" #include "minecraft/world/inventory/CraftingContainer.h" #include "minecraft/world/item/ArmorItem.h" diff --git a/targets/minecraft/world/item/crafting/Recipy.h b/targets/minecraft/world/item/crafting/Recipy.h index c53e15ed3..9f0ff125c 100644 --- a/targets/minecraft/world/item/crafting/Recipy.h +++ b/targets/minecraft/world/item/crafting/Recipy.h @@ -5,7 +5,7 @@ #pragma once -#include "4J.Common/4J_Compat.h" +#include "platform/PlatformTypes.h" #include "minecraft/world/inventory/CraftingContainer.h" #define RECIPE_TYPE_2x2 0 diff --git a/targets/minecraft/world/item/crafting/ShapedRecipy.cpp b/targets/minecraft/world/item/crafting/ShapedRecipy.cpp index 50ed38bcc..4b664fd16 100644 --- a/targets/minecraft/world/item/crafting/ShapedRecipy.cpp +++ b/targets/minecraft/world/item/crafting/ShapedRecipy.cpp @@ -7,7 +7,7 @@ #include -#include "4J.Common/4J_Compat.h" +#include "platform/PlatformTypes.h" #include "app/linux/Linux_App.h" #include "Recipes.h" #include "minecraft/world/inventory/CraftingContainer.h" diff --git a/targets/minecraft/world/item/crafting/ShapelessRecipy.cpp b/targets/minecraft/world/item/crafting/ShapelessRecipy.cpp index 1b1a43cd6..5b8ba09ad 100644 --- a/targets/minecraft/world/item/crafting/ShapelessRecipy.cpp +++ b/targets/minecraft/world/item/crafting/ShapelessRecipy.cpp @@ -12,7 +12,7 @@ #include #include -#include "4J.Common/4J_Compat.h" +#include "platform/PlatformTypes.h" #include "Recipes.h" #include "minecraft/world/inventory/CraftingContainer.h" #include "minecraft/world/item/ItemInstance.h" diff --git a/targets/minecraft/world/level/Level.h b/targets/minecraft/world/level/Level.h index 0ee6135bd..c60c4b84c 100644 --- a/targets/minecraft/world/level/Level.h +++ b/targets/minecraft/world/level/Level.h @@ -10,7 +10,7 @@ #include #include -#include "4J.Common/4J_Compat.h" +#include "platform/PlatformTypes.h" #include "ChunkPos.h" #include "LevelSource.h" #include "LightLayer.h" diff --git a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.cpp b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.cpp index 9a25586f0..5e49d6ba3 100644 --- a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.cpp +++ b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.cpp @@ -12,7 +12,7 @@ #include #include -#include "4J.Common/4J_Compat.h" +#include "platform/PlatformTypes.h" #include "app/common/App_enums.h" #include "app/common/src/BuildVer/BuildVer.h" #include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" diff --git a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp index 156387b8c..aaaf0610b 100644 --- a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp +++ b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp @@ -13,7 +13,7 @@ #include #include -#include "4J.Common/4J_Compat.h" +#include "platform/PlatformTypes.h" #include "app/common/App_enums.h" #include "app/common/src/BuildVer/BuildVer.h" #include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" diff --git a/targets/minecraft/world/level/storage/DirectoryLevelStorage.h b/targets/minecraft/world/level/storage/DirectoryLevelStorage.h index efb8a40e6..c0379cd2f 100644 --- a/targets/minecraft/world/level/storage/DirectoryLevelStorage.h +++ b/targets/minecraft/world/level/storage/DirectoryLevelStorage.h @@ -31,7 +31,7 @@ #include #include -#include "4J.Common/4J_Compat.h" +#include "platform/PlatformTypes.h" #include "LevelStorage.h" #include "PlayerIO.h" #include "java/File.h" diff --git a/targets/minecraft/world/level/storage/LevelStorage.h b/targets/minecraft/world/level/storage/LevelStorage.h index 6a4283ecf..ea61968fc 100644 --- a/targets/minecraft/world/level/storage/LevelStorage.h +++ b/targets/minecraft/world/level/storage/LevelStorage.h @@ -4,7 +4,7 @@ #include #include -#include "4J.Common/4J_Compat.h" +#include "platform/PlatformTypes.h" #include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h" class PlayerIO; diff --git a/targets/minecraft/world/level/storage/SavedDataStorage.h b/targets/minecraft/world/level/storage/SavedDataStorage.h index a318d0511..2df0ee744 100644 --- a/targets/minecraft/world/level/storage/SavedDataStorage.h +++ b/targets/minecraft/world/level/storage/SavedDataStorage.h @@ -6,7 +6,7 @@ #include #include -#include "4J.Common/4J_Compat.h" +#include "platform/PlatformTypes.h" #include "minecraft/world/level/saveddata/SavedData.h" class ConsoleSaveFile; diff --git a/targets/platform/IPlatformLeaderboard.h b/targets/platform/IPlatformLeaderboard.h index 38ad17f12..90cdfb21f 100644 --- a/targets/platform/IPlatformLeaderboard.h +++ b/targets/platform/IPlatformLeaderboard.h @@ -3,7 +3,7 @@ #include #include -#include "../4J.Common/4J_Compat.h" +#include "PlatformTypes.h" class LeaderboardReadListener; diff --git a/targets/platform/IPlatformNetwork.h b/targets/platform/IPlatformNetwork.h index 5cfeb2f0b..393082977 100644 --- a/targets/platform/IPlatformNetwork.h +++ b/targets/platform/IPlatformNetwork.h @@ -4,7 +4,7 @@ #include #include -#include "../4J.Common/4J_Compat.h" +#include "PlatformTypes.h" #include "app/include/NetTypes.h" #ifndef VER_NETWORK diff --git a/targets/platform/IPlatformProfile.h b/targets/platform/IPlatformProfile.h index 0a0e34733..9fa6c46e8 100644 --- a/targets/platform/IPlatformProfile.h +++ b/targets/platform/IPlatformProfile.h @@ -3,7 +3,7 @@ #include #include -#include "../4J.Common/4J_Compat.h" +#include "PlatformTypes.h" #include "PlatformTypes.h" class CXuiStringTable; diff --git a/targets/platform/IPlatformStorage.h b/targets/platform/IPlatformStorage.h index 42d15fce7..e771cf63c 100644 --- a/targets/platform/IPlatformStorage.h +++ b/targets/platform/IPlatformStorage.h @@ -5,7 +5,7 @@ #include #include -#include "../4J.Common/4J_Compat.h" +#include "PlatformTypes.h" struct SAVE_INFO; using PSAVE_INFO = SAVE_INFO*; diff --git a/targets/4J.Common/4J_InputActions.h b/targets/platform/InputActions.h similarity index 100% rename from targets/4J.Common/4J_InputActions.h rename to targets/platform/InputActions.h diff --git a/targets/platform/PlatformTypes.h b/targets/platform/PlatformTypes.h index fa946c4e3..3a21f0485 100644 --- a/targets/platform/PlatformTypes.h +++ b/targets/platform/PlatformTypes.h @@ -66,3 +66,63 @@ inline constexpr auto eAwardType_Achievement = EAwardType::Achievement; inline constexpr auto eAwardType_GamerPic = EAwardType::GamerPic; inline constexpr auto eAwardType_Theme = EAwardType::Theme; inline constexpr auto eAwardType_AvatarItem = EAwardType::AvatarItem; + +inline constexpr int XUSER_INDEX_ANY = 255; +inline constexpr int XUSER_MAX_COUNT = 4; +inline constexpr int XUSER_NAME_SIZE = 32; +inline constexpr int XUSER_INDEX_FOCUS = 254; + +using PlayerUID = unsigned long long; +using PPlayerUID = PlayerUID*; +inline constexpr PlayerUID INVALID_XUID = 0; + +class CXuiStringTable; + +inline constexpr int XCONTENT_MAX_DISPLAYNAME_LENGTH = 256; +inline constexpr int XCONTENT_MAX_FILENAME_LENGTH = 256; + +using XCONTENTDEVICEID = int; + +struct XCONTENT_DATA { + XCONTENTDEVICEID DeviceID; + std::uint32_t dwContentType; + wchar_t szDisplayName[XCONTENT_MAX_DISPLAYNAME_LENGTH]; + char szFileName[XCONTENT_MAX_FILENAME_LENGTH]; +}; +using PXCONTENT_DATA = XCONTENT_DATA*; + +inline constexpr int XMARKETPLACE_CONTENT_ID_LEN = 4; + +struct XMARKETPLACE_CONTENTOFFER_INFO { + std::uint64_t qwOfferID; + std::uint64_t qwPreviewOfferID; + std::uint32_t dwOfferNameLength; + wchar_t* wszOfferName; + std::uint32_t dwOfferType; + std::uint8_t contentId[XMARKETPLACE_CONTENT_ID_LEN]; + bool fIsUnrestrictedLicense; + std::uint32_t dwLicenseMask; + std::uint32_t dwTitleID; + std::uint32_t dwContentCategory; + std::uint32_t dwTitleNameLength; + wchar_t* wszTitleName; + bool fUserHasPurchased; + std::uint32_t dwPackageSize; + std::uint32_t dwInstallSize; + std::uint32_t dwSellTextLength; + wchar_t* wszSellText; + std::uint32_t dwAssetID; + std::uint32_t dwPurchaseQuantity; + std::uint32_t dwPointsPrice; +}; +using PXMARKETPLACE_CONTENTOFFER_INFO = XMARKETPLACE_CONTENTOFFER_INFO*; + +inline constexpr std::uint32_t XMARKETPLACE_OFFERING_TYPE_CONTENT = 0x00000002; +inline constexpr std::uint32_t XMARKETPLACE_OFFERING_TYPE_GAME_DEMO = 0x00000020; +inline constexpr std::uint32_t XMARKETPLACE_OFFERING_TYPE_GAME_TRAILER = 0x00000040; +inline constexpr std::uint32_t XMARKETPLACE_OFFERING_TYPE_THEME = 0x00000080; +inline constexpr std::uint32_t XMARKETPLACE_OFFERING_TYPE_TILE = 0x00000800; +inline constexpr std::uint32_t XMARKETPLACE_OFFERING_TYPE_ARCADE = 0x00002000; +inline constexpr std::uint32_t XMARKETPLACE_OFFERING_TYPE_VIDEO = 0x00004000; +inline constexpr std::uint32_t XMARKETPLACE_OFFERING_TYPE_CONSUMABLE = 0x00010000; +inline constexpr std::uint32_t XMARKETPLACE_OFFERING_TYPE_AVATARITEM = 0x00100000; diff --git a/targets/4J.Common/4J_ProfileConstants.h b/targets/platform/ProfileConstants.h similarity index 100% rename from targets/4J.Common/4J_ProfileConstants.h rename to targets/platform/ProfileConstants.h diff --git a/targets/platform/sdl2/Input.cpp b/targets/platform/sdl2/Input.cpp index f9caf06e4..257fa3963 100644 --- a/targets/platform/sdl2/Input.cpp +++ b/targets/platform/sdl2/Input.cpp @@ -16,7 +16,7 @@ #include -#include "../../4J.Common/4J_InputActions.h" +#include "../InputActions.h" #include "../PlatformTypes.h" C_4JInput InputManager; diff --git a/targets/platform/sdl2/Profile.cpp b/targets/platform/sdl2/Profile.cpp index 0759c815e..97ed53c2e 100644 --- a/targets/platform/sdl2/Profile.cpp +++ b/targets/platform/sdl2/Profile.cpp @@ -3,7 +3,7 @@ #include #include -#include "../../4J.Common/4J_ProfileConstants.h" +#include "../ProfileConstants.h" #include "../sdl2/Input.h" C_4JProfile ProfileManager; diff --git a/targets/platform/sdl2/Profile.h b/targets/platform/sdl2/Profile.h index 1331374bd..1fcdcd509 100644 --- a/targets/platform/sdl2/Profile.h +++ b/targets/platform/sdl2/Profile.h @@ -3,7 +3,7 @@ #include #include -#include "../../4J.Common/4J_Compat.h" +#include "../PlatformTypes.h" #include "../IPlatformProfile.h" #include "../PlatformTypes.h" diff --git a/targets/platform/sdl2/Storage.h b/targets/platform/sdl2/Storage.h index 01fd38653..edf153690 100644 --- a/targets/platform/sdl2/Storage.h +++ b/targets/platform/sdl2/Storage.h @@ -6,7 +6,7 @@ #include // #include -#include "../../4J.Common/4J_Compat.h" +#include "../PlatformTypes.h" #include "../IPlatformStorage.h" class C4JStringTable;