mirror of
https://github.com/4jcraft/4jcraft.git
synced 2026-05-01 07:23:48 +00:00
refactor: move 4J implementations into platform/sdl2
This commit is contained in:
parent
35b63da24d
commit
e5a859f8a7
|
|
@ -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')
|
||||
|
|
|
|||
|
|
@ -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('.'),
|
||||
)
|
||||
|
|
@ -1 +0,0 @@
|
|||
#include "stdafx.h"
|
||||
|
|
@ -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
|
||||
|
|
@ -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('.'),
|
||||
)
|
||||
|
|
@ -1 +0,0 @@
|
|||
#include "stdafx.h"
|
||||
|
|
@ -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
|
||||
|
|
@ -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('.'),
|
||||
)
|
||||
|
|
@ -1 +0,0 @@
|
|||
#include "stdafx.h"
|
||||
|
|
@ -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
|
||||
|
|
@ -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('.'),
|
||||
)
|
||||
|
|
@ -1 +0,0 @@
|
|||
#include "stdafx.h"
|
||||
|
|
@ -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
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
#include <cstdint>
|
||||
|
||||
#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"
|
||||
|
|
|
|||
|
|
@ -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 <utility>
|
||||
#include <vector>
|
||||
|
||||
#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"
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@
|
|||
#include <cstdint>
|
||||
#include <mutex>
|
||||
|
||||
#include "4J_Profile.h"
|
||||
#include "4J_Storage.h"
|
||||
#include "platform/sdl2/Profile.h"
|
||||
#include "platform/sdl2/Storage.h"
|
||||
|
||||
// using namespace std;
|
||||
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@
|
|||
#include <cstring>
|
||||
#include <unordered_map>
|
||||
|
||||
#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"
|
||||
|
|
|
|||
|
|
@ -13,8 +13,8 @@
|
|||
#include <unordered_map>
|
||||
#include <utility>
|
||||
|
||||
#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"
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
#include <sstream>
|
||||
#include <utility>
|
||||
|
||||
#include "4J_Profile.h"
|
||||
#include "platform/sdl2/Profile.h"
|
||||
#include "DLCAudioFile.h"
|
||||
#include "DLCCapeFile.h"
|
||||
#include "DLCColourTableFile.h"
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
#include <string.h>
|
||||
#include <wchar.h>
|
||||
|
||||
#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"
|
||||
|
|
|
|||
|
|
@ -8,8 +8,8 @@
|
|||
#include <unordered_set>
|
||||
#include <utility>
|
||||
|
||||
#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"
|
||||
|
|
|
|||
|
|
@ -11,10 +11,10 @@
|
|||
#include <thread>
|
||||
#include <vector>
|
||||
|
||||
#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"
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
#include <memory>
|
||||
#include <vector>
|
||||
|
||||
#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"
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
#include <utility>
|
||||
#include <vector>
|
||||
|
||||
#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"
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
#include <utility>
|
||||
#include <vector>
|
||||
|
||||
#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"
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
#include <compare>
|
||||
|
||||
#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"
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -8,8 +8,8 @@
|
|||
#include <vector>
|
||||
|
||||
#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"
|
||||
|
|
|
|||
|
|
@ -8,8 +8,8 @@
|
|||
#include <vector>
|
||||
|
||||
#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"
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@
|
|||
#include <cmath>
|
||||
#include <memory>
|
||||
|
||||
#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"
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
#include <thread>
|
||||
#include <vector>
|
||||
|
||||
#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"
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
#include <cstdint>
|
||||
#include <cstring>
|
||||
|
||||
#include "4J_Storage.h"
|
||||
#include "platform/sdl2/Storage.h"
|
||||
#include "Minecraft.Client/Common/App_Defines.h"
|
||||
#include "UIEnums.h"
|
||||
#include "console_helpers/C4JThread.h"
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
#include <memory>
|
||||
|
||||
#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"
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
#include <string>
|
||||
|
||||
#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"
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
#include <string>
|
||||
|
||||
#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"
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
#include <mutex>
|
||||
|
||||
#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"
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
#include <string>
|
||||
|
||||
#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"
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
#include <vector>
|
||||
|
||||
#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"
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
#include <memory>
|
||||
#include <string>
|
||||
|
||||
#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"
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
#include <algorithm>
|
||||
#include <memory>
|
||||
|
||||
#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"
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
#include <string>
|
||||
|
||||
#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"
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
#include <cmath>
|
||||
|
||||
#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"
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
#include <memory>
|
||||
#include <sstream>
|
||||
|
||||
#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"
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
#include <cmath>
|
||||
#include <memory>
|
||||
|
||||
#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"
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
#include <cmath>
|
||||
#include <memory>
|
||||
|
||||
#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"
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
#include <numbers>
|
||||
#include <vector>
|
||||
|
||||
#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"
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
#include <wchar.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/App_enums.h"
|
||||
#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.h"
|
||||
#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h"
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
#include <memory>
|
||||
|
||||
#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"
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@
|
|||
#include <memory>
|
||||
|
||||
#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"
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
#include <cstdint>
|
||||
|
||||
#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"
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
#include <string>
|
||||
|
||||
#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"
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
#include <string>
|
||||
|
||||
#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"
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
#include <string>
|
||||
|
||||
#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"
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
#include <string>
|
||||
|
||||
#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"
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
#include <string>
|
||||
|
||||
#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"
|
||||
|
|
|
|||
|
|
@ -5,9 +5,9 @@
|
|||
#include <utility>
|
||||
|
||||
#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"
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
#include <memory>
|
||||
|
||||
#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"
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
#include <vector>
|
||||
|
||||
#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"
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
#include <cstdint>
|
||||
#include <string>
|
||||
|
||||
#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"
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@
|
|||
#include <compare>
|
||||
|
||||
#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"
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
#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"
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
#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"
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
#include <memory>
|
||||
|
||||
#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"
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
#include <wchar.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/Controls/UIControl_CheckBox.h"
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
#include <string>
|
||||
|
||||
#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"
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
#include <wchar.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_enums.h"
|
||||
#include "Minecraft.Client/Common/src/Network/GameNetworkManager.h"
|
||||
#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h"
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
#include <wchar.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/UI/Controls/UIControl_CheckBox.h"
|
||||
#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.h"
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@
|
|||
#include <vector>
|
||||
|
||||
#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"
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
#include <format>
|
||||
#include <string>
|
||||
|
||||
#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"
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
#include <string>
|
||||
|
||||
#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"
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@
|
|||
#include <memory>
|
||||
#include <utility>
|
||||
|
||||
#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"
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue