backups/4jcraft
2
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-07-07 08:47:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: fold 4J.Common into platform types, eliminate last 4J directory

Browse source
This commit is contained in:
MatthewBeshay 2026-04-02 16:27:06 +11:00
parent 11f9bd6046
commit 26222f26e0
124 changed files with 197 additions and 266 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

129
targets/4J.Common/4J_Compat.h
View file

@ -1,129 +0,0 @@
#pragma once
#include <cstdint>
// 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

4
targets/app/common/Consoles_App.cpp
View file

@ -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"

2
targets/app/common/src/Audio/SoundEngine.cpp
View file

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

2
targets/app/common/src/DLC/DLCPack.h
View file

@ -5,7 +5,7 @@
#include <unordered_map>
#include <vector>
#include "4J.Common/4J_Compat.h"
#include "platform/PlatformTypes.h"
#include "DLCManager.h"
#include "app/common/src/DLC/DLCSkinFile.h"

2
targets/app/common/src/Leaderboards/LeaderboardInterface.h
View file

@ -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.

2
targets/app/common/src/Network/GameNetworkManager.h
View file

@ -7,7 +7,7 @@
#if !defined(__linux__)
#include <qnet.h>
#endif
#include "4J.Common/4J_Compat.h"
#include "platform/PlatformTypes.h"
#include "platform/IPlatformNetwork.h"
#include "app/include/NetTypes.h"
#include "NetworkPlayerInterface.h"

2
targets/app/common/src/Network/NetworkPlayerQNet.h
View file

@ -4,7 +4,7 @@
#include <string>
#include "4J.Common/4J_Compat.h"
#include "platform/PlatformTypes.h"
#include "NetworkPlayerInterface.h"
class IQNetPlayer;

2
targets/app/common/src/Network/PlatformNetworkManagerStub.h
View file

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

2
targets/app/common/src/Tutorial/Constraints/InputConstraint.cpp
View file

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

2
targets/app/common/src/Tutorial/FullTutorial.cpp
View file

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

2
targets/app/common/src/Tutorial/Tutorial.cpp
View file

@ -6,7 +6,7 @@
#include <algorithm>
#include <compare>
#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"

2
targets/app/common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.cpp
View file

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

2
targets/app/common/src/UI/All Platforms/IUIScene_CraftingMenu.cpp
View file

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

2
targets/app/common/src/UI/All Platforms/IUIScene_CreativeMenu.cpp
View file

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

2
targets/app/common/src/UI/All Platforms/IUIScene_TradingMenu.cpp
View file

@ -4,7 +4,7 @@
#include <algorithm>
#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"

2
targets/app/common/src/UI/Components/UIComponent_PressStartToPlay.h
View file

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

4
targets/app/common/src/UI/Components/UIComponent_Tooltips.h
View file

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

2
targets/app/common/src/UI/Scenes/Debug/UIScene_DebugCreateSchematic.cpp
View file

@ -3,7 +3,7 @@
#include <wchar.h>
#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"

2
targets/app/common/src/UI/Scenes/Debug/UIScene_DebugOptions.cpp
View file

@ -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"

2
targets/app/common/src/UI/Scenes/Debug/UIScene_DebugOverlay.cpp
View file

@ -5,7 +5,7 @@
#include <memory>
#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"

2
targets/app/common/src/UI/Scenes/Debug/UIScene_DebugSetCamera.cpp
View file

@ -5,7 +5,7 @@
#include <memory>
#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"

4
targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp
View file

@ -6,8 +6,8 @@
#include <cstdint>
#include <utility>
#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"

2
targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.cpp
View file

@ -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"

4
targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.cpp
View file

@ -3,8 +3,8 @@
#include <stdint.h>
#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"

4
targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_EULA.cpp
View file

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

2
targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_Intro.cpp
View file

@ -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"

4
targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.cpp
View file

@ -4,8 +4,8 @@
#include <stddef.h>
#include <stdint.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/App_Defines.h"
#include "app/common/App_enums.h"

2
targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.cpp
View file

@ -4,7 +4,7 @@
#include <utility>
#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"

2
targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.cpp
View file

@ -8,7 +8,7 @@
#include <memory>
#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"

2
targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.h
View file

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

4
targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp
View file

@ -4,8 +4,8 @@
#include <string.h>
#include <wchar.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 "app/common/App_Defines.h"

2
targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp
View file

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

4
targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp
View file

@ -5,8 +5,8 @@
#include <format>
#include <numbers>
#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"

2
targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.cpp
View file

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

4
targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.cpp
View file

@ -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"

2
targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.cpp
View file

@ -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"

2
targets/app/common/src/UI/Scenes/Help & Options/UIScene_ControlsMenu.cpp
View file

@ -4,7 +4,7 @@
#include <memory>
#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"

2
targets/app/common/src/UI/Scenes/Help & Options/UIScene_Credits.cpp
View file

@ -4,7 +4,7 @@
#include <string.h>
#include <wchar.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"

2
targets/app/common/src/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.cpp
View file

@ -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"

2
targets/app/common/src/UI/Scenes/Help & Options/UIScene_HowToPlay.cpp
View file

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

2
targets/app/common/src/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.cpp
View file

@ -3,7 +3,7 @@
#include <stdint.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"

2
targets/app/common/src/UI/Scenes/Help & Options/UIScene_LanguageSelector.cpp
View file

@ -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"

2
targets/app/common/src/UI/Scenes/Help & Options/UIScene_ReinstallMenu.cpp
View file

@ -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"

2
targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.cpp
View file

@ -3,7 +3,7 @@
#include <wchar.h>
#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"

2
targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.cpp
View file

@ -2,7 +2,7 @@
#include <wchar.h>
#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"

2
targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.cpp
View file

@ -2,7 +2,7 @@
#include <wchar.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"

2
targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsMenu.cpp
View file

@ -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"

2
targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.cpp
View file

@ -3,7 +3,7 @@
#include <wchar.h>
#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"

2
targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.cpp
View file

@ -3,7 +3,7 @@
#include <wchar.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/UI/Controls/UIControl_CheckBox.h"

2
targets/app/common/src/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp
View file

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

2
targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.cpp
View file

@ -4,7 +4,7 @@
#include <cmath>
#include <memory>
#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"

2
targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.cpp
View file

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

2
targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.cpp
View file

@ -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"

2
targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.cpp
View file

@ -3,7 +3,7 @@
#include <memory>
#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"

4
targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.cpp
View file

@ -6,8 +6,8 @@
#include <memory>
#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"

2
targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.cpp
View file

@ -3,7 +3,7 @@
#include <memory>
#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"

4
targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.cpp
View file

@ -2,8 +2,8 @@
#include <memory>
#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"

2
targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.cpp
View file

@ -3,7 +3,7 @@
#include <memory>
#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"

2
targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.cpp
View file

@ -5,7 +5,7 @@
#include <memory>
#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"

2
targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.cpp
View file

@ -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"

2
targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.cpp
View file

@ -3,7 +3,7 @@
#include <memory>
#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"

2
targets/app/common/src/UI/Scenes/UIScene_ConnectingProgress.cpp
View file

@ -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"

4
targets/app/common/src/UI/Scenes/UIScene_FullscreenProgress.cpp
View file

@ -4,8 +4,8 @@
#include <stdint.h>
#include <wchar.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/App_enums.h"
#include "app/common/src/Network/GameNetworkManager.h"

2
targets/app/common/src/UI/Scenes/UIScene_Keyboard.cpp
View file

@ -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"

4
targets/app/common/src/UI/Scenes/UIScene_MessageBox.cpp
View file

@ -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"

4
targets/app/common/src/UI/Scenes/UIScene_QuadrantSignin.cpp
View file

@ -3,8 +3,8 @@
#include <wchar.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/src/UI/Controls/UIControl_BitmapIcon.h"

4
targets/app/common/src/UI/UIController.h
View file

@ -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"

4
targets/app/common/src/UI/UIScene.cpp
View file

@ -4,8 +4,8 @@
#include <mutex>
#include <utility>
#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"

2
targets/app/include/NetTypes.h
View file

@ -5,7 +5,7 @@
#include <mutex>
#include <vector>
#include "../../4J.Common/4J_Compat.h"
#include "platform/PlatformTypes.h"
inline constexpr int MINECRAFT_NET_MAX_PLAYERS = 8;

2
targets/app/include/XboxStubs.h
View file

@ -3,7 +3,7 @@
#include <cstdint>
#include <string>
#include "../../4J.Common/4J_Compat.h"
#include "platform/PlatformTypes.h"
// XUI forward declarations
typedef struct _XUIOBJ* HXUIOBJ;

2
targets/app/linux/Leaderboards/LinuxLeaderboardManager.h
View file

@ -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 {

4
targets/app/linux/Linux_Minecraft.cpp
View file

@ -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"

2
targets/app/src/Extrax64Stubs.cpp
View file

@ -4,7 +4,7 @@
#include <stdlib.h>
#include <string.h>
#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"

2
targets/minecraft/client/Minecraft.cpp
View file

@ -10,7 +10,7 @@
#include <ctime>
#include <thread>
#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"

2
targets/minecraft/client/Minecraft.h
View file

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

2
targets/minecraft/client/gui/Gui.cpp
View file

@ -2,7 +2,7 @@
#include <cmath>
#include "4J.Common/4J_Compat.h"
#include "platform/PlatformTypes.h"
#include "platform/sdl2/Input.h"
#include "platform/sdl2/Render.h"
#include "Facing.h"

2
targets/minecraft/client/gui/Gui.h
View file

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

2
targets/minecraft/client/gui/Screen.cpp
View file

@ -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"

2
targets/minecraft/client/gui/inventory/CreativeInventoryScreen.cpp
View file

@ -5,7 +5,7 @@
#include <algorithm>
#include <string>
#include "4J.Common/4J_InputActions.h"
#include "platform/InputActions.h"
#include "platform/sdl2/Input.h"
#include "platform/sdl2/Render.h"
#include "AbstractContainerScreen.h"

2
targets/minecraft/client/multiplayer/ClientConnection.cpp
View file

@ -10,7 +10,7 @@
#include <limits>
#include <unordered_set>
#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"

2
targets/minecraft/client/multiplayer/MultiPlayerLevel.cpp
View file

@ -9,7 +9,7 @@
#include <string>
#include <utility>
#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"

2
targets/minecraft/client/player/Input.cpp
View file

@ -2,7 +2,7 @@
#include <cmath>
#include "4J.Common/4J_InputActions.h"
#include "platform/InputActions.h"
#include "platform/sdl2/Input.h"
#include "LocalPlayer.h"
#include "app/common/App_enums.h"

2
targets/minecraft/client/player/LocalPlayer.cpp
View file

@ -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"

2
targets/minecraft/client/renderer/GameRenderer.cpp
View file

@ -6,7 +6,7 @@
#include <cmath>
#include <numbers>
#include "4J.Common/4J_Compat.h"
#include "platform/PlatformTypes.h"
#include "platform/sdl2/Input.h"
#include "platform/sdl2/Render.h"
#include "BossMobGuiInfo.h"

2
targets/minecraft/client/renderer/LevelRenderer.cpp
View file

@ -13,7 +13,7 @@
#include <ranges>
#include <utility>
#include "4J.Common/4J_Compat.h"
#include "platform/PlatformTypes.h"
#include "platform/sdl2/Input.h"
#include "platform/sdl2/Render.h"
#include "Chunk.h"

2
targets/minecraft/client/renderer/texture/custom/ClockTexture.cpp
View file

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

2
targets/minecraft/client/renderer/texture/custom/CompassTexture.cpp
View file

@ -7,7 +7,7 @@
#include <string>
#include <vector>
#include "4J.Common/4J_Compat.h"
#include "platform/PlatformTypes.h"
#include "java/JavaMath.h"
#include "minecraft/Pos.h"
#include "minecraft/client/Minecraft.h"

2
targets/minecraft/client/skins/DLCTexturePack.h
View file

@ -3,7 +3,7 @@
#include <cstdint>
#include <string>
#include "4J.Common/4J_Compat.h"
#include "platform/PlatformTypes.h"
#include "AbstractTexturePack.h"
#include "app/common/src/Localisation/StringTable.h"

2
targets/minecraft/commands/Command.h
View file

@ -9,7 +9,7 @@
#include <string>
#include <vector>
#include "4J.Common/4J_Compat.h"
#include "platform/PlatformTypes.h"
#include "CommandsEnum.h"
#include "minecraft/network/packet/ChatPacket.h"

2
targets/minecraft/commands/common/EnchantItemCommand.cpp
View file

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

2
targets/minecraft/commands/common/GiveItemCommand.cpp
View file

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

2
targets/minecraft/network/packet/AddPlayerPacket.h
View file

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

2
targets/minecraft/network/packet/LoginPacket.h
View file

@ -4,7 +4,7 @@
#include <memory>
#include <string>
#include "4J.Common/4J_Compat.h"
#include "platform/PlatformTypes.h"
#include "Packet.h"
#include "minecraft/network/packet/Packet.h"

2
targets/minecraft/network/packet/PreLoginPacket.h
View file

@ -4,7 +4,7 @@
#include <memory>
#include <string>
#include "4J.Common/4J_Compat.h"
#include "platform/PlatformTypes.h"
#include "Packet.h"
#include "minecraft/network/packet/Packet.h"

2
targets/minecraft/server/MinecraftServer.cpp
View file

@ -10,7 +10,7 @@
#include <thread>
#include <utility>
#include "4J.Common/4J_Compat.h"
#include "platform/PlatformTypes.h"
#include "platform/sdl2/Profile.h"
#include "platform/sdl2/Storage.h"
#include "ConsoleInput.h"

2
targets/minecraft/server/PlayerList.h
View file

@ -8,7 +8,7 @@
#include <unordered_map>
#include <vector>
#include "4J.Common/4J_Compat.h"
#include "platform/PlatformTypes.h"
#include "nbt/CompoundTag.h"
class ServerPlayer;

2
targets/minecraft/server/commands/TeleportCommand.h
View file

@ -4,7 +4,7 @@
#include <memory>
#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"

2
targets/minecraft/server/level/TrackedEntity.cpp
View file

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

2
targets/minecraft/server/network/PendingConnection.cpp
View file

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

2
targets/minecraft/server/network/PlayerConnection.h
View file

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

Some files were not shown because too many files have changed in this diff Show more