backups/4jcraft
1
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-04-23 16:03:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

reorganize actions/constants for profile and input

Browse source
This commit is contained in:
Tropical 2026-04-07 12:43:47 -05:00
parent 25e6f7159e
commit 0bdef577f5
75 changed files with 74 additions and 161 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
targets/app/common/Game.cpp
View file

@ -2,7 +2,6 @@
#include "app/common/Game.h"
#include "platform/PlatformTypes.h"
#include "platform/input/InputActions.h"
#include "platform/profile/profile.h"
#include "platform/sdl2/Render.h"
#include "platform/sdl2/Storage.h"

1
targets/app/common/LocalizationManager.cpp
View file

@ -16,7 +16,6 @@
#include "minecraft/client/Minecraft.h"
#include "minecraft/client/skins/TexturePack.h"
#include "minecraft/client/skins/TexturePackRepository.h"
#include "platform/input/InputActions.h"
#include "platform/input/input.h"
#include "platform/sdl2/Render.h"
#include "platform/XboxStubs.h"

1
targets/app/common/Tutorial/Constraints/InputConstraint.cpp
View file

@ -1,6 +1,5 @@
#include "InputConstraint.h"
#include "platform/input/InputActions.h"
#include "platform/input/input.h"
bool InputConstraint::isMappingConstrained(int iPad, int mapping) {

1
targets/app/common/Tutorial/FullTutorial.cpp
View file

@ -3,7 +3,6 @@
#include <string>
#include <vector>
#include "platform/input/InputActions.h"
#include "app/common/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h"
#include "app/common/Tutorial/Constraints/AreaConstraint.h"
#include "app/common/Tutorial/Constraints/ChangeStateConstraint.h"

1
targets/app/common/Tutorial/Tutorial.cpp
View file

@ -6,7 +6,6 @@
#include <algorithm>
#include <compare>
#include "platform/input/InputActions.h"
#include "platform/profile/profile.h"
#include "minecraft/GameEnums.h"
#include "app/common/App_structs.h"

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

@ -7,7 +7,6 @@
#include <string>
#include <vector>
#include "platform/input/InputActions.h"
#include "platform/input/input.h"
#include "platform/sdl2/Render.h"
#include "minecraft/GameEnums.h"

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

@ -7,7 +7,6 @@
#include <string>
#include <vector>
#include "platform/input/InputActions.h"
#include "platform/profile/profile.h"
#include "platform/sdl2/Render.h"
#include "minecraft/GameEnums.h"

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

@ -6,7 +6,6 @@
#include <string>
#include <vector>
#include "platform/input/InputActions.h"
#include "app/common/UI/All Platforms/IUIScene_AbstractContainerMenu.h"
#include "app/linux/LinuxGame.h"
#include "app/linux/Linux_UIController.h"

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

@ -4,7 +4,6 @@
#include <algorithm>
#include "platform/input/InputActions.h"
#include "app/common/Tutorial/Tutorial.h"
#include "app/common/UI/All Platforms/UIEnums.h"
#include "app/linux/LinuxGame.h"

1
targets/app/common/UI/Components/UIComponent_Tooltips.h
View file

@ -3,7 +3,6 @@
#include <string>
#include "platform/PlatformTypes.h"
#include "platform/input/InputActions.h"
#include "platform/sdl2/Render.h"
#include "minecraft/GameEnums.h"
#include "app/common/UI/All Platforms/UIEnums.h"

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

@ -3,7 +3,6 @@
#include <wchar.h>
#include "platform/input/InputActions.h"
#include "platform/input/input.h"
#include "platform/profile/profile.h"
#include "minecraft/GameEnums.h"

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

@ -1,6 +1,5 @@
#include "UIScene_DebugOptions.h"
#include "platform/input/InputActions.h"
#include "app/common/Console_Debug_enum.h"
#include "app/common/UI/Controls/UIControl_CheckBox.h"
#include "app/common/UI/UIScene.h"

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

@ -5,7 +5,6 @@
#include <memory>
#include "platform/input/InputActions.h"
#include "platform/profile/profile.h"
#include "minecraft/GameEnums.h"
#include "app/common/Tutorial/Tutorial.h"

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

@ -5,7 +5,6 @@
#include <memory>
#include "platform/input/InputActions.h"
#include "platform/input/input.h"
#include "platform/profile/profile.h"
#include "minecraft/GameEnums.h"

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

@ -7,7 +7,6 @@
#include <utility>
#include "platform/PlatformTypes.h"
#include "platform/input/InputActions.h"
#include "platform/input/input.h"
#include "platform/profile/profile.h"
#include "app/common/App_Defines.h"

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

@ -1,7 +1,6 @@
#include "UIScene_DLCMainMenu.h"
#include "platform/input/InputActions.h"
#include "minecraft/GameEnums.h"
#include "app/common/UI/All Platforms/UIStructs.h"
#include "app/common/UI/Controls/UIControl_ButtonList.h"

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

@ -4,7 +4,6 @@
#include <stdint.h>
#include "platform/PlatformTypes.h"
#include "platform/input/InputActions.h"
#include "platform/sdl2/Render.h"
#include "app/common/UI/All Platforms/UIStructs.h"
#include "app/common/UI/Controls/UIControl_DLCList.h"

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

@ -4,7 +4,6 @@
#include <vector>
#include "platform/PlatformTypes.h"
#include "platform/input/InputActions.h"
#include "platform/input/input.h"
#include "platform/profile/profile.h"
#include "app/common/App_Defines.h"

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

@ -1,6 +1,5 @@
#include "UIScene_Intro.h"
#include "platform/input/InputActions.h"
#include "app/common/UI/All Platforms/UIEnums.h"
#include "app/common/UI/UIScene.h"
#include "app/linux/Iggy/include/iggy.h"

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

@ -5,7 +5,6 @@
#include <stdint.h>
#include "platform/PlatformTypes.h"
#include "platform/input/InputActions.h"
#include "platform/profile/profile.h"
#include "app/common/App_Defines.h"
#include "minecraft/GameEnums.h"

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

@ -4,7 +4,6 @@
#include <utility>
#include "platform/input/InputActions.h"
#include "platform/input/input.h"
#include "platform/profile/profile.h"
#include "platform/sdl2/Render.h"

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

@ -8,7 +8,6 @@
#include <memory>
#include "platform/input/InputActions.h"
#include "platform/profile/profile.h"
#include "app/common/Console_Debug_enum.h"
#include "app/common/Leaderboards/LeaderboardInterface.h"

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

@ -5,7 +5,6 @@
#include <wchar.h>
#include "platform/PlatformTypes.h"
#include "platform/input/InputActions.h"
#include "platform/profile/profile.h"
#include "platform/sdl2/Render.h"
#include "app/common/App_Defines.h"

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

@ -6,7 +6,6 @@
#include <compare>
#include "platform/input/InputActions.h"
#include "platform/input/input.h"
#include "platform/profile/profile.h"
#include "app/common/App_Defines.h"

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

@ -7,7 +7,6 @@
#include <numbers>
#include "platform/PlatformTypes.h"
#include "platform/input/InputActions.h"
#include "platform/profile/profile.h"
#include "platform/sdl2/Render.h"
#include "app/common/App_Defines.h"

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

@ -3,7 +3,6 @@
#include <vector>
#include "platform/input/InputActions.h"
#include "app/common/App_Defines.h"
#include "minecraft/GameEnums.h"
#include "app/common/UI/Controls/UIControl_Button.h"

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

@ -2,7 +2,6 @@
#include "UIScene_SaveMessage.h"
#include "platform/PlatformTypes.h"
#include "platform/input/InputActions.h"
#include "platform/input/input.h"
#include "platform/profile/profile.h"
#include "app/common/App_Defines.h"

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

@ -1,7 +1,6 @@
#include "UIScene_TrialExitUpsell.h"
#include "platform/input/InputActions.h"
#include "platform/profile/profile.h"
#include "app/common/App_Defines.h"
#include "app/common/UI/UIScene.h"

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

@ -4,7 +4,6 @@
#include <memory>
#include "platform/input/InputActions.h"
#include "platform/input/input.h"
#include "minecraft/GameEnums.h"
#include "app/common/BuildVer/BuildVer.h"

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

@ -4,7 +4,6 @@
#include <string.h>
#include <wchar.h>
#include "platform/input/InputActions.h"
#include "app/common/UI/UILayer.h"
#include "app/common/UI/UIScene.h"
#include "app/linux/LinuxGame.h"

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

@ -1,7 +1,6 @@
#include "UIScene_HelpAndOptionsMenu.h"
#include "platform/input/InputActions.h"
#include "platform/profile/profile.h"
#include "app/common/UI/Controls/UIControl_Button.h"
#include "app/common/UI/UILayer.h"

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

@ -6,7 +6,6 @@
#include <vector>
#include "platform/input/InputActions.h"
#include "minecraft/GameEnums.h"
#include "app/common/UI/Controls/UIControl_Label.h"
#include "app/common/UI/UIScene.h"

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

@ -3,7 +3,6 @@
#include <stdint.h>
#include "platform/input/InputActions.h"
#include "app/common/UI/Controls/UIControl_ButtonList.h"
#include "app/common/UI/UILayer.h"
#include "app/common/UI/UIScene.h"

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

@ -1,6 +1,5 @@
#include "UIScene_LanguageSelector.h"
#include "platform/input/InputActions.h"
#include "app/common/UI/Controls/UIControl_ButtonList.h"
#include "app/common/UI/UILayer.h"
#include "app/common/UI/UIScene.h"

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

@ -1,7 +1,6 @@
#include "UIScene_ReinstallMenu.h"
#include "platform/input/InputActions.h"
#include "app/common/UI/UILayer.h"
#include "app/common/UI/UIScene.h"
#include "app/linux/LinuxGame.h"

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

@ -3,7 +3,6 @@
#include <wchar.h>
#include "platform/input/InputActions.h"
#include "minecraft/GameEnums.h"
#include "app/common/UI/Controls/UIControl_Slider.h"
#include "app/common/UI/UILayer.h"

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

@ -2,7 +2,6 @@
#include <wchar.h>
#include "platform/input/InputActions.h"
#include "minecraft/GameEnums.h"
#include "app/common/UI/Controls/UIControl_Slider.h"
#include "app/common/UI/UILayer.h"

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

@ -2,7 +2,6 @@
#include <wchar.h>
#include "platform/input/InputActions.h"
#include "platform/profile/profile.h"
#include "minecraft/GameEnums.h"
#include "app/common/Network/GameNetworkManager.h"

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

@ -1,7 +1,6 @@
#include "UIScene_SettingsMenu.h"
#include "platform/input/InputActions.h"
#include "platform/profile/profile.h"
#include "app/common/UI/Controls/UIControl_Button.h"
#include "app/common/UI/UILayer.h"

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

@ -3,7 +3,6 @@
#include <wchar.h>
#include "platform/input/InputActions.h"
#include "platform/profile/profile.h"
#include "platform/sdl2/Render.h"
#include "minecraft/GameEnums.h"

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

@ -3,7 +3,6 @@
#include <wchar.h>
#include "platform/input/InputActions.h"
#include "platform/profile/profile.h"
#include "minecraft/GameEnums.h"
#include "app/common/UI/Controls/UIControl_CheckBox.h"

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

@ -5,7 +5,6 @@
#include <vector>
#include "platform/input/InputActions.h"
#include "platform/profile/profile.h"
#include "platform/sdl2/Render.h"
#include "app/common/App_Defines.h"

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

@ -4,7 +4,6 @@
#include <cmath>
#include <memory>
#include "platform/input/InputActions.h"
#include "app/common/Tutorial/Tutorial.h"
#include "app/common/Tutorial/TutorialMode.h"
#include "app/common/UI/All Platforms/UIStructs.h"

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

@ -5,7 +5,6 @@
#include <utility>
#include <vector>
#include "platform/input/InputActions.h"
#include "platform/profile/profile.h"
#include "app/common/Tutorial/Tutorial.h"
#include "app/common/Tutorial/TutorialEnum.h"

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

@ -1,7 +1,6 @@
#include "UIScene_CraftingMenu.h"
#include "platform/input/InputActions.h"
#include "platform/profile/profile.h"
#include "app/common/Tutorial/Tutorial.h"
#include "app/common/Tutorial/TutorialEnum.h"

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

@ -3,7 +3,6 @@
#include <memory>
#include "platform/input/InputActions.h"
#include "platform/profile/profile.h"
#include "platform/sdl2/Storage.h"
#include "minecraft/GameEnums.h"

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

@ -7,7 +7,6 @@
#include <memory>
#include "platform/PlatformTypes.h"
#include "platform/input/InputActions.h"
#include "platform/profile/profile.h"
#include "minecraft/GameEnums.h"
#include "app/common/Tutorial/Tutorial.h"

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

@ -3,7 +3,6 @@
#include <memory>
#include "platform/input/InputActions.h"
#include "minecraft/GameEnums.h"
#include "app/common/Network/GameNetworkManager.h"
#include "app/common/Network/NetworkPlayerInterface.h"

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

@ -3,7 +3,6 @@
#include <memory>
#include "platform/PlatformTypes.h"
#include "platform/input/InputActions.h"
#include "platform/profile/profile.h"
#include "minecraft/GameEnums.h"
#include "app/common/Console_Debug_enum.h"

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

@ -3,7 +3,6 @@
#include <memory>
#include "platform/input/InputActions.h"
#include "minecraft/GameEnums.h"
#include "app/common/Network/GameNetworkManager.h"
#include "app/common/Network/NetworkPlayerInterface.h"

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

@ -5,7 +5,6 @@
#include <memory>
#include "platform/input/InputActions.h"
#include "platform/profile/profile.h"
#include "minecraft/GameEnums.h"
#include "app/common/DLC/DLCManager.h"

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

@ -1,7 +1,6 @@
#include "UIScene_SignEntryMenu.h"
#include "platform/input/InputActions.h"
#include "platform/input/input.h"
#include "app/common/UI/All Platforms/UIStructs.h"
#include "app/common/UI/Controls/UIControl_Button.h"

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

@ -3,7 +3,6 @@
#include <memory>
#include "platform/input/InputActions.h"
#include "app/common/Console_Debug_enum.h"
#include "app/common/Network/GameNetworkManager.h"
#include "app/common/Network/NetworkPlayerInterface.h"

1
targets/app/common/UI/Scenes/UIScene_ConnectingProgress.cpp
View file

@ -1,7 +1,6 @@
#include "UIScene_ConnectingProgress.h"
#include "platform/input/InputActions.h"
#include "platform/profile/profile.h"
#include "minecraft/GameEnums.h"
#include "app/common/Network/GameNetworkManager.h"

1
targets/app/common/UI/Scenes/UIScene_FullscreenProgress.cpp
View file

@ -5,7 +5,6 @@
#include <wchar.h>
#include "platform/PlatformTypes.h"
#include "platform/input/InputActions.h"
#include "platform/profile/profile.h"
#include "minecraft/GameEnums.h"
#include "app/common/Network/GameNetworkManager.h"

1
targets/app/common/UI/Scenes/UIScene_Keyboard.cpp
View file

@ -1,6 +1,5 @@
#include "UIScene_Keyboard.h"
#include "platform/input/InputActions.h"
#include "app/common/App_Defines.h"
#include "app/common/UI/Controls/UIControl_Button.h"
#include "app/common/UI/Controls/UIControl_Label.h"

1
targets/app/common/UI/Scenes/UIScene_MessageBox.cpp
View file

@ -2,7 +2,6 @@
#include "UIScene_MessageBox.h"
#include "platform/PlatformTypes.h"
#include "platform/input/InputActions.h"
#include "platform/profile/profile.h"
#include "app/common/UI/All Platforms/UIStructs.h"
#include "app/common/UI/Controls/UIControl_Button.h"

1
targets/app/common/UI/Scenes/UIScene_QuadrantSignin.cpp
View file

@ -4,7 +4,6 @@
#include <wchar.h>
#include "platform/PlatformTypes.h"
#include "platform/input/InputActions.h"
#include "platform/input/input.h"
#include "platform/profile/profile.h"
#include "app/common/UI/Controls/UIControl_BitmapIcon.h"

2
targets/app/common/UI/UIController.h
View file

@ -21,7 +21,7 @@
#endif
#include "platform/PlatformTypes.h"
#include "platform/input/InputActions.h"
#include "platform/input/input.h"
#include "platform/sdl2/Render.h"
#include "platform/sdl2/Storage.h"
#include "app/common/UI/All Platforms/IUIController.h"

1
targets/app/common/UI/UIScene.cpp
View file

@ -5,7 +5,6 @@
#include <utility>
#include "platform/PlatformTypes.h"
#include "platform/input/InputActions.h"
#include "platform/sdl2/Render.h"
#include "app/common/UI/All Platforms/UIEnums.h"
#include "app/common/UI/All Platforms/UIStructs.h"

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

@ -54,7 +54,6 @@ static void sigsegv_handler(int sig) {
// #include "../Common/XUI/XUI_Scene_Container.h"
// #include "NetworkManager.h"
#include "platform/PlatformTypes.h"
#include "platform/input/InputActions.h"
#include "platform/input/input.h"
#include "platform/profile/profile.h"
#include "platform/sdl2/Render.h"

1
targets/app/linux/Linux_UIController.h
View file

@ -4,6 +4,7 @@
#include "app/common/UI/UIController.h"
#include "app/linux/Iggy/include/iggy.h"
#include "app/linux/Iggy/include/rrCore.h"
#include "platform/profile/profile.h"
class ConsoleUIController : public UIController {
public:

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

@ -13,7 +13,6 @@
#include <ctime>
#include <thread>
#include "platform/input/InputActions.h"
#include "platform/profile/profile.h"
#include "platform/sdl2/Render.h"
#include "platform/sdl2/Storage.h"

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

@ -1,7 +1,6 @@
#include "minecraft/IGameServices.h"
#include "Screen.h"
#include "platform/input/InputActions.h"
#include "platform/input/input.h"
#include "platform/profile/profile.h"
#include "Button.h"

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

@ -6,7 +6,6 @@
#include <algorithm>
#include <string>
#include "platform/input/InputActions.h"
#include "platform/input/input.h"
#include "platform/sdl2/Render.h"
#include "AbstractContainerScreen.h"

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

@ -3,7 +3,6 @@
#include <cmath>
#include "platform/input/InputActions.h"
#include "platform/input/input.h"
#include "LocalPlayer.h"
#include "minecraft/GameEnums.h"

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

@ -28,7 +28,6 @@
#include "minecraft/world/item/Item.h"
#include "minecraft/world/level/tile/Tile.h"
// 4J Stu - Added for tutorial callbacks
#include "platform/input/InputActions.h"
#include "platform/input/input.h"
#include "platform/profile/profile.h"
#include "platform/sdl2/Render.h"

2
targets/platform/PlatformServices.cpp
View file

@ -1,13 +1,11 @@
#include "PlatformServices.h"
#include "StdFileIO.h"
#include "sdl2/Profile.h"
#include "sdl2/Render.h"
#include "sdl2/Storage.h"
static StdFileIO s_stdFileIO;
IPlatformFileIO& PlatformFileIO = s_stdFileIO;
IPlatformProfile& PlatformProfile = PlatformProfile;
IPlatformRenderer& PlatformRender = RenderManager;
IPlatformStorage& PlatformStorage = StorageManager;

46
targets/platform/input/IPlatformInput.h
View file

@ -3,51 +3,7 @@
#include <functional>
#include "PlatformTypes.h"
#define MAP_STYLE_0 0
#define MAP_STYLE_1 1
#define MAP_STYLE_2 2
#define _360_JOY_BUTTON_A 0x00000001
#define _360_JOY_BUTTON_B 0x00000002
#define _360_JOY_BUTTON_X 0x00000004
#define _360_JOY_BUTTON_Y 0x00000008
#define _360_JOY_BUTTON_START 0x00000010
#define _360_JOY_BUTTON_BACK 0x00000020
#define _360_JOY_BUTTON_RB 0x00000040
#define _360_JOY_BUTTON_LB 0x00000080
#define _360_JOY_BUTTON_RTHUMB 0x00000100
#define _360_JOY_BUTTON_LTHUMB 0x00000200
#define _360_JOY_BUTTON_DPAD_UP 0x00000400
#define _360_JOY_BUTTON_DPAD_DOWN 0x00000800
#define _360_JOY_BUTTON_DPAD_LEFT 0x00001000
#define _360_JOY_BUTTON_DPAD_RIGHT 0x00002000
// fake digital versions of analog values
#define _360_JOY_BUTTON_LSTICK_RIGHT 0x00004000
#define _360_JOY_BUTTON_LSTICK_LEFT 0x00008000
#define _360_JOY_BUTTON_RSTICK_DOWN 0x00010000
#define _360_JOY_BUTTON_RSTICK_UP 0x00020000
#define _360_JOY_BUTTON_RSTICK_RIGHT 0x00040000
#define _360_JOY_BUTTON_RSTICK_LEFT 0x00080000
#define _360_JOY_BUTTON_LSTICK_DOWN 0x00100000
#define _360_JOY_BUTTON_LSTICK_UP 0x00200000
#define _360_JOY_BUTTON_RT 0x00400000
#define _360_JOY_BUTTON_LT 0x00800000
// Stick axis maps - to allow changes for SouthPaw in-game axis mapping
#define AXIS_MAP_LX 0
#define AXIS_MAP_LY 1
#define AXIS_MAP_RX 2
#define AXIS_MAP_RY 3
// Trigger map - to allow for swap triggers in-game
#define TRIGGER_MAP_0 0
#define TRIGGER_MAP_1 1
#include "InputConstants.h"
class IPlatformInput {
public:

45
targets/platform/input/InputActions.h → targets/platform/input/InputConstants.h
View file

@ -1,5 +1,50 @@
#pragma once
#define MAP_STYLE_0 0
#define MAP_STYLE_1 1
#define MAP_STYLE_2 2
#define _360_JOY_BUTTON_A 0x00000001
#define _360_JOY_BUTTON_B 0x00000002
#define _360_JOY_BUTTON_X 0x00000004
#define _360_JOY_BUTTON_Y 0x00000008
#define _360_JOY_BUTTON_START 0x00000010
#define _360_JOY_BUTTON_BACK 0x00000020
#define _360_JOY_BUTTON_RB 0x00000040
#define _360_JOY_BUTTON_LB 0x00000080
#define _360_JOY_BUTTON_RTHUMB 0x00000100
#define _360_JOY_BUTTON_LTHUMB 0x00000200
#define _360_JOY_BUTTON_DPAD_UP 0x00000400
#define _360_JOY_BUTTON_DPAD_DOWN 0x00000800
#define _360_JOY_BUTTON_DPAD_LEFT 0x00001000
#define _360_JOY_BUTTON_DPAD_RIGHT 0x00002000
// fake digital versions of analog values
#define _360_JOY_BUTTON_LSTICK_RIGHT 0x00004000
#define _360_JOY_BUTTON_LSTICK_LEFT 0x00008000
#define _360_JOY_BUTTON_RSTICK_DOWN 0x00010000
#define _360_JOY_BUTTON_RSTICK_UP 0x00020000
#define _360_JOY_BUTTON_RSTICK_RIGHT 0x00040000
#define _360_JOY_BUTTON_RSTICK_LEFT 0x00080000
#define _360_JOY_BUTTON_LSTICK_DOWN 0x00100000
#define _360_JOY_BUTTON_LSTICK_UP 0x00200000
#define _360_JOY_BUTTON_RT 0x00400000
#define _360_JOY_BUTTON_LT 0x00800000
// Stick axis maps - to allow changes for SouthPaw in-game axis mapping
#define AXIS_MAP_LX 0
#define AXIS_MAP_LY 1
#define AXIS_MAP_RX 2
#define AXIS_MAP_RY 3
// Trigger map - to allow for swap triggers in-game
#define TRIGGER_MAP_0 0
#define TRIGGER_MAP_1 1
enum EControllerActions {
ACTION_MENU_A,
ACTION_MENU_B,

2
targets/platform/input/sdl2/SDL2Input.cpp
View file

@ -17,7 +17,7 @@
#include <functional>
#include <string>
#include "../InputActions.h"
#include "../InputConstants.h"
#include "../PlatformTypes.h"
SDL2Input sdl2_input_instance;

25
targets/platform/profile/IPlatformProfile.h
View file

@ -8,31 +8,6 @@
class CXuiStringTable;
#define TITLEID_MINECRAFT 0x584111F7
#define CONTEXT_GAME_STATE 0
#define CONTEXT_GAME_STATE_BLANK 0
#define CONTEXT_GAME_STATE_RIDING_PIG 1
#define CONTEXT_GAME_STATE_RIDING_MINECART 2
#define CONTEXT_GAME_STATE_BOATING 3
#define CONTEXT_GAME_STATE_FISHING 4
#define CONTEXT_GAME_STATE_CRAFTING 5
#define CONTEXT_GAME_STATE_FORGING 6
#define CONTEXT_GAME_STATE_NETHER 7
#define CONTEXT_GAME_STATE_CD 8
#define CONTEXT_GAME_STATE_MAP 9
#define CONTEXT_GAME_STATE_ENCHANTING 5
#define CONTEXT_GAME_STATE_BREWING 5
#define CONTEXT_GAME_STATE_ANVIL 6
#define CONTEXT_GAME_STATE_TRADING 0
#define CONTEXT_PRESENCE_IDLE 0
#define CONTEXT_PRESENCE_MENUS 1
#define CONTEXT_PRESENCE_MULTIPLAYER 2
#define CONTEXT_PRESENCE_MULTIPLAYEROFFLINE 3
#define CONTEXT_PRESENCE_MULTIPLAYER_1P 4
#define CONTEXT_PRESENCE_MULTIPLAYER_1POFFLINE 5
class IPlatformProfile {
public:
struct PROFILESETTINGS {

44
targets/platform/profile/ProfileConstants.h
View file

@ -1,26 +1,26 @@
#pragma once
#include <cstdint>
#define TITLEID_MINECRAFT 0x584111F7
inline constexpr int TUTORIAL_PROFILE_STORAGE_BITS = 512;
inline constexpr int TUTORIAL_PROFILE_STORAGE_BYTES =
TUTORIAL_PROFILE_STORAGE_BITS / 8;
#define CONTEXT_GAME_STATE 0
#define CONTEXT_GAME_STATE_BLANK 0
#define CONTEXT_GAME_STATE_RIDING_PIG 1
#define CONTEXT_GAME_STATE_RIDING_MINECART 2
#define CONTEXT_GAME_STATE_BOATING 3
#define CONTEXT_GAME_STATE_FISHING 4
#define CONTEXT_GAME_STATE_CRAFTING 5
#define CONTEXT_GAME_STATE_FORGING 6
#define CONTEXT_GAME_STATE_NETHER 7
#define CONTEXT_GAME_STATE_CD 8
#define CONTEXT_GAME_STATE_MAP 9
#define CONTEXT_GAME_STATE_ENCHANTING 5
#define CONTEXT_GAME_STATE_BREWING 5
#define CONTEXT_GAME_STATE_ANVIL 6
#define CONTEXT_GAME_STATE_TRADING 0
inline constexpr int MAX_FAVORITE_SKINS = 10;
inline constexpr std::uint32_t GAMESETTING_CLOUDS = 0x00000001;
inline constexpr std::uint32_t GAMESETTING_ONLINE = 0x00000002;
inline constexpr std::uint32_t GAMESETTING_FRIENDSOFFRIENDS = 0x00000008;
inline constexpr std::uint32_t GAMESETTING_DISPLAYUPDATEMSG = 0x00000030;
inline constexpr std::uint32_t GAMESETTING_BEDROCKFOG = 0x00000040;
inline constexpr std::uint32_t GAMESETTING_DISPLAYHUD = 0x00000080;
inline constexpr std::uint32_t GAMESETTING_DISPLAYHAND = 0x00000100;
inline constexpr std::uint32_t GAMESETTING_CUSTOMSKINANIM = 0x00000200;
inline constexpr std::uint32_t GAMESETTING_DEATHMESSAGES = 0x00000400;
inline constexpr std::uint32_t GAMESETTING_UISIZE = 0x00001800;
inline constexpr std::uint32_t GAMESETTING_UISIZE_SPLITSCREEN = 0x00006000;
inline constexpr std::uint32_t GAMESETTING_ANIMATEDCHARACTER = 0x00008000;
inline constexpr std::uint32_t GAMESETTING_PS3EULAREAD = 0x00010000;
inline constexpr std::uint32_t GAMESETTING_PSVITANETWORKMODEADHOC = 0x00020000;
inline constexpr unsigned char MINECRAFT_LANGUAGE_DEFAULT = 0x00;
#define CONTEXT_PRESENCE_IDLE 0
#define CONTEXT_PRESENCE_MENUS 1
#define CONTEXT_PRESENCE_MULTIPLAYER 2
#define CONTEXT_PRESENCE_MULTIPLAYEROFFLINE 3
#define CONTEXT_PRESENCE_MULTIPLAYER_1P 4
#define CONTEXT_PRESENCE_MULTIPLAYER_1POFFLINE 5

1
targets/platform/profile/profile.h
View file

@ -1,3 +1,4 @@
#include "IPlatformProfile.h"
#include "ProfileConstants.h"
extern IPlatformProfile& PlatformProfile;

2
targets/platform/profile/stub/StubProfile.cpp
View file

@ -6,6 +6,8 @@
#include "../ProfileConstants.h"
#include "input/input.h"
#include "../../../app/common/Tutorial/TutorialEnum.h" // 4jcraft TODO
#include "../../../app/common/App_Defines.h" // 4jcraft TODO
StubProfile stub_profile_instance;
IPlatformProfile& PlatformProfile = stub_profile_instance;