diff --git a/meson.build b/meson.build index a925db98c..6fa0bdc03 100644 --- a/meson.build +++ b/meson.build @@ -82,10 +82,6 @@ subdir('targets/java') subdir('targets/nbt') subdir('targets/platform') -subdir('targets/4J.Render') -subdir('targets/4J.Input') -subdir('targets/4J.Profile') -subdir('targets/4J.Storage') subdir('targets/resources') subdir('targets/minecraft') subdir('targets/Minecraft.Client') diff --git a/targets/4J.Input/INP_ForceFeedback.cpp b/targets/4J.Input/INP_ForceFeedback.cpp deleted file mode 100644 index e69de29bb..000000000 diff --git a/targets/4J.Input/INP_Keyboard.cpp b/targets/4J.Input/INP_Keyboard.cpp deleted file mode 100644 index e69de29bb..000000000 diff --git a/targets/4J.Input/INP_Main.cpp b/targets/4J.Input/INP_Main.cpp deleted file mode 100644 index e69de29bb..000000000 diff --git a/targets/4J.Input/INP_StringCheck.cpp b/targets/4J.Input/INP_StringCheck.cpp deleted file mode 100644 index e69de29bb..000000000 diff --git a/targets/4J.Input/meson.build b/targets/4J.Input/meson.build deleted file mode 100644 index 3a2cb9ffa..000000000 --- a/targets/4J.Input/meson.build +++ /dev/null @@ -1,25 +0,0 @@ -input_sources = files( - '4J_Input.cpp', - 'INP_ForceFeedback.cpp', - 'INP_Keyboard.cpp', - 'INP_Main.cpp', - 'INP_StringCheck.cpp', - 'stdafx.cpp', -) - -lib_input = static_library('4J_Input', - input_sources, - include_directories : include_directories('.'), - cpp_args : global_cpp_args + global_cpp_defs + [ - '-include', meson.current_source_dir() / 'stdafx.h', - ], -) - -# We import SDL2 but not SDL3.. which is a bit sad, -sdl_dep = dependency('sdl2', required : false) - -input_dep = declare_dependency( - link_with : lib_input, - dependencies : [sdl_dep], - include_directories : include_directories('.'), -) diff --git a/targets/4J.Input/stdafx.cpp b/targets/4J.Input/stdafx.cpp deleted file mode 100644 index fd4f341c7..000000000 --- a/targets/4J.Input/stdafx.cpp +++ /dev/null @@ -1 +0,0 @@ -#include "stdafx.h" diff --git a/targets/4J.Input/stdafx.h b/targets/4J.Input/stdafx.h deleted file mode 100644 index a72038dd9..000000000 --- a/targets/4J.Input/stdafx.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _4J_INPUT_STADAFX_H -#define _4J_INPUT_STADAFX_H - -#include "../4J.Common/4J_Compat.h" - -#endif //_4J_INPUT_STADAFX_H diff --git a/targets/4J.Profile/PRO_AwardManager.cpp b/targets/4J.Profile/PRO_AwardManager.cpp deleted file mode 100644 index e69de29bb..000000000 diff --git a/targets/4J.Profile/PRO_Data.cpp b/targets/4J.Profile/PRO_Data.cpp deleted file mode 100644 index e69de29bb..000000000 diff --git a/targets/4J.Profile/PRO_Main.cpp b/targets/4J.Profile/PRO_Main.cpp deleted file mode 100644 index e69de29bb..000000000 diff --git a/targets/4J.Profile/PRO_RichPresence.cpp b/targets/4J.Profile/PRO_RichPresence.cpp deleted file mode 100644 index e69de29bb..000000000 diff --git a/targets/4J.Profile/PRO_Sys.cpp b/targets/4J.Profile/PRO_Sys.cpp deleted file mode 100644 index e69de29bb..000000000 diff --git a/targets/4J.Profile/meson.build b/targets/4J.Profile/meson.build deleted file mode 100644 index 987d67212..000000000 --- a/targets/4J.Profile/meson.build +++ /dev/null @@ -1,17 +0,0 @@ -profile_sources = files( - '4J_Profile.cpp', - 'stdafx.cpp', -) -# 4jprofile stink -lib_profile = static_library('4J_Profile', - profile_sources, - include_directories : include_directories('.'), - cpp_args : global_cpp_args + global_cpp_defs + [ - '-include', meson.current_source_dir() / 'stdafx.h', - ], -) - -profile_dep = declare_dependency( - link_with : lib_profile, - include_directories : include_directories('.'), -) diff --git a/targets/4J.Profile/stdafx.cpp b/targets/4J.Profile/stdafx.cpp deleted file mode 100644 index fd4f341c7..000000000 --- a/targets/4J.Profile/stdafx.cpp +++ /dev/null @@ -1 +0,0 @@ -#include "stdafx.h" diff --git a/targets/4J.Profile/stdafx.h b/targets/4J.Profile/stdafx.h deleted file mode 100644 index 0ac445076..000000000 --- a/targets/4J.Profile/stdafx.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _4J_PROFILE_STADAFX_H -#define _4J_PROFILE_STADAFX_H - -#include "../4J.Common/4J_Compat.h" - -#endif //_4J_PROFILE_STADAFX_H diff --git a/targets/4J.Render/meson.build b/targets/4J.Render/meson.build deleted file mode 100644 index ce55ef668..000000000 --- a/targets/4J.Render/meson.build +++ /dev/null @@ -1,24 +0,0 @@ -render_sources = files( - '4J_Render.cpp', - 'stdafx.cpp', - 'stubs.cpp', -) - -lib_render = static_library( - '4J_Render', - render_sources, - include_directories: include_directories('.'), - dependencies: [sdl2_dep, stb_dep, gl_dep, thread_dep, dependency('glm'), stb_dep], - cpp_args: global_cpp_args - + [ - '-fpermissive', - '-Wshift-count-overflow', - '-pipe', - '-include', meson.current_source_dir() / 'stdafx.h', - ], -) - -render_dep = declare_dependency( - link_with: lib_render, - include_directories: include_directories('.'), -) \ No newline at end of file diff --git a/targets/4J.Render/stdafx.cpp b/targets/4J.Render/stdafx.cpp deleted file mode 100644 index fd4f341c7..000000000 --- a/targets/4J.Render/stdafx.cpp +++ /dev/null @@ -1 +0,0 @@ -#include "stdafx.h" diff --git a/targets/4J.Render/stdafx.h b/targets/4J.Render/stdafx.h deleted file mode 100644 index 4f8ac6b4c..000000000 --- a/targets/4J.Render/stdafx.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _4J_RENDER_STADAFX_H -#define _4J_RENDER_STADAFX_H - -#include "../4J.Common/4J_Compat.h" - -#endif //_4J_RENDER_STADAFX_H diff --git a/targets/4J.Storage/STO_DLC.cpp b/targets/4J.Storage/STO_DLC.cpp deleted file mode 100644 index e69de29bb..000000000 diff --git a/targets/4J.Storage/STO_Main.cpp b/targets/4J.Storage/STO_Main.cpp deleted file mode 100644 index e69de29bb..000000000 diff --git a/targets/4J.Storage/STO_SaveGame.cpp b/targets/4J.Storage/STO_SaveGame.cpp deleted file mode 100644 index e69de29bb..000000000 diff --git a/targets/4J.Storage/meson.build b/targets/4J.Storage/meson.build deleted file mode 100644 index 03843c8e4..000000000 --- a/targets/4J.Storage/meson.build +++ /dev/null @@ -1,20 +0,0 @@ -storage_sources = files( - '4J_Storage.cpp', - 'stdafx.cpp', - 'STO_DLC.cpp', - 'STO_Main.cpp', - 'STO_SaveGame.cpp', -) - -lib_storage = static_library('4J_Storage', - storage_sources, - include_directories : include_directories('.'), - cpp_args : global_cpp_args + global_cpp_defs + [ - '-include', meson.current_source_dir() / 'stdafx.h', - ], -) - -storage_dep = declare_dependency( - link_with : lib_storage, - include_directories : include_directories('.'), -) diff --git a/targets/4J.Storage/stdafx.cpp b/targets/4J.Storage/stdafx.cpp deleted file mode 100644 index fd4f341c7..000000000 --- a/targets/4J.Storage/stdafx.cpp +++ /dev/null @@ -1 +0,0 @@ -#include "stdafx.h" diff --git a/targets/4J.Storage/stdafx.h b/targets/4J.Storage/stdafx.h deleted file mode 100644 index 7c052f3f6..000000000 --- a/targets/4J.Storage/stdafx.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _4J_STORAGE_STADAFX_H -#define _4J_STORAGE_STADAFX_H - -#include "../4J.Common/4J_Compat.h" - -#endif //_4J_STORAGE_STADAFX_H diff --git a/targets/Minecraft.Client/Common/App_structs.h b/targets/Minecraft.Client/Common/App_structs.h index bee279626..f8fe05f0b 100644 --- a/targets/Minecraft.Client/Common/App_structs.h +++ b/targets/Minecraft.Client/Common/App_structs.h @@ -2,7 +2,7 @@ #include -#include "4J_Storage.h" +#include "platform/sdl2/Storage.h" #include "Minecraft.Client/Common/App_Defines.h" #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" diff --git a/targets/Minecraft.Client/Common/Consoles_App.cpp b/targets/Minecraft.Client/Common/Consoles_App.cpp index 2eee619f6..8a1edad51 100644 --- a/targets/Minecraft.Client/Common/Consoles_App.cpp +++ b/targets/Minecraft.Client/Common/Consoles_App.cpp @@ -2,9 +2,9 @@ #include "4J.Common/4J_Compat.h" #include "4J.Common/4J_InputActions.h" -#include "4J_Profile.h" -#include "4J_Render.h" -#include "4J_Storage.h" +#include "platform/sdl2/Profile.h" +#include "platform/sdl2/Render.h" +#include "platform/sdl2/Storage.h" #include "Common/App_Defines.h" #include "Common/App_enums.h" #include "Common/App_structs.h" @@ -73,7 +73,7 @@ #include #include -#include "4J_Input.h" +#include "platform/sdl2/Input.h" #include "Minecraft.Client/Common/src/Audio/SoundEngine.h" #include "Minecraft.Client/Common/src/Colours/ColourTable.h" #include "Minecraft.Client/Common/src/DLC/DLCPack.h" diff --git a/targets/Minecraft.Client/Common/Consoles_App.h b/targets/Minecraft.Client/Common/Consoles_App.h index 282f88679..42301a405 100644 --- a/targets/Minecraft.Client/Common/Consoles_App.h +++ b/targets/Minecraft.Client/Common/Consoles_App.h @@ -3,8 +3,8 @@ #include #include -#include "4J_Profile.h" -#include "4J_Storage.h" +#include "platform/sdl2/Profile.h" +#include "platform/sdl2/Storage.h" // using namespace std; diff --git a/targets/Minecraft.Client/Common/src/DLC/DLCAudioFile.cpp b/targets/Minecraft.Client/Common/src/DLC/DLCAudioFile.cpp index 74287ebe1..4c9c9d6b5 100644 --- a/targets/Minecraft.Client/Common/src/DLC/DLCAudioFile.cpp +++ b/targets/Minecraft.Client/Common/src/DLC/DLCAudioFile.cpp @@ -5,8 +5,8 @@ #include #include -#include "4J_Render.h" -#include "4J_Storage.h" +#include "platform/sdl2/Render.h" +#include "platform/sdl2/Storage.h" #include "DLCManager.h" #include "Minecraft.Client/Common/src/DLC/DLCFile.h" #include "Minecraft.Client/Linux/Linux_App.h" diff --git a/targets/Minecraft.Client/Common/src/DLC/DLCManager.cpp b/targets/Minecraft.Client/Common/src/DLC/DLCManager.cpp index d08faab39..1e4c384de 100644 --- a/targets/Minecraft.Client/Common/src/DLC/DLCManager.cpp +++ b/targets/Minecraft.Client/Common/src/DLC/DLCManager.cpp @@ -13,8 +13,8 @@ #include #include -#include "4J_Profile.h" -#include "4J_Storage.h" +#include "platform/sdl2/Profile.h" +#include "platform/sdl2/Storage.h" #include "DLCFile.h" #include "DLCPack.h" #include "Minecraft.Client/Common/src/GameRules/GameRuleManager.h" diff --git a/targets/Minecraft.Client/Common/src/DLC/DLCPack.cpp b/targets/Minecraft.Client/Common/src/DLC/DLCPack.cpp index 0f6319b51..472c91434 100644 --- a/targets/Minecraft.Client/Common/src/DLC/DLCPack.cpp +++ b/targets/Minecraft.Client/Common/src/DLC/DLCPack.cpp @@ -6,7 +6,7 @@ #include #include -#include "4J_Profile.h" +#include "platform/sdl2/Profile.h" #include "DLCAudioFile.h" #include "DLCCapeFile.h" #include "DLCColourTableFile.h" diff --git a/targets/Minecraft.Client/Common/src/DLC/DLCSkinFile.cpp b/targets/Minecraft.Client/Common/src/DLC/DLCSkinFile.cpp index d969b5d8c..ca1b2cda0 100644 --- a/targets/Minecraft.Client/Common/src/DLC/DLCSkinFile.cpp +++ b/targets/Minecraft.Client/Common/src/DLC/DLCSkinFile.cpp @@ -3,7 +3,7 @@ #include #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "DLCManager.h" #include "Minecraft.Client/Common/src/DLC/DLCFile.h" #include "Minecraft.Client/Linux/Linux_App.h" diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.cpp b/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.cpp index 87ea3f01c..fd254542a 100644 --- a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.cpp +++ b/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.cpp @@ -8,8 +8,8 @@ #include #include -#include "4J_Profile.h" -#include "4J_Storage.h" +#include "platform/sdl2/Profile.h" +#include "platform/sdl2/Storage.h" #include "Common/App_enums.h" #include "Minecraft.Client/Common/src/DLC/DLCGameRulesHeader.h" #include "Minecraft.Client/Common/src/DLC/DLCManager.h" diff --git a/targets/Minecraft.Client/Common/src/Network/GameNetworkManager.cpp b/targets/Minecraft.Client/Common/src/Network/GameNetworkManager.cpp index 067f61770..93687421e 100644 --- a/targets/Minecraft.Client/Common/src/Network/GameNetworkManager.cpp +++ b/targets/Minecraft.Client/Common/src/Network/GameNetworkManager.cpp @@ -11,10 +11,10 @@ #include #include -#include "4J_Input.h" -#include "4J_Profile.h" -#include "4J_Render.h" -#include "4J_Storage.h" +#include "platform/sdl2/Input.h" +#include "platform/sdl2/Profile.h" +#include "platform/sdl2/Render.h" +#include "platform/sdl2/Storage.h" #include "Common/App_enums.h" #include "Common/Consoles_App.h" #include "Minecraft.Client/Common/src/GameRules/GameRuleManager.h" diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Constraints/InputConstraint.cpp b/targets/Minecraft.Client/Common/src/Tutorial/Constraints/InputConstraint.cpp index fe0aaf148..032f324a7 100644 --- a/targets/Minecraft.Client/Common/src/Tutorial/Constraints/InputConstraint.cpp +++ b/targets/Minecraft.Client/Common/src/Tutorial/Constraints/InputConstraint.cpp @@ -1,7 +1,7 @@ #include "InputConstraint.h" #include "4J.Common/4J_InputActions.h" -#include "4J_Input.h" +#include "platform/sdl2/Input.h" bool InputConstraint::isMappingConstrained(int iPad, int mapping) { // If it's a menu button, then we ignore all inputs diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/ChoiceTask.cpp b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/ChoiceTask.cpp index 1e227954b..e0f1b8839 100644 --- a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/ChoiceTask.cpp +++ b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/ChoiceTask.cpp @@ -3,7 +3,7 @@ #include #include -#include "4J_Input.h" +#include "platform/sdl2/Input.h" #include "Minecraft.Client/Common/src/Tutorial/Constraints/InputConstraint.h" #include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h" #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/ControllerTask.cpp b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/ControllerTask.cpp index 20b43e774..d8ceb0281 100644 --- a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/ControllerTask.cpp +++ b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/ControllerTask.cpp @@ -6,7 +6,7 @@ #include #include -#include "4J_Input.h" +#include "platform/sdl2/Input.h" #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Common/src/Tutorial/Constraints/InputConstraint.h" #include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h" diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/InfoTask.cpp b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/InfoTask.cpp index 06d8694bd..cc6c6d70d 100644 --- a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/InfoTask.cpp +++ b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/InfoTask.cpp @@ -5,7 +5,7 @@ #include #include -#include "4J_Input.h" +#include "platform/sdl2/Input.h" #include "Minecraft.Client/Common/src/Tutorial/Constraints/InputConstraint.h" #include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h" #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/StatTask.cpp b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/StatTask.cpp index 74a6cb989..fada67bc9 100644 --- a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/StatTask.cpp +++ b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/StatTask.cpp @@ -1,6 +1,6 @@ #include "StatTask.h" -#include "4J_Profile.h" +#include "platform/sdl2/Profile.h" #include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h" #include "minecraft/client/Minecraft.h" #include "minecraft/stats/StatsCounter.h" diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tutorial.cpp b/targets/Minecraft.Client/Common/src/Tutorial/Tutorial.cpp index 87d271f75..5233d412e 100644 --- a/targets/Minecraft.Client/Common/src/Tutorial/Tutorial.cpp +++ b/targets/Minecraft.Client/Common/src/Tutorial/Tutorial.cpp @@ -7,7 +7,7 @@ #include #include "4J.Common/4J_InputActions.h" -#include "4J_Profile.h" +#include "platform/sdl2/Profile.h" #include "Common/App_enums.h" #include "Common/App_structs.h" #include "Minecraft.Client/Common/src/Tutorial/Constraints/TutorialConstraint.h" diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIController.h b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIController.h index 0aefd404a..c8a71800e 100644 --- a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIController.h +++ b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIController.h @@ -1,6 +1,6 @@ #pragma once -#include "4J_Storage.h" +#include "platform/sdl2/Storage.h" #include "UIEnums.h" #include "UIStructs.h" #include "minecraft/sounds/SoundTypes.h" diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.cpp b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.cpp index 726a66e1a..68c653b0c 100644 --- a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.cpp +++ b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.cpp @@ -8,8 +8,8 @@ #include #include "4J.Common/4J_InputActions.h" -#include "4J_Input.h" -#include "4J_Render.h" +#include "platform/sdl2/Input.h" +#include "platform/sdl2/Render.h" #include "Common/App_enums.h" #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" #include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h" diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CraftingMenu.cpp b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CraftingMenu.cpp index 570ab7dca..74c748e13 100644 --- a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CraftingMenu.cpp +++ b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CraftingMenu.cpp @@ -8,8 +8,8 @@ #include #include "4J.Common/4J_InputActions.h" -#include "4J_Profile.h" -#include "4J_Render.h" +#include "platform/sdl2/Profile.h" +#include "platform/sdl2/Render.h" #include "Common/App_enums.h" #include "Minecraft.Client/Common/src/Console_Debug_enum.h" #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_HUD.cpp b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_HUD.cpp index f9d7737b5..8d20213b0 100644 --- a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_HUD.cpp +++ b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_HUD.cpp @@ -3,8 +3,8 @@ #include #include -#include "4J_Profile.h" -#include "4J_Render.h" +#include "platform/sdl2/Profile.h" +#include "platform/sdl2/Render.h" #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.Client/Linux/Linux_UIController.h" diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_PauseMenu.cpp b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_PauseMenu.cpp index 739cd745e..e0c7fd8a6 100644 --- a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_PauseMenu.cpp +++ b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_PauseMenu.cpp @@ -9,7 +9,7 @@ #include #include -#include "4J_Profile.h" +#include "platform/sdl2/Profile.h" #include "Common/App_enums.h" #include "Minecraft.Client/Common/src/DLC/DLCManager.h" #include "Minecraft.Client/Common/src/DLC/DLCPack.h" diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_PauseMenu.h b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_PauseMenu.h index 11f55070d..9165477ca 100644 --- a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_PauseMenu.h +++ b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_PauseMenu.h @@ -1,7 +1,7 @@ #pragma once -#include "4J_Profile.h" -#include "4J_Storage.h" +#include "platform/sdl2/Profile.h" +#include "platform/sdl2/Storage.h" #include "Minecraft.Client/Common/src/DLC/DLCPack.h" #include "Minecraft.Client/include/stdafx.h" diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h b/targets/Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h index cc8550c61..5603d2ea4 100644 --- a/targets/Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h +++ b/targets/Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h @@ -5,7 +5,7 @@ #include #include -#include "4J_Storage.h" +#include "platform/sdl2/Storage.h" #include "Minecraft.Client/Common/App_Defines.h" #include "UIEnums.h" #include "console_helpers/C4JThread.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Chat.cpp b/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Chat.cpp index e5ecc4078..ffaf6d67a 100644 --- a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Chat.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Chat.cpp @@ -2,7 +2,7 @@ #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" #include "Minecraft.Client/Common/src/UI/UILayer.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Chat.h b/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Chat.h index 37fbd4ae8..1e71faa3a 100644 --- a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Chat.h +++ b/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Chat.h @@ -2,7 +2,7 @@ #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Logo.cpp b/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Logo.cpp index 5c65602e2..a6d014fbf 100644 --- a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Logo.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Logo.cpp @@ -1,6 +1,6 @@ #include "UIComponent_Logo.h" -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "Minecraft.Client/Common/src/UI/UILayer.h" #include "Minecraft.Client/Common/src/UI/UIScene.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_MenuBackground.cpp b/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_MenuBackground.cpp index e1914da12..36619d881 100644 --- a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_MenuBackground.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_MenuBackground.cpp @@ -1,6 +1,6 @@ #include "UIComponent_MenuBackground.h" -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "Minecraft.Client/Common/src/UI/UILayer.h" #include "Minecraft.Client/Common/src/UI/UIScene.h" #include "Minecraft.Client/Linux/Iggy/include/iggy.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_MenuBackground.h b/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_MenuBackground.h index 7ea458000..b1fcfe0c8 100644 --- a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_MenuBackground.h +++ b/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_MenuBackground.h @@ -2,7 +2,7 @@ #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" #include "Minecraft.Client/Common/src/UI/UIScene.h" #include "Minecraft.Client/Linux/Iggy/include/rrCore.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Panorama.cpp b/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Panorama.cpp index a34e8bea6..9772b2406 100644 --- a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Panorama.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Panorama.cpp @@ -4,7 +4,7 @@ #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "Minecraft.Client/Common/src/UI/UILayer.h" #include "Minecraft.Client/Common/src/UI/UIScene.h" #include "Minecraft.Client/Linux/Iggy/include/iggy.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Panorama.h b/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Panorama.h index acfd24a1e..05e435f1b 100644 --- a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Panorama.h +++ b/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Panorama.h @@ -2,7 +2,7 @@ #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" #include "Minecraft.Client/Common/src/UI/UIScene.h" #include "Minecraft.Client/Linux/Iggy/include/iggy.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Tooltips.cpp b/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Tooltips.cpp index 7d0e60143..2c1f6457a 100644 --- a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Tooltips.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Tooltips.cpp @@ -1,7 +1,7 @@ #include "UIComponent_Tooltips.h" -#include "4J_Profile.h" -#include "4J_Render.h" +#include "platform/sdl2/Profile.h" +#include "platform/sdl2/Render.h" #include "Common/App_enums.h" #include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" #include "Minecraft.Client/Common/src/UI/UILayer.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Tooltips.h b/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Tooltips.h index bec9043f4..d6da17e38 100644 --- a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Tooltips.h +++ b/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Tooltips.h @@ -4,7 +4,7 @@ #include "4J.Common/4J_Compat.h" #include "4J.Common/4J_InputActions.h" -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" #include "Minecraft.Client/Common/src/UI/UIScene.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_TutorialPopup.cpp b/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_TutorialPopup.cpp index 4c5ad7e01..309cfd342 100644 --- a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_TutorialPopup.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_TutorialPopup.cpp @@ -4,7 +4,7 @@ #include -#include "4J_Profile.h" +#include "platform/sdl2/Profile.h" #include "Common/App_enums.h" #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" #include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_TutorialPopup.h b/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_TutorialPopup.h index b7fabff4a..4eae9d79b 100644 --- a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_TutorialPopup.h +++ b/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_TutorialPopup.h @@ -3,7 +3,7 @@ #include #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" #include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Components/UIScene_HUD.cpp b/targets/Minecraft.Client/Common/src/UI/Components/UIScene_HUD.cpp index 3e575d8ce..64d556f2c 100644 --- a/targets/Minecraft.Client/Common/src/UI/Components/UIScene_HUD.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Components/UIScene_HUD.cpp @@ -4,7 +4,7 @@ #include #include -#include "4J_Profile.h" +#include "platform/sdl2/Profile.h" #include "Common/App_enums.h" #include "Minecraft.Client/Common/src/UI/Components/UIComponent_Chat.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Components/UIScene_HUD.h b/targets/Minecraft.Client/Common/src/UI/Components/UIScene_HUD.h index 038832c38..020aa7231 100644 --- a/targets/Minecraft.Client/Common/src/UI/Components/UIScene_HUD.h +++ b/targets/Minecraft.Client/Common/src/UI/Components/UIScene_HUD.h @@ -2,7 +2,7 @@ #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_HUD.h" #include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentBook.cpp b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentBook.cpp index 1106e03aa..7560f0c1f 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentBook.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentBook.cpp @@ -2,7 +2,7 @@ #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" #include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.h" #include "Minecraft.Client/Linux/Iggy/include/iggy.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentButton.cpp b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentButton.cpp index 4c9490ed2..8f7edbd48 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentButton.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentButton.cpp @@ -5,7 +5,7 @@ #include #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftHorse.cpp b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftHorse.cpp index 089e7de1d..260f3025a 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftHorse.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftHorse.cpp @@ -5,7 +5,7 @@ #include #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" #include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.h" #include "Minecraft.Client/Linux/Iggy/include/iggy.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftPlayer.cpp b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftPlayer.cpp index 40e2fc49f..59be50f8d 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftPlayer.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftPlayer.cpp @@ -5,7 +5,7 @@ #include #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" #include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.h" #include "Minecraft.Client/Linux/Iggy/include/iggy.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerSkinPreview.cpp b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerSkinPreview.cpp index 12f201def..e9204c128 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerSkinPreview.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerSkinPreview.cpp @@ -6,7 +6,7 @@ #include #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" #include "Minecraft.Client/Linux/Iggy/include/iggy.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugCreateSchematic.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugCreateSchematic.cpp index 96a2276d4..614fe497e 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugCreateSchematic.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugCreateSchematic.cpp @@ -4,8 +4,8 @@ #include #include "4J.Common/4J_InputActions.h" -#include "4J_Input.h" -#include "4J_Profile.h" +#include "platform/sdl2/Input.h" +#include "platform/sdl2/Profile.h" #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugOverlay.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugOverlay.cpp index e9f22a25e..3cfa322f8 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugOverlay.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugOverlay.cpp @@ -6,7 +6,7 @@ #include #include "4J.Common/4J_InputActions.h" -#include "4J_Profile.h" +#include "platform/sdl2/Profile.h" #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" #include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugSetCamera.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugSetCamera.cpp index 1d4fd5b9c..a9421281e 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugSetCamera.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugSetCamera.cpp @@ -6,8 +6,8 @@ #include #include "4J.Common/4J_InputActions.h" -#include "4J_Input.h" -#include "4J_Profile.h" +#include "platform/sdl2/Input.h" +#include "platform/sdl2/Profile.h" #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.cpp index 0abd576bd..d8025cc0e 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.cpp @@ -4,7 +4,7 @@ #include -#include "4J_Profile.h" +#include "platform/sdl2/Profile.h" #include "Minecraft.Client/Common/App_structs.h" #include "Minecraft.Client/Common/src/DLC/DLCManager.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_BitmapIcon.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.h b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.h index 08631bf0b..76b7cf5f8 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.h +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.h @@ -2,7 +2,7 @@ #include -#include "4J_Storage.h" +#include "platform/sdl2/Storage.h" #include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_BitmapIcon.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp index 85d8b2923..b20faf053 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp @@ -8,8 +8,8 @@ #include "4J.Common/4J_Compat.h" #include "4J.Common/4J_InputActions.h" -#include "4J_Input.h" -#include "4J_Profile.h" +#include "platform/sdl2/Input.h" +#include "platform/sdl2/Profile.h" #include "Common/App_Defines.h" #include "Common/App_enums.h" #include "Minecraft.Client/Common/src/DLC/DLCManager.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.h index c542bcf36..61bbb384f 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.h +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.h @@ -4,7 +4,7 @@ #include -#include "4J_Storage.h" +#include "platform/sdl2/Storage.h" #include "IUIScene_StartGame.h" #include "Minecraft.Client/Common/src/DLC/DLCPack.h" #include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.h index b4cf8c7a0..d5e9baced 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.h +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.h @@ -2,7 +2,7 @@ #include -#include "4J_Storage.h" +#include "platform/sdl2/Storage.h" #include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_ButtonList.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.cpp index aafcbe32c..c873b0b80 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.cpp @@ -5,7 +5,7 @@ #include "4J.Common/4J_Compat.h" #include "4J.Common/4J_InputActions.h" -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_DLCList.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_HTMLLabel.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.h index 1abfae84c..9e1f950b3 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.h +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.h @@ -2,7 +2,7 @@ #include -#include "4J_Storage.h" +#include "platform/sdl2/Storage.h" #include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_BitmapIcon.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_EULA.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_EULA.cpp index 45223662c..8b6fe567a 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_EULA.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_EULA.cpp @@ -5,8 +5,8 @@ #include "4J.Common/4J_Compat.h" #include "4J.Common/4J_InputActions.h" -#include "4J_Input.h" -#include "4J_Profile.h" +#include "platform/sdl2/Input.h" +#include "platform/sdl2/Profile.h" #include "Common/App_Defines.h" #include "Common/App_enums.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.cpp index b7c274bdd..78fbcaaa9 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.cpp @@ -6,7 +6,7 @@ #include "4J.Common/4J_Compat.h" #include "4J.Common/4J_InputActions.h" -#include "4J_Profile.h" +#include "platform/sdl2/Profile.h" #include "Common/App_Defines.h" #include "Common/App_enums.h" #include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.h index 5e8db2f43..9e2f6e3a2 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.h +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.h @@ -2,7 +2,7 @@ #include -#include "4J_Storage.h" +#include "platform/sdl2/Storage.h" #include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_ButtonList.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.cpp index 14c47a17d..fc36ac827 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.cpp @@ -5,9 +5,9 @@ #include #include "4J.Common/4J_InputActions.h" -#include "4J_Input.h" -#include "4J_Profile.h" -#include "4J_Render.h" +#include "platform/sdl2/Input.h" +#include "platform/sdl2/Profile.h" +#include "platform/sdl2/Render.h" #include "Common/App_Defines.h" #include "Common/App_enums.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.cpp index 4ba4c2ad5..016ed8984 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.cpp @@ -9,7 +9,7 @@ #include #include "4J.Common/4J_InputActions.h" -#include "4J_Profile.h" +#include "platform/sdl2/Profile.h" #include "Minecraft.Client/Common/src/Console_Debug_enum.h" #include "Minecraft.Client/Common/src/Leaderboards/LeaderboardInterface.h" #include "Minecraft.Client/Common/src/Leaderboards/LeaderboardManager.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.h index a6e915ae4..a6b04befd 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.h +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.h @@ -4,7 +4,7 @@ #include #include "4J.Common/4J_Compat.h" -#include "4J_Storage.h" +#include "platform/sdl2/Storage.h" #include "Minecraft.Client/Common/src/Leaderboards/LeaderboardInterface.h" #include "Minecraft.Client/Common/src/Leaderboards/LeaderboardManager.h" #include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp index 86621d2d0..d4195cf60 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp @@ -6,8 +6,8 @@ #include "4J.Common/4J_Compat.h" #include "4J.Common/4J_InputActions.h" -#include "4J_Profile.h" -#include "4J_Render.h" +#include "platform/sdl2/Profile.h" +#include "platform/sdl2/Render.h" #include "Common/App_Defines.h" #include "Common/App_enums.h" #include "Minecraft.Client/Common/src/DLC/DLCManager.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.h index 3fa3ceb1f..b04de9d6e 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.h +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.h @@ -3,7 +3,7 @@ #include #include -#include "4J_Storage.h" +#include "platform/sdl2/Storage.h" #include "IUIScene_StartGame.h" #include "Minecraft.Client/Common/src/DLC/DLCPack.h" #include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp index 8f07cf0ef..fe47da632 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp @@ -7,8 +7,8 @@ #include #include "4J.Common/4J_InputActions.h" -#include "4J_Input.h" -#include "4J_Profile.h" +#include "platform/sdl2/Input.h" +#include "platform/sdl2/Profile.h" #include "Common/App_Defines.h" #include "Common/App_enums.h" #include "Minecraft.Client/Common/src/DLC/DLCManager.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.h index 2f8695a54..7f340e89a 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.h +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.h @@ -5,7 +5,7 @@ #include #include -#include "4J_Storage.h" +#include "platform/sdl2/Storage.h" #include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" #include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp index b2ed1a255..349256c00 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp @@ -7,8 +7,8 @@ #include "4J.Common/4J_Compat.h" #include "4J.Common/4J_InputActions.h" -#include "4J_Profile.h" -#include "4J_Render.h" +#include "platform/sdl2/Profile.h" +#include "platform/sdl2/Render.h" #include "Common/App_Defines.h" #include "Common/App_enums.h" #include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.h index e5d27a998..e617206a0 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.h +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.h @@ -5,7 +5,7 @@ #include #include -#include "4J_Storage.h" +#include "platform/sdl2/Storage.h" #include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.cpp index 6f30cc3d3..46eb1d451 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.cpp @@ -3,8 +3,8 @@ #include "4J.Common/4J_Compat.h" #include "4J.Common/4J_InputActions.h" -#include "4J_Input.h" -#include "4J_Profile.h" +#include "platform/sdl2/Input.h" +#include "platform/sdl2/Profile.h" #include "Common/App_Defines.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.cpp index 757f1054d..9ce07ff5f 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.cpp @@ -2,7 +2,7 @@ #include "UIScene_TrialExitUpsell.h" #include "4J.Common/4J_InputActions.h" -#include "4J_Profile.h" +#include "platform/sdl2/Profile.h" #include "Common/App_Defines.h" #include "Minecraft.Client/Common/src/UI/UIScene.h" #include "Minecraft.Client/Linux/Linux_App.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_ControlsMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_ControlsMenu.cpp index 3232fbc73..1176321a9 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_ControlsMenu.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_ControlsMenu.cpp @@ -5,7 +5,7 @@ #include #include "4J.Common/4J_InputActions.h" -#include "4J_Input.h" +#include "platform/sdl2/Input.h" #include "Common/App_enums.h" #include "Minecraft.Client/Common/src/BuildVer/BuildVer.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.cpp index bc15ae2e0..0351ce98c 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.cpp @@ -2,7 +2,7 @@ #include "UIScene_HelpAndOptionsMenu.h" #include "4J.Common/4J_InputActions.h" -#include "4J_Profile.h" +#include "platform/sdl2/Profile.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" #include "Minecraft.Client/Common/src/UI/UILayer.h" #include "Minecraft.Client/Common/src/UI/UIScene.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.cpp index f65ce7e5c..fabbfbb2c 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.cpp @@ -3,7 +3,7 @@ #include #include "4J.Common/4J_InputActions.h" -#include "4J_Profile.h" +#include "platform/sdl2/Profile.h" #include "Common/App_enums.h" #include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsMenu.cpp index 7a9e43105..c4f2de98c 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsMenu.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsMenu.cpp @@ -2,7 +2,7 @@ #include "UIScene_SettingsMenu.h" #include "4J.Common/4J_InputActions.h" -#include "4J_Profile.h" +#include "platform/sdl2/Profile.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" #include "Minecraft.Client/Common/src/UI/UILayer.h" #include "Minecraft.Client/Common/src/UI/UIScene.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsMenu.h index 422ec4059..61e681fce 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsMenu.h +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsMenu.h @@ -2,7 +2,7 @@ #include -#include "4J_Storage.h" +#include "platform/sdl2/Storage.h" #include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" #include "Minecraft.Client/Common/src/UI/UIScene.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.cpp index 65e103f29..0b95314b6 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.cpp @@ -4,8 +4,8 @@ #include #include "4J.Common/4J_InputActions.h" -#include "4J_Profile.h" -#include "4J_Render.h" +#include "platform/sdl2/Profile.h" +#include "platform/sdl2/Render.h" #include "Common/App_enums.h" #include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.cpp index 8c289f0df..52d86bb20 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.cpp @@ -4,7 +4,7 @@ #include #include "4J.Common/4J_InputActions.h" -#include "4J_Profile.h" +#include "platform/sdl2/Profile.h" #include "Common/App_enums.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp index 741c0b067..4cca644e0 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp @@ -6,8 +6,8 @@ #include #include "4J.Common/4J_InputActions.h" -#include "4J_Profile.h" -#include "4J_Render.h" +#include "platform/sdl2/Profile.h" +#include "platform/sdl2/Render.h" #include "Common/App_Defines.h" #include "Minecraft.Client/Common/Minecraft_Macros.h" #include "Minecraft.Client/Common/src/DLC/DLCManager.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.h index 51ce3e1f6..c5cd3b2d2 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.h +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.h @@ -3,7 +3,7 @@ #include #include -#include "4J_Storage.h" +#include "platform/sdl2/Storage.h" #include "Minecraft.Client/Common/src/DLC/DLCPack.h" #include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h index 6ccff65cd..6becd0c21 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h @@ -2,7 +2,7 @@ #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Cursor.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.cpp index 7cbda5a5c..845b8bc58 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.cpp @@ -7,8 +7,8 @@ #include #include -#include "4J_Input.h" -#include "4J_Profile.h" +#include "platform/sdl2/Input.h" +#include "platform/sdl2/Profile.h" #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" #include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" #include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.h index fd8e5e2f2..696144aad 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.h +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.h @@ -2,7 +2,7 @@ #include -#include "4J_Input.h" +#include "platform/sdl2/Input.h" #include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h" #include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AnvilMenu.h" #include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.cpp index 3a6ffeb32..25c0aae0e 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.cpp @@ -2,7 +2,7 @@ #include -#include "4J_Profile.h" +#include "platform/sdl2/Profile.h" #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" #include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" #include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.cpp index 6c5f3ab58..f23974bbf 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.cpp @@ -5,7 +5,7 @@ #include -#include "4J_Profile.h" +#include "platform/sdl2/Profile.h" #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" #include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" #include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.cpp index 1e6867a41..027800656 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.cpp @@ -3,7 +3,7 @@ #include -#include "4J_Profile.h" +#include "platform/sdl2/Profile.h" #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" #include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" #include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.cpp index 3e099e431..73cee54e0 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.cpp @@ -6,7 +6,7 @@ #include #include "4J.Common/4J_InputActions.h" -#include "4J_Profile.h" +#include "platform/sdl2/Profile.h" #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" #include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" #include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.cpp index 1fb26f82c..58d318b24 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.cpp @@ -2,7 +2,7 @@ #include "UIScene_CraftingMenu.h" #include "4J.Common/4J_InputActions.h" -#include "4J_Profile.h" +#include "platform/sdl2/Profile.h" #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" #include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" #include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.cpp index ded6b8f23..cd18f01b7 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.cpp @@ -4,8 +4,8 @@ #include #include "4J.Common/4J_InputActions.h" -#include "4J_Profile.h" -#include "4J_Storage.h" +#include "platform/sdl2/Profile.h" +#include "platform/sdl2/Storage.h" #include "Common/App_enums.h" #include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.cpp index 67441f40c..c892e0ab9 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.cpp @@ -8,7 +8,7 @@ #include "4J.Common/4J_Compat.h" #include "4J.Common/4J_InputActions.h" -#include "4J_Profile.h" +#include "platform/sdl2/Profile.h" #include "Common/App_enums.h" #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" #include "Minecraft.Client/Common/src/UI/UIScene.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.cpp index 4305c1221..2c057ed91 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.cpp @@ -4,7 +4,7 @@ #include "4J.Common/4J_Compat.h" #include "4J.Common/4J_InputActions.h" -#include "4J_Profile.h" +#include "platform/sdl2/Profile.h" #include "Common/App_enums.h" #include "Minecraft.Client/Common/src/Console_Debug_enum.h" #include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.h index 54d7201ff..44c3a022f 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.h +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.h @@ -4,7 +4,7 @@ #include #include -#include "4J_Storage.h" +#include "platform/sdl2/Storage.h" #include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" #include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.h index a73f388e6..c71478ff3 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.h +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.h @@ -3,7 +3,7 @@ #include #include -#include "4J_Storage.h" +#include "platform/sdl2/Storage.h" #include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" #include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.cpp index 67edbbee8..dd7e7d416 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.cpp @@ -6,7 +6,7 @@ #include #include "4J.Common/4J_InputActions.h" -#include "4J_Profile.h" +#include "platform/sdl2/Profile.h" #include "Common/App_enums.h" #include "Minecraft.Client/Common/src/DLC/DLCManager.h" #include "Minecraft.Client/Common/src/DLC/DLCPack.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h index f01b81f75..6cde37107 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h @@ -2,7 +2,7 @@ #include -#include "4J_Storage.h" +#include "platform/sdl2/Storage.h" #include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_PauseMenu.h" #include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.cpp index 8a96c244c..aaa702d60 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.cpp @@ -2,7 +2,7 @@ #include "UIScene_SignEntryMenu.h" #include "4J.Common/4J_InputActions.h" -#include "4J_Input.h" +#include "platform/sdl2/Input.h" #include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_ConnectingProgress.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_ConnectingProgress.cpp index 19cb3795a..4cb9fb536 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_ConnectingProgress.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_ConnectingProgress.cpp @@ -2,7 +2,7 @@ #include "UIScene_ConnectingProgress.h" #include "4J.Common/4J_InputActions.h" -#include "4J_Profile.h" +#include "platform/sdl2/Profile.h" #include "Common/App_enums.h" #include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" #include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_FullscreenProgress.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_FullscreenProgress.cpp index 981b8949d..9e273840d 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_FullscreenProgress.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_FullscreenProgress.cpp @@ -6,7 +6,7 @@ #include "4J.Common/4J_Compat.h" #include "4J.Common/4J_InputActions.h" -#include "4J_Profile.h" +#include "platform/sdl2/Profile.h" #include "Common/App_enums.h" #include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_MessageBox.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_MessageBox.cpp index 9e4ea45e2..96bc20e4f 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_MessageBox.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_MessageBox.cpp @@ -3,7 +3,7 @@ #include "4J.Common/4J_Compat.h" #include "4J.Common/4J_InputActions.h" -#include "4J_Profile.h" +#include "platform/sdl2/Profile.h" #include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_MessageBox.h b/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_MessageBox.h index f5a4291ee..be01c337b 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_MessageBox.h +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_MessageBox.h @@ -2,7 +2,7 @@ #include -#include "4J_Storage.h" +#include "platform/sdl2/Storage.h" #include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_QuadrantSignin.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_QuadrantSignin.cpp index 7902d5e2e..ae8554416 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_QuadrantSignin.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_QuadrantSignin.cpp @@ -5,8 +5,8 @@ #include "4J.Common/4J_Compat.h" #include "4J.Common/4J_InputActions.h" -#include "4J_Input.h" -#include "4J_Profile.h" +#include "platform/sdl2/Input.h" +#include "platform/sdl2/Profile.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_BitmapIcon.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" #include "Minecraft.Client/Common/src/UI/UILayer.h" diff --git a/targets/Minecraft.Client/Common/src/UI/UIController.cpp b/targets/Minecraft.Client/Common/src/UI/UIController.cpp index 882af6f95..c3f5e9f01 100644 --- a/targets/Minecraft.Client/Common/src/UI/UIController.cpp +++ b/targets/Minecraft.Client/Common/src/UI/UIController.cpp @@ -10,8 +10,8 @@ #include #include -#include "4J_Input.h" -#include "4J_Profile.h" +#include "platform/sdl2/Input.h" +#include "platform/sdl2/Profile.h" #include "Common/App_enums.h" #include "Minecraft.Client/Common/src/Audio/SoundEngine.h" #include "Minecraft.Client/Common/src/DLC/DLCManager.h" diff --git a/targets/Minecraft.Client/Common/src/UI/UIController.h b/targets/Minecraft.Client/Common/src/UI/UIController.h index 2ff6c826a..b47299c60 100644 --- a/targets/Minecraft.Client/Common/src/UI/UIController.h +++ b/targets/Minecraft.Client/Common/src/UI/UIController.h @@ -17,8 +17,8 @@ #include "4J.Common/4J_Compat.h" #include "4J.Common/4J_InputActions.h" -#include "4J_Render.h" -#include "4J_Storage.h" +#include "platform/sdl2/Render.h" +#include "platform/sdl2/Storage.h" #include "Minecraft.Client/Common/src/UI/All Platforms/IUIController.h" #include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" #include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" diff --git a/targets/Minecraft.Client/Common/src/UI/UIGroup.cpp b/targets/Minecraft.Client/Common/src/UI/UIGroup.cpp index 8c7bfc849..d579ec68c 100644 --- a/targets/Minecraft.Client/Common/src/UI/UIGroup.cpp +++ b/targets/Minecraft.Client/Common/src/UI/UIGroup.cpp @@ -1,7 +1,7 @@ #include "UIGroup.h" -#include "4J_Profile.h" -#include "4J_Render.h" +#include "platform/sdl2/Profile.h" +#include "platform/sdl2/Render.h" #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" #include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h" #include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" diff --git a/targets/Minecraft.Client/Common/src/UI/UIGroup.h b/targets/Minecraft.Client/Common/src/UI/UIGroup.h index f52dd1580..bdf0c4d44 100644 --- a/targets/Minecraft.Client/Common/src/UI/UIGroup.h +++ b/targets/Minecraft.Client/Common/src/UI/UIGroup.h @@ -1,7 +1,7 @@ #pragma once #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" #include "Minecraft.Client/Linux/Iggy/include/rrCore.h" #include "UILayer.h" diff --git a/targets/Minecraft.Client/Common/src/UI/UILayer.cpp b/targets/Minecraft.Client/Common/src/UI/UILayer.cpp index 4f9f08132..1edab6312 100644 --- a/targets/Minecraft.Client/Common/src/UI/UILayer.cpp +++ b/targets/Minecraft.Client/Common/src/UI/UILayer.cpp @@ -2,7 +2,7 @@ #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" #include "Minecraft.Client/Common/src/UI/Components/UIComponent_Chat.h" #include "Minecraft.Client/Common/src/UI/Components/UIComponent_DebugUIConsole.h" diff --git a/targets/Minecraft.Client/Common/src/UI/UILayer.h b/targets/Minecraft.Client/Common/src/UI/UILayer.h index 1e5b64950..21e41cbb1 100644 --- a/targets/Minecraft.Client/Common/src/UI/UILayer.h +++ b/targets/Minecraft.Client/Common/src/UI/UILayer.h @@ -6,7 +6,7 @@ #include #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" #include "Minecraft.Client/Linux/Iggy/include/rrCore.h" diff --git a/targets/Minecraft.Client/Common/src/UI/UIScene.cpp b/targets/Minecraft.Client/Common/src/UI/UIScene.cpp index 6f1f4530b..79fa52629 100644 --- a/targets/Minecraft.Client/Common/src/UI/UIScene.cpp +++ b/targets/Minecraft.Client/Common/src/UI/UIScene.cpp @@ -6,7 +6,7 @@ #include "4J.Common/4J_Compat.h" #include "4J.Common/4J_InputActions.h" -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" #include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" diff --git a/targets/Minecraft.Client/Common/src/UI/UIScene.h b/targets/Minecraft.Client/Common/src/UI/UIScene.h index 1078848fc..d19a776c1 100644 --- a/targets/Minecraft.Client/Common/src/UI/UIScene.h +++ b/targets/Minecraft.Client/Common/src/UI/UIScene.h @@ -13,7 +13,7 @@ #include #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" #include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h" diff --git a/targets/Minecraft.Client/Linux/LinuxGL.cpp b/targets/Minecraft.Client/Linux/LinuxGL.cpp index 8339558bf..3bbf3b0c9 100644 --- a/targets/Minecraft.Client/Linux/LinuxGL.cpp +++ b/targets/Minecraft.Client/Linux/LinuxGL.cpp @@ -1,6 +1,6 @@ #ifdef __linux__ -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "Minecraft.Client/include/stubs.h" #include "gl3_loader.h" #include "java/ByteBuffer.h" diff --git a/targets/Minecraft.Client/Linux/Linux_App.cpp b/targets/Minecraft.Client/Linux/Linux_App.cpp index 6fb17ad33..37b457809 100644 --- a/targets/Minecraft.Client/Linux/Linux_App.cpp +++ b/targets/Minecraft.Client/Linux/Linux_App.cpp @@ -4,9 +4,9 @@ #include -#include "4J_Profile.h" -#include "4J_Render.h" -#include "4J_Storage.h" +#include "platform/sdl2/Profile.h" +#include "platform/sdl2/Render.h" +#include "platform/sdl2/Storage.h" #include "Common/App_enums.h" #include "Minecraft.Client/Common/Consoles_App.h" #include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" diff --git a/targets/Minecraft.Client/Linux/Linux_Minecraft.cpp b/targets/Minecraft.Client/Linux/Linux_Minecraft.cpp index 324803de4..4d68989ce 100644 --- a/targets/Minecraft.Client/Linux/Linux_Minecraft.cpp +++ b/targets/Minecraft.Client/Linux/Linux_Minecraft.cpp @@ -51,10 +51,10 @@ static void sigsegv_handler(int sig) { // #include "NetworkManager.h" #include "4J.Common/4J_Compat.h" #include "4J.Common/4J_InputActions.h" -#include "4J_Input.h" -#include "4J_Profile.h" -#include "4J_Render.h" -#include "4J_Storage.h" +#include "platform/sdl2/Input.h" +#include "platform/sdl2/Profile.h" +#include "platform/sdl2/Render.h" +#include "platform/sdl2/Storage.h" #include "Minecraft.Client/Common/App_Defines.h" #include "Minecraft.Client/Common/src/Audio/SoundEngine.h" #include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" diff --git a/targets/Minecraft.Client/Linux/Linux_UIController.cpp b/targets/Minecraft.Client/Linux/Linux_UIController.cpp index 5d212ff6f..c1303aced 100644 --- a/targets/Minecraft.Client/Linux/Linux_UIController.cpp +++ b/targets/Minecraft.Client/Linux/Linux_UIController.cpp @@ -1,7 +1,7 @@ #include // GDraw GL backend for Linux -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "Linux_UIController.h" #include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" #include "Minecraft.Client/Linux/Iggy/gdraw/gdraw.h" diff --git a/targets/Minecraft.Client/src/BufferedImage.cpp b/targets/Minecraft.Client/src/BufferedImage.cpp index 5e42765d5..c5da29cad 100644 --- a/targets/Minecraft.Client/src/BufferedImage.cpp +++ b/targets/Minecraft.Client/src/BufferedImage.cpp @@ -7,7 +7,7 @@ #include #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "Minecraft.Client/Common/src/DLC/DLCFile.h" #include "Minecraft.Client/Common/src/DLC/DLCManager.h" #include "Minecraft.Client/Common/src/DLC/DLCPack.h" diff --git a/targets/minecraft/client/Lighting.cpp b/targets/minecraft/client/Lighting.cpp index b11887ea9..0163e740b 100644 --- a/targets/minecraft/client/Lighting.cpp +++ b/targets/minecraft/client/Lighting.cpp @@ -2,7 +2,7 @@ #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "Minecraft.Client/include/stubs.h" #include "java/FloatBuffer.h" #include "minecraft/world/phys/Vec3.h" diff --git a/targets/minecraft/client/MemoryTracker.cpp b/targets/minecraft/client/MemoryTracker.cpp index d17094497..b44bc7aaa 100644 --- a/targets/minecraft/client/MemoryTracker.cpp +++ b/targets/minecraft/client/MemoryTracker.cpp @@ -3,7 +3,7 @@ #include #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "java/ByteBuffer.h" std::unordered_map MemoryTracker::GL_LIST_IDS; diff --git a/targets/minecraft/client/Minecraft.cpp b/targets/minecraft/client/Minecraft.cpp index 4cbef5d9e..1150ffb98 100644 --- a/targets/minecraft/client/Minecraft.cpp +++ b/targets/minecraft/client/Minecraft.cpp @@ -11,9 +11,9 @@ #include #include "4J.Common/4J_InputActions.h" -#include "4J_Profile.h" -#include "4J_Render.h" -#include "4J_Storage.h" +#include "platform/sdl2/Profile.h" +#include "platform/sdl2/Render.h" +#include "platform/sdl2/Storage.h" #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Common/src/Audio/SoundEngine.h" #include "Minecraft.Client/Common/src/DLC/DLCManager.h" @@ -101,7 +101,7 @@ #if defined(ENABLE_JAVA_GUIS) #include "minecraft/client/gui/inventory/CreativeInventoryScreen.h" #endif -#include "4J_Input.h" +#include "platform/sdl2/Input.h" #include "Minecraft.Client/Common/Minecraft_Macros.h" #include "Minecraft.Client/Common/src/Colours/ColourTable.h" #include "Minecraft.Client/Common/src/ConsoleGameMode.h" diff --git a/targets/minecraft/client/gui/Button.cpp b/targets/minecraft/client/gui/Button.cpp index ab4bbe722..c7b960875 100644 --- a/targets/minecraft/client/gui/Button.cpp +++ b/targets/minecraft/client/gui/Button.cpp @@ -1,6 +1,6 @@ #include "Button.h" -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/renderer/Textures.h" #include "minecraft/client/resources/ResourceLocation.h" diff --git a/targets/minecraft/client/gui/CreateWorldScreen.cpp b/targets/minecraft/client/gui/CreateWorldScreen.cpp index a70d320ef..8172ad06f 100644 --- a/targets/minecraft/client/gui/CreateWorldScreen.cpp +++ b/targets/minecraft/client/gui/CreateWorldScreen.cpp @@ -6,7 +6,7 @@ #include #include -#include "4J_Storage.h" +#include "platform/sdl2/Storage.h" #include "Button.h" #include "EditBox.h" #include "MessageScreen.h" diff --git a/targets/minecraft/client/gui/DeathScreen.cpp b/targets/minecraft/client/gui/DeathScreen.cpp index c28bb9a71..5bffc11f1 100644 --- a/targets/minecraft/client/gui/DeathScreen.cpp +++ b/targets/minecraft/client/gui/DeathScreen.cpp @@ -4,7 +4,7 @@ #include #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "Button.h" #include "PauseScreen.h" #include "console_helpers/StringHelpers.h" diff --git a/targets/minecraft/client/gui/Font.cpp b/targets/minecraft/client/gui/Font.cpp index 7cf0596b6..cb7f8ac4d 100644 --- a/targets/minecraft/client/gui/Font.cpp +++ b/targets/minecraft/client/gui/Font.cpp @@ -5,7 +5,7 @@ #include #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "Minecraft.Client/include/BufferedImage.h" #include "console_helpers/StringHelpers.h" #include "java/Random.h" diff --git a/targets/minecraft/client/gui/Gui.cpp b/targets/minecraft/client/gui/Gui.cpp index 4487fb1df..e425f75a4 100644 --- a/targets/minecraft/client/gui/Gui.cpp +++ b/targets/minecraft/client/gui/Gui.cpp @@ -3,8 +3,8 @@ #include #include "4J.Common/4J_Compat.h" -#include "4J_Input.h" -#include "4J_Render.h" +#include "platform/sdl2/Input.h" +#include "platform/sdl2/Render.h" #include "Facing.h" #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Common/App_structs.h" diff --git a/targets/minecraft/client/gui/GuiComponent.cpp b/targets/minecraft/client/gui/GuiComponent.cpp index 7f959e38b..0f76f2769 100644 --- a/targets/minecraft/client/gui/GuiComponent.cpp +++ b/targets/minecraft/client/gui/GuiComponent.cpp @@ -3,7 +3,7 @@ #include #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "Minecraft.Client/include/stubs.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/gui/Font.h" diff --git a/targets/minecraft/client/gui/Minimap.cpp b/targets/minecraft/client/gui/Minimap.cpp index c0c198df2..6eb450d0e 100644 --- a/targets/minecraft/client/gui/Minimap.cpp +++ b/targets/minecraft/client/gui/Minimap.cpp @@ -7,7 +7,7 @@ #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "Font.h" #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Common/src/Colours/ColourTable.h" diff --git a/targets/minecraft/client/gui/PauseScreen.cpp b/targets/minecraft/client/gui/PauseScreen.cpp index 31ce22b27..986018106 100644 --- a/targets/minecraft/client/gui/PauseScreen.cpp +++ b/targets/minecraft/client/gui/PauseScreen.cpp @@ -7,7 +7,7 @@ #include #include -#include "4J_Input.h" +#include "platform/sdl2/Input.h" #include "Button.h" #include "MessageScreen.h" #include "Minecraft.Client/Common/App_enums.h" diff --git a/targets/minecraft/client/gui/Screen.cpp b/targets/minecraft/client/gui/Screen.cpp index 75e174535..9e5f880b4 100644 --- a/targets/minecraft/client/gui/Screen.cpp +++ b/targets/minecraft/client/gui/Screen.cpp @@ -1,8 +1,8 @@ #include "Screen.h" #include "4J.Common/4J_InputActions.h" -#include "4J_Input.h" -#include "4J_Profile.h" +#include "platform/sdl2/Input.h" +#include "platform/sdl2/Profile.h" #include "Button.h" #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Common/src/Audio/SoundEngine.h" diff --git a/targets/minecraft/client/gui/SlideButton.cpp b/targets/minecraft/client/gui/SlideButton.cpp index d34063a64..28bda91e6 100644 --- a/targets/minecraft/client/gui/SlideButton.cpp +++ b/targets/minecraft/client/gui/SlideButton.cpp @@ -1,6 +1,6 @@ #include "SlideButton.h" -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/Options.h" #include "minecraft/client/gui/Button.h" diff --git a/targets/minecraft/client/gui/achievement/AchievementPopup.cpp b/targets/minecraft/client/gui/achievement/AchievementPopup.cpp index 809558665..017767e9b 100644 --- a/targets/minecraft/client/gui/achievement/AchievementPopup.cpp +++ b/targets/minecraft/client/gui/achievement/AchievementPopup.cpp @@ -2,7 +2,7 @@ #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "java/System.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/gui/Font.h" diff --git a/targets/minecraft/client/gui/achievement/AchievementScreen.cpp b/targets/minecraft/client/gui/achievement/AchievementScreen.cpp index 271e9acfc..0b59ee2de 100644 --- a/targets/minecraft/client/gui/achievement/AchievementScreen.cpp +++ b/targets/minecraft/client/gui/achievement/AchievementScreen.cpp @@ -5,7 +5,7 @@ #include #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "Minecraft.Client/include/stubs.h" #include "minecraft/client/KeyMapping.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/minecraft/client/gui/inventory/AbstractBeaconButton.cpp b/targets/minecraft/client/gui/inventory/AbstractBeaconButton.cpp index d33843779..4a2373667 100644 --- a/targets/minecraft/client/gui/inventory/AbstractBeaconButton.cpp +++ b/targets/minecraft/client/gui/inventory/AbstractBeaconButton.cpp @@ -2,7 +2,7 @@ #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "minecraft/client/gui/Button.h" #include "minecraft/client/renderer/Textures.h" #include "minecraft/client/resources/ResourceLocation.h" diff --git a/targets/minecraft/client/gui/inventory/BeaconScreen.cpp b/targets/minecraft/client/gui/inventory/BeaconScreen.cpp index 204d07b2b..8ff2f0589 100644 --- a/targets/minecraft/client/gui/inventory/BeaconScreen.cpp +++ b/targets/minecraft/client/gui/inventory/BeaconScreen.cpp @@ -6,7 +6,7 @@ #include #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "BeaconCancelButton.h" #include "BeaconConfirmButton.h" #include "BeaconPowerButton.h" diff --git a/targets/minecraft/client/gui/inventory/CreativeInventoryScreen.cpp b/targets/minecraft/client/gui/inventory/CreativeInventoryScreen.cpp index 9ea7f4b5f..55cac3459 100644 --- a/targets/minecraft/client/gui/inventory/CreativeInventoryScreen.cpp +++ b/targets/minecraft/client/gui/inventory/CreativeInventoryScreen.cpp @@ -6,8 +6,8 @@ #include #include "4J.Common/4J_InputActions.h" -#include "4J_Input.h" -#include "4J_Render.h" +#include "platform/sdl2/Input.h" +#include "platform/sdl2/Render.h" #include "AbstractContainerScreen.h" #include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CreativeMenu.h" #include "Minecraft.Client/Linux/Linux_App.h" diff --git a/targets/minecraft/client/gui/inventory/InventoryScreen.cpp b/targets/minecraft/client/gui/inventory/InventoryScreen.cpp index 2205f8670..c9d0b7fd0 100644 --- a/targets/minecraft/client/gui/inventory/InventoryScreen.cpp +++ b/targets/minecraft/client/gui/inventory/InventoryScreen.cpp @@ -4,7 +4,7 @@ #include #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "minecraft/client/Lighting.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/gui/Button.h" diff --git a/targets/minecraft/client/gui/inventory/RepairScreen.cpp b/targets/minecraft/client/gui/inventory/RepairScreen.cpp index b8413b581..2ee2cd99a 100644 --- a/targets/minecraft/client/gui/inventory/RepairScreen.cpp +++ b/targets/minecraft/client/gui/inventory/RepairScreen.cpp @@ -5,7 +5,7 @@ #include #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "java/InputOutputStream/ByteArrayOutputStream.h" #include "java/InputOutputStream/DataOutputStream.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/minecraft/client/gui/inventory/TextEditScreen.cpp b/targets/minecraft/client/gui/inventory/TextEditScreen.cpp index 7dee3b7af..934d244da 100644 --- a/targets/minecraft/client/gui/inventory/TextEditScreen.cpp +++ b/targets/minecraft/client/gui/inventory/TextEditScreen.cpp @@ -2,7 +2,7 @@ #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "Minecraft.Client/include/stubs.h" #include "minecraft/SharedConstants.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/minecraft/client/model/ChickenModel.cpp b/targets/minecraft/client/model/ChickenModel.cpp index be8b9c43d..f18595342 100644 --- a/targets/minecraft/client/model/ChickenModel.cpp +++ b/targets/minecraft/client/model/ChickenModel.cpp @@ -5,7 +5,7 @@ #include #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "minecraft/client/model/geom/Model.h" #include "minecraft/client/model/geom/ModelPart.h" diff --git a/targets/minecraft/client/model/GhastModel.cpp b/targets/minecraft/client/model/GhastModel.cpp index aa0a74d3c..9325bb3e1 100644 --- a/targets/minecraft/client/model/GhastModel.cpp +++ b/targets/minecraft/client/model/GhastModel.cpp @@ -4,7 +4,7 @@ #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "java/Random.h" #include "minecraft/client/model/geom/Model.h" #include "minecraft/client/model/geom/ModelPart.h" diff --git a/targets/minecraft/client/model/HumanoidModel.cpp b/targets/minecraft/client/model/HumanoidModel.cpp index 5cde5bf80..05fca28b9 100644 --- a/targets/minecraft/client/model/HumanoidModel.cpp +++ b/targets/minecraft/client/model/HumanoidModel.cpp @@ -4,7 +4,7 @@ #include #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "minecraft/client/model/geom/Model.h" #include "minecraft/client/model/geom/ModelPart.h" diff --git a/targets/minecraft/client/model/ModelHorse.cpp b/targets/minecraft/client/model/ModelHorse.cpp index e8ae1ef80..c110229bb 100644 --- a/targets/minecraft/client/model/ModelHorse.cpp +++ b/targets/minecraft/client/model/ModelHorse.cpp @@ -5,7 +5,7 @@ #include #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "minecraft/client/model/geom/Model.h" #include "minecraft/client/model/geom/ModelPart.h" #include "minecraft/util/Mth.h" diff --git a/targets/minecraft/client/model/OcelotModel.cpp b/targets/minecraft/client/model/OcelotModel.cpp index 825903b4f..30a090c6e 100644 --- a/targets/minecraft/client/model/OcelotModel.cpp +++ b/targets/minecraft/client/model/OcelotModel.cpp @@ -6,7 +6,7 @@ #include #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "minecraft/client/model/geom/ModelPart.h" #include "minecraft/world/entity/LivingEntity.h" #include "minecraft/world/entity/animal/Ocelot.h" diff --git a/targets/minecraft/client/model/QuadrupedModel.cpp b/targets/minecraft/client/model/QuadrupedModel.cpp index faf94c7aa..360210103 100644 --- a/targets/minecraft/client/model/QuadrupedModel.cpp +++ b/targets/minecraft/client/model/QuadrupedModel.cpp @@ -5,7 +5,7 @@ #include #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "minecraft/client/model/geom/Model.h" #include "minecraft/client/model/geom/ModelPart.h" diff --git a/targets/minecraft/client/model/WolfModel.cpp b/targets/minecraft/client/model/WolfModel.cpp index 342a66227..75b6d0400 100644 --- a/targets/minecraft/client/model/WolfModel.cpp +++ b/targets/minecraft/client/model/WolfModel.cpp @@ -5,7 +5,7 @@ #include #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "minecraft/client/model/geom/Model.h" #include "minecraft/client/model/geom/ModelPart.h" #include "minecraft/world/entity/LivingEntity.h" diff --git a/targets/minecraft/client/model/dragon/DragonModel.cpp b/targets/minecraft/client/model/dragon/DragonModel.cpp index 7fd1ddca0..19a2cd7b3 100644 --- a/targets/minecraft/client/model/dragon/DragonModel.cpp +++ b/targets/minecraft/client/model/dragon/DragonModel.cpp @@ -7,7 +7,7 @@ #include #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "gl3_loader.h" #include "minecraft/client/model/geom/Model.h" #include "minecraft/client/model/geom/ModelPart.h" diff --git a/targets/minecraft/client/model/dragon/EnderCrystalModel.cpp b/targets/minecraft/client/model/dragon/EnderCrystalModel.cpp index 24f1064ee..5e8e51501 100644 --- a/targets/minecraft/client/model/dragon/EnderCrystalModel.cpp +++ b/targets/minecraft/client/model/dragon/EnderCrystalModel.cpp @@ -3,7 +3,7 @@ #include #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "minecraft/client/model/geom/ModelPart.h" EnderCrystalModel::EnderCrystalModel(float g) { diff --git a/targets/minecraft/client/model/geom/ModelPart.cpp b/targets/minecraft/client/model/geom/ModelPart.cpp index df3db442b..c64c567b5 100644 --- a/targets/minecraft/client/model/geom/ModelPart.cpp +++ b/targets/minecraft/client/model/geom/ModelPart.cpp @@ -4,7 +4,7 @@ #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "Cube.h" #include "TexOffs.h" #include "minecraft/client/MemoryTracker.h" diff --git a/targets/minecraft/client/multiplayer/ClientConnection.cpp b/targets/minecraft/client/multiplayer/ClientConnection.cpp index f1711e7ef..1ce770659 100644 --- a/targets/minecraft/client/multiplayer/ClientConnection.cpp +++ b/targets/minecraft/client/multiplayer/ClientConnection.cpp @@ -11,8 +11,8 @@ #include #include "4J.Common/4J_Compat.h" -#include "4J_Input.h" -#include "4J_Profile.h" +#include "platform/sdl2/Input.h" +#include "platform/sdl2/Profile.h" #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Common/App_structs.h" #include "Minecraft.Client/Common/src/ConsoleGameMode.h" diff --git a/targets/minecraft/client/multiplayer/ClientConnection.h b/targets/minecraft/client/multiplayer/ClientConnection.h index 10358fd8a..2a873397c 100644 --- a/targets/minecraft/client/multiplayer/ClientConnection.h +++ b/targets/minecraft/client/multiplayer/ClientConnection.h @@ -5,7 +5,7 @@ #include #include -#include "4J_Storage.h" +#include "platform/sdl2/Storage.h" #include "minecraft/network/Connection.h" #include "minecraft/network/packet/DisconnectPacket.h" diff --git a/targets/minecraft/client/multiplayer/MultiPlayerLevel.cpp b/targets/minecraft/client/multiplayer/MultiPlayerLevel.cpp index 143a4d6d4..d8d011554 100644 --- a/targets/minecraft/client/multiplayer/MultiPlayerLevel.cpp +++ b/targets/minecraft/client/multiplayer/MultiPlayerLevel.cpp @@ -10,7 +10,7 @@ #include #include "4J.Common/4J_Compat.h" -#include "4J_Input.h" +#include "platform/sdl2/Input.h" #include "ClientConnection.h" #include "Minecraft.Client/Common/src/Audio/SoundEngine.h" #include "Minecraft.Client/Common/src/Console_Debug_enum.h" diff --git a/targets/minecraft/client/particle/FootstepParticle.cpp b/targets/minecraft/client/particle/FootstepParticle.cpp index 47c5c93a0..1a270c663 100644 --- a/targets/minecraft/client/particle/FootstepParticle.cpp +++ b/targets/minecraft/client/particle/FootstepParticle.cpp @@ -4,7 +4,7 @@ #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "minecraft/client/particle/Particle.h" #include "minecraft/client/particle/ParticleEngine.h" #include "minecraft/client/renderer/Tesselator.h" diff --git a/targets/minecraft/client/particle/HugeExplosionParticle.cpp b/targets/minecraft/client/particle/HugeExplosionParticle.cpp index 8f04fc776..f53b9c3f6 100644 --- a/targets/minecraft/client/particle/HugeExplosionParticle.cpp +++ b/targets/minecraft/client/particle/HugeExplosionParticle.cpp @@ -2,7 +2,7 @@ #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Common/src/Colours/ColourTable.h" #include "java/Random.h" diff --git a/targets/minecraft/client/particle/ParticleEngine.cpp b/targets/minecraft/client/particle/ParticleEngine.cpp index fe683cb33..140bfb606 100644 --- a/targets/minecraft/client/particle/ParticleEngine.cpp +++ b/targets/minecraft/client/particle/ParticleEngine.cpp @@ -6,7 +6,7 @@ #include #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "Particle.h" #include "TerrainParticle.h" #include "console_helpers/StringHelpers.h" diff --git a/targets/minecraft/client/particle/TakeAnimationParticle.cpp b/targets/minecraft/client/particle/TakeAnimationParticle.cpp index 3b03b53c1..9f4e44be7 100644 --- a/targets/minecraft/client/particle/TakeAnimationParticle.cpp +++ b/targets/minecraft/client/particle/TakeAnimationParticle.cpp @@ -4,7 +4,7 @@ #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "minecraft/SharedConstants.h" #include "minecraft/client/particle/Particle.h" #include "minecraft/client/particle/ParticleEngine.h" diff --git a/targets/minecraft/client/player/Input.cpp b/targets/minecraft/client/player/Input.cpp index af2147d5f..a6227d773 100644 --- a/targets/minecraft/client/player/Input.cpp +++ b/targets/minecraft/client/player/Input.cpp @@ -3,7 +3,7 @@ #include #include "4J.Common/4J_InputActions.h" -#include "4J_Input.h" +#include "platform/sdl2/Input.h" #include "LocalPlayer.h" #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Linux/Linux_App.h" diff --git a/targets/minecraft/client/player/LocalPlayer.cpp b/targets/minecraft/client/player/LocalPlayer.cpp index bb86e4a36..c005a6c1d 100644 --- a/targets/minecraft/client/player/LocalPlayer.cpp +++ b/targets/minecraft/client/player/LocalPlayer.cpp @@ -26,9 +26,9 @@ #include "minecraft/world/level/tile/Tile.h" // 4J Stu - Added for tutorial callbacks #include "4J.Common/4J_InputActions.h" -#include "4J_Input.h" -#include "4J_Profile.h" -#include "4J_Render.h" +#include "platform/sdl2/Input.h" +#include "platform/sdl2/Profile.h" +#include "platform/sdl2/Render.h" #include "Minecraft.Client/Common/App_structs.h" #include "Minecraft.Client/Common/src/Audio/SoundEngine.h" #include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" diff --git a/targets/minecraft/client/renderer/Chunk.cpp b/targets/minecraft/client/renderer/Chunk.cpp index 6669a2406..5038762ac 100644 --- a/targets/minecraft/client/renderer/Chunk.cpp +++ b/targets/minecraft/client/renderer/Chunk.cpp @@ -9,7 +9,7 @@ #include #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "LevelRenderer.h" #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" #include "Minecraft.Client/include/FrameProfiler.h" diff --git a/targets/minecraft/client/renderer/GameRenderer.cpp b/targets/minecraft/client/renderer/GameRenderer.cpp index 0a09ab28d..a397726aa 100644 --- a/targets/minecraft/client/renderer/GameRenderer.cpp +++ b/targets/minecraft/client/renderer/GameRenderer.cpp @@ -7,8 +7,8 @@ #include #include "4J.Common/4J_Compat.h" -#include "4J_Input.h" -#include "4J_Render.h" +#include "platform/sdl2/Input.h" +#include "platform/sdl2/Render.h" #include "BossMobGuiInfo.h" #include "Chunk.h" #include "ItemInHandRenderer.h" diff --git a/targets/minecraft/client/renderer/ItemInHandRenderer.cpp b/targets/minecraft/client/renderer/ItemInHandRenderer.cpp index 68b81d660..3d7a0feef 100644 --- a/targets/minecraft/client/renderer/ItemInHandRenderer.cpp +++ b/targets/minecraft/client/renderer/ItemInHandRenderer.cpp @@ -6,7 +6,7 @@ #include #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Common/src/Colours/ColourTable.h" #include "Minecraft.Client/Linux/Linux_App.h" diff --git a/targets/minecraft/client/renderer/LevelRenderer.cpp b/targets/minecraft/client/renderer/LevelRenderer.cpp index 20b3eedd9..55b693ee1 100644 --- a/targets/minecraft/client/renderer/LevelRenderer.cpp +++ b/targets/minecraft/client/renderer/LevelRenderer.cpp @@ -14,8 +14,8 @@ #include #include "4J.Common/4J_Compat.h" -#include "4J_Input.h" -#include "4J_Render.h" +#include "platform/sdl2/Input.h" +#include "platform/sdl2/Render.h" #include "Chunk.h" #include "GameRenderer.h" #include "Minecraft.Client/Common/App_enums.h" diff --git a/targets/minecraft/client/renderer/OffsettedRenderList.cpp b/targets/minecraft/client/renderer/OffsettedRenderList.cpp index b79338a9c..ddc0d1eb4 100644 --- a/targets/minecraft/client/renderer/OffsettedRenderList.cpp +++ b/targets/minecraft/client/renderer/OffsettedRenderList.cpp @@ -1,6 +1,6 @@ #include "OffsettedRenderList.h" -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "java/IntBuffer.h" #include "minecraft/client/MemoryTracker.h" diff --git a/targets/minecraft/client/renderer/Tesselator.cpp b/targets/minecraft/client/renderer/Tesselator.cpp index afb0903dd..a594e3b9e 100644 --- a/targets/minecraft/client/renderer/Tesselator.cpp +++ b/targets/minecraft/client/renderer/Tesselator.cpp @@ -4,7 +4,7 @@ #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.Client/include/stubs.h" #include "minecraft/client/MemoryTracker.h" diff --git a/targets/minecraft/client/renderer/Textures.cpp b/targets/minecraft/client/renderer/Textures.cpp index 741e22845..ba23caddd 100644 --- a/targets/minecraft/client/renderer/Textures.cpp +++ b/targets/minecraft/client/renderer/Textures.cpp @@ -7,7 +7,7 @@ #include #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "HttpTexture.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.Client/include/BufferedImage.h" diff --git a/targets/minecraft/client/renderer/Textures.h b/targets/minecraft/client/renderer/Textures.h index d3d2413c0..e69783834 100644 --- a/targets/minecraft/client/renderer/Textures.h +++ b/targets/minecraft/client/renderer/Textures.h @@ -5,7 +5,7 @@ #include #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "IPlatformRenderer.h" class Icon; diff --git a/targets/minecraft/client/renderer/TileRenderer.cpp b/targets/minecraft/client/renderer/TileRenderer.cpp index 13af5da2c..9bba981be 100644 --- a/targets/minecraft/client/renderer/TileRenderer.cpp +++ b/targets/minecraft/client/renderer/TileRenderer.cpp @@ -9,7 +9,7 @@ #include #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "EntityTileRenderer.h" #include "GameRenderer.h" #include "Minecraft.Client/Common/App_enums.h" diff --git a/targets/minecraft/client/renderer/culling/Frustum.cpp b/targets/minecraft/client/renderer/culling/Frustum.cpp index 1f9ee45f7..e39c9cf6d 100644 --- a/targets/minecraft/client/renderer/culling/Frustum.cpp +++ b/targets/minecraft/client/renderer/culling/Frustum.cpp @@ -6,7 +6,7 @@ #include #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "java/FloatBuffer.h" #include "minecraft/client/MemoryTracker.h" diff --git a/targets/minecraft/client/renderer/entity/ArrowRenderer.cpp b/targets/minecraft/client/renderer/entity/ArrowRenderer.cpp index c9c77c1ba..38ed2372c 100644 --- a/targets/minecraft/client/renderer/entity/ArrowRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/ArrowRenderer.cpp @@ -4,7 +4,7 @@ #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "gl3_loader.h" #include "minecraft/client/renderer/Tesselator.h" #include "minecraft/client/renderer/Textures.h" diff --git a/targets/minecraft/client/renderer/entity/BatRenderer.cpp b/targets/minecraft/client/renderer/entity/BatRenderer.cpp index 2993148fa..72bb017fc 100644 --- a/targets/minecraft/client/renderer/entity/BatRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/BatRenderer.cpp @@ -3,7 +3,7 @@ #include #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "minecraft/client/model/BatModel.h" #include "minecraft/client/model/geom/Model.h" #include "minecraft/client/renderer/Textures.h" diff --git a/targets/minecraft/client/renderer/entity/BoatRenderer.cpp b/targets/minecraft/client/renderer/entity/BoatRenderer.cpp index 095db96e1..35cf2b62e 100644 --- a/targets/minecraft/client/renderer/entity/BoatRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/BoatRenderer.cpp @@ -4,7 +4,7 @@ #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "minecraft/client/model/BoatModel.h" #include "minecraft/client/model/geom/Model.h" #include "minecraft/client/renderer/Textures.h" diff --git a/targets/minecraft/client/renderer/entity/CaveSpiderRenderer.cpp b/targets/minecraft/client/renderer/entity/CaveSpiderRenderer.cpp index 17f5b6ff3..a85836653 100644 --- a/targets/minecraft/client/renderer/entity/CaveSpiderRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/CaveSpiderRenderer.cpp @@ -2,7 +2,7 @@ #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "minecraft/client/renderer/Textures.h" #include "minecraft/client/renderer/entity/SpiderRenderer.h" #include "minecraft/client/resources/ResourceLocation.h" diff --git a/targets/minecraft/client/renderer/entity/CreeperRenderer.cpp b/targets/minecraft/client/renderer/entity/CreeperRenderer.cpp index e07be7d6a..6efd57455 100644 --- a/targets/minecraft/client/renderer/entity/CreeperRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/CreeperRenderer.cpp @@ -4,7 +4,7 @@ #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "gl3_loader.h" #include "minecraft/client/model/CreeperModel.h" #include "minecraft/client/renderer/Textures.h" diff --git a/targets/minecraft/client/renderer/entity/DefaultRenderer.cpp b/targets/minecraft/client/renderer/entity/DefaultRenderer.cpp index 2b225e987..7807198ea 100644 --- a/targets/minecraft/client/renderer/entity/DefaultRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/DefaultRenderer.cpp @@ -1,6 +1,6 @@ #include "DefaultRenderer.h" -#include "4J_Render.h" +#include "platform/sdl2/Render.h" void DefaultRenderer::render(std::shared_ptr entity, double x, double y, double z, float rot, float a) { diff --git a/targets/minecraft/client/renderer/entity/EnderCrystalRenderer.cpp b/targets/minecraft/client/renderer/entity/EnderCrystalRenderer.cpp index d5cf080fc..b3e793099 100644 --- a/targets/minecraft/client/renderer/entity/EnderCrystalRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/EnderCrystalRenderer.cpp @@ -3,7 +3,7 @@ #include #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "minecraft/client/model/dragon/EnderCrystalModel.h" #include "minecraft/client/model/geom/Model.h" #include "minecraft/client/renderer/Textures.h" diff --git a/targets/minecraft/client/renderer/entity/EnderDragonRenderer.cpp b/targets/minecraft/client/renderer/entity/EnderDragonRenderer.cpp index 0d3593e53..e5b9bb4de 100644 --- a/targets/minecraft/client/renderer/entity/EnderDragonRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/EnderDragonRenderer.cpp @@ -5,7 +5,7 @@ #include #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "SharedConstants.h" #include "gl3_loader.h" #include "java/Random.h" diff --git a/targets/minecraft/client/renderer/entity/EndermanRenderer.cpp b/targets/minecraft/client/renderer/entity/EndermanRenderer.cpp index 165d9bed1..fb35bf5ba 100644 --- a/targets/minecraft/client/renderer/entity/EndermanRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/EndermanRenderer.cpp @@ -2,7 +2,7 @@ #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "gl3_loader.h" #include "minecraft/SharedConstants.h" #include "minecraft/client/model/EndermanModel.h" diff --git a/targets/minecraft/client/renderer/entity/EntityRenderDispatcher.cpp b/targets/minecraft/client/renderer/entity/EntityRenderDispatcher.cpp index 623586ae6..d9894f373 100644 --- a/targets/minecraft/client/renderer/entity/EntityRenderDispatcher.cpp +++ b/targets/minecraft/client/renderer/entity/EntityRenderDispatcher.cpp @@ -5,7 +5,7 @@ #include #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "ArrowRenderer.h" #include "BatRenderer.h" #include "BlazeRenderer.h" diff --git a/targets/minecraft/client/renderer/entity/EntityRenderer.cpp b/targets/minecraft/client/renderer/entity/EntityRenderer.cpp index f0d9fd72c..068bc5384 100644 --- a/targets/minecraft/client/renderer/entity/EntityRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/EntityRenderer.cpp @@ -2,7 +2,7 @@ #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "EntityRenderDispatcher.h" #include "gl3_loader.h" #include "java/Class.h" diff --git a/targets/minecraft/client/renderer/entity/ExperienceOrbRenderer.cpp b/targets/minecraft/client/renderer/entity/ExperienceOrbRenderer.cpp index 3b1df72c2..15c110f6a 100644 --- a/targets/minecraft/client/renderer/entity/ExperienceOrbRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/ExperienceOrbRenderer.cpp @@ -5,7 +5,7 @@ #include #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "EntityRenderDispatcher.h" #include "gl3_loader.h" #include "minecraft/SharedConstants.h" diff --git a/targets/minecraft/client/renderer/entity/FallingTileRenderer.cpp b/targets/minecraft/client/renderer/entity/FallingTileRenderer.cpp index 5a8c29dfe..c1bc2e4fc 100644 --- a/targets/minecraft/client/renderer/entity/FallingTileRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/FallingTileRenderer.cpp @@ -3,7 +3,7 @@ #include #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "gl3_loader.h" #include "minecraft/client/renderer/Tesselator.h" #include "minecraft/client/renderer/TileRenderer.h" diff --git a/targets/minecraft/client/renderer/entity/FireballRenderer.cpp b/targets/minecraft/client/renderer/entity/FireballRenderer.cpp index 19228c4fb..8dc94a890 100644 --- a/targets/minecraft/client/renderer/entity/FireballRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/FireballRenderer.cpp @@ -2,7 +2,7 @@ #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "EntityRenderDispatcher.h" #include "gl3_loader.h" #include "java/Class.h" diff --git a/targets/minecraft/client/renderer/entity/FishingHookRenderer.cpp b/targets/minecraft/client/renderer/entity/FishingHookRenderer.cpp index bd5c18bff..ca1b974f3 100644 --- a/targets/minecraft/client/renderer/entity/FishingHookRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/FishingHookRenderer.cpp @@ -4,7 +4,7 @@ #include #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "EntityRenderDispatcher.h" #include "gl3_loader.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/minecraft/client/renderer/entity/GhastRenderer.cpp b/targets/minecraft/client/renderer/entity/GhastRenderer.cpp index 67ec31533..b0fa23786 100644 --- a/targets/minecraft/client/renderer/entity/GhastRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/GhastRenderer.cpp @@ -2,7 +2,7 @@ #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "minecraft/client/model/GhastModel.h" #include "minecraft/client/renderer/Textures.h" #include "minecraft/client/renderer/entity/MobRenderer.h" diff --git a/targets/minecraft/client/renderer/entity/GiantMobRenderer.cpp b/targets/minecraft/client/renderer/entity/GiantMobRenderer.cpp index 5f14fed29..6f290e262 100644 --- a/targets/minecraft/client/renderer/entity/GiantMobRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/GiantMobRenderer.cpp @@ -2,7 +2,7 @@ #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "minecraft/client/renderer/Textures.h" #include "minecraft/client/renderer/entity/MobRenderer.h" #include "minecraft/client/resources/ResourceLocation.h" diff --git a/targets/minecraft/client/renderer/entity/HorseRenderer.cpp b/targets/minecraft/client/renderer/entity/HorseRenderer.cpp index b2a4eb9fb..31d225da5 100644 --- a/targets/minecraft/client/renderer/entity/HorseRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/HorseRenderer.cpp @@ -2,7 +2,7 @@ #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "EntityRenderDispatcher.h" #include "MobRenderer.h" #include "minecraft/client/model/geom/Model.h" diff --git a/targets/minecraft/client/renderer/entity/HumanoidMobRenderer.cpp b/targets/minecraft/client/renderer/entity/HumanoidMobRenderer.cpp index b41b53242..f02884946 100644 --- a/targets/minecraft/client/renderer/entity/HumanoidMobRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/HumanoidMobRenderer.cpp @@ -3,7 +3,7 @@ #include #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "EntityRenderDispatcher.h" #include "console_helpers/StringHelpers.h" #include "minecraft/Facing.h" diff --git a/targets/minecraft/client/renderer/entity/ItemFrameRenderer.cpp b/targets/minecraft/client/renderer/entity/ItemFrameRenderer.cpp index 1a9b50d94..fd162027d 100644 --- a/targets/minecraft/client/renderer/entity/ItemFrameRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/ItemFrameRenderer.cpp @@ -5,7 +5,7 @@ #include "EntityRenderDispatcher.h" #include "minecraft/client/renderer/TileRenderer.h" // #include "ItemFrame" -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "ItemFrameRenderer.h" #include "minecraft/Direction.h" #include "minecraft/Facing.h" diff --git a/targets/minecraft/client/renderer/entity/ItemRenderer.cpp b/targets/minecraft/client/renderer/entity/ItemRenderer.cpp index b8b604e9b..3bf03f177 100644 --- a/targets/minecraft/client/renderer/entity/ItemRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/ItemRenderer.cpp @@ -4,7 +4,7 @@ #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "EntityRenderDispatcher.h" #include "console_helpers/StringHelpers.h" #include "gl3_loader.h" diff --git a/targets/minecraft/client/renderer/entity/ItemSpriteRenderer.cpp b/targets/minecraft/client/renderer/entity/ItemSpriteRenderer.cpp index 816b8bca3..76180f22c 100644 --- a/targets/minecraft/client/renderer/entity/ItemSpriteRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/ItemSpriteRenderer.cpp @@ -2,7 +2,7 @@ #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "EntityRenderDispatcher.h" #include "gl3_loader.h" #include "minecraft/client/renderer/Tesselator.h" diff --git a/targets/minecraft/client/renderer/entity/LavaSlimeRenderer.cpp b/targets/minecraft/client/renderer/entity/LavaSlimeRenderer.cpp index 1ba2909b9..7048aa84e 100644 --- a/targets/minecraft/client/renderer/entity/LavaSlimeRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/LavaSlimeRenderer.cpp @@ -2,7 +2,7 @@ #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "minecraft/client/model/LavaSlimeModel.h" #include "minecraft/client/renderer/Textures.h" #include "minecraft/client/renderer/entity/MobRenderer.h" diff --git a/targets/minecraft/client/renderer/entity/LeashKnotRenderer.cpp b/targets/minecraft/client/renderer/entity/LeashKnotRenderer.cpp index b3cc74500..8ba35454b 100644 --- a/targets/minecraft/client/renderer/entity/LeashKnotRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/LeashKnotRenderer.cpp @@ -2,7 +2,7 @@ #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "gl3_loader.h" #include "minecraft/client/model/LeashKnotModel.h" #include "minecraft/client/renderer/Textures.h" diff --git a/targets/minecraft/client/renderer/entity/LightningBoltRenderer.cpp b/targets/minecraft/client/renderer/entity/LightningBoltRenderer.cpp index 81ce49fa6..69c664577 100644 --- a/targets/minecraft/client/renderer/entity/LightningBoltRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/LightningBoltRenderer.cpp @@ -2,7 +2,7 @@ #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "gl3_loader.h" #include "java/Random.h" #include "minecraft/client/renderer/Tesselator.h" diff --git a/targets/minecraft/client/renderer/entity/LivingEntityRenderer.cpp b/targets/minecraft/client/renderer/entity/LivingEntityRenderer.cpp index 1f5ce57ad..c36a81d50 100644 --- a/targets/minecraft/client/renderer/entity/LivingEntityRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/LivingEntityRenderer.cpp @@ -4,7 +4,7 @@ #include #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "EntityRenderDispatcher.h" #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Linux/Linux_App.h" diff --git a/targets/minecraft/client/renderer/entity/MinecartRenderer.cpp b/targets/minecraft/client/renderer/entity/MinecartRenderer.cpp index 29bde53ce..41f3aa01b 100644 --- a/targets/minecraft/client/renderer/entity/MinecartRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/MinecartRenderer.cpp @@ -6,7 +6,7 @@ #include #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "minecraft/client/model/MinecartModel.h" #include "minecraft/client/model/geom/Model.h" #include "minecraft/client/renderer/Textures.h" diff --git a/targets/minecraft/client/renderer/entity/MobRenderer.cpp b/targets/minecraft/client/renderer/entity/MobRenderer.cpp index 9e8fe77a4..d2b19361c 100644 --- a/targets/minecraft/client/renderer/entity/MobRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/MobRenderer.cpp @@ -4,7 +4,7 @@ #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "EntityRenderDispatcher.h" #include "LivingEntityRenderer.h" #include "Minecraft.Client/Common/App_enums.h" diff --git a/targets/minecraft/client/renderer/entity/MushroomCowRenderer.cpp b/targets/minecraft/client/renderer/entity/MushroomCowRenderer.cpp index c02c1a93c..0187ff02f 100644 --- a/targets/minecraft/client/renderer/entity/MushroomCowRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/MushroomCowRenderer.cpp @@ -2,7 +2,7 @@ #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "gl3_loader.h" #include "minecraft/client/model/QuadrupedModel.h" #include "minecraft/client/model/geom/ModelPart.h" diff --git a/targets/minecraft/client/renderer/entity/OcelotRenderer.cpp b/targets/minecraft/client/renderer/entity/OcelotRenderer.cpp index 65ae20ea3..00b5e7e2c 100644 --- a/targets/minecraft/client/renderer/entity/OcelotRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/OcelotRenderer.cpp @@ -2,7 +2,7 @@ #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "minecraft/client/renderer/Textures.h" #include "minecraft/client/renderer/entity/MobRenderer.h" #include "minecraft/client/resources/ResourceLocation.h" diff --git a/targets/minecraft/client/renderer/entity/PaintingRenderer.cpp b/targets/minecraft/client/renderer/entity/PaintingRenderer.cpp index 6829c4092..81ca589ad 100644 --- a/targets/minecraft/client/renderer/entity/PaintingRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/PaintingRenderer.cpp @@ -2,7 +2,7 @@ #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "EntityRenderDispatcher.h" #include "gl3_loader.h" #include "java/Random.h" diff --git a/targets/minecraft/client/renderer/entity/PlayerRenderer.cpp b/targets/minecraft/client/renderer/entity/PlayerRenderer.cpp index f20375afc..1d4918514 100644 --- a/targets/minecraft/client/renderer/entity/PlayerRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/PlayerRenderer.cpp @@ -4,7 +4,7 @@ #include #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "EntityRenderDispatcher.h" #include "HumanoidMobRenderer.h" #include "Minecraft.Client/Common/App_enums.h" diff --git a/targets/minecraft/client/renderer/entity/SheepRenderer.cpp b/targets/minecraft/client/renderer/entity/SheepRenderer.cpp index 4027fc445..c939a31e3 100644 --- a/targets/minecraft/client/renderer/entity/SheepRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/SheepRenderer.cpp @@ -3,7 +3,7 @@ #include #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "minecraft/SharedConstants.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" diff --git a/targets/minecraft/client/renderer/entity/SkeletonRenderer.cpp b/targets/minecraft/client/renderer/entity/SkeletonRenderer.cpp index 25a894f0c..b08df7223 100644 --- a/targets/minecraft/client/renderer/entity/SkeletonRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/SkeletonRenderer.cpp @@ -2,7 +2,7 @@ #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "minecraft/client/model/SkeletonModel.h" #include "minecraft/client/renderer/Textures.h" #include "minecraft/client/renderer/entity/HumanoidMobRenderer.h" diff --git a/targets/minecraft/client/renderer/entity/SlimeRenderer.cpp b/targets/minecraft/client/renderer/entity/SlimeRenderer.cpp index 9beb44917..3331c1476 100644 --- a/targets/minecraft/client/renderer/entity/SlimeRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/SlimeRenderer.cpp @@ -2,7 +2,7 @@ #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "gl3_loader.h" #include "minecraft/client/renderer/Textures.h" #include "minecraft/client/renderer/entity/MobRenderer.h" diff --git a/targets/minecraft/client/renderer/entity/SnowManRenderer.cpp b/targets/minecraft/client/renderer/entity/SnowManRenderer.cpp index e9bc0172a..bd8501956 100644 --- a/targets/minecraft/client/renderer/entity/SnowManRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/SnowManRenderer.cpp @@ -2,7 +2,7 @@ #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "EntityRenderDispatcher.h" #include "minecraft/client/model/SnowManModel.h" #include "minecraft/client/model/geom/ModelPart.h" diff --git a/targets/minecraft/client/renderer/entity/SpiderRenderer.cpp b/targets/minecraft/client/renderer/entity/SpiderRenderer.cpp index 1e001f01f..ce26a6822 100644 --- a/targets/minecraft/client/renderer/entity/SpiderRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/SpiderRenderer.cpp @@ -2,7 +2,7 @@ #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "gl3_loader.h" #include "minecraft/SharedConstants.h" #include "minecraft/client/model/SpiderModel.h" diff --git a/targets/minecraft/client/renderer/entity/SquidRenderer.cpp b/targets/minecraft/client/renderer/entity/SquidRenderer.cpp index 353531e7e..0c024b328 100644 --- a/targets/minecraft/client/renderer/entity/SquidRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/SquidRenderer.cpp @@ -2,7 +2,7 @@ #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "minecraft/client/renderer/Textures.h" #include "minecraft/client/renderer/entity/MobRenderer.h" #include "minecraft/client/resources/ResourceLocation.h" diff --git a/targets/minecraft/client/renderer/entity/TntMinecartRenderer.cpp b/targets/minecraft/client/renderer/entity/TntMinecartRenderer.cpp index f7e6a2583..4b5001808 100644 --- a/targets/minecraft/client/renderer/entity/TntMinecartRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/TntMinecartRenderer.cpp @@ -2,7 +2,7 @@ #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "gl3_loader.h" #include "minecraft/client/renderer/TileRenderer.h" #include "minecraft/client/renderer/entity/MinecartRenderer.h" diff --git a/targets/minecraft/client/renderer/entity/TntRenderer.cpp b/targets/minecraft/client/renderer/entity/TntRenderer.cpp index afeb81a93..df83fdad4 100644 --- a/targets/minecraft/client/renderer/entity/TntRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/TntRenderer.cpp @@ -2,7 +2,7 @@ #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "gl3_loader.h" #include "minecraft/SharedConstants.h" #include "minecraft/client/renderer/TileRenderer.h" diff --git a/targets/minecraft/client/renderer/entity/VillagerGolemRenderer.cpp b/targets/minecraft/client/renderer/entity/VillagerGolemRenderer.cpp index aeba87b45..8603a1bb2 100644 --- a/targets/minecraft/client/renderer/entity/VillagerGolemRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/VillagerGolemRenderer.cpp @@ -4,7 +4,7 @@ #include #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "gl3_loader.h" #include "minecraft/SharedConstants.h" #include "minecraft/client/model/VillagerGolemModel.h" diff --git a/targets/minecraft/client/renderer/entity/VillagerRenderer.cpp b/targets/minecraft/client/renderer/entity/VillagerRenderer.cpp index 10c1ca827..91af50aa6 100644 --- a/targets/minecraft/client/renderer/entity/VillagerRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/VillagerRenderer.cpp @@ -2,7 +2,7 @@ #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "minecraft/client/model/VillagerModel.h" #include "minecraft/client/renderer/Textures.h" #include "minecraft/client/renderer/entity/MobRenderer.h" diff --git a/targets/minecraft/client/renderer/entity/WitchRenderer.cpp b/targets/minecraft/client/renderer/entity/WitchRenderer.cpp index a27badb60..4286b2b1c 100644 --- a/targets/minecraft/client/renderer/entity/WitchRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/WitchRenderer.cpp @@ -3,7 +3,7 @@ #include #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "EntityRenderDispatcher.h" #include "minecraft/SharedConstants.h" #include "minecraft/client/model/WitchModel.h" diff --git a/targets/minecraft/client/renderer/entity/WitherBossRenderer.cpp b/targets/minecraft/client/renderer/entity/WitherBossRenderer.cpp index e9681d63b..d91f3d04a 100644 --- a/targets/minecraft/client/renderer/entity/WitherBossRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/WitherBossRenderer.cpp @@ -3,7 +3,7 @@ #include #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "MobRenderer.h" #include "SharedConstants.h" #include "gl3_loader.h" diff --git a/targets/minecraft/client/renderer/entity/WitherSkullRenderer.cpp b/targets/minecraft/client/renderer/entity/WitherSkullRenderer.cpp index e04dcfb87..c0673e1bf 100644 --- a/targets/minecraft/client/renderer/entity/WitherSkullRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/WitherSkullRenderer.cpp @@ -2,7 +2,7 @@ #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "gl3_loader.h" #include "minecraft/client/model/SkeletonHeadModel.h" #include "minecraft/client/renderer/Textures.h" diff --git a/targets/minecraft/client/renderer/entity/WolfRenderer.cpp b/targets/minecraft/client/renderer/entity/WolfRenderer.cpp index 060dc1aa9..eab36adc9 100644 --- a/targets/minecraft/client/renderer/entity/WolfRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/WolfRenderer.cpp @@ -2,7 +2,7 @@ #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "minecraft/SharedConstants.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" diff --git a/targets/minecraft/client/renderer/texture/Texture.cpp b/targets/minecraft/client/renderer/texture/Texture.cpp index 59fc6a0db..1b433ebd9 100644 --- a/targets/minecraft/client/renderer/texture/Texture.cpp +++ b/targets/minecraft/client/renderer/texture/Texture.cpp @@ -5,7 +5,7 @@ #include #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.Client/include/BufferedImage.h" #include "TextureManager.h" diff --git a/targets/minecraft/client/renderer/tileentity/BeaconRenderer.cpp b/targets/minecraft/client/renderer/tileentity/BeaconRenderer.cpp index 54e921ad9..1a7418316 100644 --- a/targets/minecraft/client/renderer/tileentity/BeaconRenderer.cpp +++ b/targets/minecraft/client/renderer/tileentity/BeaconRenderer.cpp @@ -4,7 +4,7 @@ #include #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "gl3_loader.h" #include "minecraft/client/renderer/Tesselator.h" #include "minecraft/client/renderer/Textures.h" diff --git a/targets/minecraft/client/renderer/tileentity/ChestRenderer.cpp b/targets/minecraft/client/renderer/tileentity/ChestRenderer.cpp index 5f499efbb..5af17a888 100644 --- a/targets/minecraft/client/renderer/tileentity/ChestRenderer.cpp +++ b/targets/minecraft/client/renderer/tileentity/ChestRenderer.cpp @@ -3,7 +3,7 @@ #include #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "gl3_loader.h" #include "minecraft/client/model/ChestModel.h" #include "minecraft/client/model/LargeChestModel.h" diff --git a/targets/minecraft/client/renderer/tileentity/EnchantTableRenderer.cpp b/targets/minecraft/client/renderer/tileentity/EnchantTableRenderer.cpp index 21c25a2c4..a7e3d67d4 100644 --- a/targets/minecraft/client/renderer/tileentity/EnchantTableRenderer.cpp +++ b/targets/minecraft/client/renderer/tileentity/EnchantTableRenderer.cpp @@ -4,7 +4,7 @@ #include #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "gl3_loader.h" #include "minecraft/client/model/BookModel.h" #include "minecraft/client/renderer/Textures.h" diff --git a/targets/minecraft/client/renderer/tileentity/EnderChestRenderer.cpp b/targets/minecraft/client/renderer/tileentity/EnderChestRenderer.cpp index 6d5db505a..59e3009ba 100644 --- a/targets/minecraft/client/renderer/tileentity/EnderChestRenderer.cpp +++ b/targets/minecraft/client/renderer/tileentity/EnderChestRenderer.cpp @@ -3,7 +3,7 @@ #include #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "gl3_loader.h" #include "minecraft/client/model/ChestModel.h" #include "minecraft/client/model/geom/ModelPart.h" diff --git a/targets/minecraft/client/renderer/tileentity/MobSpawnerRenderer.cpp b/targets/minecraft/client/renderer/tileentity/MobSpawnerRenderer.cpp index e0536c732..3fc8f0467 100644 --- a/targets/minecraft/client/renderer/tileentity/MobSpawnerRenderer.cpp +++ b/targets/minecraft/client/renderer/tileentity/MobSpawnerRenderer.cpp @@ -1,6 +1,6 @@ #include "MobSpawnerRenderer.h" -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "minecraft/client/renderer/entity/EntityRenderDispatcher.h" #include "minecraft/world/entity/Entity.h" #include "minecraft/world/level/BaseMobSpawner.h" diff --git a/targets/minecraft/client/renderer/tileentity/PistonPieceRenderer.cpp b/targets/minecraft/client/renderer/tileentity/PistonPieceRenderer.cpp index d577d821b..1a6cadd97 100644 --- a/targets/minecraft/client/renderer/tileentity/PistonPieceRenderer.cpp +++ b/targets/minecraft/client/renderer/tileentity/PistonPieceRenderer.cpp @@ -2,7 +2,7 @@ #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "gl3_loader.h" #include "minecraft/client/Lighting.h" #include "minecraft/client/renderer/Tesselator.h" diff --git a/targets/minecraft/client/renderer/tileentity/SignRenderer.cpp b/targets/minecraft/client/renderer/tileentity/SignRenderer.cpp index 458440732..0713bf3e3 100644 --- a/targets/minecraft/client/renderer/tileentity/SignRenderer.cpp +++ b/targets/minecraft/client/renderer/tileentity/SignRenderer.cpp @@ -4,7 +4,7 @@ #include #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Common/src/Colours/ColourTable.h" #include "Minecraft.Client/Linux/Linux_App.h" diff --git a/targets/minecraft/client/renderer/tileentity/SkullTileRenderer.cpp b/targets/minecraft/client/renderer/tileentity/SkullTileRenderer.cpp index 1af3a9ad6..6a7cdf3c9 100644 --- a/targets/minecraft/client/renderer/tileentity/SkullTileRenderer.cpp +++ b/targets/minecraft/client/renderer/tileentity/SkullTileRenderer.cpp @@ -2,7 +2,7 @@ #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "gl3_loader.h" #include "minecraft/Facing.h" #include "minecraft/client/model/SkeletonHeadModel.h" diff --git a/targets/minecraft/client/renderer/tileentity/TheEndPortalRenderer.cpp b/targets/minecraft/client/renderer/tileentity/TheEndPortalRenderer.cpp index 70d113d2a..c48d4db64 100644 --- a/targets/minecraft/client/renderer/tileentity/TheEndPortalRenderer.cpp +++ b/targets/minecraft/client/renderer/tileentity/TheEndPortalRenderer.cpp @@ -2,7 +2,7 @@ #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "TileEntityRenderDispatcher.h" #include "gl3_loader.h" #include "java/FloatBuffer.h" diff --git a/targets/minecraft/client/renderer/tileentity/TileEntityRenderDispatcher.cpp b/targets/minecraft/client/renderer/tileentity/TileEntityRenderDispatcher.cpp index da12ceaed..554eb8ce7 100644 --- a/targets/minecraft/client/renderer/tileentity/TileEntityRenderDispatcher.cpp +++ b/targets/minecraft/client/renderer/tileentity/TileEntityRenderDispatcher.cpp @@ -2,7 +2,7 @@ #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "BeaconRenderer.h" #include "ChestRenderer.h" #include "EnchantTableRenderer.h" diff --git a/targets/minecraft/client/skins/DLCTexturePack.cpp b/targets/minecraft/client/skins/DLCTexturePack.cpp index 935ec2432..d9c75d73c 100644 --- a/targets/minecraft/client/skins/DLCTexturePack.cpp +++ b/targets/minecraft/client/skins/DLCTexturePack.cpp @@ -5,8 +5,8 @@ #include #include -#include "4J_Input.h" -#include "4J_Storage.h" +#include "platform/sdl2/Input.h" +#include "platform/sdl2/Storage.h" #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Common/src/Audio/SoundEngine.h" #include "Minecraft.Client/Common/src/Colours/ColourTable.h" diff --git a/targets/minecraft/client/skins/TexturePackRepository.cpp b/targets/minecraft/client/skins/TexturePackRepository.cpp index d736f6a08..5e2268310 100644 --- a/targets/minecraft/client/skins/TexturePackRepository.cpp +++ b/targets/minecraft/client/skins/TexturePackRepository.cpp @@ -5,7 +5,7 @@ #include #include -#include "4J_Input.h" +#include "platform/sdl2/Input.h" #include "DLCTexturePack.h" #include "DefaultTexturePack.h" #include "Minecraft.Client/Common/App_enums.h" diff --git a/targets/minecraft/client/title/TitleScreen.cpp b/targets/minecraft/client/title/TitleScreen.cpp index 216bfe07f..fd133530e 100644 --- a/targets/minecraft/client/title/TitleScreen.cpp +++ b/targets/minecraft/client/title/TitleScreen.cpp @@ -5,7 +5,7 @@ #include #include -#include "4J_Render.h" +#include "platform/sdl2/Render.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" #include "Minecraft.Client/include/BufferedImage.h" diff --git a/targets/minecraft/server/MinecraftServer.cpp b/targets/minecraft/server/MinecraftServer.cpp index 8e5bafcaa..526a437f4 100644 --- a/targets/minecraft/server/MinecraftServer.cpp +++ b/targets/minecraft/server/MinecraftServer.cpp @@ -11,8 +11,8 @@ #include #include "4J.Common/4J_Compat.h" -#include "4J_Profile.h" -#include "4J_Storage.h" +#include "platform/sdl2/Profile.h" +#include "platform/sdl2/Storage.h" #include "ConsoleInput.h" #include "DispenserBootstrap.h" #include "Minecraft.Client/Common/App_enums.h" @@ -64,7 +64,7 @@ #if defined(SPLIT_SAVES) #include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.h" #endif -#include "4J_Input.h" +#include "platform/sdl2/Input.h" #include "Minecraft.Client/Common/ShutdownManager.h" #include "Minecraft.Client/Common/src/Console_Debug_enum.h" #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.h" diff --git a/targets/minecraft/server/PlayerList.cpp b/targets/minecraft/server/PlayerList.cpp index 1b92212f7..5e461e2a0 100644 --- a/targets/minecraft/server/PlayerList.cpp +++ b/targets/minecraft/server/PlayerList.cpp @@ -8,7 +8,7 @@ #include #include -#include "4J_Profile.h" +#include "platform/sdl2/Profile.h" #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h" diff --git a/targets/minecraft/server/level/ServerLevel.cpp b/targets/minecraft/server/level/ServerLevel.cpp index 26bd3e409..1413f836d 100644 --- a/targets/minecraft/server/level/ServerLevel.cpp +++ b/targets/minecraft/server/level/ServerLevel.cpp @@ -5,8 +5,8 @@ #include #include -#include "4J_Input.h" -#include "4J_Storage.h" +#include "platform/sdl2/Input.h" +#include "platform/sdl2/Storage.h" #include "EntityTracker.h" #include "Minecraft.Client/Common/ShutdownManager.h" #include "Minecraft.Client/Common/src/Console_Debug_enum.h" diff --git a/targets/minecraft/server/level/ServerPlayer.cpp b/targets/minecraft/server/level/ServerPlayer.cpp index acd33a77f..1dc497f45 100644 --- a/targets/minecraft/server/level/ServerPlayer.cpp +++ b/targets/minecraft/server/level/ServerPlayer.cpp @@ -8,7 +8,7 @@ #include #include -#include "4J_Input.h" +#include "platform/sdl2/Input.h" #include "EntityTracker.h" #include "Minecraft.Client/Common/src/Console_Debug_enum.h" #include "Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRulesInstance.h" diff --git a/targets/minecraft/server/network/PendingConnection.cpp b/targets/minecraft/server/network/PendingConnection.cpp index e5c39a2fa..5c7d55ee7 100644 --- a/targets/minecraft/server/network/PendingConnection.cpp +++ b/targets/minecraft/server/network/PendingConnection.cpp @@ -6,7 +6,7 @@ #include #include "4J.Common/4J_Compat.h" -#include "4J_Storage.h" +#include "platform/sdl2/Storage.h" #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Common/src/BuildVer/BuildVer.h" #include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h" diff --git a/targets/minecraft/stats/StatsCounter.cpp b/targets/minecraft/stats/StatsCounter.cpp index 8b3983fa2..0350927c0 100644 --- a/targets/minecraft/stats/StatsCounter.cpp +++ b/targets/minecraft/stats/StatsCounter.cpp @@ -9,7 +9,7 @@ #include #include -#include "4J_Profile.h" +#include "platform/sdl2/Profile.h" #include "Minecraft.Client/Common/App_structs.h" #include "Minecraft.Client/Common/src/Leaderboards/LeaderboardManager.h" #include "Minecraft.Client/Linux/Linux_App.h" diff --git a/targets/platform/PlatformServices.cpp b/targets/platform/PlatformServices.cpp index d88c3f53e..a79ff20d3 100644 --- a/targets/platform/PlatformServices.cpp +++ b/targets/platform/PlatformServices.cpp @@ -1,9 +1,9 @@ #include "PlatformServices.h" -#include "../4J.Input/4J_Input.h" -#include "../4J.Profile/4J_Profile.h" -#include "../4J.Render/4J_Render.h" -#include "../4J.Storage/4J_Storage.h" +#include "../platform/sdl2/Input.h" +#include "../platform/sdl2/Profile.h" +#include "../platform/sdl2/Render.h" +#include "../platform/sdl2/Storage.h" class IPlatformInput; class IPlatformProfile; diff --git a/targets/platform/meson.build b/targets/platform/meson.build index 8c736a9f5..4e216ab0a 100644 --- a/targets/platform/meson.build +++ b/targets/platform/meson.build @@ -3,3 +3,42 @@ platform_inc = include_directories('.') platform_dep = declare_dependency( include_directories: platform_inc, ) + +# SDL2-based platform implementations (formerly 4J.* modules) +_sdl2 = dependency('sdl2') +_threads = dependency('threads') +_glm = dependency('glm') +_defs = [] + +if get_option('renderer') == 'gles' + _gl = dependency('glesv2', required: true) + _defs += ['-DGLES'] +else + _gl = dependency('gl', required: true) +endif + +sdl2_sources = files( + 'sdl2/Input.cpp', + 'sdl2/Profile.cpp', + 'sdl2/Render.cpp', + 'sdl2/render_stubs.cpp', + 'sdl2/Storage.cpp', +) + +lib_platform_sdl2 = static_library('platform_sdl2', + sdl2_sources, + include_directories: [platform_inc, include_directories('sdl2')], + dependencies: [_sdl2, _gl, _threads, _glm, stb_dep], + cpp_args: _defs + global_cpp_args + global_cpp_defs, +) + +# Combined dependency: interfaces + SDL2 implementations +# Replaces the old render_dep, input_dep, profile_dep, storage_dep +render_dep = declare_dependency( + link_with: lib_platform_sdl2, + include_directories: [platform_inc, include_directories('sdl2')], + dependencies: [_sdl2, _gl, _threads, _glm], +) +input_dep = render_dep +profile_dep = render_dep +storage_dep = render_dep diff --git a/targets/4J.Input/4J_Input.cpp b/targets/platform/sdl2/Input.cpp similarity index 99% rename from targets/4J.Input/4J_Input.cpp rename to targets/platform/sdl2/Input.cpp index 0f740ab94..f9caf06e4 100644 --- a/targets/4J.Input/4J_Input.cpp +++ b/targets/platform/sdl2/Input.cpp @@ -1,4 +1,4 @@ -#include "4J_Input.h" +#include "Input.h" #include #include @@ -16,8 +16,8 @@ #include -#include "../4J.Common/4J_InputActions.h" -#include "../platform/PlatformTypes.h" +#include "../../4J.Common/4J_InputActions.h" +#include "../PlatformTypes.h" C_4JInput InputManager; diff --git a/targets/4J.Input/4J_Input.h b/targets/platform/sdl2/Input.h similarity index 99% rename from targets/4J.Input/4J_Input.h rename to targets/platform/sdl2/Input.h index a93bb8d6e..4b757af3d 100644 --- a/targets/4J.Input/4J_Input.h +++ b/targets/platform/sdl2/Input.h @@ -2,7 +2,7 @@ #include -#include "../platform/IPlatformInput.h" +#include "../IPlatformInput.h" #define MAP_STYLE_0 0 #define MAP_STYLE_1 1 diff --git a/targets/4J.Profile/4J_Profile.cpp b/targets/platform/sdl2/Profile.cpp similarity index 98% rename from targets/4J.Profile/4J_Profile.cpp rename to targets/platform/sdl2/Profile.cpp index 54109b15c..0759c815e 100644 --- a/targets/4J.Profile/4J_Profile.cpp +++ b/targets/platform/sdl2/Profile.cpp @@ -1,10 +1,10 @@ -#include "4J_Profile.h" +#include "Profile.h" #include #include -#include "../4J.Common/4J_ProfileConstants.h" -#include "../4J.Input/4J_Input.h" +#include "../../4J.Common/4J_ProfileConstants.h" +#include "../sdl2/Input.h" C_4JProfile ProfileManager; diff --git a/targets/4J.Profile/4J_Profile.h b/targets/platform/sdl2/Profile.h similarity index 97% rename from targets/4J.Profile/4J_Profile.h rename to targets/platform/sdl2/Profile.h index e5104fee9..1331374bd 100644 --- a/targets/4J.Profile/4J_Profile.h +++ b/targets/platform/sdl2/Profile.h @@ -3,9 +3,9 @@ #include #include -#include "../4J.Common/4J_Compat.h" -#include "../platform/IPlatformProfile.h" -#include "../platform/PlatformTypes.h" +#include "../../4J.Common/4J_Compat.h" +#include "../IPlatformProfile.h" +#include "../PlatformTypes.h" #define TITLEID_MINECRAFT 0x584111F7 diff --git a/targets/4J.Render/4J_Render.cpp b/targets/platform/sdl2/Render.cpp similarity index 99% rename from targets/4J.Render/4J_Render.cpp rename to targets/platform/sdl2/Render.cpp index bcf428fde..fcc7fac4a 100644 --- a/targets/4J.Render/4J_Render.cpp +++ b/targets/platform/sdl2/Render.cpp @@ -1,6 +1,6 @@ -#include "4J_Render.h" +#include "Render.h" -#include "../platform/PlatformTypes.h" +#include "../PlatformTypes.h" #include "SDL.h" #include "SDL_error.h" #include "SDL_events.h" diff --git a/targets/4J.Render/4J_Render.h b/targets/platform/sdl2/Render.h similarity index 99% rename from targets/4J.Render/4J_Render.h rename to targets/platform/sdl2/Render.h index 943ff234d..3e649c14e 100644 --- a/targets/4J.Render/4J_Render.h +++ b/targets/platform/sdl2/Render.h @@ -8,7 +8,7 @@ #include #include -#include "../platform/IPlatformRenderer.h" +#include "../IPlatformRenderer.h" class C4JRender : public IPlatformRenderer { public: diff --git a/targets/4J.Storage/4J_Storage.cpp b/targets/platform/sdl2/Storage.cpp similarity index 99% rename from targets/4J.Storage/4J_Storage.cpp rename to targets/platform/sdl2/Storage.cpp index cf5677c2a..c64802ea5 100644 --- a/targets/4J.Storage/4J_Storage.cpp +++ b/targets/platform/sdl2/Storage.cpp @@ -1,4 +1,4 @@ -#include "4J_Storage.h" +#include "Storage.h" #include diff --git a/targets/4J.Storage/4J_Storage.h b/targets/platform/sdl2/Storage.h similarity index 99% rename from targets/4J.Storage/4J_Storage.h rename to targets/platform/sdl2/Storage.h index 1531740eb..01fd38653 100644 --- a/targets/4J.Storage/4J_Storage.h +++ b/targets/platform/sdl2/Storage.h @@ -6,8 +6,8 @@ #include // #include -#include "../4J.Common/4J_Compat.h" -#include "../platform/IPlatformStorage.h" +#include "../../4J.Common/4J_Compat.h" +#include "../IPlatformStorage.h" class C4JStringTable; diff --git a/targets/4J.Render/gl3_loader.h b/targets/platform/sdl2/gl3_loader.h similarity index 100% rename from targets/4J.Render/gl3_loader.h rename to targets/platform/sdl2/gl3_loader.h diff --git a/targets/4J.Render/stubs.cpp b/targets/platform/sdl2/render_stubs.cpp similarity index 98% rename from targets/4J.Render/stubs.cpp rename to targets/platform/sdl2/render_stubs.cpp index 509fb79a1..4f5619017 100644 --- a/targets/4J.Render/stubs.cpp +++ b/targets/platform/sdl2/render_stubs.cpp @@ -1,4 +1,4 @@ -#include "4J_Render.h" +#include "Render.h" // Command Buffers void C4JRender::CBuffLockStaticCreations() {} diff --git a/targets/4J.Render/shaders/fragment.frag b/targets/platform/shaders/fragment.frag similarity index 100% rename from targets/4J.Render/shaders/fragment.frag rename to targets/platform/shaders/fragment.frag diff --git a/targets/4J.Render/shaders/fragment_es.frag b/targets/platform/shaders/fragment_es.frag similarity index 100% rename from targets/4J.Render/shaders/fragment_es.frag rename to targets/platform/shaders/fragment_es.frag diff --git a/targets/4J.Render/shaders/vertex.vert b/targets/platform/shaders/vertex.vert similarity index 100% rename from targets/4J.Render/shaders/vertex.vert rename to targets/platform/shaders/vertex.vert diff --git a/targets/4J.Render/shaders/vertex_es.vert b/targets/platform/shaders/vertex_es.vert similarity index 100% rename from targets/4J.Render/shaders/vertex_es.vert rename to targets/platform/shaders/vertex_es.vert