diff --git a/targets/app/common/App_structs.h b/targets/app/common/App_structs.h index c11531165..705ec9bcf 100644 --- a/targets/app/common/App_structs.h +++ b/targets/app/common/App_structs.h @@ -5,11 +5,11 @@ #include "platform/sdl2/Storage.h" #include "app/common/App_Defines.h" #include "app/common/App_enums.h" -#include "app/common/src/Tutorial/TutorialEnum.h" -#include "app/common/src/UI/All Platforms/UIEnums.h" -#include "app/include/NetTypes.h" -#include "app/include/SkinBox.h" -#include "app/include/XboxStubs.h" +#include "app/common/Tutorial/TutorialEnum.h" +#include "app/common/UI/All Platforms/UIEnums.h" +#include "app/common/NetTypes.h" +#include "app/common/SkinBox.h" +#include "app/common/XboxStubs.h" typedef struct { wchar_t* wchFilename; diff --git a/targets/app/common/src/Audio/Consoles_SoundEngine.cpp b/targets/app/common/Audio/Consoles_SoundEngine.cpp similarity index 100% rename from targets/app/common/src/Audio/Consoles_SoundEngine.cpp rename to targets/app/common/Audio/Consoles_SoundEngine.cpp diff --git a/targets/app/common/src/Audio/Consoles_SoundEngine.h b/targets/app/common/Audio/Consoles_SoundEngine.h similarity index 100% rename from targets/app/common/src/Audio/Consoles_SoundEngine.h rename to targets/app/common/Audio/Consoles_SoundEngine.h diff --git a/targets/app/common/src/Audio/SoundEngine.cpp b/targets/app/common/Audio/SoundEngine.cpp similarity index 99% rename from targets/app/common/src/Audio/SoundEngine.cpp rename to targets/app/common/Audio/SoundEngine.cpp index 7e1848414..66ea8b8af 100644 --- a/targets/app/common/src/Audio/SoundEngine.cpp +++ b/targets/app/common/Audio/SoundEngine.cpp @@ -12,7 +12,7 @@ #include "platform/PlatformTypes.h" #include "app/common/App_Defines.h" -#include "app/common/src/Audio/Consoles_SoundEngine.h" +#include "app/common/Audio/Consoles_SoundEngine.h" #include "app/linux/Iggy/include/rrCore.h" #include "app/linux/LinuxGame.h" #include "platform/C4JThread.h" diff --git a/targets/app/common/src/Audio/SoundEngine.h b/targets/app/common/Audio/SoundEngine.h similarity index 99% rename from targets/app/common/src/Audio/SoundEngine.h rename to targets/app/common/Audio/SoundEngine.h index 7a401503d..659046f61 100644 --- a/targets/app/common/src/Audio/SoundEngine.h +++ b/targets/app/common/Audio/SoundEngine.h @@ -7,7 +7,7 @@ class Random; #include #include "app/common/App_Defines.h" -#include "app/common/src/Audio/Consoles_SoundEngine.h" +#include "app/common/Audio/Consoles_SoundEngine.h" #include "app/linux/Iggy/include/rrCore.h" #include "minecraft/sounds/SoundTypes.h" #include "miniaudio.h" diff --git a/targets/app/common/src/Audio/SoundNames.cpp b/targets/app/common/Audio/SoundNames.cpp similarity index 100% rename from targets/app/common/src/Audio/SoundNames.cpp rename to targets/app/common/Audio/SoundNames.cpp diff --git a/targets/app/src/BufferedImage.cpp b/targets/app/common/BufferedImage.cpp similarity index 98% rename from targets/app/src/BufferedImage.cpp rename to targets/app/common/BufferedImage.cpp index 405979696..028ef2524 100644 --- a/targets/app/src/BufferedImage.cpp +++ b/targets/app/common/BufferedImage.cpp @@ -1,4 +1,4 @@ -#include "app/include/BufferedImage.h" +#include "app/common/BufferedImage.h" #include @@ -7,9 +7,9 @@ #include #include "platform/sdl2/Render.h" -#include "app/common/src/DLC/DLCFile.h" -#include "app/common/src/DLC/DLCManager.h" -#include "app/common/src/DLC/DLCPack.h" +#include "app/common/DLC/DLCFile.h" +#include "app/common/DLC/DLCManager.h" +#include "app/common/DLC/DLCPack.h" #include "app/linux/LinuxGame.h" #include "app/linux/Stubs/winapi_stubs.h" #include "PlatformTypes.h" diff --git a/targets/app/include/BufferedImage.h b/targets/app/common/BufferedImage.h similarity index 100% rename from targets/app/include/BufferedImage.h rename to targets/app/common/BufferedImage.h diff --git a/targets/app/common/src/BuildVer/BuildVer.h b/targets/app/common/BuildVer/BuildVer.h similarity index 100% rename from targets/app/common/src/BuildVer/BuildVer.h rename to targets/app/common/BuildVer/BuildVer.h diff --git a/targets/app/common/src/Colours/ColourTable.cpp b/targets/app/common/Colours/ColourTable.cpp similarity index 100% rename from targets/app/common/src/Colours/ColourTable.cpp rename to targets/app/common/Colours/ColourTable.cpp diff --git a/targets/app/common/src/Colours/ColourTable.h b/targets/app/common/Colours/ColourTable.h similarity index 100% rename from targets/app/common/src/Colours/ColourTable.h rename to targets/app/common/Colours/ColourTable.h diff --git a/targets/app/common/src/ConsoleGameMode.cpp b/targets/app/common/ConsoleGameMode.cpp similarity index 74% rename from targets/app/common/src/ConsoleGameMode.cpp rename to targets/app/common/ConsoleGameMode.cpp index 5c6fa6b93..0032dbd9b 100644 --- a/targets/app/common/src/ConsoleGameMode.cpp +++ b/targets/app/common/ConsoleGameMode.cpp @@ -1,7 +1,7 @@ #include "ConsoleGameMode.h" -#include "app/common/src/Tutorial/Tutorial.h" -#include "app/common/src/Tutorial/TutorialMode.h" +#include "app/common/Tutorial/Tutorial.h" +#include "app/common/Tutorial/TutorialMode.h" class ClientConnection; class Minecraft; diff --git a/targets/app/common/src/ConsoleGameMode.h b/targets/app/common/ConsoleGameMode.h similarity index 84% rename from targets/app/common/src/ConsoleGameMode.h rename to targets/app/common/ConsoleGameMode.h index ab8a3632e..c1dfb1bf5 100644 --- a/targets/app/common/src/ConsoleGameMode.h +++ b/targets/app/common/ConsoleGameMode.h @@ -1,5 +1,5 @@ #pragma once -#include "app/common/src/Tutorial/TutorialMode.h" +#include "app/common/Tutorial/TutorialMode.h" class ClientConnection; class Minecraft; diff --git a/targets/app/common/src/Console_Awards_enum.h b/targets/app/common/Console_Awards_enum.h similarity index 100% rename from targets/app/common/src/Console_Awards_enum.h rename to targets/app/common/Console_Awards_enum.h diff --git a/targets/app/common/src/Console_Debug_enum.h b/targets/app/common/Console_Debug_enum.h similarity index 100% rename from targets/app/common/src/Console_Debug_enum.h rename to targets/app/common/Console_Debug_enum.h diff --git a/targets/app/common/src/DLC/DLCAudioFile.cpp b/targets/app/common/DLC/DLCAudioFile.cpp similarity index 99% rename from targets/app/common/src/DLC/DLCAudioFile.cpp rename to targets/app/common/DLC/DLCAudioFile.cpp index 2c9260afe..234aadaf3 100644 --- a/targets/app/common/src/DLC/DLCAudioFile.cpp +++ b/targets/app/common/DLC/DLCAudioFile.cpp @@ -8,9 +8,9 @@ #include "platform/sdl2/Render.h" #include "platform/sdl2/Storage.h" #include "DLCManager.h" -#include "app/common/src/DLC/DLCFile.h" +#include "app/common/DLC/DLCFile.h" #include "app/linux/LinuxGame.h" -#include "app/include/XboxStubs.h" +#include "app/common/XboxStubs.h" #if defined(_WINDOWS64) #include "app/windows/XML/ATGXmlParser.h" #include "app/windows/XML/xmlFilesCallback.h" diff --git a/targets/app/common/src/DLC/DLCAudioFile.h b/targets/app/common/DLC/DLCAudioFile.h similarity index 100% rename from targets/app/common/src/DLC/DLCAudioFile.h rename to targets/app/common/DLC/DLCAudioFile.h diff --git a/targets/app/common/src/DLC/DLCCapeFile.cpp b/targets/app/common/DLC/DLCCapeFile.cpp similarity index 88% rename from targets/app/common/src/DLC/DLCCapeFile.cpp rename to targets/app/common/DLC/DLCCapeFile.cpp index 5beb4e48a..e4dba5d4c 100644 --- a/targets/app/common/src/DLC/DLCCapeFile.cpp +++ b/targets/app/common/DLC/DLCCapeFile.cpp @@ -1,7 +1,7 @@ #include "DLCCapeFile.h" #include "DLCManager.h" -#include "app/common/src/DLC/DLCFile.h" +#include "app/common/DLC/DLCFile.h" #include "app/linux/LinuxGame.h" DLCCapeFile::DLCCapeFile(const std::wstring& path) diff --git a/targets/app/common/src/DLC/DLCCapeFile.h b/targets/app/common/DLC/DLCCapeFile.h similarity index 100% rename from targets/app/common/src/DLC/DLCCapeFile.h rename to targets/app/common/DLC/DLCCapeFile.h diff --git a/targets/app/common/src/DLC/DLCColourTableFile.cpp b/targets/app/common/DLC/DLCColourTableFile.cpp similarity index 90% rename from targets/app/common/src/DLC/DLCColourTableFile.cpp rename to targets/app/common/DLC/DLCColourTableFile.cpp index 83b082979..96aee1ae4 100644 --- a/targets/app/common/src/DLC/DLCColourTableFile.cpp +++ b/targets/app/common/DLC/DLCColourTableFile.cpp @@ -1,8 +1,8 @@ #include "DLCColourTableFile.h" #include "DLCManager.h" -#include "app/common/src/Colours/ColourTable.h" -#include "app/common/src/DLC/DLCFile.h" +#include "app/common/Colours/ColourTable.h" +#include "app/common/DLC/DLCFile.h" #include "app/linux/LinuxGame.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/skins/TexturePack.h" diff --git a/targets/app/common/src/DLC/DLCColourTableFile.h b/targets/app/common/DLC/DLCColourTableFile.h similarity index 100% rename from targets/app/common/src/DLC/DLCColourTableFile.h rename to targets/app/common/DLC/DLCColourTableFile.h diff --git a/targets/app/common/src/DLC/DLCFile.cpp b/targets/app/common/DLC/DLCFile.cpp similarity index 93% rename from targets/app/common/src/DLC/DLCFile.cpp rename to targets/app/common/DLC/DLCFile.cpp index 30424e957..2383b2954 100644 --- a/targets/app/common/src/DLC/DLCFile.cpp +++ b/targets/app/common/DLC/DLCFile.cpp @@ -3,7 +3,7 @@ #include #include "app/common/Minecraft_Macros.h" -#include "app/common/src/DLC/DLCManager.h" +#include "app/common/DLC/DLCManager.h" DLCFile::DLCFile(DLCManager::EDLCType type, const std::wstring& path) { m_type = type; diff --git a/targets/app/common/src/DLC/DLCFile.h b/targets/app/common/DLC/DLCFile.h similarity index 100% rename from targets/app/common/src/DLC/DLCFile.h rename to targets/app/common/DLC/DLCFile.h diff --git a/targets/app/common/src/DLC/DLCGameRules.h b/targets/app/common/DLC/DLCGameRules.h similarity index 70% rename from targets/app/common/src/DLC/DLCGameRules.h rename to targets/app/common/DLC/DLCGameRules.h index e1d34f70c..4a73f72c4 100644 --- a/targets/app/common/src/DLC/DLCGameRules.h +++ b/targets/app/common/DLC/DLCGameRules.h @@ -1,7 +1,7 @@ #pragma once #include "DLCFile.h" -#include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h" class DLCGameRules : public DLCFile { public: diff --git a/targets/app/common/src/DLC/DLCGameRulesFile.cpp b/targets/app/common/DLC/DLCGameRulesFile.cpp similarity index 91% rename from targets/app/common/src/DLC/DLCGameRulesFile.cpp rename to targets/app/common/DLC/DLCGameRulesFile.cpp index d523a9b89..eb90be010 100644 --- a/targets/app/common/src/DLC/DLCGameRulesFile.cpp +++ b/targets/app/common/DLC/DLCGameRulesFile.cpp @@ -1,7 +1,7 @@ #include "DLCGameRulesFile.h" #include "DLCManager.h" -#include "app/common/src/DLC/DLCGameRules.h" +#include "app/common/DLC/DLCGameRules.h" DLCGameRulesFile::DLCGameRulesFile(const std::wstring& path) : DLCGameRules(DLCManager::e_DLCType_GameRules, path) { diff --git a/targets/app/common/src/DLC/DLCGameRulesFile.h b/targets/app/common/DLC/DLCGameRulesFile.h similarity index 100% rename from targets/app/common/src/DLC/DLCGameRulesFile.h rename to targets/app/common/DLC/DLCGameRulesFile.h diff --git a/targets/app/common/src/DLC/DLCGameRulesHeader.cpp b/targets/app/common/DLC/DLCGameRulesHeader.cpp similarity index 91% rename from targets/app/common/src/DLC/DLCGameRulesHeader.cpp rename to targets/app/common/DLC/DLCGameRulesHeader.cpp index aa57c370b..8c00e32ec 100644 --- a/targets/app/common/src/DLC/DLCGameRulesHeader.cpp +++ b/targets/app/common/DLC/DLCGameRulesHeader.cpp @@ -3,8 +3,8 @@ #include #include "DLCManager.h" -#include "app/common/src/DLC/DLCGameRules.h" -#include "app/common/src/GameRules/GameRuleManager.h" +#include "app/common/DLC/DLCGameRules.h" +#include "app/common/GameRules/GameRuleManager.h" #include "app/linux/LinuxGame.h" class StringTable; diff --git a/targets/app/common/src/DLC/DLCGameRulesHeader.h b/targets/app/common/DLC/DLCGameRulesHeader.h similarity index 95% rename from targets/app/common/src/DLC/DLCGameRulesHeader.h rename to targets/app/common/DLC/DLCGameRulesHeader.h index 9063aa3d0..02e8443ee 100644 --- a/targets/app/common/src/DLC/DLCGameRulesHeader.h +++ b/targets/app/common/DLC/DLCGameRulesHeader.h @@ -4,7 +4,7 @@ #include #include "DLCGameRules.h" -#include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h" class StringTable; diff --git a/targets/app/common/src/DLC/DLCLocalisationFile.cpp b/targets/app/common/DLC/DLCLocalisationFile.cpp similarity index 80% rename from targets/app/common/src/DLC/DLCLocalisationFile.cpp rename to targets/app/common/DLC/DLCLocalisationFile.cpp index 3775c074d..b82884947 100644 --- a/targets/app/common/src/DLC/DLCLocalisationFile.cpp +++ b/targets/app/common/DLC/DLCLocalisationFile.cpp @@ -1,8 +1,8 @@ #include "DLCLocalisationFile.h" #include "DLCManager.h" -#include "app/common/src/DLC/DLCFile.h" -#include "app/common/src/Localisation/StringTable.h" +#include "app/common/DLC/DLCFile.h" +#include "app/common/Localisation/StringTable.h" DLCLocalisationFile::DLCLocalisationFile(const std::wstring& path) : DLCFile(DLCManager::e_DLCType_LocalisationData, path) { diff --git a/targets/app/common/src/DLC/DLCLocalisationFile.h b/targets/app/common/DLC/DLCLocalisationFile.h similarity index 100% rename from targets/app/common/src/DLC/DLCLocalisationFile.h rename to targets/app/common/DLC/DLCLocalisationFile.h diff --git a/targets/app/common/src/DLC/DLCManager.cpp b/targets/app/common/DLC/DLCManager.cpp similarity index 99% rename from targets/app/common/src/DLC/DLCManager.cpp rename to targets/app/common/DLC/DLCManager.cpp index d1ab657c3..795ac9508 100644 --- a/targets/app/common/src/DLC/DLCManager.cpp +++ b/targets/app/common/DLC/DLCManager.cpp @@ -17,7 +17,7 @@ #include "platform/sdl2/Storage.h" #include "DLCFile.h" #include "DLCPack.h" -#include "app/common/src/GameRules/GameRuleManager.h" +#include "app/common/GameRules/GameRuleManager.h" #include "app/linux/LinuxGame.h" #include "app/linux/Linux_UIController.h" #include "platform/PlatformServices.h" diff --git a/targets/app/common/src/DLC/DLCManager.h b/targets/app/common/DLC/DLCManager.h similarity index 100% rename from targets/app/common/src/DLC/DLCManager.h rename to targets/app/common/DLC/DLCManager.h diff --git a/targets/app/common/src/DLC/DLCPack.cpp b/targets/app/common/DLC/DLCPack.cpp similarity index 97% rename from targets/app/common/src/DLC/DLCPack.cpp rename to targets/app/common/DLC/DLCPack.cpp index 07e4d78ae..0347f9bcc 100644 --- a/targets/app/common/src/DLC/DLCPack.cpp +++ b/targets/app/common/DLC/DLCPack.cpp @@ -15,11 +15,11 @@ #include "DLCLocalisationFile.h" #include "DLCTextureFile.h" #include "DLCUIDataFile.h" -#include "app/common/src/Console_Debug_enum.h" -#include "app/common/src/DLC/DLCFile.h" -#include "app/common/src/DLC/DLCManager.h" -#include "app/common/src/DLC/DLCSkinFile.h" -#include "app/common/src/Localisation/StringTable.h" +#include "app/common/Console_Debug_enum.h" +#include "app/common/DLC/DLCFile.h" +#include "app/common/DLC/DLCManager.h" +#include "app/common/DLC/DLCSkinFile.h" +#include "app/common/Localisation/StringTable.h" #include "app/linux/LinuxGame.h" #include "app/linux/Stubs/winapi_stubs.h" #include "util/StringHelpers.h" diff --git a/targets/app/common/src/DLC/DLCPack.h b/targets/app/common/DLC/DLCPack.h similarity index 98% rename from targets/app/common/src/DLC/DLCPack.h rename to targets/app/common/DLC/DLCPack.h index 996afa32a..5048e91cf 100644 --- a/targets/app/common/src/DLC/DLCPack.h +++ b/targets/app/common/DLC/DLCPack.h @@ -7,7 +7,7 @@ #include "platform/PlatformTypes.h" #include "DLCManager.h" -#include "app/common/src/DLC/DLCSkinFile.h" +#include "app/common/DLC/DLCSkinFile.h" class DLCFile; class DLCSkinFile; diff --git a/targets/app/common/src/DLC/DLCSkinFile.cpp b/targets/app/common/DLC/DLCSkinFile.cpp similarity index 98% rename from targets/app/common/src/DLC/DLCSkinFile.cpp rename to targets/app/common/DLC/DLCSkinFile.cpp index c38e7d6b8..f03b60732 100644 --- a/targets/app/common/src/DLC/DLCSkinFile.cpp +++ b/targets/app/common/DLC/DLCSkinFile.cpp @@ -5,10 +5,10 @@ #include "platform/sdl2/Render.h" #include "DLCManager.h" -#include "app/common/src/DLC/DLCFile.h" +#include "app/common/DLC/DLCFile.h" #include "app/linux/LinuxGame.h" -#include "app/include/SkinBox.h" -#include "app/include/XboxStubs.h" +#include "app/common/SkinBox.h" +#include "app/common/XboxStubs.h" DLCSkinFile::DLCSkinFile(const std::wstring& path) : DLCFile(DLCManager::e_DLCType_Skin, path) { diff --git a/targets/app/common/src/DLC/DLCSkinFile.h b/targets/app/common/DLC/DLCSkinFile.h similarity index 93% rename from targets/app/common/src/DLC/DLCSkinFile.h rename to targets/app/common/DLC/DLCSkinFile.h index 350a2da66..02d541624 100644 --- a/targets/app/common/src/DLC/DLCSkinFile.h +++ b/targets/app/common/DLC/DLCSkinFile.h @@ -5,8 +5,8 @@ #include #include "DLCFile.h" -#include "app/common/src/DLC/DLCManager.h" -#include "app/include/SkinBox.h" +#include "app/common/DLC/DLCManager.h" +#include "app/common/SkinBox.h" #include "minecraft/client/model/HumanoidModel.h" class DLCSkinFile : public DLCFile { diff --git a/targets/app/common/src/DLC/DLCTextureFile.cpp b/targets/app/common/DLC/DLCTextureFile.cpp similarity index 97% rename from targets/app/common/src/DLC/DLCTextureFile.cpp rename to targets/app/common/DLC/DLCTextureFile.cpp index 964d497b7..52c9f1ade 100644 --- a/targets/app/common/src/DLC/DLCTextureFile.cpp +++ b/targets/app/common/DLC/DLCTextureFile.cpp @@ -1,7 +1,7 @@ #include "DLCTextureFile.h" #include "DLCManager.h" -#include "app/common/src/DLC/DLCFile.h" +#include "app/common/DLC/DLCFile.h" DLCTextureFile::DLCTextureFile(const std::wstring& path) : DLCFile(DLCManager::e_DLCType_Texture, path) { diff --git a/targets/app/common/src/DLC/DLCTextureFile.h b/targets/app/common/DLC/DLCTextureFile.h similarity index 94% rename from targets/app/common/src/DLC/DLCTextureFile.h rename to targets/app/common/DLC/DLCTextureFile.h index 71c6b5c11..015a2915c 100644 --- a/targets/app/common/src/DLC/DLCTextureFile.h +++ b/targets/app/common/DLC/DLCTextureFile.h @@ -3,7 +3,7 @@ #include #include "DLCFile.h" -#include "app/common/src/DLC/DLCManager.h" +#include "app/common/DLC/DLCManager.h" class DLCTextureFile : public DLCFile { private: diff --git a/targets/app/common/src/DLC/DLCUIDataFile.cpp b/targets/app/common/DLC/DLCUIDataFile.cpp similarity index 95% rename from targets/app/common/src/DLC/DLCUIDataFile.cpp rename to targets/app/common/DLC/DLCUIDataFile.cpp index 9b233c1a8..63b2d4a41 100644 --- a/targets/app/common/src/DLC/DLCUIDataFile.cpp +++ b/targets/app/common/DLC/DLCUIDataFile.cpp @@ -1,7 +1,7 @@ #include "DLCUIDataFile.h" #include "DLCManager.h" -#include "app/common/src/DLC/DLCFile.h" +#include "app/common/DLC/DLCFile.h" #include "app/linux/LinuxGame.h" DLCUIDataFile::DLCUIDataFile(const std::wstring& path) diff --git a/targets/app/common/src/DLC/DLCUIDataFile.h b/targets/app/common/DLC/DLCUIDataFile.h similarity index 100% rename from targets/app/common/src/DLC/DLCUIDataFile.h rename to targets/app/common/DLC/DLCUIDataFile.h diff --git a/targets/app/src/FrameProfiler.cpp b/targets/app/common/FrameProfiler.cpp similarity index 100% rename from targets/app/src/FrameProfiler.cpp rename to targets/app/common/FrameProfiler.cpp diff --git a/targets/app/include/FrameProfiler.h b/targets/app/common/FrameProfiler.h similarity index 100% rename from targets/app/include/FrameProfiler.h rename to targets/app/common/FrameProfiler.h diff --git a/targets/app/common/Game.cpp b/targets/app/common/Game.cpp index aeb8668bd..88cc6f77f 100644 --- a/targets/app/common/Game.cpp +++ b/targets/app/common/Game.cpp @@ -8,22 +8,22 @@ #include "app/common/App_Defines.h" #include "app/common/App_enums.h" #include "app/common/App_structs.h" -#include "app/common/src/Console_Debug_enum.h" -#include "app/common/src/DLC/DLCManager.h" -#include "app/common/src/DLC/DLCSkinFile.h" -#include "app/common/src/GameRules/GameRuleManager.h" -#include "app/common/src/Network/GameNetworkManager.h" -#include "app/common/src/Network/NetworkPlayerInterface.h" -#include "app/common/src/Tutorial/Tutorial.h" -#include "app/common/src/UI/All Platforms/UIEnums.h" -#include "app/common/src/UI/All Platforms/UIStructs.h" -#include "app/common/src/UI/Scenes/UIScene_FullscreenProgress.h" +#include "app/common/Console_Debug_enum.h" +#include "app/common/DLC/DLCManager.h" +#include "app/common/DLC/DLCSkinFile.h" +#include "app/common/GameRules/GameRuleManager.h" +#include "app/common/Network/GameNetworkManager.h" +#include "app/common/Network/NetworkPlayerInterface.h" +#include "app/common/Tutorial/Tutorial.h" +#include "app/common/UI/All Platforms/UIEnums.h" +#include "app/common/UI/All Platforms/UIStructs.h" +#include "app/common/UI/Scenes/UIScene_FullscreenProgress.h" #include "app/linux/LinuxGame.h" #include "app/linux/Linux_UIController.h" #include "app/linux/Stubs/winapi_stubs.h" -#include "app/include/NetTypes.h" -#include "SkinBox.h" -#include "XboxStubs.h" +#include "app/common/NetTypes.h" +#include "app/common/SkinBox.h" +#include "app/common/XboxStubs.h" #include "platform/PlatformServices.h" #include "java/Class.h" #include "java/File.h" @@ -74,12 +74,12 @@ #include #include "platform/sdl2/Input.h" -#include "app/common/src/Audio/SoundEngine.h" -#include "app/common/src/Colours/ColourTable.h" -#include "app/common/src/DLC/DLCPack.h" -#include "app/common/src/Localisation/StringTable.h" -#include "app/common/src/UI/All Platforms/ArchiveFile.h" -#include "app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h" +#include "app/common/Audio/SoundEngine.h" +#include "app/common/Colours/ColourTable.h" +#include "app/common/DLC/DLCPack.h" +#include "app/common/Localisation/StringTable.h" +#include "app/common/UI/All Platforms/ArchiveFile.h" +#include "app/common/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h" #include "Minecraft_Macros.h" #include "util/Timer.h" #include "util/StringHelpers.h" diff --git a/targets/app/common/Game.h b/targets/app/common/Game.h index 8b96c2910..5a688c23c 100644 --- a/targets/app/common/Game.h +++ b/targets/app/common/Game.h @@ -11,17 +11,17 @@ #include "app/common/IPlatformGame.h" #include "app/common/App_structs.h" -#include "app/common/src/Audio/Consoles_SoundEngine.h" -#include "app/common/src/DLC/DLCManager.h" -#include "app/common/src/GameRules/ConsoleGameRulesConstants.h" -#include "app/common/src/GameRules/GameRuleManager.h" -#include "app/common/src/Localisation/StringTable.h" -#include "app/common/src/Tutorial/TutorialEnum.h" -#include "app/common/src/UI/All Platforms/ArchiveFile.h" -#include "app/common/src/UI/All Platforms/UIStructs.h" -#include "app/include/NetTypes.h" -#include "app/include/SkinBox.h" -#include "app/include/XboxStubs.h" +#include "app/common/Audio/Consoles_SoundEngine.h" +#include "app/common/DLC/DLCManager.h" +#include "app/common/GameRules/ConsoleGameRulesConstants.h" +#include "app/common/GameRules/GameRuleManager.h" +#include "app/common/Localisation/StringTable.h" +#include "app/common/Tutorial/TutorialEnum.h" +#include "app/common/UI/All Platforms/ArchiveFile.h" +#include "app/common/UI/All Platforms/UIStructs.h" +#include "app/common/NetTypes.h" +#include "app/common/SkinBox.h" +#include "app/common/XboxStubs.h" #include "minecraft/network/packet/DisconnectPacket.h" #include "minecraft/world/entity/item/MinecartHopper.h" diff --git a/targets/app/common/GameRules/ConsoleGameRules.h b/targets/app/common/GameRules/ConsoleGameRules.h new file mode 100644 index 000000000..765acff99 --- /dev/null +++ b/targets/app/common/GameRules/ConsoleGameRules.h @@ -0,0 +1,25 @@ +#pragma once +#include "ConsoleGameRulesConstants.h" +#include "GameRuleManager.h" +#include "app/common/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h" +#include "app/common/GameRules/LevelGeneration/BiomeOverride.h" +#include "app/common/GameRules/LevelGeneration/ConsoleGenerateStructure.h" +#include "app/common/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h" +#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "app/common/GameRules/LevelGeneration/StartFeature.h" +#include "app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.h" +#include "app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h" +#include "app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.h" +#include "app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.h" +#include "app/common/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.h" +#include "app/common/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h" +#include "app/common/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.h" +#include "app/common/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h" +#include "app/common/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h" +#include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "app/common/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h" +#include "app/common/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h" +#include "app/common/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.h" +#include "app/common/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h" +#include "app/common/GameRules/LevelRules/Rules/GameRule.h" +#include "app/common/GameRules/LevelRules/Rules/GameRulesInstance.h" diff --git a/targets/app/common/src/GameRules/ConsoleGameRulesConstants.h b/targets/app/common/GameRules/ConsoleGameRulesConstants.h similarity index 100% rename from targets/app/common/src/GameRules/ConsoleGameRulesConstants.h rename to targets/app/common/GameRules/ConsoleGameRulesConstants.h diff --git a/targets/app/common/src/GameRules/GameRuleManager.cpp b/targets/app/common/GameRules/GameRuleManager.cpp similarity index 97% rename from targets/app/common/src/GameRules/GameRuleManager.cpp rename to targets/app/common/GameRules/GameRuleManager.cpp index 9c14da10e..000e198b9 100644 --- a/targets/app/common/src/GameRules/GameRuleManager.cpp +++ b/targets/app/common/GameRules/GameRuleManager.cpp @@ -7,18 +7,18 @@ #include #include -#include "app/common/src/DLC/DLCGameRulesFile.h" -#include "app/common/src/DLC/DLCGameRulesHeader.h" -#include "app/common/src/DLC/DLCLocalisationFile.h" -#include "app/common/src/DLC/DLCManager.h" -#include "app/common/src/DLC/DLCPack.h" -#include "app/common/src/GameRules/LevelGeneration/ConsoleSchematicFile.h" -#include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" -#include "app/common/src/GameRules/LevelGeneration/LevelGenerators.h" -#include "app/common/src/GameRules/LevelRules/LevelRules.h" -#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" -#include "app/common/src/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h" -#include "app/common/src/Localisation/StringTable.h" +#include "app/common/DLC/DLCGameRulesFile.h" +#include "app/common/DLC/DLCGameRulesHeader.h" +#include "app/common/DLC/DLCLocalisationFile.h" +#include "app/common/DLC/DLCManager.h" +#include "app/common/DLC/DLCPack.h" +#include "app/common/GameRules/LevelGeneration/ConsoleSchematicFile.h" +#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "app/common/GameRules/LevelGeneration/LevelGenerators.h" +#include "app/common/GameRules/LevelRules/LevelRules.h" +#include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "app/common/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h" +#include "app/common/Localisation/StringTable.h" #include "app/linux/LinuxGame.h" #include "minecraft/world/level/storage/ConsoleSaveFileIO/compression.h" #include "java/File.h" diff --git a/targets/app/common/src/GameRules/GameRuleManager.h b/targets/app/common/GameRules/GameRuleManager.h similarity index 92% rename from targets/app/common/src/GameRules/GameRuleManager.h rename to targets/app/common/GameRules/GameRuleManager.h index 63b837550..674b836e7 100644 --- a/targets/app/common/src/GameRules/GameRuleManager.h +++ b/targets/app/common/GameRules/GameRuleManager.h @@ -7,10 +7,10 @@ #include #include -#include "app/common/src/DLC/DLCGameRulesHeader.h" -#include "app/common/src/GameRules/ConsoleGameRulesConstants.h" -#include "app/common/src/GameRules/LevelGeneration/LevelGenerators.h" -#include "app/common/src/GameRules/LevelRules/LevelRules.h" +#include "app/common/DLC/DLCGameRulesHeader.h" +#include "app/common/GameRules/ConsoleGameRulesConstants.h" +#include "app/common/GameRules/LevelGeneration/LevelGenerators.h" +#include "app/common/GameRules/LevelRules/LevelRules.h" class LevelGenerationOptions; class RootGameRulesDefinition; diff --git a/targets/app/common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.cpp b/targets/app/common/GameRules/LevelGeneration/ApplySchematicRuleDefinition.cpp similarity index 98% rename from targets/app/common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.cpp rename to targets/app/common/GameRules/LevelGeneration/ApplySchematicRuleDefinition.cpp index a837ef0a2..372674e3a 100644 --- a/targets/app/common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.cpp +++ b/targets/app/common/GameRules/LevelGeneration/ApplySchematicRuleDefinition.cpp @@ -5,8 +5,8 @@ #include "ConsoleSchematicFile.h" #include "LevelGenerationOptions.h" -#include "app/common/src/GameRules/ConsoleGameRulesConstants.h" -#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "app/common/GameRules/ConsoleGameRulesConstants.h" +#include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" #include "app/linux/LinuxGame.h" #include "util/StringHelpers.h" #include "java/InputOutputStream/DataOutputStream.h" diff --git a/targets/app/common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h b/targets/app/common/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h similarity index 92% rename from targets/app/common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h rename to targets/app/common/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h index ddd61f367..8de7747bf 100644 --- a/targets/app/common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h +++ b/targets/app/common/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h @@ -5,8 +5,8 @@ #include #include "ConsoleSchematicFile.h" -#include "app/common/src/GameRules/ConsoleGameRulesConstants.h" -#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "app/common/GameRules/ConsoleGameRulesConstants.h" +#include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" #include "minecraft/world/phys/AABB.h" #include "minecraft/world/phys/Vec3.h" diff --git a/targets/app/common/src/GameRules/LevelGeneration/BiomeOverride.cpp b/targets/app/common/GameRules/LevelGeneration/BiomeOverride.cpp similarity index 92% rename from targets/app/common/src/GameRules/LevelGeneration/BiomeOverride.cpp rename to targets/app/common/GameRules/LevelGeneration/BiomeOverride.cpp index 43e41bb85..e466eb9b7 100644 --- a/targets/app/common/src/GameRules/LevelGeneration/BiomeOverride.cpp +++ b/targets/app/common/GameRules/LevelGeneration/BiomeOverride.cpp @@ -1,7 +1,7 @@ #include "BiomeOverride.h" -#include "app/common/src/GameRules/ConsoleGameRulesConstants.h" -#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "app/common/GameRules/ConsoleGameRulesConstants.h" +#include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" #include "app/linux/LinuxGame.h" #include "util/StringHelpers.h" #include "java/InputOutputStream/DataOutputStream.h" diff --git a/targets/app/common/src/GameRules/LevelGeneration/BiomeOverride.h b/targets/app/common/GameRules/LevelGeneration/BiomeOverride.h similarity index 82% rename from targets/app/common/src/GameRules/LevelGeneration/BiomeOverride.h rename to targets/app/common/GameRules/LevelGeneration/BiomeOverride.h index f55cce44a..014ac4107 100644 --- a/targets/app/common/src/GameRules/LevelGeneration/BiomeOverride.h +++ b/targets/app/common/GameRules/LevelGeneration/BiomeOverride.h @@ -4,8 +4,8 @@ #include #include -#include "app/common/src/GameRules/ConsoleGameRulesConstants.h" -#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "app/common/GameRules/ConsoleGameRulesConstants.h" +#include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" class BiomeOverride : public GameRuleDefinition { private: diff --git a/targets/app/common/src/GameRules/LevelGeneration/ConsoleGenerateStructure.cpp b/targets/app/common/GameRules/LevelGeneration/ConsoleGenerateStructure.cpp similarity index 91% rename from targets/app/common/src/GameRules/LevelGeneration/ConsoleGenerateStructure.cpp rename to targets/app/common/GameRules/LevelGeneration/ConsoleGenerateStructure.cpp index 98be85fb3..67ac87059 100644 --- a/targets/app/common/src/GameRules/LevelGeneration/ConsoleGenerateStructure.cpp +++ b/targets/app/common/GameRules/LevelGeneration/ConsoleGenerateStructure.cpp @@ -4,13 +4,13 @@ #include -#include "app/common/src/GameRules/ConsoleGameRulesConstants.h" -#include "app/common/src/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h" -#include "app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.h" -#include "app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h" -#include "app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.h" -#include "app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.h" -#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "app/common/GameRules/ConsoleGameRulesConstants.h" +#include "app/common/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h" +#include "app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.h" +#include "app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h" +#include "app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.h" +#include "app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.h" +#include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" #include "app/linux/LinuxGame.h" #include "util/StringHelpers.h" #include "java/InputOutputStream/DataOutputStream.h" diff --git a/targets/app/common/src/GameRules/LevelGeneration/ConsoleGenerateStructure.h b/targets/app/common/GameRules/LevelGeneration/ConsoleGenerateStructure.h similarity index 91% rename from targets/app/common/src/GameRules/LevelGeneration/ConsoleGenerateStructure.h rename to targets/app/common/GameRules/LevelGeneration/ConsoleGenerateStructure.h index 207c6d4d0..e4bd1c208 100644 --- a/targets/app/common/src/GameRules/LevelGeneration/ConsoleGenerateStructure.h +++ b/targets/app/common/GameRules/LevelGeneration/ConsoleGenerateStructure.h @@ -2,8 +2,8 @@ #include #include -#include "app/common/src/GameRules/ConsoleGameRulesConstants.h" -#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "app/common/GameRules/ConsoleGameRulesConstants.h" +#include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" #include "minecraft/world/level/levelgen/structure/StructureFeatureIO.h" #include "minecraft/world/level/levelgen/structure/StructurePiece.h" diff --git a/targets/app/common/src/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h b/targets/app/common/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h similarity index 68% rename from targets/app/common/src/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h rename to targets/app/common/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h index 7e2cf7f14..f8f1014a2 100644 --- a/targets/app/common/src/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h +++ b/targets/app/common/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h @@ -1,6 +1,6 @@ #pragma once -#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" class ConsoleGenerateStructureAction : public GameRuleDefinition { public: diff --git a/targets/app/common/src/GameRules/LevelGeneration/ConsoleSchematicFile.cpp b/targets/app/common/GameRules/LevelGeneration/ConsoleSchematicFile.cpp similarity index 100% rename from targets/app/common/src/GameRules/LevelGeneration/ConsoleSchematicFile.cpp rename to targets/app/common/GameRules/LevelGeneration/ConsoleSchematicFile.cpp diff --git a/targets/app/common/src/GameRules/LevelGeneration/ConsoleSchematicFile.h b/targets/app/common/GameRules/LevelGeneration/ConsoleSchematicFile.h similarity index 100% rename from targets/app/common/src/GameRules/LevelGeneration/ConsoleSchematicFile.h rename to targets/app/common/GameRules/LevelGeneration/ConsoleSchematicFile.h diff --git a/targets/app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.cpp b/targets/app/common/GameRules/LevelGeneration/LevelGenerationOptions.cpp similarity index 97% rename from targets/app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.cpp rename to targets/app/common/GameRules/LevelGeneration/LevelGenerationOptions.cpp index 33f77d6c1..8400e8eed 100644 --- a/targets/app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.cpp +++ b/targets/app/common/GameRules/LevelGeneration/LevelGenerationOptions.cpp @@ -7,17 +7,17 @@ #include #include "app/common/App_enums.h" -#include "app/common/src/DLC/DLCGameRulesHeader.h" -#include "app/common/src/DLC/DLCManager.h" -#include "app/common/src/DLC/DLCPack.h" -#include "app/common/src/GameRules/GameRuleManager.h" -#include "app/common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h" -#include "app/common/src/GameRules/LevelGeneration/BiomeOverride.h" -#include "app/common/src/GameRules/LevelGeneration/ConsoleGenerateStructure.h" -#include "app/common/src/GameRules/LevelGeneration/ConsoleSchematicFile.h" -#include "app/common/src/GameRules/LevelGeneration/StartFeature.h" -#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" -#include "app/common/src/Localisation/StringTable.h" +#include "app/common/DLC/DLCGameRulesHeader.h" +#include "app/common/DLC/DLCManager.h" +#include "app/common/DLC/DLCPack.h" +#include "app/common/GameRules/GameRuleManager.h" +#include "app/common/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h" +#include "app/common/GameRules/LevelGeneration/BiomeOverride.h" +#include "app/common/GameRules/LevelGeneration/ConsoleGenerateStructure.h" +#include "app/common/GameRules/LevelGeneration/ConsoleSchematicFile.h" +#include "app/common/GameRules/LevelGeneration/StartFeature.h" +#include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "app/common/Localisation/StringTable.h" #include "app/linux/LinuxGame.h" #include "app/linux/Stubs/winapi_stubs.h" #include "java/File.h" diff --git a/targets/app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h b/targets/app/common/GameRules/LevelGeneration/LevelGenerationOptions.h similarity index 97% rename from targets/app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h rename to targets/app/common/GameRules/LevelGeneration/LevelGenerationOptions.h index 90fad20f5..cf70675e8 100644 --- a/targets/app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h +++ b/targets/app/common/GameRules/LevelGeneration/LevelGenerationOptions.h @@ -8,10 +8,10 @@ #include #include -#include "app/common/src/DLC/DLCPack.h" -#include "app/common/src/GameRules/ConsoleGameRulesConstants.h" -#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" -#include "app/common/src/Localisation/StringTable.h" +#include "app/common/DLC/DLCPack.h" +#include "app/common/GameRules/ConsoleGameRulesConstants.h" +#include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "app/common/Localisation/StringTable.h" #include "minecraft/world/level/levelgen/structure/StructureFeature.h" class ApplySchematicRuleDefinition; diff --git a/targets/app/common/src/GameRules/LevelGeneration/LevelGenerators.cpp b/targets/app/common/GameRules/LevelGeneration/LevelGenerators.cpp similarity index 100% rename from targets/app/common/src/GameRules/LevelGeneration/LevelGenerators.cpp rename to targets/app/common/GameRules/LevelGeneration/LevelGenerators.cpp diff --git a/targets/app/common/src/GameRules/LevelGeneration/LevelGenerators.h b/targets/app/common/GameRules/LevelGeneration/LevelGenerators.h similarity index 100% rename from targets/app/common/src/GameRules/LevelGeneration/LevelGenerators.h rename to targets/app/common/GameRules/LevelGeneration/LevelGenerators.h diff --git a/targets/app/common/src/GameRules/LevelGeneration/StartFeature.cpp b/targets/app/common/GameRules/LevelGeneration/StartFeature.cpp similarity index 94% rename from targets/app/common/src/GameRules/LevelGeneration/StartFeature.cpp rename to targets/app/common/GameRules/LevelGeneration/StartFeature.cpp index b66efbaa4..225048439 100644 --- a/targets/app/common/src/GameRules/LevelGeneration/StartFeature.cpp +++ b/targets/app/common/GameRules/LevelGeneration/StartFeature.cpp @@ -1,7 +1,7 @@ #include "StartFeature.h" -#include "app/common/src/GameRules/ConsoleGameRulesConstants.h" -#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "app/common/GameRules/ConsoleGameRulesConstants.h" +#include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" #include "app/linux/LinuxGame.h" #include "util/StringHelpers.h" #include "java/InputOutputStream/DataOutputStream.h" diff --git a/targets/app/common/src/GameRules/LevelGeneration/StartFeature.h b/targets/app/common/GameRules/LevelGeneration/StartFeature.h similarity index 84% rename from targets/app/common/src/GameRules/LevelGeneration/StartFeature.h rename to targets/app/common/GameRules/LevelGeneration/StartFeature.h index c54c671b2..c5716be6e 100644 --- a/targets/app/common/src/GameRules/LevelGeneration/StartFeature.h +++ b/targets/app/common/GameRules/LevelGeneration/StartFeature.h @@ -3,8 +3,8 @@ #include -#include "app/common/src/GameRules/ConsoleGameRulesConstants.h" -#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "app/common/GameRules/ConsoleGameRulesConstants.h" +#include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" #include "minecraft/world/level/levelgen/structure/StructureFeature.h" class StartFeature : public GameRuleDefinition { diff --git a/targets/app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.cpp b/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.cpp similarity index 94% rename from targets/app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.cpp rename to targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.cpp index 00ae3e039..051d7419c 100644 --- a/targets/app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.cpp +++ b/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.cpp @@ -1,8 +1,8 @@ #include "XboxStructureActionGenerateBox.h" -#include "app/common/src/GameRules/ConsoleGameRulesConstants.h" -#include "app/common/src/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h" -#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "app/common/GameRules/ConsoleGameRulesConstants.h" +#include "app/common/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h" +#include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" #include "app/linux/LinuxGame.h" #include "util/StringHelpers.h" #include "java/InputOutputStream/DataOutputStream.h" diff --git a/targets/app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.h b/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.h similarity index 85% rename from targets/app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.h rename to targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.h index 2d20f138f..41c058abc 100644 --- a/targets/app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.h +++ b/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.h @@ -1,8 +1,8 @@ #pragma once #include -#include "app/common/src/GameRules/ConsoleGameRulesConstants.h" -#include "app/common/src/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h" +#include "app/common/GameRules/ConsoleGameRulesConstants.h" +#include "app/common/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h" class StructurePiece; class Level; diff --git a/targets/app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.cpp b/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.cpp similarity index 92% rename from targets/app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.cpp rename to targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.cpp index 8f54aa1ec..e9c20b361 100644 --- a/targets/app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.cpp +++ b/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.cpp @@ -1,8 +1,8 @@ #include "XboxStructureActionPlaceBlock.h" -#include "app/common/src/GameRules/ConsoleGameRulesConstants.h" -#include "app/common/src/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h" -#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "app/common/GameRules/ConsoleGameRulesConstants.h" +#include "app/common/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h" +#include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" #include "app/linux/LinuxGame.h" #include "util/StringHelpers.h" #include "java/InputOutputStream/DataOutputStream.h" diff --git a/targets/app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h b/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h similarity index 85% rename from targets/app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h rename to targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h index 9d755899b..ccf3e961d 100644 --- a/targets/app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h +++ b/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h @@ -1,8 +1,8 @@ #pragma once #include -#include "app/common/src/GameRules/ConsoleGameRulesConstants.h" -#include "app/common/src/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h" +#include "app/common/GameRules/ConsoleGameRulesConstants.h" +#include "app/common/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h" class StructurePiece; class Level; diff --git a/targets/app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.cpp b/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.cpp similarity index 93% rename from targets/app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.cpp rename to targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.cpp index 4e807c820..8dfb354cd 100644 --- a/targets/app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.cpp +++ b/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.cpp @@ -4,9 +4,9 @@ #include -#include "app/common/src/GameRules/ConsoleGameRulesConstants.h" -#include "app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h" -#include "app/common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h" +#include "app/common/GameRules/ConsoleGameRulesConstants.h" +#include "app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h" +#include "app/common/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h" #include "app/linux/LinuxGame.h" #include "util/StringHelpers.h" #include "minecraft/world/Container.h" diff --git a/targets/app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.h b/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.h similarity index 94% rename from targets/app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.h rename to targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.h index 2c5e2ae1e..bb15f2630 100644 --- a/targets/app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.h +++ b/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.h @@ -3,7 +3,7 @@ #include #include -#include "app/common/src/GameRules/ConsoleGameRulesConstants.h" +#include "app/common/GameRules/ConsoleGameRulesConstants.h" #include "XboxStructureActionPlaceBlock.h" class AddItemRuleDefinition; diff --git a/targets/app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.cpp b/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.cpp similarity index 94% rename from targets/app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.cpp rename to targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.cpp index 6596f5fcf..31512bd14 100644 --- a/targets/app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.cpp +++ b/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.cpp @@ -4,8 +4,8 @@ #include -#include "app/common/src/GameRules/ConsoleGameRulesConstants.h" -#include "app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h" +#include "app/common/GameRules/ConsoleGameRulesConstants.h" +#include "app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h" #include "java/InputOutputStream/DataOutputStream.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/levelgen/structure/BoundingBox.h" diff --git a/targets/app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.h b/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.h similarity index 92% rename from targets/app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.h rename to targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.h index 23551dbb7..5fc9e989c 100644 --- a/targets/app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.h +++ b/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.h @@ -2,7 +2,7 @@ #include -#include "app/common/src/GameRules/ConsoleGameRulesConstants.h" +#include "app/common/GameRules/ConsoleGameRulesConstants.h" #include "XboxStructureActionPlaceBlock.h" class StructurePiece; diff --git a/targets/app/common/src/GameRules/LevelRules/LevelRules.cpp b/targets/app/common/GameRules/LevelRules/LevelRules.cpp similarity index 100% rename from targets/app/common/src/GameRules/LevelRules/LevelRules.cpp rename to targets/app/common/GameRules/LevelRules/LevelRules.cpp diff --git a/targets/app/common/src/GameRules/LevelRules/LevelRules.h b/targets/app/common/GameRules/LevelRules/LevelRules.h similarity index 100% rename from targets/app/common/src/GameRules/LevelRules/LevelRules.h rename to targets/app/common/GameRules/LevelRules/LevelRules.h diff --git a/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.cpp b/targets/app/common/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.cpp similarity index 95% rename from targets/app/common/src/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.cpp rename to targets/app/common/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.cpp index 1233444c1..5e7e4472d 100644 --- a/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.cpp +++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.cpp @@ -3,8 +3,8 @@ #include #include -#include "app/common/src/GameRules/ConsoleGameRulesConstants.h" -#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "app/common/GameRules/ConsoleGameRulesConstants.h" +#include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" #include "app/linux/LinuxGame.h" #include "util/StringHelpers.h" #include "java/InputOutputStream/DataOutputStream.h" diff --git a/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.h b/targets/app/common/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.h similarity index 91% rename from targets/app/common/src/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.h rename to targets/app/common/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.h index e1d3c1edd..ba4b9b488 100644 --- a/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.h +++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.h @@ -4,7 +4,7 @@ #include #include "GameRuleDefinition.h" -#include "app/common/src/GameRules/ConsoleGameRulesConstants.h" +#include "app/common/GameRules/ConsoleGameRulesConstants.h" class ItemInstance; diff --git a/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.cpp b/targets/app/common/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.cpp similarity index 96% rename from targets/app/common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.cpp rename to targets/app/common/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.cpp index 0d541b7dc..eb3805c4c 100644 --- a/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.cpp +++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.cpp @@ -3,8 +3,8 @@ #include #include "AddEnchantmentRuleDefinition.h" -#include "app/common/src/GameRules/ConsoleGameRulesConstants.h" -#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "app/common/GameRules/ConsoleGameRulesConstants.h" +#include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" #include "util/StringHelpers.h" #include "java/InputOutputStream/DataOutputStream.h" #include "minecraft/world/Container.h" diff --git a/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h b/targets/app/common/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h similarity index 94% rename from targets/app/common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h rename to targets/app/common/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h index dd21a0414..3bc21d700 100644 --- a/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h +++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h @@ -5,7 +5,7 @@ #include #include "GameRuleDefinition.h" -#include "app/common/src/GameRules/ConsoleGameRulesConstants.h" +#include "app/common/GameRules/ConsoleGameRulesConstants.h" class Container; class AddEnchantmentRuleDefinition; diff --git a/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.cpp b/targets/app/common/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.cpp similarity index 94% rename from targets/app/common/src/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.cpp rename to targets/app/common/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.cpp index f12a9428c..f1ae569f7 100644 --- a/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.cpp +++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.cpp @@ -1,9 +1,9 @@ #include "CollectItemRuleDefinition.h" -#include "app/common/src/GameRules/ConsoleGameRulesConstants.h" -#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" -#include "app/common/src/GameRules/LevelRules/Rules/GameRule.h" -#include "app/common/src/GameRules/LevelRules/Rules/GameRulesInstance.h" +#include "app/common/GameRules/ConsoleGameRulesConstants.h" +#include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "app/common/GameRules/LevelRules/Rules/GameRule.h" +#include "app/common/GameRules/LevelRules/Rules/GameRulesInstance.h" #include "app/linux/LinuxGame.h" #include "util/StringHelpers.h" #include "java/InputOutputStream/DataOutputStream.h" diff --git a/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.h b/targets/app/common/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.h similarity index 90% rename from targets/app/common/src/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.h rename to targets/app/common/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.h index 8e40a3dcf..2bd8567f0 100644 --- a/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.h +++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.h @@ -4,8 +4,8 @@ #include #include "GameRuleDefinition.h" -#include "app/common/src/GameRules/ConsoleGameRulesConstants.h" -#include "app/common/src/GameRules/LevelRules/Rules/GameRulesInstance.h" +#include "app/common/GameRules/ConsoleGameRulesConstants.h" +#include "app/common/GameRules/LevelRules/Rules/GameRulesInstance.h" class Pos; class UseTileRuleDefinition; diff --git a/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.cpp b/targets/app/common/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.cpp similarity index 91% rename from targets/app/common/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.cpp rename to targets/app/common/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.cpp index d9e25e2d0..8eae45405 100644 --- a/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.cpp +++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.cpp @@ -4,9 +4,9 @@ #include #include -#include "app/common/src/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h" -#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" -#include "app/common/src/GameRules/LevelRules/Rules/GameRule.h" +#include "app/common/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h" +#include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "app/common/GameRules/LevelRules/Rules/GameRule.h" #include "app/linux/LinuxGame.h" #include "util/StringHelpers.h" #include "minecraft/network/Connection.h" diff --git a/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h b/targets/app/common/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h similarity index 92% rename from targets/app/common/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h rename to targets/app/common/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h index de8cef785..f32212ea2 100644 --- a/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h +++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h @@ -3,7 +3,7 @@ #include #include "CompoundGameRuleDefinition.h" -#include "app/common/src/GameRules/ConsoleGameRulesConstants.h" +#include "app/common/GameRules/ConsoleGameRulesConstants.h" class GameRule; diff --git a/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.cpp b/targets/app/common/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.cpp similarity index 85% rename from targets/app/common/src/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.cpp rename to targets/app/common/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.cpp index 0d3907fa8..0e3b3e54a 100644 --- a/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.cpp +++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.cpp @@ -7,14 +7,14 @@ #include #include -#include "app/common/src/GameRules/ConsoleGameRulesConstants.h" -#include "app/common/src/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.h" -#include "app/common/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h" -#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" -#include "app/common/src/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.h" -#include "app/common/src/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h" -#include "app/common/src/GameRules/LevelRules/Rules/GameRule.h" -#include "app/common/src/GameRules/LevelRules/Rules/GameRulesInstance.h" +#include "app/common/GameRules/ConsoleGameRulesConstants.h" +#include "app/common/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.h" +#include "app/common/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h" +#include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "app/common/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.h" +#include "app/common/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h" +#include "app/common/GameRules/LevelRules/Rules/GameRule.h" +#include "app/common/GameRules/LevelRules/Rules/GameRulesInstance.h" #include "util/StringHelpers.h" CompoundGameRuleDefinition::CompoundGameRuleDefinition() { diff --git a/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h b/targets/app/common/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h similarity index 86% rename from targets/app/common/src/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h rename to targets/app/common/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h index e9423599e..26b89124e 100644 --- a/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h +++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h @@ -3,8 +3,8 @@ #include #include "GameRuleDefinition.h" -#include "app/common/src/GameRules/ConsoleGameRulesConstants.h" -#include "app/common/src/GameRules/LevelRules/Rules/GameRulesInstance.h" +#include "app/common/GameRules/ConsoleGameRulesConstants.h" +#include "app/common/GameRules/LevelRules/Rules/GameRulesInstance.h" class CompoundGameRuleDefinition : public GameRuleDefinition { protected: diff --git a/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.cpp b/targets/app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.cpp similarity index 91% rename from targets/app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.cpp rename to targets/app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.cpp index ab7bcdbed..7ea580b34 100644 --- a/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.cpp +++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.cpp @@ -1,4 +1,4 @@ -#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" #include #include @@ -8,11 +8,11 @@ #include #include -#include "app/common/src/GameRules/ConsoleGameRulesConstants.h" -#include "app/common/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h" -#include "app/common/src/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h" -#include "app/common/src/GameRules/LevelRules/Rules/GameRule.h" -#include "app/common/src/GameRules/LevelRules/Rules/GameRulesInstance.h" +#include "app/common/GameRules/ConsoleGameRulesConstants.h" +#include "app/common/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h" +#include "app/common/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h" +#include "app/common/GameRules/LevelRules/Rules/GameRule.h" +#include "app/common/GameRules/LevelRules/Rules/GameRulesInstance.h" #include "app/linux/LinuxGame.h" #include "util/StringHelpers.h" #include "java/InputOutputStream/DataOutputStream.h" diff --git a/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h b/targets/app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h similarity index 95% rename from targets/app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h rename to targets/app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h index 179336f75..706914467 100644 --- a/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h +++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h @@ -6,8 +6,8 @@ #include #include -#include "app/common/src/GameRules/ConsoleGameRulesConstants.h" -#include "app/common/src/GameRules/LevelRules/Rules/GameRulesInstance.h" +#include "app/common/GameRules/ConsoleGameRulesConstants.h" +#include "app/common/GameRules/LevelRules/Rules/GameRulesInstance.h" #include "minecraft/world/item/ItemInstance.h" class GameRule; diff --git a/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/LevelRuleset.cpp b/targets/app/common/GameRules/LevelRules/RuleDefinitions/LevelRuleset.cpp similarity index 82% rename from targets/app/common/src/GameRules/LevelRules/RuleDefinitions/LevelRuleset.cpp rename to targets/app/common/GameRules/LevelRules/RuleDefinitions/LevelRuleset.cpp index cfba4e883..96e85c8ca 100644 --- a/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/LevelRuleset.cpp +++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/LevelRuleset.cpp @@ -1,9 +1,9 @@ #include "LevelRuleset.h" -#include "app/common/src/GameRules/ConsoleGameRulesConstants.h" -#include "app/common/src/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h" -#include "app/common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h" -#include "app/common/src/Localisation/StringTable.h" +#include "app/common/GameRules/ConsoleGameRulesConstants.h" +#include "app/common/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h" +#include "app/common/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h" +#include "app/common/Localisation/StringTable.h" class AABB; diff --git a/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h b/targets/app/common/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h similarity index 93% rename from targets/app/common/src/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h rename to targets/app/common/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h index 2cb2f546e..52e70174e 100644 --- a/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h +++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h @@ -4,7 +4,7 @@ #include #include "CompoundGameRuleDefinition.h" -#include "app/common/src/GameRules/ConsoleGameRulesConstants.h" +#include "app/common/GameRules/ConsoleGameRulesConstants.h" class NamedAreaRuleDefinition; class AABB; diff --git a/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.cpp b/targets/app/common/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.cpp similarity index 95% rename from targets/app/common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.cpp rename to targets/app/common/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.cpp index cd2d37903..28e46d186 100644 --- a/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.cpp +++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.cpp @@ -2,8 +2,8 @@ #include -#include "app/common/src/GameRules/ConsoleGameRulesConstants.h" -#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "app/common/GameRules/ConsoleGameRulesConstants.h" +#include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" #include "app/linux/LinuxGame.h" #include "util/StringHelpers.h" #include "java/InputOutputStream/DataOutputStream.h" diff --git a/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h b/targets/app/common/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h similarity index 91% rename from targets/app/common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h rename to targets/app/common/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h index 49394ff67..19c5c87fa 100644 --- a/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h +++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h @@ -3,7 +3,7 @@ #include #include "GameRuleDefinition.h" -#include "app/common/src/GameRules/ConsoleGameRulesConstants.h" +#include "app/common/GameRules/ConsoleGameRulesConstants.h" #include "minecraft/world/phys/AABB.h" class NamedAreaRuleDefinition : public GameRuleDefinition { diff --git a/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.cpp b/targets/app/common/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.cpp similarity index 95% rename from targets/app/common/src/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.cpp rename to targets/app/common/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.cpp index cdbcf25fe..58dfecb6c 100644 --- a/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.cpp +++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.cpp @@ -4,9 +4,9 @@ #include -#include "app/common/src/GameRules/ConsoleGameRulesConstants.h" -#include "app/common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h" -#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "app/common/GameRules/ConsoleGameRulesConstants.h" +#include "app/common/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h" +#include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" #include "app/linux/LinuxGame.h" #include "util/StringHelpers.h" #include "java/InputOutputStream/DataOutputStream.h" diff --git a/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.h b/targets/app/common/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.h similarity index 94% rename from targets/app/common/src/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.h rename to targets/app/common/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.h index a0e6c00ac..f529dd355 100644 --- a/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.h +++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.h @@ -5,7 +5,7 @@ #include #include "GameRuleDefinition.h" -#include "app/common/src/GameRules/ConsoleGameRulesConstants.h" +#include "app/common/GameRules/ConsoleGameRulesConstants.h" class AddItemRuleDefinition; class Pos; diff --git a/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.cpp b/targets/app/common/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.cpp similarity index 95% rename from targets/app/common/src/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.cpp rename to targets/app/common/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.cpp index bddf63ba0..a47b7e6b4 100644 --- a/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.cpp +++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.cpp @@ -1,7 +1,7 @@ #include "UseTileRuleDefinition.h" -#include "app/common/src/GameRules/ConsoleGameRulesConstants.h" -#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "app/common/GameRules/ConsoleGameRulesConstants.h" +#include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" #include "app/linux/LinuxGame.h" #include "util/StringHelpers.h" #include "java/InputOutputStream/DataOutputStream.h" diff --git a/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h b/targets/app/common/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h similarity index 92% rename from targets/app/common/src/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h rename to targets/app/common/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h index e07ff80ff..eb72a020b 100644 --- a/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h +++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h @@ -4,7 +4,7 @@ #include #include "GameRuleDefinition.h" -#include "app/common/src/GameRules/ConsoleGameRulesConstants.h" +#include "app/common/GameRules/ConsoleGameRulesConstants.h" #include "minecraft/Pos.h" class UseTileRuleDefinition : public GameRuleDefinition { diff --git a/targets/app/common/src/GameRules/LevelRules/Rules/GameRule.cpp b/targets/app/common/GameRules/LevelRules/Rules/GameRule.cpp similarity index 94% rename from targets/app/common/src/GameRules/LevelRules/Rules/GameRule.cpp rename to targets/app/common/GameRules/LevelRules/Rules/GameRule.cpp index 1d6e93938..5d00d72cd 100644 --- a/targets/app/common/src/GameRules/LevelRules/Rules/GameRule.cpp +++ b/targets/app/common/GameRules/LevelRules/Rules/GameRule.cpp @@ -1,5 +1,5 @@ -#include "app/common/src/GameRules/LevelRules/Rules/GameRule.h" +#include "app/common/GameRules/LevelRules/Rules/GameRule.h" #include @@ -8,7 +8,7 @@ #include #include -#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" #include "app/linux/Stubs/winapi_stubs.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" diff --git a/targets/app/common/src/GameRules/LevelRules/Rules/GameRule.h b/targets/app/common/GameRules/LevelRules/Rules/GameRule.h similarity index 100% rename from targets/app/common/src/GameRules/LevelRules/Rules/GameRule.h rename to targets/app/common/GameRules/LevelRules/Rules/GameRule.h diff --git a/targets/app/common/src/GameRules/LevelRules/Rules/GameRulesInstance.h b/targets/app/common/GameRules/LevelRules/Rules/GameRulesInstance.h similarity index 100% rename from targets/app/common/src/GameRules/LevelRules/Rules/GameRulesInstance.h rename to targets/app/common/GameRules/LevelRules/Rules/GameRulesInstance.h diff --git a/targets/app/common/src/GameRules/WstringLookup.cpp b/targets/app/common/GameRules/WstringLookup.cpp similarity index 100% rename from targets/app/common/src/GameRules/WstringLookup.cpp rename to targets/app/common/GameRules/WstringLookup.cpp diff --git a/targets/app/common/src/GameRules/WstringLookup.h b/targets/app/common/GameRules/WstringLookup.h similarity index 100% rename from targets/app/common/src/GameRules/WstringLookup.h rename to targets/app/common/GameRules/WstringLookup.h diff --git a/targets/app/common/src/Leaderboards/LeaderboardInterface.cpp b/targets/app/common/Leaderboards/LeaderboardInterface.cpp similarity index 97% rename from targets/app/common/src/Leaderboards/LeaderboardInterface.cpp rename to targets/app/common/Leaderboards/LeaderboardInterface.cpp index 38274afe2..979d7937b 100644 --- a/targets/app/common/src/Leaderboards/LeaderboardInterface.cpp +++ b/targets/app/common/Leaderboards/LeaderboardInterface.cpp @@ -2,7 +2,7 @@ #include -#include "app/common/src/Leaderboards/LeaderboardManager.h" +#include "app/common/Leaderboards/LeaderboardManager.h" LeaderboardInterface::LeaderboardInterface(IPlatformLeaderboard* man) { m_manager = man; diff --git a/targets/app/common/src/Leaderboards/LeaderboardInterface.h b/targets/app/common/Leaderboards/LeaderboardInterface.h similarity index 100% rename from targets/app/common/src/Leaderboards/LeaderboardInterface.h rename to targets/app/common/Leaderboards/LeaderboardInterface.h diff --git a/targets/app/common/src/Leaderboards/LeaderboardManager.cpp b/targets/app/common/Leaderboards/LeaderboardManager.cpp similarity index 100% rename from targets/app/common/src/Leaderboards/LeaderboardManager.cpp rename to targets/app/common/Leaderboards/LeaderboardManager.cpp diff --git a/targets/app/common/src/Leaderboards/LeaderboardManager.h b/targets/app/common/Leaderboards/LeaderboardManager.h similarity index 100% rename from targets/app/common/src/Leaderboards/LeaderboardManager.h rename to targets/app/common/Leaderboards/LeaderboardManager.h diff --git a/targets/app/common/src/Leaderboards/base64.cpp b/targets/app/common/Leaderboards/base64.cpp similarity index 100% rename from targets/app/common/src/Leaderboards/base64.cpp rename to targets/app/common/Leaderboards/base64.cpp diff --git a/targets/app/common/src/Leaderboards/base64.h b/targets/app/common/Leaderboards/base64.h similarity index 100% rename from targets/app/common/src/Leaderboards/base64.h rename to targets/app/common/Leaderboards/base64.h diff --git a/targets/app/common/src/Localisation/StringTable.cpp b/targets/app/common/Localisation/StringTable.cpp similarity index 100% rename from targets/app/common/src/Localisation/StringTable.cpp rename to targets/app/common/Localisation/StringTable.cpp diff --git a/targets/app/common/src/Localisation/StringTable.h b/targets/app/common/Localisation/StringTable.h similarity index 100% rename from targets/app/common/src/Localisation/StringTable.h rename to targets/app/common/Localisation/StringTable.h diff --git a/targets/app/include/MemTexture.h b/targets/app/common/MemTexture.h similarity index 100% rename from targets/app/include/MemTexture.h rename to targets/app/common/MemTexture.h diff --git a/targets/app/include/MemTextureProcessor.h b/targets/app/common/MemTextureProcessor.h similarity index 100% rename from targets/app/include/MemTextureProcessor.h rename to targets/app/common/MemTextureProcessor.h diff --git a/targets/app/include/MobSkinMemTextureProcessor.h b/targets/app/common/MobSkinMemTextureProcessor.h similarity index 88% rename from targets/app/include/MobSkinMemTextureProcessor.h rename to targets/app/common/MobSkinMemTextureProcessor.h index f1e4879bf..aa93beca9 100644 --- a/targets/app/include/MobSkinMemTextureProcessor.h +++ b/targets/app/common/MobSkinMemTextureProcessor.h @@ -1,5 +1,5 @@ #pragma once -#include "app/include/MemTextureProcessor.h" +#include "app/common/MemTextureProcessor.h" class MobSkinMemTextureProcessor : public MemTextureProcessor { private: diff --git a/targets/app/include/NetTypes.h b/targets/app/common/NetTypes.h similarity index 100% rename from targets/app/include/NetTypes.h rename to targets/app/common/NetTypes.h diff --git a/targets/app/common/src/Network/GameNetworkManager.cpp b/targets/app/common/Network/GameNetworkManager.cpp similarity index 99% rename from targets/app/common/src/Network/GameNetworkManager.cpp rename to targets/app/common/Network/GameNetworkManager.cpp index d133f22f2..7dc8275f3 100644 --- a/targets/app/common/src/Network/GameNetworkManager.cpp +++ b/targets/app/common/Network/GameNetworkManager.cpp @@ -15,18 +15,18 @@ #include "platform/sdl2/Storage.h" #include "app/common/App_enums.h" #include "app/common/Game.h" -#include "app/common/src/GameRules/GameRuleManager.h" -#include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" -#include "app/common/src/Network/NetworkPlayerInterface.h" -#include "app/common/src/Network/PlatformNetworkManagerStub.h" -#include "app/common/src/UI/All Platforms/UIEnums.h" -#include "app/common/src/UI/All Platforms/UIStructs.h" -#include "app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h" +#include "app/common/GameRules/GameRuleManager.h" +#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "app/common/Network/NetworkPlayerInterface.h" +#include "app/common/Network/PlatformNetworkManagerStub.h" +#include "app/common/UI/All Platforms/UIEnums.h" +#include "app/common/UI/All Platforms/UIStructs.h" +#include "app/common/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h" #include "app/linux/LinuxGame.h" #include "app/linux/Linux_UIController.h" #include "app/linux/Stubs/winapi_stubs.h" #include "Socket.h" -#include "XboxStubs.h" +#include "app/common/XboxStubs.h" #include "util/StringHelpers.h" #include "platform/PlatformServices.h" #include "minecraft/world/level/storage/ConsoleSaveFileIO/compression.h" diff --git a/targets/app/common/src/Network/GameNetworkManager.h b/targets/app/common/Network/GameNetworkManager.h similarity index 99% rename from targets/app/common/src/Network/GameNetworkManager.h rename to targets/app/common/Network/GameNetworkManager.h index 03df4262e..91073b4c3 100644 --- a/targets/app/common/src/Network/GameNetworkManager.h +++ b/targets/app/common/Network/GameNetworkManager.h @@ -9,7 +9,7 @@ #endif #include "platform/PlatformTypes.h" #include "platform/IPlatformNetwork.h" -#include "app/include/NetTypes.h" +#include "app/common/NetTypes.h" #include "NetworkPlayerInterface.h" #include "PlatformNetworkManagerStub.h" #include "SessionInfo.h" diff --git a/targets/app/common/src/Network/NetworkPlayerInterface.h b/targets/app/common/Network/NetworkPlayerInterface.h similarity index 100% rename from targets/app/common/src/Network/NetworkPlayerInterface.h rename to targets/app/common/Network/NetworkPlayerInterface.h diff --git a/targets/app/common/src/Network/NetworkPlayerQNet.cpp b/targets/app/common/Network/NetworkPlayerQNet.cpp similarity index 99% rename from targets/app/common/src/Network/NetworkPlayerQNet.cpp rename to targets/app/common/Network/NetworkPlayerQNet.cpp index 6794dc586..5fe259314 100644 --- a/targets/app/common/src/Network/NetworkPlayerQNet.cpp +++ b/targets/app/common/Network/NetworkPlayerQNet.cpp @@ -2,7 +2,7 @@ #include -#include "app/include/NetTypes.h" +#include "app/common/NetTypes.h" #include "java/System.h" NetworkPlayerQNet::NetworkPlayerQNet(IQNetPlayer* qnetPlayer) { diff --git a/targets/app/common/src/Network/NetworkPlayerQNet.h b/targets/app/common/Network/NetworkPlayerQNet.h similarity index 100% rename from targets/app/common/src/Network/NetworkPlayerQNet.h rename to targets/app/common/Network/NetworkPlayerQNet.h diff --git a/targets/app/common/src/Network/PlatformNetworkManagerInterface.h b/targets/app/common/Network/PlatformNetworkManagerInterface.h similarity index 98% rename from targets/app/common/src/Network/PlatformNetworkManagerInterface.h rename to targets/app/common/Network/PlatformNetworkManagerInterface.h index 0fbed1620..e93a38bc7 100644 --- a/targets/app/common/src/Network/PlatformNetworkManagerInterface.h +++ b/targets/app/common/Network/PlatformNetworkManagerInterface.h @@ -5,9 +5,9 @@ #if !defined(__linux__) #include #endif -#include "app/include/NetTypes.h" -#include "app/include/SkinBox.h" -#include "app/include/XboxStubs.h" +#include "app/common/NetTypes.h" +#include "app/common/SkinBox.h" +#include "app/common/XboxStubs.h" #include "NetworkPlayerInterface.h" #include "SessionInfo.h" #include "platform/C4JThread.h" diff --git a/targets/app/common/src/Network/PlatformNetworkManagerStub.cpp b/targets/app/common/Network/PlatformNetworkManagerStub.cpp similarity index 99% rename from targets/app/common/src/Network/PlatformNetworkManagerStub.cpp rename to targets/app/common/Network/PlatformNetworkManagerStub.cpp index 17fb5443a..646a2f97b 100644 --- a/targets/app/common/src/Network/PlatformNetworkManagerStub.cpp +++ b/targets/app/common/Network/PlatformNetworkManagerStub.cpp @@ -5,11 +5,11 @@ #include -#include "app/common/src/Network/GameNetworkManager.h" -#include "app/common/src/Network/NetworkPlayerInterface.h" +#include "app/common/Network/GameNetworkManager.h" +#include "app/common/Network/NetworkPlayerInterface.h" #include "app/linux/LinuxGame.h" #include "app/linux/Stubs/winapi_stubs.h" -#include "app/include/NetTypes.h" +#include "app/common/NetTypes.h" #include "NetworkPlayerQNet.h" #include "Socket.h" #include "platform/C4JThread.h" diff --git a/targets/app/common/src/Network/PlatformNetworkManagerStub.h b/targets/app/common/Network/PlatformNetworkManagerStub.h similarity index 98% rename from targets/app/common/src/Network/PlatformNetworkManagerStub.h rename to targets/app/common/Network/PlatformNetworkManagerStub.h index c9dac6743..bf7c115d9 100644 --- a/targets/app/common/src/Network/PlatformNetworkManagerStub.h +++ b/targets/app/common/Network/PlatformNetworkManagerStub.h @@ -5,9 +5,9 @@ #include #include "platform/PlatformTypes.h" -#include "app/include/NetTypes.h" -#include "app/include/SkinBox.h" -#include "app/include/XboxStubs.h" +#include "app/common/NetTypes.h" +#include "app/common/SkinBox.h" +#include "app/common/XboxStubs.h" #include "NetworkPlayerInterface.h" #include "platform/IPlatformNetwork.h" #include "SessionInfo.h" diff --git a/targets/app/common/src/Network/SessionInfo.h b/targets/app/common/Network/SessionInfo.h similarity index 96% rename from targets/app/common/src/Network/SessionInfo.h rename to targets/app/common/Network/SessionInfo.h index 471bb4409..077315e4a 100644 --- a/targets/app/common/src/Network/SessionInfo.h +++ b/targets/app/common/Network/SessionInfo.h @@ -1,6 +1,6 @@ #pragma once -#include "app/include/NetTypes.h" +#include "app/common/NetTypes.h" // A struct that we store in the QoS data when we are hosting the session. Max // size 1020 bytes. diff --git a/targets/app/common/src/Network/Socket.cpp b/targets/app/common/Network/Socket.cpp similarity index 99% rename from targets/app/common/src/Network/Socket.cpp rename to targets/app/common/Network/Socket.cpp index befdd7478..d0ea379c1 100644 --- a/targets/app/common/src/Network/Socket.cpp +++ b/targets/app/common/Network/Socket.cpp @@ -8,9 +8,9 @@ // 4jcraft TODO #include "platform/ShutdownManager.h" -#include "app/common/src/Network/GameNetworkManager.h" -#include "app/common/src/Network/NetworkPlayerInterface.h" -#include "app/include/NetTypes.h" +#include "app/common/Network/GameNetworkManager.h" +#include "app/common/Network/NetworkPlayerInterface.h" +#include "app/common/NetTypes.h" #include "minecraft/server/network/ServerConnection.h" class SocketAddress {}; diff --git a/targets/app/common/src/Network/Socket.h b/targets/app/common/Network/Socket.h similarity index 98% rename from targets/app/common/src/Network/Socket.h rename to targets/app/common/Network/Socket.h index b862d5c77..e8d69ff85 100644 --- a/targets/app/common/src/Network/Socket.h +++ b/targets/app/common/Network/Socket.h @@ -10,8 +10,8 @@ #include #include -#include "app/common/src/Network/GameNetworkManager.h" -#include "app/common/src/Network/NetworkPlayerInterface.h" +#include "app/common/Network/GameNetworkManager.h" +#include "app/common/Network/NetworkPlayerInterface.h" #include "platform/C4JThread.h" #include "java/InputOutputStream/InputStream.h" #include "java/InputOutputStream/OutputStream.h" diff --git a/targets/app/include/SkinBox.h b/targets/app/common/SkinBox.h similarity index 100% rename from targets/app/include/SkinBox.h rename to targets/app/common/SkinBox.h diff --git a/targets/app/common/src/Trial/TrialMode.cpp b/targets/app/common/Trial/TrialMode.cpp similarity index 72% rename from targets/app/common/src/Trial/TrialMode.cpp rename to targets/app/common/Trial/TrialMode.cpp index a1138b853..71b3f785c 100644 --- a/targets/app/common/src/Trial/TrialMode.cpp +++ b/targets/app/common/Trial/TrialMode.cpp @@ -1,7 +1,7 @@ #include "TrialMode.h" -#include "app/common/src/Tutorial/FullTutorial.h" -#include "app/common/src/Tutorial/FullTutorialMode.h" +#include "app/common/Tutorial/FullTutorial.h" +#include "app/common/Tutorial/FullTutorialMode.h" class ClientConnection; class Minecraft; diff --git a/targets/app/common/src/Trial/TrialMode.h b/targets/app/common/Trial/TrialMode.h similarity index 81% rename from targets/app/common/src/Trial/TrialMode.h rename to targets/app/common/Trial/TrialMode.h index 41a7d92d5..a6908f97f 100644 --- a/targets/app/common/src/Trial/TrialMode.h +++ b/targets/app/common/Trial/TrialMode.h @@ -1,5 +1,5 @@ #pragma once -#include "app/common/src/Tutorial/FullTutorialMode.h" +#include "app/common/Tutorial/FullTutorialMode.h" class ClientConnection; class Minecraft; diff --git a/targets/app/common/src/Tutorial/Constraints/AreaConstraint.cpp b/targets/app/common/Tutorial/Constraints/AreaConstraint.cpp similarity index 96% rename from targets/app/common/src/Tutorial/Constraints/AreaConstraint.cpp rename to targets/app/common/Tutorial/Constraints/AreaConstraint.cpp index a49d44ecd..c5625cb82 100644 --- a/targets/app/common/src/Tutorial/Constraints/AreaConstraint.cpp +++ b/targets/app/common/Tutorial/Constraints/AreaConstraint.cpp @@ -2,7 +2,7 @@ #include -#include "app/common/src/Tutorial/Constraints/TutorialConstraint.h" +#include "app/common/Tutorial/Constraints/TutorialConstraint.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "minecraft/world/phys/AABB.h" diff --git a/targets/app/common/src/Tutorial/Constraints/AreaConstraint.h b/targets/app/common/Tutorial/Constraints/AreaConstraint.h similarity index 100% rename from targets/app/common/src/Tutorial/Constraints/AreaConstraint.h rename to targets/app/common/Tutorial/Constraints/AreaConstraint.h diff --git a/targets/app/common/src/Tutorial/Constraints/ChangeStateConstraint.cpp b/targets/app/common/Tutorial/Constraints/ChangeStateConstraint.cpp similarity index 96% rename from targets/app/common/src/Tutorial/Constraints/ChangeStateConstraint.cpp rename to targets/app/common/Tutorial/Constraints/ChangeStateConstraint.cpp index 8669f4c5d..5135f2c8e 100644 --- a/targets/app/common/src/Tutorial/Constraints/ChangeStateConstraint.cpp +++ b/targets/app/common/Tutorial/Constraints/ChangeStateConstraint.cpp @@ -2,10 +2,10 @@ #include -#include "app/common/src/Network/NetworkPlayerInterface.h" -#include "app/common/src/Tutorial/Constraints/TutorialConstraint.h" -#include "app/common/src/Tutorial/Tutorial.h" -#include "app/common/src/Tutorial/TutorialEnum.h" +#include "app/common/Network/NetworkPlayerInterface.h" +#include "app/common/Tutorial/Constraints/TutorialConstraint.h" +#include "app/common/Tutorial/Tutorial.h" +#include "app/common/Tutorial/TutorialEnum.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/ClientConnection.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" diff --git a/targets/app/common/src/Tutorial/Constraints/ChangeStateConstraint.h b/targets/app/common/Tutorial/Constraints/ChangeStateConstraint.h similarity index 96% rename from targets/app/common/src/Tutorial/Constraints/ChangeStateConstraint.h rename to targets/app/common/Tutorial/Constraints/ChangeStateConstraint.h index 9c059151c..b87601123 100644 --- a/targets/app/common/src/Tutorial/Constraints/ChangeStateConstraint.h +++ b/targets/app/common/Tutorial/Constraints/ChangeStateConstraint.h @@ -2,7 +2,7 @@ #include -#include "app/common/src/Tutorial/TutorialEnum.h" +#include "app/common/Tutorial/TutorialEnum.h" #include "TutorialConstraint.h" #include "minecraft/world/phys/AABB.h" diff --git a/targets/app/common/src/Tutorial/Constraints/InputConstraint.cpp b/targets/app/common/Tutorial/Constraints/InputConstraint.cpp similarity index 100% rename from targets/app/common/src/Tutorial/Constraints/InputConstraint.cpp rename to targets/app/common/Tutorial/Constraints/InputConstraint.cpp diff --git a/targets/app/common/src/Tutorial/Constraints/InputConstraint.h b/targets/app/common/Tutorial/Constraints/InputConstraint.h similarity index 100% rename from targets/app/common/src/Tutorial/Constraints/InputConstraint.h rename to targets/app/common/Tutorial/Constraints/InputConstraint.h diff --git a/targets/app/common/src/Tutorial/Constraints/TutorialConstraint.h b/targets/app/common/Tutorial/Constraints/TutorialConstraint.h similarity index 100% rename from targets/app/common/src/Tutorial/Constraints/TutorialConstraint.h rename to targets/app/common/Tutorial/Constraints/TutorialConstraint.h diff --git a/targets/app/common/src/Tutorial/Constraints/TutorialConstraints.h b/targets/app/common/Tutorial/Constraints/TutorialConstraints.h similarity index 100% rename from targets/app/common/src/Tutorial/Constraints/TutorialConstraints.h rename to targets/app/common/Tutorial/Constraints/TutorialConstraints.h diff --git a/targets/app/common/src/Tutorial/FullTutorial.cpp b/targets/app/common/Tutorial/FullTutorial.cpp similarity index 98% rename from targets/app/common/src/Tutorial/FullTutorial.cpp rename to targets/app/common/Tutorial/FullTutorial.cpp index 8f79ed9d7..c0d45db3d 100644 --- a/targets/app/common/src/Tutorial/FullTutorial.cpp +++ b/targets/app/common/Tutorial/FullTutorial.cpp @@ -4,26 +4,26 @@ #include #include "platform/InputActions.h" -#include "app/common/src/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h" -#include "app/common/src/Tutorial/Constraints/AreaConstraint.h" -#include "app/common/src/Tutorial/Constraints/ChangeStateConstraint.h" -#include "app/common/src/Tutorial/Hints/AreaHint.h" -#include "app/common/src/Tutorial/Tasks/AreaTask.h" -#include "app/common/src/Tutorial/Tasks/ChoiceTask.h" -#include "app/common/src/Tutorial/Tasks/CompleteUsingItemTask.h" -#include "app/common/src/Tutorial/Tasks/ControllerTask.h" -#include "app/common/src/Tutorial/Tasks/CraftTask.h" -#include "app/common/src/Tutorial/Tasks/EffectChangedTask.h" -#include "app/common/src/Tutorial/Tasks/FullTutorialActiveTask.h" -#include "app/common/src/Tutorial/Tasks/InfoTask.h" -#include "app/common/src/Tutorial/Tasks/PickupTask.h" -#include "app/common/src/Tutorial/Tasks/ProcedureCompoundTask.h" -#include "app/common/src/Tutorial/Tasks/ProgressFlagTask.h" -#include "app/common/src/Tutorial/Tasks/StateChangeTask.h" -#include "app/common/src/Tutorial/Tasks/UseItemTask.h" -#include "app/common/src/Tutorial/Tasks/UseTileTask.h" -#include "app/common/src/Tutorial/Tasks/XuiCraftingTask.h" -#include "app/common/src/Tutorial/Tutorial.h" +#include "app/common/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h" +#include "app/common/Tutorial/Constraints/AreaConstraint.h" +#include "app/common/Tutorial/Constraints/ChangeStateConstraint.h" +#include "app/common/Tutorial/Hints/AreaHint.h" +#include "app/common/Tutorial/Tasks/AreaTask.h" +#include "app/common/Tutorial/Tasks/ChoiceTask.h" +#include "app/common/Tutorial/Tasks/CompleteUsingItemTask.h" +#include "app/common/Tutorial/Tasks/ControllerTask.h" +#include "app/common/Tutorial/Tasks/CraftTask.h" +#include "app/common/Tutorial/Tasks/EffectChangedTask.h" +#include "app/common/Tutorial/Tasks/FullTutorialActiveTask.h" +#include "app/common/Tutorial/Tasks/InfoTask.h" +#include "app/common/Tutorial/Tasks/PickupTask.h" +#include "app/common/Tutorial/Tasks/ProcedureCompoundTask.h" +#include "app/common/Tutorial/Tasks/ProgressFlagTask.h" +#include "app/common/Tutorial/Tasks/StateChangeTask.h" +#include "app/common/Tutorial/Tasks/UseItemTask.h" +#include "app/common/Tutorial/Tasks/UseTileTask.h" +#include "app/common/Tutorial/Tasks/XuiCraftingTask.h" +#include "app/common/Tutorial/Tutorial.h" #include "app/linux/LinuxGame.h" #include "minecraft/world/effect/MobEffect.h" #include "minecraft/world/item/Item.h" diff --git a/targets/app/common/src/Tutorial/FullTutorial.h b/targets/app/common/Tutorial/FullTutorial.h similarity index 92% rename from targets/app/common/src/Tutorial/FullTutorial.h rename to targets/app/common/Tutorial/FullTutorial.h index 22c2d2ec8..ddf86922d 100644 --- a/targets/app/common/src/Tutorial/FullTutorial.h +++ b/targets/app/common/Tutorial/FullTutorial.h @@ -1,5 +1,5 @@ #pragma once -#include "app/common/src/Tutorial/TutorialEnum.h" +#include "app/common/Tutorial/TutorialEnum.h" #include "Tutorial.h" #define FULL_TUTORIAL_PROGRESS_2_X_2_Crafting 1 diff --git a/targets/app/common/src/Tutorial/FullTutorialMode.cpp b/targets/app/common/Tutorial/FullTutorialMode.cpp similarity index 83% rename from targets/app/common/src/Tutorial/FullTutorialMode.cpp rename to targets/app/common/Tutorial/FullTutorialMode.cpp index 55a5b9621..f9500d5f7 100644 --- a/targets/app/common/src/Tutorial/FullTutorialMode.cpp +++ b/targets/app/common/Tutorial/FullTutorialMode.cpp @@ -1,8 +1,8 @@ #include "FullTutorialMode.h" #include "FullTutorial.h" -#include "app/common/src/Tutorial/Tutorial.h" -#include "app/common/src/Tutorial/TutorialMode.h" +#include "app/common/Tutorial/Tutorial.h" +#include "app/common/Tutorial/TutorialMode.h" #include "minecraft/client/Minecraft.h" class ClientConnection; diff --git a/targets/app/common/src/Tutorial/FullTutorialMode.h b/targets/app/common/Tutorial/FullTutorialMode.h similarity index 100% rename from targets/app/common/src/Tutorial/FullTutorialMode.h rename to targets/app/common/Tutorial/FullTutorialMode.h diff --git a/targets/app/common/src/Tutorial/Hints/AreaHint.cpp b/targets/app/common/Tutorial/Hints/AreaHint.cpp similarity index 90% rename from targets/app/common/src/Tutorial/Hints/AreaHint.cpp rename to targets/app/common/Tutorial/Hints/AreaHint.cpp index c42ca2354..8f4501cdc 100644 --- a/targets/app/common/src/Tutorial/Hints/AreaHint.cpp +++ b/targets/app/common/Tutorial/Hints/AreaHint.cpp @@ -2,9 +2,9 @@ #include -#include "app/common/src/Tutorial/Hints/TutorialHint.h" -#include "app/common/src/Tutorial/Tutorial.h" -#include "app/common/src/Tutorial/TutorialEnum.h" +#include "app/common/Tutorial/Hints/TutorialHint.h" +#include "app/common/Tutorial/Tutorial.h" +#include "app/common/Tutorial/TutorialEnum.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "minecraft/world/phys/AABB.h" diff --git a/targets/app/common/src/Tutorial/Hints/AreaHint.h b/targets/app/common/Tutorial/Hints/AreaHint.h similarity index 94% rename from targets/app/common/src/Tutorial/Hints/AreaHint.h rename to targets/app/common/Tutorial/Hints/AreaHint.h index e3922e008..375abfc99 100644 --- a/targets/app/common/src/Tutorial/Hints/AreaHint.h +++ b/targets/app/common/Tutorial/Hints/AreaHint.h @@ -1,6 +1,6 @@ #pragma once -#include "app/common/src/Tutorial/TutorialEnum.h" +#include "app/common/Tutorial/TutorialEnum.h" #include "TutorialHint.h" #include "minecraft/world/phys/AABB.h" diff --git a/targets/app/common/src/Tutorial/Hints/DiggerItemHint.cpp b/targets/app/common/Tutorial/Hints/DiggerItemHint.cpp similarity index 95% rename from targets/app/common/src/Tutorial/Hints/DiggerItemHint.cpp rename to targets/app/common/Tutorial/Hints/DiggerItemHint.cpp index 2742c963c..dfea1d621 100644 --- a/targets/app/common/src/Tutorial/Hints/DiggerItemHint.cpp +++ b/targets/app/common/Tutorial/Hints/DiggerItemHint.cpp @@ -3,8 +3,8 @@ #include -#include "app/common/src/Tutorial/Hints/TutorialHint.h" -#include "app/common/src/Tutorial/Tutorial.h" +#include "app/common/Tutorial/Hints/TutorialHint.h" +#include "app/common/Tutorial/Tutorial.h" #include "java/Class.h" #include "minecraft/world/entity/Entity.h" #include "minecraft/world/item/ItemInstance.h" diff --git a/targets/app/common/src/Tutorial/Hints/DiggerItemHint.h b/targets/app/common/Tutorial/Hints/DiggerItemHint.h similarity index 91% rename from targets/app/common/src/Tutorial/Hints/DiggerItemHint.h rename to targets/app/common/Tutorial/Hints/DiggerItemHint.h index 45357afe1..95ba875e2 100644 --- a/targets/app/common/src/Tutorial/Hints/DiggerItemHint.h +++ b/targets/app/common/Tutorial/Hints/DiggerItemHint.h @@ -1,6 +1,6 @@ #pragma once -#include "app/common/src/Tutorial/TutorialEnum.h" +#include "app/common/Tutorial/TutorialEnum.h" #include "TutorialHint.h" class DiggerItem; diff --git a/targets/app/common/src/Tutorial/Hints/LookAtEntityHint.cpp b/targets/app/common/Tutorial/Hints/LookAtEntityHint.cpp similarity index 83% rename from targets/app/common/src/Tutorial/Hints/LookAtEntityHint.cpp rename to targets/app/common/Tutorial/Hints/LookAtEntityHint.cpp index 94ce2a8a6..486259a5a 100644 --- a/targets/app/common/src/Tutorial/Hints/LookAtEntityHint.cpp +++ b/targets/app/common/Tutorial/Hints/LookAtEntityHint.cpp @@ -1,8 +1,8 @@ #include "LookAtEntityHint.h" -#include "app/common/src/Tutorial/Hints/TutorialHint.h" -#include "app/common/src/Tutorial/Tutorial.h" -#include "app/common/src/Tutorial/TutorialEnum.h" +#include "app/common/Tutorial/Hints/TutorialHint.h" +#include "app/common/Tutorial/Tutorial.h" +#include "app/common/Tutorial/TutorialEnum.h" LookAtEntityHint::LookAtEntityHint(eTutorial_Hint id, Tutorial* tutorial, int descriptionId, int titleId, diff --git a/targets/app/common/src/Tutorial/Hints/LookAtEntityHint.h b/targets/app/common/Tutorial/Hints/LookAtEntityHint.h similarity index 90% rename from targets/app/common/src/Tutorial/Hints/LookAtEntityHint.h rename to targets/app/common/Tutorial/Hints/LookAtEntityHint.h index 6633ae8cd..d74b98767 100644 --- a/targets/app/common/src/Tutorial/Hints/LookAtEntityHint.h +++ b/targets/app/common/Tutorial/Hints/LookAtEntityHint.h @@ -1,7 +1,7 @@ #pragma once // using namespace std; -#include "app/common/src/Tutorial/TutorialEnum.h" +#include "app/common/Tutorial/TutorialEnum.h" #include "TutorialHint.h" #include "java/Class.h" diff --git a/targets/app/common/src/Tutorial/Hints/LookAtTileHint.cpp b/targets/app/common/Tutorial/Hints/LookAtTileHint.cpp similarity index 92% rename from targets/app/common/src/Tutorial/Hints/LookAtTileHint.cpp rename to targets/app/common/Tutorial/Hints/LookAtTileHint.cpp index cf65ae02a..2c07bbab6 100644 --- a/targets/app/common/src/Tutorial/Hints/LookAtTileHint.cpp +++ b/targets/app/common/Tutorial/Hints/LookAtTileHint.cpp @@ -2,9 +2,9 @@ #include -#include "app/common/src/Tutorial/Hints/TutorialHint.h" -#include "app/common/src/Tutorial/Tutorial.h" -#include "app/common/src/Tutorial/TutorialEnum.h" +#include "app/common/Tutorial/Hints/TutorialHint.h" +#include "app/common/Tutorial/Tutorial.h" +#include "app/common/Tutorial/TutorialEnum.h" #include "minecraft/world/item/Item.h" LookAtTileHint::LookAtTileHint(eTutorial_Hint id, Tutorial* tutorial, diff --git a/targets/app/common/src/Tutorial/Hints/LookAtTileHint.h b/targets/app/common/Tutorial/Hints/LookAtTileHint.h similarity index 92% rename from targets/app/common/src/Tutorial/Hints/LookAtTileHint.h rename to targets/app/common/Tutorial/Hints/LookAtTileHint.h index dd133f291..514c4fc43 100644 --- a/targets/app/common/src/Tutorial/Hints/LookAtTileHint.h +++ b/targets/app/common/Tutorial/Hints/LookAtTileHint.h @@ -1,7 +1,7 @@ #pragma once // using namespace std; -#include "app/common/src/Tutorial/TutorialEnum.h" +#include "app/common/Tutorial/TutorialEnum.h" #include "TutorialHint.h" class ItemInstance; diff --git a/targets/app/common/src/Tutorial/Hints/TakeItemHint.cpp b/targets/app/common/Tutorial/Hints/TakeItemHint.cpp similarity index 88% rename from targets/app/common/src/Tutorial/Hints/TakeItemHint.cpp rename to targets/app/common/Tutorial/Hints/TakeItemHint.cpp index b059d5b31..51d3356e1 100644 --- a/targets/app/common/src/Tutorial/Hints/TakeItemHint.cpp +++ b/targets/app/common/Tutorial/Hints/TakeItemHint.cpp @@ -2,9 +2,9 @@ #include -#include "app/common/src/Tutorial/Hints/TutorialHint.h" -#include "app/common/src/Tutorial/Tutorial.h" -#include "app/common/src/Tutorial/TutorialEnum.h" +#include "app/common/Tutorial/Hints/TutorialHint.h" +#include "app/common/Tutorial/Tutorial.h" +#include "app/common/Tutorial/TutorialEnum.h" #include "minecraft/world/item/ItemInstance.h" TakeItemHint::TakeItemHint(eTutorial_Hint id, Tutorial* tutorial, int items[], diff --git a/targets/app/common/src/Tutorial/Hints/TakeItemHint.h b/targets/app/common/Tutorial/Hints/TakeItemHint.h similarity index 90% rename from targets/app/common/src/Tutorial/Hints/TakeItemHint.h rename to targets/app/common/Tutorial/Hints/TakeItemHint.h index e836aa618..0cb9c6928 100644 --- a/targets/app/common/src/Tutorial/Hints/TakeItemHint.h +++ b/targets/app/common/Tutorial/Hints/TakeItemHint.h @@ -1,7 +1,7 @@ #pragma once // using namespace std; -#include "app/common/src/Tutorial/TutorialEnum.h" +#include "app/common/Tutorial/TutorialEnum.h" #include "TutorialHint.h" class ItemInstance; diff --git a/targets/app/common/src/Tutorial/Hints/TutorialHint.cpp b/targets/app/common/Tutorial/Hints/TutorialHint.cpp similarity index 96% rename from targets/app/common/src/Tutorial/Hints/TutorialHint.cpp rename to targets/app/common/Tutorial/Hints/TutorialHint.cpp index 14f89c60f..1122ceb00 100644 --- a/targets/app/common/src/Tutorial/Hints/TutorialHint.cpp +++ b/targets/app/common/Tutorial/Hints/TutorialHint.cpp @@ -1,7 +1,7 @@ #include "TutorialHint.h" -#include "app/common/src/Tutorial/Tutorial.h" -#include "app/common/src/Tutorial/TutorialEnum.h" +#include "app/common/Tutorial/Tutorial.h" +#include "app/common/Tutorial/TutorialEnum.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "minecraft/world/level/material/Material.h" diff --git a/targets/app/common/src/Tutorial/Hints/TutorialHint.h b/targets/app/common/Tutorial/Hints/TutorialHint.h similarity index 96% rename from targets/app/common/src/Tutorial/Hints/TutorialHint.h rename to targets/app/common/Tutorial/Hints/TutorialHint.h index b30746df0..0ef31b135 100644 --- a/targets/app/common/src/Tutorial/Hints/TutorialHint.h +++ b/targets/app/common/Tutorial/Hints/TutorialHint.h @@ -3,7 +3,7 @@ #include -#include "app/common/src/Tutorial/TutorialEnum.h" +#include "app/common/Tutorial/TutorialEnum.h" #include "java/Class.h" class Entity; diff --git a/targets/app/common/src/Tutorial/Hints/TutorialHints.h b/targets/app/common/Tutorial/Hints/TutorialHints.h similarity index 100% rename from targets/app/common/src/Tutorial/Hints/TutorialHints.h rename to targets/app/common/Tutorial/Hints/TutorialHints.h diff --git a/targets/app/common/src/Tutorial/Tasks/AreaTask.cpp b/targets/app/common/Tutorial/Tasks/AreaTask.cpp similarity index 89% rename from targets/app/common/src/Tutorial/Tasks/AreaTask.cpp rename to targets/app/common/Tutorial/Tasks/AreaTask.cpp index c81e0f004..d3b5c7ebb 100644 --- a/targets/app/common/src/Tutorial/Tasks/AreaTask.cpp +++ b/targets/app/common/Tutorial/Tasks/AreaTask.cpp @@ -2,10 +2,10 @@ #include -#include "app/common/src/Tutorial/Constraints/TutorialConstraint.h" -#include "app/common/src/Tutorial/Tasks/TutorialTask.h" -#include "app/common/src/Tutorial/Tutorial.h" -#include "app/common/src/Tutorial/TutorialEnum.h" +#include "app/common/Tutorial/Constraints/TutorialConstraint.h" +#include "app/common/Tutorial/Tasks/TutorialTask.h" +#include "app/common/Tutorial/Tutorial.h" +#include "app/common/Tutorial/TutorialEnum.h" AreaTask::AreaTask(eTutorial_State state, Tutorial* tutorial, std::vector* inConstraints, diff --git a/targets/app/common/src/Tutorial/Tasks/AreaTask.h b/targets/app/common/Tutorial/Tasks/AreaTask.h similarity index 94% rename from targets/app/common/src/Tutorial/Tasks/AreaTask.h rename to targets/app/common/Tutorial/Tasks/AreaTask.h index 8b8111bea..fbbd20bcc 100644 --- a/targets/app/common/src/Tutorial/Tasks/AreaTask.h +++ b/targets/app/common/Tutorial/Tasks/AreaTask.h @@ -4,7 +4,7 @@ #include #include -#include "app/common/src/Tutorial/TutorialEnum.h" +#include "app/common/Tutorial/TutorialEnum.h" #include "TutorialTask.h" class Tutorial; diff --git a/targets/app/common/src/Tutorial/Tasks/ChoiceTask.cpp b/targets/app/common/Tutorial/Tasks/ChoiceTask.cpp similarity index 93% rename from targets/app/common/src/Tutorial/Tasks/ChoiceTask.cpp rename to targets/app/common/Tutorial/Tasks/ChoiceTask.cpp index fb243c15c..9847c2981 100644 --- a/targets/app/common/src/Tutorial/Tasks/ChoiceTask.cpp +++ b/targets/app/common/Tutorial/Tasks/ChoiceTask.cpp @@ -4,10 +4,10 @@ #include #include "platform/sdl2/Input.h" -#include "app/common/src/Tutorial/Constraints/InputConstraint.h" -#include "app/common/src/Tutorial/Tasks/TutorialTask.h" -#include "app/common/src/Tutorial/Tutorial.h" -#include "app/common/src/Tutorial/TutorialEnum.h" +#include "app/common/Tutorial/Constraints/InputConstraint.h" +#include "app/common/Tutorial/Tasks/TutorialTask.h" +#include "app/common/Tutorial/Tutorial.h" +#include "app/common/Tutorial/TutorialEnum.h" #include "app/linux/Linux_UIController.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" diff --git a/targets/app/common/src/Tutorial/Tasks/ChoiceTask.h b/targets/app/common/Tutorial/Tasks/ChoiceTask.h similarity index 94% rename from targets/app/common/src/Tutorial/Tasks/ChoiceTask.h rename to targets/app/common/Tutorial/Tasks/ChoiceTask.h index 2e54de703..7faf10682 100644 --- a/targets/app/common/src/Tutorial/Tasks/ChoiceTask.h +++ b/targets/app/common/Tutorial/Tasks/ChoiceTask.h @@ -1,7 +1,7 @@ #pragma once // using namespace std; -#include "app/common/src/Tutorial/TutorialEnum.h" +#include "app/common/Tutorial/TutorialEnum.h" #include "TutorialTask.h" class Tutorial; diff --git a/targets/app/common/src/Tutorial/Tasks/CompleteUsingItemTask.cpp b/targets/app/common/Tutorial/Tasks/CompleteUsingItemTask.cpp similarity index 95% rename from targets/app/common/src/Tutorial/Tasks/CompleteUsingItemTask.cpp rename to targets/app/common/Tutorial/Tasks/CompleteUsingItemTask.cpp index 09a6f8fd6..24be8f6ce 100644 --- a/targets/app/common/src/Tutorial/Tasks/CompleteUsingItemTask.cpp +++ b/targets/app/common/Tutorial/Tasks/CompleteUsingItemTask.cpp @@ -2,7 +2,7 @@ #include -#include "app/common/src/Tutorial/Tasks/TutorialTask.h" +#include "app/common/Tutorial/Tasks/TutorialTask.h" #include "minecraft/world/item/ItemInstance.h" class Tutorial; diff --git a/targets/app/common/src/Tutorial/Tasks/CompleteUsingItemTask.h b/targets/app/common/Tutorial/Tasks/CompleteUsingItemTask.h similarity index 100% rename from targets/app/common/src/Tutorial/Tasks/CompleteUsingItemTask.h rename to targets/app/common/Tutorial/Tasks/CompleteUsingItemTask.h diff --git a/targets/app/common/src/Tutorial/Tasks/ControllerTask.cpp b/targets/app/common/Tutorial/Tasks/ControllerTask.cpp similarity index 97% rename from targets/app/common/src/Tutorial/Tasks/ControllerTask.cpp rename to targets/app/common/Tutorial/Tasks/ControllerTask.cpp index aaf25d66e..c59a87c06 100644 --- a/targets/app/common/src/Tutorial/Tasks/ControllerTask.cpp +++ b/targets/app/common/Tutorial/Tasks/ControllerTask.cpp @@ -8,8 +8,8 @@ #include "platform/sdl2/Input.h" #include "app/common/App_enums.h" -#include "app/common/src/Tutorial/Constraints/InputConstraint.h" -#include "app/common/src/Tutorial/Tasks/TutorialTask.h" +#include "app/common/Tutorial/Constraints/InputConstraint.h" +#include "app/common/Tutorial/Tasks/TutorialTask.h" #include "app/linux/LinuxGame.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" diff --git a/targets/app/common/src/Tutorial/Tasks/ControllerTask.h b/targets/app/common/Tutorial/Tasks/ControllerTask.h similarity index 100% rename from targets/app/common/src/Tutorial/Tasks/ControllerTask.h rename to targets/app/common/Tutorial/Tasks/ControllerTask.h diff --git a/targets/app/common/src/Tutorial/Tasks/CraftTask.cpp b/targets/app/common/Tutorial/Tasks/CraftTask.cpp similarity index 97% rename from targets/app/common/src/Tutorial/Tasks/CraftTask.cpp rename to targets/app/common/Tutorial/Tasks/CraftTask.cpp index bb8b59ca5..6af9a997d 100644 --- a/targets/app/common/src/Tutorial/Tasks/CraftTask.cpp +++ b/targets/app/common/Tutorial/Tasks/CraftTask.cpp @@ -5,7 +5,7 @@ #include #include -#include "app/common/src/Tutorial/Tasks/TutorialTask.h" +#include "app/common/Tutorial/Tasks/TutorialTask.h" #include "minecraft/world/item/ItemInstance.h" class Tutorial; diff --git a/targets/app/common/src/Tutorial/Tasks/CraftTask.h b/targets/app/common/Tutorial/Tasks/CraftTask.h similarity index 100% rename from targets/app/common/src/Tutorial/Tasks/CraftTask.h rename to targets/app/common/Tutorial/Tasks/CraftTask.h diff --git a/targets/app/common/src/Tutorial/Tasks/EffectChangedTask.cpp b/targets/app/common/Tutorial/Tasks/EffectChangedTask.cpp similarity index 94% rename from targets/app/common/src/Tutorial/Tasks/EffectChangedTask.cpp rename to targets/app/common/Tutorial/Tasks/EffectChangedTask.cpp index afd13e041..0e4f137fb 100644 --- a/targets/app/common/src/Tutorial/Tasks/EffectChangedTask.cpp +++ b/targets/app/common/Tutorial/Tasks/EffectChangedTask.cpp @@ -1,6 +1,6 @@ #include "EffectChangedTask.h" -#include "app/common/src/Tutorial/Tasks/TutorialTask.h" +#include "app/common/Tutorial/Tasks/TutorialTask.h" class Tutorial; diff --git a/targets/app/common/src/Tutorial/Tasks/EffectChangedTask.h b/targets/app/common/Tutorial/Tasks/EffectChangedTask.h similarity index 100% rename from targets/app/common/src/Tutorial/Tasks/EffectChangedTask.h rename to targets/app/common/Tutorial/Tasks/EffectChangedTask.h diff --git a/targets/app/common/src/Tutorial/Tasks/FullTutorialActiveTask.cpp b/targets/app/common/Tutorial/Tasks/FullTutorialActiveTask.cpp similarity index 79% rename from targets/app/common/src/Tutorial/Tasks/FullTutorialActiveTask.cpp rename to targets/app/common/Tutorial/Tasks/FullTutorialActiveTask.cpp index 27604b4cc..eba2e6900 100644 --- a/targets/app/common/src/Tutorial/Tasks/FullTutorialActiveTask.cpp +++ b/targets/app/common/Tutorial/Tasks/FullTutorialActiveTask.cpp @@ -1,8 +1,8 @@ #include "FullTutorialActiveTask.h" -#include "app/common/src/Tutorial/Tasks/TutorialTask.h" -#include "app/common/src/Tutorial/Tutorial.h" -#include "app/common/src/Tutorial/TutorialEnum.h" +#include "app/common/Tutorial/Tasks/TutorialTask.h" +#include "app/common/Tutorial/Tutorial.h" +#include "app/common/Tutorial/TutorialEnum.h" FullTutorialActiveTask::FullTutorialActiveTask( Tutorial* tutorial, diff --git a/targets/app/common/src/Tutorial/Tasks/FullTutorialActiveTask.h b/targets/app/common/Tutorial/Tasks/FullTutorialActiveTask.h similarity index 91% rename from targets/app/common/src/Tutorial/Tasks/FullTutorialActiveTask.h rename to targets/app/common/Tutorial/Tasks/FullTutorialActiveTask.h index b150d764d..bcee51649 100644 --- a/targets/app/common/src/Tutorial/Tasks/FullTutorialActiveTask.h +++ b/targets/app/common/Tutorial/Tasks/FullTutorialActiveTask.h @@ -1,7 +1,7 @@ #pragma once // using namespace std; -#include "app/common/src/Tutorial/TutorialEnum.h" +#include "app/common/Tutorial/TutorialEnum.h" #include "TutorialTask.h" class Tutorial; diff --git a/targets/app/common/src/Tutorial/Tasks/HorseChoiceTask.cpp b/targets/app/common/Tutorial/Tasks/HorseChoiceTask.cpp similarity index 93% rename from targets/app/common/src/Tutorial/Tasks/HorseChoiceTask.cpp rename to targets/app/common/Tutorial/Tasks/HorseChoiceTask.cpp index be3373be3..bbb131b5a 100644 --- a/targets/app/common/src/Tutorial/Tasks/HorseChoiceTask.cpp +++ b/targets/app/common/Tutorial/Tasks/HorseChoiceTask.cpp @@ -2,8 +2,8 @@ #include -#include "app/common/src/Tutorial/Tasks/ChoiceTask.h" -#include "app/common/src/Tutorial/TutorialEnum.h" +#include "app/common/Tutorial/Tasks/ChoiceTask.h" +#include "app/common/Tutorial/TutorialEnum.h" #include "java/Class.h" #include "minecraft/world/entity/Entity.h" #include "minecraft/world/entity/animal/EntityHorse.h" diff --git a/targets/app/common/src/Tutorial/Tasks/HorseChoiceTask.h b/targets/app/common/Tutorial/Tasks/HorseChoiceTask.h similarity index 92% rename from targets/app/common/src/Tutorial/Tasks/HorseChoiceTask.h rename to targets/app/common/Tutorial/Tasks/HorseChoiceTask.h index 9a8f537e6..67fd7c95a 100644 --- a/targets/app/common/src/Tutorial/Tasks/HorseChoiceTask.h +++ b/targets/app/common/Tutorial/Tasks/HorseChoiceTask.h @@ -1,7 +1,7 @@ #pragma once #include "ChoiceTask.h" -#include "app/common/src/Tutorial/TutorialEnum.h" +#include "app/common/Tutorial/TutorialEnum.h" class Tutorial; diff --git a/targets/app/common/src/Tutorial/Tasks/InfoTask.cpp b/targets/app/common/Tutorial/Tasks/InfoTask.cpp similarity index 94% rename from targets/app/common/src/Tutorial/Tasks/InfoTask.cpp rename to targets/app/common/Tutorial/Tasks/InfoTask.cpp index 9ef123d0a..c9dfc0283 100644 --- a/targets/app/common/src/Tutorial/Tasks/InfoTask.cpp +++ b/targets/app/common/Tutorial/Tasks/InfoTask.cpp @@ -6,9 +6,9 @@ #include #include "platform/sdl2/Input.h" -#include "app/common/src/Tutorial/Constraints/InputConstraint.h" -#include "app/common/src/Tutorial/Tasks/TutorialTask.h" -#include "app/common/src/Tutorial/Tutorial.h" +#include "app/common/Tutorial/Constraints/InputConstraint.h" +#include "app/common/Tutorial/Tasks/TutorialTask.h" +#include "app/common/Tutorial/Tutorial.h" #include "app/linux/Linux_UIController.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" diff --git a/targets/app/common/src/Tutorial/Tasks/InfoTask.h b/targets/app/common/Tutorial/Tasks/InfoTask.h similarity index 100% rename from targets/app/common/src/Tutorial/Tasks/InfoTask.h rename to targets/app/common/Tutorial/Tasks/InfoTask.h diff --git a/targets/app/common/src/Tutorial/Tasks/PickupTask.cpp b/targets/app/common/Tutorial/Tasks/PickupTask.cpp similarity index 100% rename from targets/app/common/src/Tutorial/Tasks/PickupTask.cpp rename to targets/app/common/Tutorial/Tasks/PickupTask.cpp diff --git a/targets/app/common/src/Tutorial/Tasks/PickupTask.h b/targets/app/common/Tutorial/Tasks/PickupTask.h similarity index 100% rename from targets/app/common/src/Tutorial/Tasks/PickupTask.h rename to targets/app/common/Tutorial/Tasks/PickupTask.h diff --git a/targets/app/common/src/Tutorial/Tasks/ProcedureCompoundTask.cpp b/targets/app/common/Tutorial/Tasks/ProcedureCompoundTask.cpp similarity index 98% rename from targets/app/common/src/Tutorial/Tasks/ProcedureCompoundTask.cpp rename to targets/app/common/Tutorial/Tasks/ProcedureCompoundTask.cpp index cf4984645..90a55014c 100644 --- a/targets/app/common/src/Tutorial/Tasks/ProcedureCompoundTask.cpp +++ b/targets/app/common/Tutorial/Tasks/ProcedureCompoundTask.cpp @@ -3,8 +3,8 @@ #include #include -#include "app/common/src/Tutorial/Tasks/TutorialTask.h" -#include "app/common/src/Tutorial/TutorialEnum.h" +#include "app/common/Tutorial/Tasks/TutorialTask.h" +#include "app/common/Tutorial/TutorialEnum.h" ProcedureCompoundTask::~ProcedureCompoundTask() { for (auto it = m_taskSequence.begin(); it < m_taskSequence.end(); ++it) { diff --git a/targets/app/common/src/Tutorial/Tasks/ProcedureCompoundTask.h b/targets/app/common/Tutorial/Tasks/ProcedureCompoundTask.h similarity index 96% rename from targets/app/common/src/Tutorial/Tasks/ProcedureCompoundTask.h rename to targets/app/common/Tutorial/Tasks/ProcedureCompoundTask.h index f0338c425..c78318b0d 100644 --- a/targets/app/common/src/Tutorial/Tasks/ProcedureCompoundTask.h +++ b/targets/app/common/Tutorial/Tasks/ProcedureCompoundTask.h @@ -2,7 +2,7 @@ #include -#include "app/common/src/Tutorial/TutorialEnum.h" +#include "app/common/Tutorial/TutorialEnum.h" #include "TutorialTask.h" class Tutorial; diff --git a/targets/app/common/src/Tutorial/Tasks/ProgressFlagTask.cpp b/targets/app/common/Tutorial/Tasks/ProgressFlagTask.cpp similarity index 100% rename from targets/app/common/src/Tutorial/Tasks/ProgressFlagTask.cpp rename to targets/app/common/Tutorial/Tasks/ProgressFlagTask.cpp diff --git a/targets/app/common/src/Tutorial/Tasks/ProgressFlagTask.h b/targets/app/common/Tutorial/Tasks/ProgressFlagTask.h similarity index 85% rename from targets/app/common/src/Tutorial/Tasks/ProgressFlagTask.h rename to targets/app/common/Tutorial/Tasks/ProgressFlagTask.h index b0077521a..03f0abb42 100644 --- a/targets/app/common/src/Tutorial/Tasks/ProgressFlagTask.h +++ b/targets/app/common/Tutorial/Tasks/ProgressFlagTask.h @@ -1,7 +1,7 @@ #pragma once // using namespace std; -#include "app/common/src/Tutorial/Tasks/TutorialTask.h" -#include "app/common/src/Tutorial/Tutorial.h" +#include "app/common/Tutorial/Tasks/TutorialTask.h" +#include "app/common/Tutorial/Tutorial.h" #include "TutorialTask.h" class Tutorial; diff --git a/targets/app/common/src/Tutorial/Tasks/RideEntityTask.cpp b/targets/app/common/Tutorial/Tasks/RideEntityTask.cpp similarity index 94% rename from targets/app/common/src/Tutorial/Tasks/RideEntityTask.cpp rename to targets/app/common/Tutorial/Tasks/RideEntityTask.cpp index 1e8d26807..af7a61733 100644 --- a/targets/app/common/src/Tutorial/Tasks/RideEntityTask.cpp +++ b/targets/app/common/Tutorial/Tasks/RideEntityTask.cpp @@ -2,7 +2,7 @@ #include -#include "app/common/src/Tutorial/Tasks/TutorialTask.h" +#include "app/common/Tutorial/Tasks/TutorialTask.h" #include "java/Class.h" #include "minecraft/world/entity/Entity.h" diff --git a/targets/app/common/src/Tutorial/Tasks/RideEntityTask.h b/targets/app/common/Tutorial/Tasks/RideEntityTask.h similarity index 100% rename from targets/app/common/src/Tutorial/Tasks/RideEntityTask.h rename to targets/app/common/Tutorial/Tasks/RideEntityTask.h diff --git a/targets/app/common/src/Tutorial/Tasks/StatTask.cpp b/targets/app/common/Tutorial/Tasks/StatTask.cpp similarity index 93% rename from targets/app/common/src/Tutorial/Tasks/StatTask.cpp rename to targets/app/common/Tutorial/Tasks/StatTask.cpp index c6b129f8f..007c4b252 100644 --- a/targets/app/common/src/Tutorial/Tasks/StatTask.cpp +++ b/targets/app/common/Tutorial/Tasks/StatTask.cpp @@ -1,7 +1,7 @@ #include "StatTask.h" #include "platform/sdl2/Profile.h" -#include "app/common/src/Tutorial/Tasks/TutorialTask.h" +#include "app/common/Tutorial/Tasks/TutorialTask.h" #include "minecraft/client/Minecraft.h" #include "minecraft/stats/StatsCounter.h" diff --git a/targets/app/common/src/Tutorial/Tasks/StatTask.h b/targets/app/common/Tutorial/Tasks/StatTask.h similarity index 100% rename from targets/app/common/src/Tutorial/Tasks/StatTask.h rename to targets/app/common/Tutorial/Tasks/StatTask.h diff --git a/targets/app/common/src/Tutorial/Tasks/StateChangeTask.h b/targets/app/common/Tutorial/Tasks/StateChangeTask.h similarity index 95% rename from targets/app/common/src/Tutorial/Tasks/StateChangeTask.h rename to targets/app/common/Tutorial/Tasks/StateChangeTask.h index 660ce02ab..af6e7cf20 100644 --- a/targets/app/common/src/Tutorial/Tasks/StateChangeTask.h +++ b/targets/app/common/Tutorial/Tasks/StateChangeTask.h @@ -1,6 +1,6 @@ #pragma once // using namespace std; -#include "app/common/src/Tutorial/Tutorial.h" +#include "app/common/Tutorial/Tutorial.h" #include "TutorialTask.h" class StateChangeTask : public TutorialTask { diff --git a/targets/app/common/src/Tutorial/Tasks/TutorialTask.cpp b/targets/app/common/Tutorial/Tasks/TutorialTask.cpp similarity index 95% rename from targets/app/common/src/Tutorial/Tasks/TutorialTask.cpp rename to targets/app/common/Tutorial/Tasks/TutorialTask.cpp index cfaf76275..954258f9e 100644 --- a/targets/app/common/src/Tutorial/Tasks/TutorialTask.cpp +++ b/targets/app/common/Tutorial/Tasks/TutorialTask.cpp @@ -2,8 +2,8 @@ #include -#include "app/common/src/Tutorial/Constraints/TutorialConstraint.h" -#include "app/common/src/Tutorial/Tutorial.h" +#include "app/common/Tutorial/Constraints/TutorialConstraint.h" +#include "app/common/Tutorial/Tutorial.h" TutorialTask::TutorialTask(Tutorial* tutorial, int descriptionId, bool enablePreCompletion, diff --git a/targets/app/common/src/Tutorial/Tasks/TutorialTask.h b/targets/app/common/Tutorial/Tasks/TutorialTask.h similarity index 98% rename from targets/app/common/src/Tutorial/Tasks/TutorialTask.h rename to targets/app/common/Tutorial/Tasks/TutorialTask.h index a87cf704b..593edf3a6 100644 --- a/targets/app/common/src/Tutorial/Tasks/TutorialTask.h +++ b/targets/app/common/Tutorial/Tasks/TutorialTask.h @@ -4,7 +4,7 @@ #include // using namespace std; -#include "app/common/src/Tutorial/TutorialEnum.h" +#include "app/common/Tutorial/TutorialEnum.h" class Level; class Tutorial; diff --git a/targets/app/common/src/Tutorial/Tasks/TutorialTasks.h b/targets/app/common/Tutorial/Tasks/TutorialTasks.h similarity index 100% rename from targets/app/common/src/Tutorial/Tasks/TutorialTasks.h rename to targets/app/common/Tutorial/Tasks/TutorialTasks.h diff --git a/targets/app/common/src/Tutorial/Tasks/UseItemTask.cpp b/targets/app/common/Tutorial/Tasks/UseItemTask.cpp similarity index 93% rename from targets/app/common/src/Tutorial/Tasks/UseItemTask.cpp rename to targets/app/common/Tutorial/Tasks/UseItemTask.cpp index d4ddacdd7..a8cb185ef 100644 --- a/targets/app/common/src/Tutorial/Tasks/UseItemTask.cpp +++ b/targets/app/common/Tutorial/Tasks/UseItemTask.cpp @@ -2,7 +2,7 @@ #include -#include "app/common/src/Tutorial/Tasks/TutorialTask.h" +#include "app/common/Tutorial/Tasks/TutorialTask.h" #include "minecraft/world/item/ItemInstance.h" class Tutorial; diff --git a/targets/app/common/src/Tutorial/Tasks/UseItemTask.h b/targets/app/common/Tutorial/Tasks/UseItemTask.h similarity index 100% rename from targets/app/common/src/Tutorial/Tasks/UseItemTask.h rename to targets/app/common/Tutorial/Tasks/UseItemTask.h diff --git a/targets/app/common/src/Tutorial/Tasks/UseTileTask.cpp b/targets/app/common/Tutorial/Tasks/UseTileTask.cpp similarity index 96% rename from targets/app/common/src/Tutorial/Tasks/UseTileTask.cpp rename to targets/app/common/Tutorial/Tasks/UseTileTask.cpp index d9014956f..0bb742cc2 100644 --- a/targets/app/common/src/Tutorial/Tasks/UseTileTask.cpp +++ b/targets/app/common/Tutorial/Tasks/UseTileTask.cpp @@ -2,7 +2,7 @@ #include -#include "app/common/src/Tutorial/Tasks/TutorialTask.h" +#include "app/common/Tutorial/Tasks/TutorialTask.h" #include "minecraft/world/level/Level.h" class Tutorial; diff --git a/targets/app/common/src/Tutorial/Tasks/UseTileTask.h b/targets/app/common/Tutorial/Tasks/UseTileTask.h similarity index 100% rename from targets/app/common/src/Tutorial/Tasks/UseTileTask.h rename to targets/app/common/Tutorial/Tasks/UseTileTask.h diff --git a/targets/app/common/src/Tutorial/Tasks/XuiCraftingTask.cpp b/targets/app/common/Tutorial/Tasks/XuiCraftingTask.cpp similarity index 86% rename from targets/app/common/src/Tutorial/Tasks/XuiCraftingTask.cpp rename to targets/app/common/Tutorial/Tasks/XuiCraftingTask.cpp index 66f177ce1..da3617966 100644 --- a/targets/app/common/src/Tutorial/Tasks/XuiCraftingTask.cpp +++ b/targets/app/common/Tutorial/Tasks/XuiCraftingTask.cpp @@ -1,7 +1,7 @@ #include "XuiCraftingTask.h" -#include "app/common/src/Tutorial/Tutorial.h" -#include "app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.h" +#include "app/common/Tutorial/Tutorial.h" +#include "app/common/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.h" bool XuiCraftingTask::isCompleted() { // This doesn't seem to work diff --git a/targets/app/common/src/Tutorial/Tasks/XuiCraftingTask.h b/targets/app/common/Tutorial/Tasks/XuiCraftingTask.h similarity index 100% rename from targets/app/common/src/Tutorial/Tasks/XuiCraftingTask.h rename to targets/app/common/Tutorial/Tasks/XuiCraftingTask.h diff --git a/targets/app/common/src/Tutorial/Tutorial.cpp b/targets/app/common/Tutorial/Tutorial.cpp similarity index 99% rename from targets/app/common/src/Tutorial/Tutorial.cpp rename to targets/app/common/Tutorial/Tutorial.cpp index d56d54293..8c572353e 100644 --- a/targets/app/common/src/Tutorial/Tutorial.cpp +++ b/targets/app/common/Tutorial/Tutorial.cpp @@ -10,18 +10,18 @@ #include "platform/sdl2/Profile.h" #include "app/common/App_enums.h" #include "app/common/App_structs.h" -#include "app/common/src/Tutorial/Constraints/TutorialConstraint.h" -#include "app/common/src/Tutorial/Hints/DiggerItemHint.h" -#include "app/common/src/Tutorial/Hints/LookAtEntityHint.h" -#include "app/common/src/Tutorial/Hints/LookAtTileHint.h" -#include "app/common/src/Tutorial/Hints/TutorialHint.h" -#include "app/common/src/Tutorial/Tasks/ChoiceTask.h" -#include "app/common/src/Tutorial/Tasks/HorseChoiceTask.h" -#include "app/common/src/Tutorial/Tasks/InfoTask.h" -#include "app/common/src/Tutorial/Tasks/ProcedureCompoundTask.h" -#include "app/common/src/Tutorial/Tasks/RideEntityTask.h" -#include "app/common/src/Tutorial/Tasks/TutorialTask.h" -#include "app/common/src/UI/All Platforms/UIStructs.h" +#include "app/common/Tutorial/Constraints/TutorialConstraint.h" +#include "app/common/Tutorial/Hints/DiggerItemHint.h" +#include "app/common/Tutorial/Hints/LookAtEntityHint.h" +#include "app/common/Tutorial/Hints/LookAtTileHint.h" +#include "app/common/Tutorial/Hints/TutorialHint.h" +#include "app/common/Tutorial/Tasks/ChoiceTask.h" +#include "app/common/Tutorial/Tasks/HorseChoiceTask.h" +#include "app/common/Tutorial/Tasks/InfoTask.h" +#include "app/common/Tutorial/Tasks/ProcedureCompoundTask.h" +#include "app/common/Tutorial/Tasks/RideEntityTask.h" +#include "app/common/Tutorial/Tasks/TutorialTask.h" +#include "app/common/UI/All Platforms/UIStructs.h" #include "app/linux/LinuxGame.h" #include "app/linux/Linux_UIController.h" #include "TutorialMessage.h" diff --git a/targets/app/common/src/Tutorial/Tutorial.h b/targets/app/common/Tutorial/Tutorial.h similarity index 96% rename from targets/app/common/src/Tutorial/Tutorial.h rename to targets/app/common/Tutorial/Tutorial.h index def40763e..5070d5ea5 100644 --- a/targets/app/common/src/Tutorial/Tutorial.h +++ b/targets/app/common/Tutorial/Tutorial.h @@ -11,10 +11,10 @@ #include "util/Timer.h" -#include "app/common/src/Tutorial/Constraints/TutorialConstraint.h" -#include "app/common/src/Tutorial/Hints/TutorialHint.h" -#include "app/common/src/Tutorial/Tasks/TutorialTask.h" -#include "app/common/src/Tutorial/TutorialEnum.h" +#include "app/common/Tutorial/Constraints/TutorialConstraint.h" +#include "app/common/Tutorial/Hints/TutorialHint.h" +#include "app/common/Tutorial/Tasks/TutorialTask.h" +#include "app/common/Tutorial/TutorialEnum.h" #include "TutorialEnum.h" #include "TutorialMessage.h" diff --git a/targets/app/common/src/Tutorial/TutorialEnum.h b/targets/app/common/Tutorial/TutorialEnum.h similarity index 100% rename from targets/app/common/src/Tutorial/TutorialEnum.h rename to targets/app/common/Tutorial/TutorialEnum.h diff --git a/targets/app/common/src/Tutorial/TutorialMessage.cpp b/targets/app/common/Tutorial/TutorialMessage.cpp similarity index 100% rename from targets/app/common/src/Tutorial/TutorialMessage.cpp rename to targets/app/common/Tutorial/TutorialMessage.cpp diff --git a/targets/app/common/src/Tutorial/TutorialMessage.h b/targets/app/common/Tutorial/TutorialMessage.h similarity index 100% rename from targets/app/common/src/Tutorial/TutorialMessage.h rename to targets/app/common/Tutorial/TutorialMessage.h diff --git a/targets/app/common/src/Tutorial/TutorialMode.cpp b/targets/app/common/Tutorial/TutorialMode.cpp similarity index 98% rename from targets/app/common/src/Tutorial/TutorialMode.cpp rename to targets/app/common/Tutorial/TutorialMode.cpp index 0f936d73a..014f7a5b8 100644 --- a/targets/app/common/src/Tutorial/TutorialMode.cpp +++ b/targets/app/common/Tutorial/TutorialMode.cpp @@ -2,7 +2,7 @@ #include -#include "app/common/src/Tutorial/Tutorial.h" +#include "app/common/Tutorial/Tutorial.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/MultiPlayerGameMode.h" #include "minecraft/client/multiplayer/MultiPlayerLevel.h" diff --git a/targets/app/common/src/Tutorial/TutorialMode.h b/targets/app/common/Tutorial/TutorialMode.h similarity index 100% rename from targets/app/common/src/Tutorial/TutorialMode.h rename to targets/app/common/Tutorial/TutorialMode.h diff --git a/targets/app/common/src/UI/All Platforms/ArchiveFile.cpp b/targets/app/common/UI/All Platforms/ArchiveFile.cpp similarity index 100% rename from targets/app/common/src/UI/All Platforms/ArchiveFile.cpp rename to targets/app/common/UI/All Platforms/ArchiveFile.cpp diff --git a/targets/app/common/src/UI/All Platforms/ArchiveFile.h b/targets/app/common/UI/All Platforms/ArchiveFile.h similarity index 100% rename from targets/app/common/src/UI/All Platforms/ArchiveFile.h rename to targets/app/common/UI/All Platforms/ArchiveFile.h diff --git a/targets/app/common/src/UI/All Platforms/IUIController.h b/targets/app/common/UI/All Platforms/IUIController.h similarity index 100% rename from targets/app/common/src/UI/All Platforms/IUIController.h rename to targets/app/common/UI/All Platforms/IUIController.h diff --git a/targets/app/common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.cpp b/targets/app/common/UI/All Platforms/IUIScene_AbstractContainerMenu.cpp similarity index 99% rename from targets/app/common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.cpp rename to targets/app/common/UI/All Platforms/IUIScene_AbstractContainerMenu.cpp index 2fdfe4b84..3f6d69e52 100644 --- a/targets/app/common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.cpp +++ b/targets/app/common/UI/All Platforms/IUIScene_AbstractContainerMenu.cpp @@ -11,9 +11,9 @@ #include "platform/sdl2/Input.h" #include "platform/sdl2/Render.h" #include "app/common/App_enums.h" -#include "app/common/src/Tutorial/Tutorial.h" -#include "app/common/src/Tutorial/TutorialMode.h" -#include "app/common/src/UI/All Platforms/UIStructs.h" +#include "app/common/Tutorial/Tutorial.h" +#include "app/common/Tutorial/TutorialMode.h" +#include "app/common/UI/All Platforms/UIStructs.h" #include "app/linux/LinuxGame.h" #include "app/linux/Linux_UIController.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/app/common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h b/targets/app/common/UI/All Platforms/IUIScene_AbstractContainerMenu.h similarity index 99% rename from targets/app/common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h rename to targets/app/common/UI/All Platforms/IUIScene_AbstractContainerMenu.h index 45feb362e..dcf87e8ee 100644 --- a/targets/app/common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h +++ b/targets/app/common/UI/All Platforms/IUIScene_AbstractContainerMenu.h @@ -3,8 +3,8 @@ #include #include -#include "app/common/src/Tutorial/TutorialEnum.h" -#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/common/Tutorial/TutorialEnum.h" +#include "app/common/UI/All Platforms/UIEnums.h" #include "UIStructs.h" class HtmlString; diff --git a/targets/app/common/src/UI/All Platforms/IUIScene_AnvilMenu.cpp b/targets/app/common/UI/All Platforms/IUIScene_AnvilMenu.cpp similarity index 99% rename from targets/app/common/src/UI/All Platforms/IUIScene_AnvilMenu.cpp rename to targets/app/common/UI/All Platforms/IUIScene_AnvilMenu.cpp index 55ef3a9e1..094ad37fa 100644 --- a/targets/app/common/src/UI/All Platforms/IUIScene_AnvilMenu.cpp +++ b/targets/app/common/UI/All Platforms/IUIScene_AnvilMenu.cpp @@ -3,7 +3,7 @@ #include #include -#include "app/common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h" +#include "app/common/UI/All Platforms/IUIScene_AbstractContainerMenu.h" #include "app/linux/LinuxGame.h" #include "java/InputOutputStream/ByteArrayOutputStream.h" #include "java/InputOutputStream/DataOutputStream.h" diff --git a/targets/app/common/src/UI/All Platforms/IUIScene_AnvilMenu.h b/targets/app/common/UI/All Platforms/IUIScene_AnvilMenu.h similarity index 100% rename from targets/app/common/src/UI/All Platforms/IUIScene_AnvilMenu.h rename to targets/app/common/UI/All Platforms/IUIScene_AnvilMenu.h diff --git a/targets/app/common/src/UI/All Platforms/IUIScene_BeaconMenu.cpp b/targets/app/common/UI/All Platforms/IUIScene_BeaconMenu.cpp similarity index 99% rename from targets/app/common/src/UI/All Platforms/IUIScene_BeaconMenu.cpp rename to targets/app/common/UI/All Platforms/IUIScene_BeaconMenu.cpp index 6e84ffe93..1b7585330 100644 --- a/targets/app/common/src/UI/All Platforms/IUIScene_BeaconMenu.cpp +++ b/targets/app/common/UI/All Platforms/IUIScene_BeaconMenu.cpp @@ -6,7 +6,7 @@ #include #include "app/common/App_enums.h" -#include "app/common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h" +#include "app/common/UI/All Platforms/IUIScene_AbstractContainerMenu.h" #include "app/linux/LinuxGame.h" #include "java/InputOutputStream/ByteArrayOutputStream.h" #include "java/InputOutputStream/DataOutputStream.h" diff --git a/targets/app/common/src/UI/All Platforms/IUIScene_BeaconMenu.h b/targets/app/common/UI/All Platforms/IUIScene_BeaconMenu.h similarity index 100% rename from targets/app/common/src/UI/All Platforms/IUIScene_BeaconMenu.h rename to targets/app/common/UI/All Platforms/IUIScene_BeaconMenu.h diff --git a/targets/app/common/src/UI/All Platforms/IUIScene_BrewingMenu.cpp b/targets/app/common/UI/All Platforms/IUIScene_BrewingMenu.cpp similarity index 98% rename from targets/app/common/src/UI/All Platforms/IUIScene_BrewingMenu.cpp rename to targets/app/common/UI/All Platforms/IUIScene_BrewingMenu.cpp index 74ba96d52..af0ecd802 100644 --- a/targets/app/common/src/UI/All Platforms/IUIScene_BrewingMenu.cpp +++ b/targets/app/common/UI/All Platforms/IUIScene_BrewingMenu.cpp @@ -2,7 +2,7 @@ #include -#include "app/common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h" +#include "app/common/UI/All Platforms/IUIScene_AbstractContainerMenu.h" #include "minecraft/world/inventory/BrewingStandMenu.h" IUIScene_AbstractContainerMenu::ESceneSection diff --git a/targets/app/common/src/UI/All Platforms/IUIScene_BrewingMenu.h b/targets/app/common/UI/All Platforms/IUIScene_BrewingMenu.h similarity index 100% rename from targets/app/common/src/UI/All Platforms/IUIScene_BrewingMenu.h rename to targets/app/common/UI/All Platforms/IUIScene_BrewingMenu.h diff --git a/targets/app/common/src/UI/All Platforms/IUIScene_CommandBlockMenu.cpp b/targets/app/common/UI/All Platforms/IUIScene_CommandBlockMenu.cpp similarity index 100% rename from targets/app/common/src/UI/All Platforms/IUIScene_CommandBlockMenu.cpp rename to targets/app/common/UI/All Platforms/IUIScene_CommandBlockMenu.cpp diff --git a/targets/app/common/src/UI/All Platforms/IUIScene_CommandBlockMenu.h b/targets/app/common/UI/All Platforms/IUIScene_CommandBlockMenu.h similarity index 100% rename from targets/app/common/src/UI/All Platforms/IUIScene_CommandBlockMenu.h rename to targets/app/common/UI/All Platforms/IUIScene_CommandBlockMenu.h diff --git a/targets/app/common/src/UI/All Platforms/IUIScene_ContainerMenu.cpp b/targets/app/common/UI/All Platforms/IUIScene_ContainerMenu.cpp similarity index 96% rename from targets/app/common/src/UI/All Platforms/IUIScene_ContainerMenu.cpp rename to targets/app/common/UI/All Platforms/IUIScene_ContainerMenu.cpp index a79b99bd7..a533ba16e 100644 --- a/targets/app/common/src/UI/All Platforms/IUIScene_ContainerMenu.cpp +++ b/targets/app/common/UI/All Platforms/IUIScene_ContainerMenu.cpp @@ -2,7 +2,7 @@ #include -#include "app/common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h" +#include "app/common/UI/All Platforms/IUIScene_AbstractContainerMenu.h" #include "minecraft/world/inventory/AbstractContainerMenu.h" IUIScene_AbstractContainerMenu::ESceneSection diff --git a/targets/app/common/src/UI/All Platforms/IUIScene_ContainerMenu.h b/targets/app/common/UI/All Platforms/IUIScene_ContainerMenu.h similarity index 100% rename from targets/app/common/src/UI/All Platforms/IUIScene_ContainerMenu.h rename to targets/app/common/UI/All Platforms/IUIScene_ContainerMenu.h diff --git a/targets/app/common/src/UI/All Platforms/IUIScene_CraftingMenu.cpp b/targets/app/common/UI/All Platforms/IUIScene_CraftingMenu.cpp similarity index 99% rename from targets/app/common/src/UI/All Platforms/IUIScene_CraftingMenu.cpp rename to targets/app/common/UI/All Platforms/IUIScene_CraftingMenu.cpp index 2d50f47ca..fc519fd23 100644 --- a/targets/app/common/src/UI/All Platforms/IUIScene_CraftingMenu.cpp +++ b/targets/app/common/UI/All Platforms/IUIScene_CraftingMenu.cpp @@ -11,9 +11,9 @@ #include "platform/sdl2/Profile.h" #include "platform/sdl2/Render.h" #include "app/common/App_enums.h" -#include "app/common/src/Console_Debug_enum.h" -#include "app/common/src/Tutorial/Tutorial.h" -#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/common/Console_Debug_enum.h" +#include "app/common/Tutorial/Tutorial.h" +#include "app/common/UI/All Platforms/UIEnums.h" #include "app/linux/LinuxGame.h" #include "app/linux/Linux_UIController.h" #include "app/linux/Stubs/winapi_stubs.h" diff --git a/targets/app/common/src/UI/All Platforms/IUIScene_CraftingMenu.h b/targets/app/common/UI/All Platforms/IUIScene_CraftingMenu.h similarity index 97% rename from targets/app/common/src/UI/All Platforms/IUIScene_CraftingMenu.h rename to targets/app/common/UI/All Platforms/IUIScene_CraftingMenu.h index 76aea9810..a6ee67e14 100644 --- a/targets/app/common/src/UI/All Platforms/IUIScene_CraftingMenu.h +++ b/targets/app/common/UI/All Platforms/IUIScene_CraftingMenu.h @@ -1,8 +1,8 @@ #pragma once #include -#include "app/common/src/Tutorial/Tutorial.h" -#include "app/common/src/Tutorial/TutorialEnum.h" +#include "app/common/Tutorial/Tutorial.h" +#include "app/common/Tutorial/TutorialEnum.h" #include "minecraft/client/multiplayer/MultiPlayerGameMode.h" #include "minecraft/world/item/Item.h" #include "minecraft/world/item/crafting/Recipy.h" diff --git a/targets/app/common/src/UI/All Platforms/IUIScene_CreativeMenu.cpp b/targets/app/common/UI/All Platforms/IUIScene_CreativeMenu.cpp similarity index 99% rename from targets/app/common/src/UI/All Platforms/IUIScene_CreativeMenu.cpp rename to targets/app/common/UI/All Platforms/IUIScene_CreativeMenu.cpp index a5e701ed2..59233e5dc 100644 --- a/targets/app/common/src/UI/All Platforms/IUIScene_CreativeMenu.cpp +++ b/targets/app/common/UI/All Platforms/IUIScene_CreativeMenu.cpp @@ -7,7 +7,7 @@ #include #include "platform/InputActions.h" -#include "app/common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h" +#include "app/common/UI/All Platforms/IUIScene_AbstractContainerMenu.h" #include "app/linux/LinuxGame.h" #include "app/linux/Linux_UIController.h" #include "java/JavaMath.h" diff --git a/targets/app/common/src/UI/All Platforms/IUIScene_CreativeMenu.h b/targets/app/common/UI/All Platforms/IUIScene_CreativeMenu.h similarity index 98% rename from targets/app/common/src/UI/All Platforms/IUIScene_CreativeMenu.h rename to targets/app/common/UI/All Platforms/IUIScene_CreativeMenu.h index 694de8d57..711177cef 100644 --- a/targets/app/common/src/UI/All Platforms/IUIScene_CreativeMenu.h +++ b/targets/app/common/UI/All Platforms/IUIScene_CreativeMenu.h @@ -5,8 +5,8 @@ #include #include "IUIScene_AbstractContainerMenu.h" -#include "app/common/src/UI/All Platforms/UIEnums.h" -#include "app/common/src/UI/All Platforms/UIStructs.h" +#include "app/common/UI/All Platforms/UIEnums.h" +#include "app/common/UI/All Platforms/UIStructs.h" #include "minecraft/world/inventory/AbstractContainerMenu.h" class Inventory; diff --git a/targets/app/common/src/UI/All Platforms/IUIScene_DispenserMenu.cpp b/targets/app/common/UI/All Platforms/IUIScene_DispenserMenu.cpp similarity index 96% rename from targets/app/common/src/UI/All Platforms/IUIScene_DispenserMenu.cpp rename to targets/app/common/UI/All Platforms/IUIScene_DispenserMenu.cpp index 9473d9da5..11d6faa4f 100644 --- a/targets/app/common/src/UI/All Platforms/IUIScene_DispenserMenu.cpp +++ b/targets/app/common/UI/All Platforms/IUIScene_DispenserMenu.cpp @@ -2,7 +2,7 @@ #include -#include "app/common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h" +#include "app/common/UI/All Platforms/IUIScene_AbstractContainerMenu.h" IUIScene_AbstractContainerMenu::ESceneSection IUIScene_DispenserMenu::GetSectionAndSlotInDirection(ESceneSection eSection, diff --git a/targets/app/common/src/UI/All Platforms/IUIScene_DispenserMenu.h b/targets/app/common/UI/All Platforms/IUIScene_DispenserMenu.h similarity index 100% rename from targets/app/common/src/UI/All Platforms/IUIScene_DispenserMenu.h rename to targets/app/common/UI/All Platforms/IUIScene_DispenserMenu.h diff --git a/targets/app/common/src/UI/All Platforms/IUIScene_EnchantingMenu.cpp b/targets/app/common/UI/All Platforms/IUIScene_EnchantingMenu.cpp similarity index 98% rename from targets/app/common/src/UI/All Platforms/IUIScene_EnchantingMenu.cpp rename to targets/app/common/UI/All Platforms/IUIScene_EnchantingMenu.cpp index 517a7e4c5..78533d498 100644 --- a/targets/app/common/src/UI/All Platforms/IUIScene_EnchantingMenu.cpp +++ b/targets/app/common/UI/All Platforms/IUIScene_EnchantingMenu.cpp @@ -4,7 +4,7 @@ #include -#include "app/common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h" +#include "app/common/UI/All Platforms/IUIScene_AbstractContainerMenu.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/MultiPlayerGameMode.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" diff --git a/targets/app/common/src/UI/All Platforms/IUIScene_EnchantingMenu.h b/targets/app/common/UI/All Platforms/IUIScene_EnchantingMenu.h similarity index 100% rename from targets/app/common/src/UI/All Platforms/IUIScene_EnchantingMenu.h rename to targets/app/common/UI/All Platforms/IUIScene_EnchantingMenu.h diff --git a/targets/app/common/src/UI/All Platforms/IUIScene_FireworksMenu.cpp b/targets/app/common/UI/All Platforms/IUIScene_FireworksMenu.cpp similarity index 98% rename from targets/app/common/src/UI/All Platforms/IUIScene_FireworksMenu.cpp rename to targets/app/common/UI/All Platforms/IUIScene_FireworksMenu.cpp index eca43ef42..fe0b87499 100644 --- a/targets/app/common/src/UI/All Platforms/IUIScene_FireworksMenu.cpp +++ b/targets/app/common/UI/All Platforms/IUIScene_FireworksMenu.cpp @@ -2,7 +2,7 @@ #include -#include "app/common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h" +#include "app/common/UI/All Platforms/IUIScene_AbstractContainerMenu.h" #include "minecraft/world/inventory/FireworksMenu.h" IUIScene_AbstractContainerMenu::ESceneSection diff --git a/targets/app/common/src/UI/All Platforms/IUIScene_FireworksMenu.h b/targets/app/common/UI/All Platforms/IUIScene_FireworksMenu.h similarity index 100% rename from targets/app/common/src/UI/All Platforms/IUIScene_FireworksMenu.h rename to targets/app/common/UI/All Platforms/IUIScene_FireworksMenu.h diff --git a/targets/app/common/src/UI/All Platforms/IUIScene_FurnaceMenu.cpp b/targets/app/common/UI/All Platforms/IUIScene_FurnaceMenu.cpp similarity index 98% rename from targets/app/common/src/UI/All Platforms/IUIScene_FurnaceMenu.cpp rename to targets/app/common/UI/All Platforms/IUIScene_FurnaceMenu.cpp index 9be58df2a..aee52849f 100644 --- a/targets/app/common/src/UI/All Platforms/IUIScene_FurnaceMenu.cpp +++ b/targets/app/common/UI/All Platforms/IUIScene_FurnaceMenu.cpp @@ -2,7 +2,7 @@ #include -#include "app/common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h" +#include "app/common/UI/All Platforms/IUIScene_AbstractContainerMenu.h" #include "minecraft/world/inventory/FurnaceMenu.h" IUIScene_AbstractContainerMenu::ESceneSection diff --git a/targets/app/common/src/UI/All Platforms/IUIScene_FurnaceMenu.h b/targets/app/common/UI/All Platforms/IUIScene_FurnaceMenu.h similarity index 100% rename from targets/app/common/src/UI/All Platforms/IUIScene_FurnaceMenu.h rename to targets/app/common/UI/All Platforms/IUIScene_FurnaceMenu.h diff --git a/targets/app/common/src/UI/All Platforms/IUIScene_HUD.cpp b/targets/app/common/UI/All Platforms/IUIScene_HUD.cpp similarity index 100% rename from targets/app/common/src/UI/All Platforms/IUIScene_HUD.cpp rename to targets/app/common/UI/All Platforms/IUIScene_HUD.cpp diff --git a/targets/app/common/src/UI/All Platforms/IUIScene_HUD.h b/targets/app/common/UI/All Platforms/IUIScene_HUD.h similarity index 100% rename from targets/app/common/src/UI/All Platforms/IUIScene_HUD.h rename to targets/app/common/UI/All Platforms/IUIScene_HUD.h diff --git a/targets/app/common/src/UI/All Platforms/IUIScene_HopperMenu.cpp b/targets/app/common/UI/All Platforms/IUIScene_HopperMenu.cpp similarity index 96% rename from targets/app/common/src/UI/All Platforms/IUIScene_HopperMenu.cpp rename to targets/app/common/UI/All Platforms/IUIScene_HopperMenu.cpp index 6e85a142a..c62940270 100644 --- a/targets/app/common/src/UI/All Platforms/IUIScene_HopperMenu.cpp +++ b/targets/app/common/UI/All Platforms/IUIScene_HopperMenu.cpp @@ -2,7 +2,7 @@ #include -#include "app/common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h" +#include "app/common/UI/All Platforms/IUIScene_AbstractContainerMenu.h" #include "minecraft/world/inventory/HopperMenu.h" IUIScene_AbstractContainerMenu::ESceneSection diff --git a/targets/app/common/src/UI/All Platforms/IUIScene_HopperMenu.h b/targets/app/common/UI/All Platforms/IUIScene_HopperMenu.h similarity index 100% rename from targets/app/common/src/UI/All Platforms/IUIScene_HopperMenu.h rename to targets/app/common/UI/All Platforms/IUIScene_HopperMenu.h diff --git a/targets/app/common/src/UI/All Platforms/IUIScene_HorseInventoryMenu.cpp b/targets/app/common/UI/All Platforms/IUIScene_HorseInventoryMenu.cpp similarity index 98% rename from targets/app/common/src/UI/All Platforms/IUIScene_HorseInventoryMenu.cpp rename to targets/app/common/UI/All Platforms/IUIScene_HorseInventoryMenu.cpp index 4f5441db1..91aefb70f 100644 --- a/targets/app/common/src/UI/All Platforms/IUIScene_HorseInventoryMenu.cpp +++ b/targets/app/common/UI/All Platforms/IUIScene_HorseInventoryMenu.cpp @@ -2,7 +2,7 @@ #include -#include "app/common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h" +#include "app/common/UI/All Platforms/IUIScene_AbstractContainerMenu.h" #include "minecraft/world/entity/animal/EntityHorse.h" IUIScene_AbstractContainerMenu::ESceneSection diff --git a/targets/app/common/src/UI/All Platforms/IUIScene_HorseInventoryMenu.h b/targets/app/common/UI/All Platforms/IUIScene_HorseInventoryMenu.h similarity index 100% rename from targets/app/common/src/UI/All Platforms/IUIScene_HorseInventoryMenu.h rename to targets/app/common/UI/All Platforms/IUIScene_HorseInventoryMenu.h diff --git a/targets/app/common/src/UI/All Platforms/IUIScene_InventoryMenu.cpp b/targets/app/common/UI/All Platforms/IUIScene_InventoryMenu.cpp similarity index 96% rename from targets/app/common/src/UI/All Platforms/IUIScene_InventoryMenu.cpp rename to targets/app/common/UI/All Platforms/IUIScene_InventoryMenu.cpp index 57bcdcecb..b3c03fc57 100644 --- a/targets/app/common/src/UI/All Platforms/IUIScene_InventoryMenu.cpp +++ b/targets/app/common/UI/All Platforms/IUIScene_InventoryMenu.cpp @@ -2,7 +2,7 @@ #include -#include "app/common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h" +#include "app/common/UI/All Platforms/IUIScene_AbstractContainerMenu.h" #include "minecraft/world/inventory/InventoryMenu.h" IUIScene_AbstractContainerMenu::ESceneSection diff --git a/targets/app/common/src/UI/All Platforms/IUIScene_InventoryMenu.h b/targets/app/common/UI/All Platforms/IUIScene_InventoryMenu.h similarity index 100% rename from targets/app/common/src/UI/All Platforms/IUIScene_InventoryMenu.h rename to targets/app/common/UI/All Platforms/IUIScene_InventoryMenu.h diff --git a/targets/app/common/src/UI/All Platforms/IUIScene_PauseMenu.cpp b/targets/app/common/UI/All Platforms/IUIScene_PauseMenu.cpp similarity index 98% rename from targets/app/common/src/UI/All Platforms/IUIScene_PauseMenu.cpp rename to targets/app/common/UI/All Platforms/IUIScene_PauseMenu.cpp index bb2e2170e..50ff3383b 100644 --- a/targets/app/common/src/UI/All Platforms/IUIScene_PauseMenu.cpp +++ b/targets/app/common/UI/All Platforms/IUIScene_PauseMenu.cpp @@ -11,11 +11,11 @@ #include "platform/sdl2/Profile.h" #include "app/common/App_enums.h" -#include "app/common/src/DLC/DLCManager.h" -#include "app/common/src/DLC/DLCPack.h" -#include "app/common/src/GameRules/GameRuleManager.h" -#include "app/common/src/Network/GameNetworkManager.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/DLC/DLCManager.h" +#include "app/common/DLC/DLCPack.h" +#include "app/common/GameRules/GameRuleManager.h" +#include "app/common/Network/GameNetworkManager.h" +#include "app/common/UI/UIScene.h" #include "app/linux/LinuxGame.h" #include "app/linux/Linux_UIController.h" #include "app/linux/Stubs/winapi_stubs.h" diff --git a/targets/app/common/src/UI/All Platforms/IUIScene_PauseMenu.h b/targets/app/common/UI/All Platforms/IUIScene_PauseMenu.h similarity index 97% rename from targets/app/common/src/UI/All Platforms/IUIScene_PauseMenu.h rename to targets/app/common/UI/All Platforms/IUIScene_PauseMenu.h index 74ffcdcf0..02a778471 100644 --- a/targets/app/common/src/UI/All Platforms/IUIScene_PauseMenu.h +++ b/targets/app/common/UI/All Platforms/IUIScene_PauseMenu.h @@ -2,7 +2,7 @@ #include "platform/sdl2/Profile.h" #include "platform/sdl2/Storage.h" -#include "app/common/src/DLC/DLCPack.h" +#include "app/common/DLC/DLCPack.h" class DLCPack; diff --git a/targets/app/common/src/UI/All Platforms/IUIScene_TradingMenu.cpp b/targets/app/common/UI/All Platforms/IUIScene_TradingMenu.cpp similarity index 99% rename from targets/app/common/src/UI/All Platforms/IUIScene_TradingMenu.cpp rename to targets/app/common/UI/All Platforms/IUIScene_TradingMenu.cpp index 0c7140dab..30f14552d 100644 --- a/targets/app/common/src/UI/All Platforms/IUIScene_TradingMenu.cpp +++ b/targets/app/common/UI/All Platforms/IUIScene_TradingMenu.cpp @@ -5,8 +5,8 @@ #include #include "platform/InputActions.h" -#include "app/common/src/Tutorial/Tutorial.h" -#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/common/Tutorial/Tutorial.h" +#include "app/common/UI/All Platforms/UIEnums.h" #include "app/linux/LinuxGame.h" #include "app/linux/Linux_UIController.h" #include "util/StringHelpers.h" diff --git a/targets/app/common/src/UI/All Platforms/IUIScene_TradingMenu.h b/targets/app/common/UI/All Platforms/IUIScene_TradingMenu.h similarity index 95% rename from targets/app/common/src/UI/All Platforms/IUIScene_TradingMenu.h rename to targets/app/common/UI/All Platforms/IUIScene_TradingMenu.h index 266d73070..2d5b01a26 100644 --- a/targets/app/common/src/UI/All Platforms/IUIScene_TradingMenu.h +++ b/targets/app/common/UI/All Platforms/IUIScene_TradingMenu.h @@ -5,8 +5,8 @@ #include #include -#include "app/common/src/Tutorial/Tutorial.h" -#include "app/common/src/Tutorial/TutorialEnum.h" +#include "app/common/Tutorial/Tutorial.h" +#include "app/common/Tutorial/TutorialEnum.h" #include "minecraft/util/HtmlString.h" #include "minecraft/world/inventory/MerchantMenu.h" #include "minecraft/world/item/Rarity.h" diff --git a/targets/app/common/src/UI/All Platforms/UIEnums.h b/targets/app/common/UI/All Platforms/UIEnums.h similarity index 100% rename from targets/app/common/src/UI/All Platforms/UIEnums.h rename to targets/app/common/UI/All Platforms/UIEnums.h diff --git a/targets/app/common/src/UI/All Platforms/UIStructs.h b/targets/app/common/UI/All Platforms/UIStructs.h similarity index 100% rename from targets/app/common/src/UI/All Platforms/UIStructs.h rename to targets/app/common/UI/All Platforms/UIStructs.h diff --git a/targets/app/common/src/UI/Components/UIComponent_Chat.cpp b/targets/app/common/UI/Components/UIComponent_Chat.cpp similarity index 96% rename from targets/app/common/src/UI/Components/UIComponent_Chat.cpp rename to targets/app/common/UI/Components/UIComponent_Chat.cpp index 4f4a63493..38310d908 100644 --- a/targets/app/common/src/UI/Components/UIComponent_Chat.cpp +++ b/targets/app/common/UI/Components/UIComponent_Chat.cpp @@ -3,10 +3,10 @@ #include #include "platform/sdl2/Render.h" -#include "app/common/src/UI/Controls/UIControl.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/UILayer.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/Controls/UIControl.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/UILayer.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" diff --git a/targets/app/common/src/UI/Components/UIComponent_Chat.h b/targets/app/common/UI/Components/UIComponent_Chat.h similarity index 92% rename from targets/app/common/src/UI/Components/UIComponent_Chat.h rename to targets/app/common/UI/Components/UIComponent_Chat.h index 1c6c1bd09..85e3439b0 100644 --- a/targets/app/common/src/UI/Components/UIComponent_Chat.h +++ b/targets/app/common/UI/Components/UIComponent_Chat.h @@ -3,10 +3,10 @@ #include #include "platform/sdl2/Render.h" -#include "app/common/src/UI/All Platforms/UIEnums.h" -#include "app/common/src/UI/Controls/UIControl.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/All Platforms/UIEnums.h" +#include "app/common/UI/Controls/UIControl.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/rrCore.h" class UILayer; diff --git a/targets/app/common/src/UI/Components/UIComponent_DebugUIConsole.cpp b/targets/app/common/UI/Components/UIComponent_DebugUIConsole.cpp similarity index 91% rename from targets/app/common/src/UI/Components/UIComponent_DebugUIConsole.cpp rename to targets/app/common/UI/Components/UIComponent_DebugUIConsole.cpp index 3332970c3..f3f7eecc2 100644 --- a/targets/app/common/src/UI/Components/UIComponent_DebugUIConsole.cpp +++ b/targets/app/common/UI/Components/UIComponent_DebugUIConsole.cpp @@ -1,7 +1,7 @@ #include "UIComponent_DebugUIConsole.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/UIScene.h" class UILayer; diff --git a/targets/app/common/src/UI/Components/UIComponent_DebugUIConsole.h b/targets/app/common/UI/Components/UIComponent_DebugUIConsole.h similarity index 91% rename from targets/app/common/src/UI/Components/UIComponent_DebugUIConsole.h rename to targets/app/common/UI/Components/UIComponent_DebugUIConsole.h index 9fbb44404..4cf695149 100644 --- a/targets/app/common/src/UI/Components/UIComponent_DebugUIConsole.h +++ b/targets/app/common/UI/Components/UIComponent_DebugUIConsole.h @@ -3,9 +3,9 @@ #include #include -#include "app/common/src/UI/All Platforms/UIEnums.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/All Platforms/UIEnums.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/UIScene.h" class UILayer; diff --git a/targets/app/common/src/UI/Components/UIComponent_DebugUIMarketingGuide.cpp b/targets/app/common/UI/Components/UIComponent_DebugUIMarketingGuide.cpp similarity index 96% rename from targets/app/common/src/UI/Components/UIComponent_DebugUIMarketingGuide.cpp rename to targets/app/common/UI/Components/UIComponent_DebugUIMarketingGuide.cpp index 68253c8b9..e77fadb7b 100644 --- a/targets/app/common/src/UI/Components/UIComponent_DebugUIMarketingGuide.cpp +++ b/targets/app/common/UI/Components/UIComponent_DebugUIMarketingGuide.cpp @@ -1,6 +1,6 @@ #include "UIComponent_DebugUIMarketingGuide.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" diff --git a/targets/app/common/src/UI/Components/UIComponent_DebugUIMarketingGuide.h b/targets/app/common/UI/Components/UIComponent_DebugUIMarketingGuide.h similarity index 88% rename from targets/app/common/src/UI/Components/UIComponent_DebugUIMarketingGuide.h rename to targets/app/common/UI/Components/UIComponent_DebugUIMarketingGuide.h index 180474367..55712fe17 100644 --- a/targets/app/common/src/UI/Components/UIComponent_DebugUIMarketingGuide.h +++ b/targets/app/common/UI/Components/UIComponent_DebugUIMarketingGuide.h @@ -2,9 +2,9 @@ #include -#include "app/common/src/UI/All Platforms/UIEnums.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/All Platforms/UIEnums.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" diff --git a/targets/app/common/src/UI/Components/UIComponent_Logo.cpp b/targets/app/common/UI/Components/UIComponent_Logo.cpp similarity index 92% rename from targets/app/common/src/UI/Components/UIComponent_Logo.cpp rename to targets/app/common/UI/Components/UIComponent_Logo.cpp index a805bf59b..a0db6e84f 100644 --- a/targets/app/common/src/UI/Components/UIComponent_Logo.cpp +++ b/targets/app/common/UI/Components/UIComponent_Logo.cpp @@ -1,8 +1,8 @@ #include "UIComponent_Logo.h" #include "platform/sdl2/Render.h" -#include "app/common/src/UI/UILayer.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/UILayer.h" +#include "app/common/UI/UIScene.h" UIComponent_Logo::UIComponent_Logo(int iPad, void* initData, UILayer* parentLayer) diff --git a/targets/app/common/src/UI/Components/UIComponent_Logo.h b/targets/app/common/UI/Components/UIComponent_Logo.h similarity index 89% rename from targets/app/common/src/UI/Components/UIComponent_Logo.h rename to targets/app/common/UI/Components/UIComponent_Logo.h index 8f0b11757..0a7b4a674 100644 --- a/targets/app/common/src/UI/Components/UIComponent_Logo.h +++ b/targets/app/common/UI/Components/UIComponent_Logo.h @@ -2,8 +2,8 @@ #include -#include "app/common/src/UI/All Platforms/UIEnums.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/All Platforms/UIEnums.h" +#include "app/common/UI/UIScene.h" class UILayer; diff --git a/targets/app/common/src/UI/Components/UIComponent_MenuBackground.cpp b/targets/app/common/UI/Components/UIComponent_MenuBackground.cpp similarity index 98% rename from targets/app/common/src/UI/Components/UIComponent_MenuBackground.cpp rename to targets/app/common/UI/Components/UIComponent_MenuBackground.cpp index a6e5640ea..7d9f6b9bc 100644 --- a/targets/app/common/src/UI/Components/UIComponent_MenuBackground.cpp +++ b/targets/app/common/UI/Components/UIComponent_MenuBackground.cpp @@ -1,8 +1,8 @@ #include "UIComponent_MenuBackground.h" #include "platform/sdl2/Render.h" -#include "app/common/src/UI/UILayer.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/UILayer.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" diff --git a/targets/app/common/src/UI/Components/UIComponent_MenuBackground.h b/targets/app/common/UI/Components/UIComponent_MenuBackground.h similarity index 91% rename from targets/app/common/src/UI/Components/UIComponent_MenuBackground.h rename to targets/app/common/UI/Components/UIComponent_MenuBackground.h index 1d57c5fdd..c22bc08bf 100644 --- a/targets/app/common/src/UI/Components/UIComponent_MenuBackground.h +++ b/targets/app/common/UI/Components/UIComponent_MenuBackground.h @@ -3,8 +3,8 @@ #include #include "platform/sdl2/Render.h" -#include "app/common/src/UI/All Platforms/UIEnums.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/All Platforms/UIEnums.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/rrCore.h" class UILayer; diff --git a/targets/app/common/src/UI/Components/UIComponent_Panorama.cpp b/targets/app/common/UI/Components/UIComponent_Panorama.cpp similarity index 98% rename from targets/app/common/src/UI/Components/UIComponent_Panorama.cpp rename to targets/app/common/UI/Components/UIComponent_Panorama.cpp index cc449f243..ca284e743 100644 --- a/targets/app/common/src/UI/Components/UIComponent_Panorama.cpp +++ b/targets/app/common/UI/Components/UIComponent_Panorama.cpp @@ -5,8 +5,8 @@ #include #include "platform/sdl2/Render.h" -#include "app/common/src/UI/UILayer.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/UILayer.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" diff --git a/targets/app/common/src/UI/Components/UIComponent_Panorama.h b/targets/app/common/UI/Components/UIComponent_Panorama.h similarity index 92% rename from targets/app/common/src/UI/Components/UIComponent_Panorama.h rename to targets/app/common/UI/Components/UIComponent_Panorama.h index 43c761321..798cb339d 100644 --- a/targets/app/common/src/UI/Components/UIComponent_Panorama.h +++ b/targets/app/common/UI/Components/UIComponent_Panorama.h @@ -3,8 +3,8 @@ #include #include "platform/sdl2/Render.h" -#include "app/common/src/UI/All Platforms/UIEnums.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/All Platforms/UIEnums.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" diff --git a/targets/app/common/src/UI/Components/UIComponent_PressStartToPlay.cpp b/targets/app/common/UI/Components/UIComponent_PressStartToPlay.cpp similarity index 97% rename from targets/app/common/src/UI/Components/UIComponent_PressStartToPlay.cpp rename to targets/app/common/UI/Components/UIComponent_PressStartToPlay.cpp index 8f1610125..6460c46dc 100644 --- a/targets/app/common/src/UI/Components/UIComponent_PressStartToPlay.cpp +++ b/targets/app/common/UI/Components/UIComponent_PressStartToPlay.cpp @@ -1,7 +1,7 @@ #include "UIComponent_PressStartToPlay.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/UIScene.h" #include "app/linux/LinuxGame.h" #include "app/linux/Linux_UIController.h" #include "strings.h" diff --git a/targets/app/common/src/UI/Components/UIComponent_PressStartToPlay.h b/targets/app/common/UI/Components/UIComponent_PressStartToPlay.h similarity index 91% rename from targets/app/common/src/UI/Components/UIComponent_PressStartToPlay.h rename to targets/app/common/UI/Components/UIComponent_PressStartToPlay.h index ca52c2a6f..14d434132 100644 --- a/targets/app/common/src/UI/Components/UIComponent_PressStartToPlay.h +++ b/targets/app/common/UI/Components/UIComponent_PressStartToPlay.h @@ -3,10 +3,10 @@ #include #include "platform/PlatformTypes.h" -#include "app/common/src/UI/All Platforms/UIEnums.h" -#include "app/common/src/UI/Controls/UIControl.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/All Platforms/UIEnums.h" +#include "app/common/UI/Controls/UIControl.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" diff --git a/targets/app/common/src/UI/Components/UIComponent_Tooltips.cpp b/targets/app/common/UI/Components/UIComponent_Tooltips.cpp similarity index 98% rename from targets/app/common/src/UI/Components/UIComponent_Tooltips.cpp rename to targets/app/common/UI/Components/UIComponent_Tooltips.cpp index 59bb96ffe..8e5d7f82b 100644 --- a/targets/app/common/src/UI/Components/UIComponent_Tooltips.cpp +++ b/targets/app/common/UI/Components/UIComponent_Tooltips.cpp @@ -3,10 +3,10 @@ #include "platform/sdl2/Profile.h" #include "platform/sdl2/Render.h" #include "app/common/App_enums.h" -#include "app/common/src/UI/All Platforms/UIEnums.h" -#include "app/common/src/UI/UILayer.h" -#include "app/common/src/UI/UIScene.h" -#include "app/common/src/UI/UIString.h" +#include "app/common/UI/All Platforms/UIEnums.h" +#include "app/common/UI/UILayer.h" +#include "app/common/UI/UIScene.h" +#include "app/common/UI/UIString.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" diff --git a/targets/app/common/src/UI/Components/UIComponent_Tooltips.h b/targets/app/common/UI/Components/UIComponent_Tooltips.h similarity index 95% rename from targets/app/common/src/UI/Components/UIComponent_Tooltips.h rename to targets/app/common/UI/Components/UIComponent_Tooltips.h index dc263cddb..95d02f872 100644 --- a/targets/app/common/src/UI/Components/UIComponent_Tooltips.h +++ b/targets/app/common/UI/Components/UIComponent_Tooltips.h @@ -6,9 +6,9 @@ #include "platform/InputActions.h" #include "platform/sdl2/Render.h" #include "app/common/App_enums.h" -#include "app/common/src/UI/All Platforms/UIEnums.h" -#include "app/common/src/UI/UIScene.h" -#include "app/common/src/UI/UIString.h" +#include "app/common/UI/All Platforms/UIEnums.h" +#include "app/common/UI/UIScene.h" +#include "app/common/UI/UIString.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" diff --git a/targets/app/common/src/UI/Components/UIComponent_TutorialPopup.cpp b/targets/app/common/UI/Components/UIComponent_TutorialPopup.cpp similarity index 98% rename from targets/app/common/src/UI/Components/UIComponent_TutorialPopup.cpp rename to targets/app/common/UI/Components/UIComponent_TutorialPopup.cpp index 69a1d1e44..1248ee97a 100644 --- a/targets/app/common/src/UI/Components/UIComponent_TutorialPopup.cpp +++ b/targets/app/common/UI/Components/UIComponent_TutorialPopup.cpp @@ -6,11 +6,11 @@ #include "platform/sdl2/Profile.h" #include "app/common/App_enums.h" -#include "app/common/src/Tutorial/Tutorial.h" -#include "app/common/src/Tutorial/TutorialEnum.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/UILayer.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/Tutorial/Tutorial.h" +#include "app/common/Tutorial/TutorialEnum.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/UILayer.h" +#include "app/common/UI/UIScene.h" #include "app/linux/LinuxGame.h" #include "app/linux/Linux_UIController.h" #include "util/StringHelpers.h" diff --git a/targets/app/common/src/UI/Components/UIComponent_TutorialPopup.h b/targets/app/common/UI/Components/UIComponent_TutorialPopup.h similarity index 93% rename from targets/app/common/src/UI/Components/UIComponent_TutorialPopup.h rename to targets/app/common/UI/Components/UIComponent_TutorialPopup.h index 82735f1da..c594f213f 100644 --- a/targets/app/common/src/UI/Components/UIComponent_TutorialPopup.h +++ b/targets/app/common/UI/Components/UIComponent_TutorialPopup.h @@ -4,11 +4,11 @@ #include #include "platform/sdl2/Render.h" -#include "app/common/src/UI/All Platforms/UIEnums.h" -#include "app/common/src/UI/All Platforms/UIStructs.h" -#include "app/common/src/UI/Controls/UIControl.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/All Platforms/UIEnums.h" +#include "app/common/UI/All Platforms/UIStructs.h" +#include "app/common/UI/Controls/UIControl.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" diff --git a/targets/app/common/src/UI/Components/UIScene_HUD.cpp b/targets/app/common/UI/Components/UIScene_HUD.cpp similarity index 99% rename from targets/app/common/src/UI/Components/UIScene_HUD.cpp rename to targets/app/common/UI/Components/UIScene_HUD.cpp index 448567cf9..b509b9048 100644 --- a/targets/app/common/src/UI/Components/UIScene_HUD.cpp +++ b/targets/app/common/UI/Components/UIScene_HUD.cpp @@ -6,10 +6,10 @@ #include "platform/sdl2/Profile.h" #include "app/common/App_enums.h" -#include "app/common/src/UI/Components/UIComponent_Chat.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/UILayer.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/Components/UIComponent_Chat.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/UILayer.h" +#include "app/common/UI/UIScene.h" #include "app/linux/LinuxGame.h" #include "app/linux/Linux_UIController.h" #include "util/StringHelpers.h" diff --git a/targets/app/common/src/UI/Components/UIScene_HUD.h b/targets/app/common/UI/Components/UIScene_HUD.h similarity index 96% rename from targets/app/common/src/UI/Components/UIScene_HUD.h rename to targets/app/common/UI/Components/UIScene_HUD.h index a565b1da0..9be484b44 100644 --- a/targets/app/common/src/UI/Components/UIScene_HUD.h +++ b/targets/app/common/UI/Components/UIScene_HUD.h @@ -3,11 +3,11 @@ #include #include "platform/sdl2/Render.h" -#include "app/common/src/UI/All Platforms/IUIScene_HUD.h" -#include "app/common/src/UI/All Platforms/UIEnums.h" -#include "app/common/src/UI/Controls/UIControl.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/All Platforms/IUIScene_HUD.h" +#include "app/common/UI/All Platforms/UIEnums.h" +#include "app/common/UI/Controls/UIControl.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" diff --git a/targets/app/common/src/UI/Controls/UIControl.cpp b/targets/app/common/UI/Controls/UIControl.cpp similarity index 99% rename from targets/app/common/src/UI/Controls/UIControl.cpp rename to targets/app/common/UI/Controls/UIControl.cpp index 2982ca3ca..f7227d1da 100644 --- a/targets/app/common/src/UI/Controls/UIControl.cpp +++ b/targets/app/common/UI/Controls/UIControl.cpp @@ -1,6 +1,6 @@ #include "UIControl.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" diff --git a/targets/app/common/src/UI/Controls/UIControl.h b/targets/app/common/UI/Controls/UIControl.h similarity index 100% rename from targets/app/common/src/UI/Controls/UIControl.h rename to targets/app/common/UI/Controls/UIControl.h diff --git a/targets/app/common/src/UI/Controls/UIControl_Base.cpp b/targets/app/common/UI/Controls/UIControl_Base.cpp similarity index 95% rename from targets/app/common/src/UI/Controls/UIControl_Base.cpp rename to targets/app/common/UI/Controls/UIControl_Base.cpp index c812d2871..633dda49c 100644 --- a/targets/app/common/src/UI/Controls/UIControl_Base.cpp +++ b/targets/app/common/UI/Controls/UIControl_Base.cpp @@ -1,11 +1,11 @@ -#include "app/common/src/UI/Controls/UIControl_Base.h" +#include "app/common/UI/Controls/UIControl_Base.h" #include #include -#include "app/common/src/UI/Controls/UIControl.h" -#include "app/common/src/UI/UIScene.h" -#include "app/common/src/UI/UIString.h" +#include "app/common/UI/Controls/UIControl.h" +#include "app/common/UI/UIScene.h" +#include "app/common/UI/UIString.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" diff --git a/targets/app/common/src/UI/Controls/UIControl_Base.h b/targets/app/common/UI/Controls/UIControl_Base.h similarity index 89% rename from targets/app/common/src/UI/Controls/UIControl_Base.h rename to targets/app/common/UI/Controls/UIControl_Base.h index 352a88ab0..5864e86e8 100644 --- a/targets/app/common/src/UI/Controls/UIControl_Base.h +++ b/targets/app/common/UI/Controls/UIControl_Base.h @@ -2,9 +2,9 @@ #include -#include "app/common/src/UI/Controls/UIControl.h" -#include "app/common/src/UI/UIScene.h" -#include "app/common/src/UI/UIString.h" +#include "app/common/UI/Controls/UIControl.h" +#include "app/common/UI/UIScene.h" +#include "app/common/UI/UIString.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" diff --git a/targets/app/common/src/UI/Controls/UIControl_BeaconEffectButton.cpp b/targets/app/common/UI/Controls/UIControl_BeaconEffectButton.cpp similarity index 96% rename from targets/app/common/src/UI/Controls/UIControl_BeaconEffectButton.cpp rename to targets/app/common/UI/Controls/UIControl_BeaconEffectButton.cpp index ed88a0bc9..87e8ea1b5 100644 --- a/targets/app/common/src/UI/Controls/UIControl_BeaconEffectButton.cpp +++ b/targets/app/common/UI/Controls/UIControl_BeaconEffectButton.cpp @@ -1,7 +1,7 @@ #include "UIControl_BeaconEffectButton.h" -#include "app/common/src/UI/Controls/UIControl.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/Controls/UIControl.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" diff --git a/targets/app/common/src/UI/Controls/UIControl_BeaconEffectButton.h b/targets/app/common/UI/Controls/UIControl_BeaconEffectButton.h similarity index 88% rename from targets/app/common/src/UI/Controls/UIControl_BeaconEffectButton.h rename to targets/app/common/UI/Controls/UIControl_BeaconEffectButton.h index eb4db2422..bdc889568 100644 --- a/targets/app/common/src/UI/Controls/UIControl_BeaconEffectButton.h +++ b/targets/app/common/UI/Controls/UIControl_BeaconEffectButton.h @@ -2,9 +2,9 @@ #include -#include "app/common/src/UI/Controls/UIControl.h" -#include "app/common/src/UI/Controls/UIControl_BeaconEffectButton.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/Controls/UIControl.h" +#include "app/common/UI/Controls/UIControl_BeaconEffectButton.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" diff --git a/targets/app/common/src/UI/Controls/UIControl_BitmapIcon.cpp b/targets/app/common/UI/Controls/UIControl_BitmapIcon.cpp similarity index 93% rename from targets/app/common/src/UI/Controls/UIControl_BitmapIcon.cpp rename to targets/app/common/UI/Controls/UIControl_BitmapIcon.cpp index a7237bdd3..d80955019 100644 --- a/targets/app/common/src/UI/Controls/UIControl_BitmapIcon.cpp +++ b/targets/app/common/UI/Controls/UIControl_BitmapIcon.cpp @@ -1,7 +1,7 @@ #include "UIControl_BitmapIcon.h" -#include "app/common/src/UI/Controls/UIControl.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/Controls/UIControl.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" diff --git a/targets/app/common/src/UI/Controls/UIControl_BitmapIcon.h b/targets/app/common/UI/Controls/UIControl_BitmapIcon.h similarity index 75% rename from targets/app/common/src/UI/Controls/UIControl_BitmapIcon.h rename to targets/app/common/UI/Controls/UIControl_BitmapIcon.h index f6b037a59..8a455b1f5 100644 --- a/targets/app/common/src/UI/Controls/UIControl_BitmapIcon.h +++ b/targets/app/common/UI/Controls/UIControl_BitmapIcon.h @@ -2,9 +2,9 @@ #include -#include "app/common/src/UI/Controls/UIControl.h" -#include "app/common/src/UI/Controls/UIControl_BitmapIcon.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/Controls/UIControl.h" +#include "app/common/UI/Controls/UIControl_BitmapIcon.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" diff --git a/targets/app/common/src/UI/Controls/UIControl_Button.cpp b/targets/app/common/UI/Controls/UIControl_Button.cpp similarity index 90% rename from targets/app/common/src/UI/Controls/UIControl_Button.cpp rename to targets/app/common/UI/Controls/UIControl_Button.cpp index 425c11143..99965b371 100644 --- a/targets/app/common/src/UI/Controls/UIControl_Button.cpp +++ b/targets/app/common/UI/Controls/UIControl_Button.cpp @@ -1,9 +1,9 @@ #include "UIControl_Button.h" -#include "app/common/src/UI/Controls/UIControl.h" -#include "app/common/src/UI/Controls/UIControl_Base.h" -#include "app/common/src/UI/UIScene.h" -#include "app/common/src/UI/UIString.h" +#include "app/common/UI/Controls/UIControl.h" +#include "app/common/UI/Controls/UIControl_Base.h" +#include "app/common/UI/UIScene.h" +#include "app/common/UI/UIString.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" diff --git a/targets/app/common/src/UI/Controls/UIControl_Button.h b/targets/app/common/UI/Controls/UIControl_Button.h similarity index 76% rename from targets/app/common/src/UI/Controls/UIControl_Button.h rename to targets/app/common/UI/Controls/UIControl_Button.h index 54260d16a..f595550bf 100644 --- a/targets/app/common/src/UI/Controls/UIControl_Button.h +++ b/targets/app/common/UI/Controls/UIControl_Button.h @@ -2,10 +2,10 @@ #include -#include "app/common/src/UI/Controls/UIControl_Base.h" -#include "app/common/src/UI/Controls/UIControl_Button.h" -#include "app/common/src/UI/UIScene.h" -#include "app/common/src/UI/UIString.h" +#include "app/common/UI/Controls/UIControl_Base.h" +#include "app/common/UI/Controls/UIControl_Button.h" +#include "app/common/UI/UIScene.h" +#include "app/common/UI/UIString.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" diff --git a/targets/app/common/src/UI/Controls/UIControl_ButtonList.cpp b/targets/app/common/UI/Controls/UIControl_ButtonList.cpp similarity index 97% rename from targets/app/common/src/UI/Controls/UIControl_ButtonList.cpp rename to targets/app/common/UI/Controls/UIControl_ButtonList.cpp index 84339ec2d..6c77ce52e 100644 --- a/targets/app/common/src/UI/Controls/UIControl_ButtonList.cpp +++ b/targets/app/common/UI/Controls/UIControl_ButtonList.cpp @@ -1,9 +1,9 @@ #include "UIControl_ButtonList.h" -#include "app/common/src/UI/Controls/UIControl.h" -#include "app/common/src/UI/Controls/UIControl_Base.h" -#include "app/common/src/UI/UIScene.h" -#include "app/common/src/UI/UIString.h" +#include "app/common/UI/Controls/UIControl.h" +#include "app/common/UI/Controls/UIControl_Base.h" +#include "app/common/UI/UIScene.h" +#include "app/common/UI/UIString.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" diff --git a/targets/app/common/src/UI/Controls/UIControl_ButtonList.h b/targets/app/common/UI/Controls/UIControl_ButtonList.h similarity index 88% rename from targets/app/common/src/UI/Controls/UIControl_ButtonList.h rename to targets/app/common/UI/Controls/UIControl_ButtonList.h index 144cff072..313a6b287 100644 --- a/targets/app/common/src/UI/Controls/UIControl_ButtonList.h +++ b/targets/app/common/UI/Controls/UIControl_ButtonList.h @@ -3,10 +3,10 @@ #include #include -#include "app/common/src/UI/Controls/UIControl_Base.h" -#include "app/common/src/UI/Controls/UIControl_ButtonList.h" -#include "app/common/src/UI/UIScene.h" -#include "app/common/src/UI/UIString.h" +#include "app/common/UI/Controls/UIControl_Base.h" +#include "app/common/UI/Controls/UIControl_ButtonList.h" +#include "app/common/UI/UIScene.h" +#include "app/common/UI/UIString.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" diff --git a/targets/app/common/src/UI/Controls/UIControl_CheckBox.cpp b/targets/app/common/UI/Controls/UIControl_CheckBox.cpp similarity index 94% rename from targets/app/common/src/UI/Controls/UIControl_CheckBox.cpp rename to targets/app/common/UI/Controls/UIControl_CheckBox.cpp index a0432ba01..6ec876a55 100644 --- a/targets/app/common/src/UI/Controls/UIControl_CheckBox.cpp +++ b/targets/app/common/UI/Controls/UIControl_CheckBox.cpp @@ -1,9 +1,9 @@ #include "UIControl_CheckBox.h" -#include "app/common/src/UI/Controls/UIControl.h" -#include "app/common/src/UI/Controls/UIControl_Base.h" -#include "app/common/src/UI/UIScene.h" -#include "app/common/src/UI/UIString.h" +#include "app/common/UI/Controls/UIControl.h" +#include "app/common/UI/Controls/UIControl_Base.h" +#include "app/common/UI/UIScene.h" +#include "app/common/UI/UIString.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" diff --git a/targets/app/common/src/UI/Controls/UIControl_CheckBox.h b/targets/app/common/UI/Controls/UIControl_CheckBox.h similarity index 79% rename from targets/app/common/src/UI/Controls/UIControl_CheckBox.h rename to targets/app/common/UI/Controls/UIControl_CheckBox.h index 3c846d90a..da891a56b 100644 --- a/targets/app/common/src/UI/Controls/UIControl_CheckBox.h +++ b/targets/app/common/UI/Controls/UIControl_CheckBox.h @@ -2,10 +2,10 @@ #include -#include "app/common/src/UI/Controls/UIControl_Base.h" -#include "app/common/src/UI/Controls/UIControl_CheckBox.h" -#include "app/common/src/UI/UIScene.h" -#include "app/common/src/UI/UIString.h" +#include "app/common/UI/Controls/UIControl_Base.h" +#include "app/common/UI/Controls/UIControl_CheckBox.h" +#include "app/common/UI/UIScene.h" +#include "app/common/UI/UIString.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" diff --git a/targets/app/common/src/UI/Controls/UIControl_Cursor.cpp b/targets/app/common/UI/Controls/UIControl_Cursor.cpp similarity index 83% rename from targets/app/common/src/UI/Controls/UIControl_Cursor.cpp rename to targets/app/common/UI/Controls/UIControl_Cursor.cpp index 74a8b0c3e..3a5c44f4b 100644 --- a/targets/app/common/src/UI/Controls/UIControl_Cursor.cpp +++ b/targets/app/common/UI/Controls/UIControl_Cursor.cpp @@ -1,7 +1,7 @@ #include "UIControl_Cursor.h" -#include "app/common/src/UI/Controls/UIControl.h" -#include "app/common/src/UI/Controls/UIControl_Base.h" +#include "app/common/UI/Controls/UIControl.h" +#include "app/common/UI/Controls/UIControl_Base.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" diff --git a/targets/app/common/src/UI/Controls/UIControl_Cursor.h b/targets/app/common/UI/Controls/UIControl_Cursor.h similarity index 71% rename from targets/app/common/src/UI/Controls/UIControl_Cursor.h rename to targets/app/common/UI/Controls/UIControl_Cursor.h index 353bff3b8..8488628d0 100644 --- a/targets/app/common/src/UI/Controls/UIControl_Cursor.h +++ b/targets/app/common/UI/Controls/UIControl_Cursor.h @@ -2,9 +2,9 @@ #include -#include "app/common/src/UI/Controls/UIControl_Base.h" -#include "app/common/src/UI/Controls/UIControl_Cursor.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/Controls/UIControl_Base.h" +#include "app/common/UI/Controls/UIControl_Cursor.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" diff --git a/targets/app/common/src/UI/Controls/UIControl_DLCList.cpp b/targets/app/common/UI/Controls/UIControl_DLCList.cpp similarity index 94% rename from targets/app/common/src/UI/Controls/UIControl_DLCList.cpp rename to targets/app/common/UI/Controls/UIControl_DLCList.cpp index 6f135eb02..3ce5ae42f 100644 --- a/targets/app/common/src/UI/Controls/UIControl_DLCList.cpp +++ b/targets/app/common/UI/Controls/UIControl_DLCList.cpp @@ -1,8 +1,8 @@ #include "UIControl_DLCList.h" -#include "app/common/src/UI/Controls/UIControl.h" -#include "app/common/src/UI/Controls/UIControl_ButtonList.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/Controls/UIControl.h" +#include "app/common/UI/Controls/UIControl_ButtonList.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" diff --git a/targets/app/common/src/UI/Controls/UIControl_DLCList.h b/targets/app/common/UI/Controls/UIControl_DLCList.h similarity index 86% rename from targets/app/common/src/UI/Controls/UIControl_DLCList.h rename to targets/app/common/UI/Controls/UIControl_DLCList.h index 959be49ce..63cdb375c 100644 --- a/targets/app/common/src/UI/Controls/UIControl_DLCList.h +++ b/targets/app/common/UI/Controls/UIControl_DLCList.h @@ -2,8 +2,8 @@ #include -#include "app/common/src/UI/Controls/UIControl_DLCList.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/Controls/UIControl_DLCList.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" diff --git a/targets/app/common/src/UI/Controls/UIControl_DynamicLabel.cpp b/targets/app/common/UI/Controls/UIControl_DynamicLabel.cpp similarity index 95% rename from targets/app/common/src/UI/Controls/UIControl_DynamicLabel.cpp rename to targets/app/common/UI/Controls/UIControl_DynamicLabel.cpp index e376f9e76..1c4aac7a9 100644 --- a/targets/app/common/src/UI/Controls/UIControl_DynamicLabel.cpp +++ b/targets/app/common/UI/Controls/UIControl_DynamicLabel.cpp @@ -1,8 +1,8 @@ #include "UIControl_DynamicLabel.h" -#include "app/common/src/UI/Controls/UIControl.h" -#include "app/common/src/UI/Controls/UIControl_Base.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/Controls/UIControl.h" +#include "app/common/UI/Controls/UIControl_Base.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" diff --git a/targets/app/common/src/UI/Controls/UIControl_DynamicLabel.h b/targets/app/common/UI/Controls/UIControl_DynamicLabel.h similarity index 83% rename from targets/app/common/src/UI/Controls/UIControl_DynamicLabel.h rename to targets/app/common/UI/Controls/UIControl_DynamicLabel.h index f715db092..987c589cd 100644 --- a/targets/app/common/src/UI/Controls/UIControl_DynamicLabel.h +++ b/targets/app/common/UI/Controls/UIControl_DynamicLabel.h @@ -2,9 +2,9 @@ #include -#include "app/common/src/UI/Controls/UIControl_DynamicLabel.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/Controls/UIControl_DynamicLabel.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" diff --git a/targets/app/common/src/UI/Controls/UIControl_EnchantmentBook.cpp b/targets/app/common/UI/Controls/UIControl_EnchantmentBook.cpp similarity index 96% rename from targets/app/common/src/UI/Controls/UIControl_EnchantmentBook.cpp rename to targets/app/common/UI/Controls/UIControl_EnchantmentBook.cpp index 4942d20ea..be543ad91 100644 --- a/targets/app/common/src/UI/Controls/UIControl_EnchantmentBook.cpp +++ b/targets/app/common/UI/Controls/UIControl_EnchantmentBook.cpp @@ -3,8 +3,8 @@ #include #include "platform/sdl2/Render.h" -#include "app/common/src/UI/Controls/UIControl.h" -#include "app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.h" +#include "app/common/UI/Controls/UIControl.h" +#include "app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" diff --git a/targets/app/common/src/UI/Controls/UIControl_EnchantmentBook.h b/targets/app/common/UI/Controls/UIControl_EnchantmentBook.h similarity index 83% rename from targets/app/common/src/UI/Controls/UIControl_EnchantmentBook.h rename to targets/app/common/UI/Controls/UIControl_EnchantmentBook.h index eab4e9c59..31e0ff88d 100644 --- a/targets/app/common/src/UI/Controls/UIControl_EnchantmentBook.h +++ b/targets/app/common/UI/Controls/UIControl_EnchantmentBook.h @@ -2,9 +2,9 @@ #include -#include "app/common/src/UI/Controls/UIControl.h" -#include "app/common/src/UI/Controls/UIControl_EnchantmentBook.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/Controls/UIControl.h" +#include "app/common/UI/Controls/UIControl_EnchantmentBook.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" diff --git a/targets/app/common/src/UI/Controls/UIControl_EnchantmentButton.cpp b/targets/app/common/UI/Controls/UIControl_EnchantmentButton.cpp similarity index 96% rename from targets/app/common/src/UI/Controls/UIControl_EnchantmentButton.cpp rename to targets/app/common/UI/Controls/UIControl_EnchantmentButton.cpp index 8822b5972..d6249f361 100644 --- a/targets/app/common/src/UI/Controls/UIControl_EnchantmentButton.cpp +++ b/targets/app/common/UI/Controls/UIControl_EnchantmentButton.cpp @@ -7,10 +7,10 @@ #include "platform/sdl2/Render.h" #include "app/common/App_enums.h" -#include "app/common/src/UI/Controls/UIControl.h" -#include "app/common/src/UI/Controls/UIControl_Button.h" -#include "app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/Controls/UIControl.h" +#include "app/common/UI/Controls/UIControl_Button.h" +#include "app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" diff --git a/targets/app/common/src/UI/Controls/UIControl_EnchantmentButton.h b/targets/app/common/UI/Controls/UIControl_EnchantmentButton.h similarity index 92% rename from targets/app/common/src/UI/Controls/UIControl_EnchantmentButton.h rename to targets/app/common/UI/Controls/UIControl_EnchantmentButton.h index 7be2c5825..ffacbf700 100644 --- a/targets/app/common/src/UI/Controls/UIControl_EnchantmentButton.h +++ b/targets/app/common/UI/Controls/UIControl_EnchantmentButton.h @@ -3,8 +3,8 @@ #include #include -#include "app/common/src/UI/Controls/UIControl_EnchantmentButton.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/Controls/UIControl_EnchantmentButton.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" diff --git a/targets/app/common/src/UI/Controls/UIControl_HTMLLabel.cpp b/targets/app/common/UI/Controls/UIControl_HTMLLabel.cpp similarity index 95% rename from targets/app/common/src/UI/Controls/UIControl_HTMLLabel.cpp rename to targets/app/common/UI/Controls/UIControl_HTMLLabel.cpp index 79f783cb5..52e2d887b 100644 --- a/targets/app/common/src/UI/Controls/UIControl_HTMLLabel.cpp +++ b/targets/app/common/UI/Controls/UIControl_HTMLLabel.cpp @@ -1,8 +1,8 @@ #include "UIControl_HTMLLabel.h" -#include "app/common/src/UI/Controls/UIControl.h" -#include "app/common/src/UI/Controls/UIControl_Base.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/Controls/UIControl.h" +#include "app/common/UI/Controls/UIControl_Base.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" diff --git a/targets/app/common/src/UI/Controls/UIControl_HTMLLabel.h b/targets/app/common/UI/Controls/UIControl_HTMLLabel.h similarity index 79% rename from targets/app/common/src/UI/Controls/UIControl_HTMLLabel.h rename to targets/app/common/UI/Controls/UIControl_HTMLLabel.h index 5267e2386..eb2d4319c 100644 --- a/targets/app/common/src/UI/Controls/UIControl_HTMLLabel.h +++ b/targets/app/common/UI/Controls/UIControl_HTMLLabel.h @@ -2,10 +2,10 @@ #include -#include "app/common/src/UI/Controls/UIControl_Base.h" -#include "app/common/src/UI/Controls/UIControl_HTMLLabel.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/Controls/UIControl_Base.h" +#include "app/common/UI/Controls/UIControl_HTMLLabel.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" diff --git a/targets/app/common/src/UI/Controls/UIControl_Label.cpp b/targets/app/common/UI/Controls/UIControl_Label.cpp similarity index 87% rename from targets/app/common/src/UI/Controls/UIControl_Label.cpp rename to targets/app/common/UI/Controls/UIControl_Label.cpp index bc8e883c2..81d14ebd8 100644 --- a/targets/app/common/src/UI/Controls/UIControl_Label.cpp +++ b/targets/app/common/UI/Controls/UIControl_Label.cpp @@ -1,9 +1,9 @@ #include "UIControl_Label.h" -#include "app/common/src/UI/Controls/UIControl.h" -#include "app/common/src/UI/Controls/UIControl_Base.h" -#include "app/common/src/UI/UIScene.h" -#include "app/common/src/UI/UIString.h" +#include "app/common/UI/Controls/UIControl.h" +#include "app/common/UI/Controls/UIControl_Base.h" +#include "app/common/UI/UIScene.h" +#include "app/common/UI/UIString.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" diff --git a/targets/app/common/src/UI/Controls/UIControl_Label.h b/targets/app/common/UI/Controls/UIControl_Label.h similarity index 74% rename from targets/app/common/src/UI/Controls/UIControl_Label.h rename to targets/app/common/UI/Controls/UIControl_Label.h index fa4d935b6..ff2e86f00 100644 --- a/targets/app/common/src/UI/Controls/UIControl_Label.h +++ b/targets/app/common/UI/Controls/UIControl_Label.h @@ -2,10 +2,10 @@ #include -#include "app/common/src/UI/Controls/UIControl_Base.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/UIScene.h" -#include "app/common/src/UI/UIString.h" +#include "app/common/UI/Controls/UIControl_Base.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/UIScene.h" +#include "app/common/UI/UIString.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" diff --git a/targets/app/common/src/UI/Controls/UIControl_LeaderboardList.cpp b/targets/app/common/UI/Controls/UIControl_LeaderboardList.cpp similarity index 98% rename from targets/app/common/src/UI/Controls/UIControl_LeaderboardList.cpp rename to targets/app/common/UI/Controls/UIControl_LeaderboardList.cpp index 182ebd80b..cae041698 100644 --- a/targets/app/common/src/UI/Controls/UIControl_LeaderboardList.cpp +++ b/targets/app/common/UI/Controls/UIControl_LeaderboardList.cpp @@ -1,8 +1,8 @@ #include "UIControl_LeaderboardList.h" -#include "app/common/src/UI/Controls/UIControl.h" -#include "app/common/src/UI/Controls/UIControl_Base.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/Controls/UIControl.h" +#include "app/common/UI/Controls/UIControl_Base.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" diff --git a/targets/app/common/src/UI/Controls/UIControl_LeaderboardList.h b/targets/app/common/UI/Controls/UIControl_LeaderboardList.h similarity index 91% rename from targets/app/common/src/UI/Controls/UIControl_LeaderboardList.h rename to targets/app/common/UI/Controls/UIControl_LeaderboardList.h index 09b0ac687..d6a1feb56 100644 --- a/targets/app/common/src/UI/Controls/UIControl_LeaderboardList.h +++ b/targets/app/common/UI/Controls/UIControl_LeaderboardList.h @@ -2,9 +2,9 @@ #include -#include "app/common/src/UI/Controls/UIControl_Base.h" -#include "app/common/src/UI/Controls/UIControl_LeaderboardList.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/Controls/UIControl_Base.h" +#include "app/common/UI/Controls/UIControl_LeaderboardList.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" diff --git a/targets/app/common/src/UI/Controls/UIControl_MinecraftHorse.cpp b/targets/app/common/UI/Controls/UIControl_MinecraftHorse.cpp similarity index 94% rename from targets/app/common/src/UI/Controls/UIControl_MinecraftHorse.cpp rename to targets/app/common/UI/Controls/UIControl_MinecraftHorse.cpp index b785e2a02..046a5b163 100644 --- a/targets/app/common/src/UI/Controls/UIControl_MinecraftHorse.cpp +++ b/targets/app/common/UI/Controls/UIControl_MinecraftHorse.cpp @@ -1,4 +1,4 @@ -#include "app/common/src/UI/Controls/UIControl_MinecraftHorse.h" +#include "app/common/UI/Controls/UIControl_MinecraftHorse.h" #include @@ -6,8 +6,8 @@ #include #include "platform/sdl2/Render.h" -#include "app/common/src/UI/Controls/UIControl.h" -#include "app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.h" +#include "app/common/UI/Controls/UIControl.h" +#include "app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" diff --git a/targets/app/common/src/UI/Controls/UIControl_MinecraftHorse.h b/targets/app/common/UI/Controls/UIControl_MinecraftHorse.h similarity index 85% rename from targets/app/common/src/UI/Controls/UIControl_MinecraftHorse.h rename to targets/app/common/UI/Controls/UIControl_MinecraftHorse.h index 8aea1d504..31e824f60 100644 --- a/targets/app/common/src/UI/Controls/UIControl_MinecraftHorse.h +++ b/targets/app/common/UI/Controls/UIControl_MinecraftHorse.h @@ -1,6 +1,6 @@ #pragma once -#include "app/common/src/UI/Controls/UIControl_MinecraftHorse.h" +#include "app/common/UI/Controls/UIControl_MinecraftHorse.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" diff --git a/targets/app/common/src/UI/Controls/UIControl_MinecraftPlayer.cpp b/targets/app/common/UI/Controls/UIControl_MinecraftPlayer.cpp similarity index 96% rename from targets/app/common/src/UI/Controls/UIControl_MinecraftPlayer.cpp rename to targets/app/common/UI/Controls/UIControl_MinecraftPlayer.cpp index 4a025068b..32a866138 100644 --- a/targets/app/common/src/UI/Controls/UIControl_MinecraftPlayer.cpp +++ b/targets/app/common/UI/Controls/UIControl_MinecraftPlayer.cpp @@ -6,8 +6,8 @@ #include #include "platform/sdl2/Render.h" -#include "app/common/src/UI/Controls/UIControl.h" -#include "app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.h" +#include "app/common/UI/Controls/UIControl.h" +#include "app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" diff --git a/targets/app/common/src/UI/Controls/UIControl_MinecraftPlayer.h b/targets/app/common/UI/Controls/UIControl_MinecraftPlayer.h similarity index 85% rename from targets/app/common/src/UI/Controls/UIControl_MinecraftPlayer.h rename to targets/app/common/UI/Controls/UIControl_MinecraftPlayer.h index 341d161bf..89d94f366 100644 --- a/targets/app/common/src/UI/Controls/UIControl_MinecraftPlayer.h +++ b/targets/app/common/UI/Controls/UIControl_MinecraftPlayer.h @@ -1,6 +1,6 @@ #pragma once -#include "app/common/src/UI/Controls/UIControl_MinecraftPlayer.h" +#include "app/common/UI/Controls/UIControl_MinecraftPlayer.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" diff --git a/targets/app/common/src/UI/Controls/UIControl_PlayerList.cpp b/targets/app/common/UI/Controls/UIControl_PlayerList.cpp similarity index 94% rename from targets/app/common/src/UI/Controls/UIControl_PlayerList.cpp rename to targets/app/common/UI/Controls/UIControl_PlayerList.cpp index e62ba1e9b..80bb89d99 100644 --- a/targets/app/common/src/UI/Controls/UIControl_PlayerList.cpp +++ b/targets/app/common/UI/Controls/UIControl_PlayerList.cpp @@ -1,8 +1,8 @@ #include "UIControl_PlayerList.h" -#include "app/common/src/UI/Controls/UIControl.h" -#include "app/common/src/UI/Controls/UIControl_ButtonList.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/Controls/UIControl.h" +#include "app/common/UI/Controls/UIControl_ButtonList.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" diff --git a/targets/app/common/src/UI/Controls/UIControl_PlayerList.h b/targets/app/common/UI/Controls/UIControl_PlayerList.h similarity index 86% rename from targets/app/common/src/UI/Controls/UIControl_PlayerList.h rename to targets/app/common/UI/Controls/UIControl_PlayerList.h index 714eef50d..ab2a7a954 100644 --- a/targets/app/common/src/UI/Controls/UIControl_PlayerList.h +++ b/targets/app/common/UI/Controls/UIControl_PlayerList.h @@ -2,8 +2,8 @@ #include -#include "app/common/src/UI/Controls/UIControl_PlayerList.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/Controls/UIControl_PlayerList.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" diff --git a/targets/app/common/src/UI/Controls/UIControl_PlayerSkinPreview.cpp b/targets/app/common/UI/Controls/UIControl_PlayerSkinPreview.cpp similarity index 99% rename from targets/app/common/src/UI/Controls/UIControl_PlayerSkinPreview.cpp rename to targets/app/common/UI/Controls/UIControl_PlayerSkinPreview.cpp index 0684d7c3f..44431a5cd 100644 --- a/targets/app/common/src/UI/Controls/UIControl_PlayerSkinPreview.cpp +++ b/targets/app/common/UI/Controls/UIControl_PlayerSkinPreview.cpp @@ -8,7 +8,7 @@ #include "platform/sdl2/Render.h" #include "app/common/App_enums.h" -#include "app/common/src/UI/Controls/UIControl.h" +#include "app/common/UI/Controls/UIControl.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" diff --git a/targets/app/common/src/UI/Controls/UIControl_PlayerSkinPreview.h b/targets/app/common/UI/Controls/UIControl_PlayerSkinPreview.h similarity index 97% rename from targets/app/common/src/UI/Controls/UIControl_PlayerSkinPreview.h rename to targets/app/common/UI/Controls/UIControl_PlayerSkinPreview.h index 9d599a52e..6f07238bf 100644 --- a/targets/app/common/src/UI/Controls/UIControl_PlayerSkinPreview.h +++ b/targets/app/common/UI/Controls/UIControl_PlayerSkinPreview.h @@ -5,7 +5,7 @@ #include #include -#include "app/common/src/UI/Controls/UIControl_PlayerSkinPreview.h" +#include "app/common/UI/Controls/UIControl_PlayerSkinPreview.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" diff --git a/targets/app/common/src/UI/Controls/UIControl_Progress.cpp b/targets/app/common/UI/Controls/UIControl_Progress.cpp similarity index 93% rename from targets/app/common/src/UI/Controls/UIControl_Progress.cpp rename to targets/app/common/UI/Controls/UIControl_Progress.cpp index 93d81ca0e..7f2a28fd8 100644 --- a/targets/app/common/src/UI/Controls/UIControl_Progress.cpp +++ b/targets/app/common/UI/Controls/UIControl_Progress.cpp @@ -1,9 +1,9 @@ #include "UIControl_Progress.h" -#include "app/common/src/UI/Controls/UIControl.h" -#include "app/common/src/UI/Controls/UIControl_Base.h" -#include "app/common/src/UI/UIScene.h" -#include "app/common/src/UI/UIString.h" +#include "app/common/UI/Controls/UIControl.h" +#include "app/common/UI/Controls/UIControl_Base.h" +#include "app/common/UI/UIScene.h" +#include "app/common/UI/UIString.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" diff --git a/targets/app/common/src/UI/Controls/UIControl_Progress.h b/targets/app/common/UI/Controls/UIControl_Progress.h similarity index 78% rename from targets/app/common/src/UI/Controls/UIControl_Progress.h rename to targets/app/common/UI/Controls/UIControl_Progress.h index 50b921854..d1a1c4348 100644 --- a/targets/app/common/src/UI/Controls/UIControl_Progress.h +++ b/targets/app/common/UI/Controls/UIControl_Progress.h @@ -2,10 +2,10 @@ #include -#include "app/common/src/UI/Controls/UIControl_Base.h" -#include "app/common/src/UI/Controls/UIControl_Progress.h" -#include "app/common/src/UI/UIScene.h" -#include "app/common/src/UI/UIString.h" +#include "app/common/UI/Controls/UIControl_Base.h" +#include "app/common/UI/Controls/UIControl_Progress.h" +#include "app/common/UI/UIScene.h" +#include "app/common/UI/UIString.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" diff --git a/targets/app/common/src/UI/Controls/UIControl_SaveList.cpp b/targets/app/common/UI/Controls/UIControl_SaveList.cpp similarity index 96% rename from targets/app/common/src/UI/Controls/UIControl_SaveList.cpp rename to targets/app/common/UI/Controls/UIControl_SaveList.cpp index 86cd16160..64c8346a2 100644 --- a/targets/app/common/src/UI/Controls/UIControl_SaveList.cpp +++ b/targets/app/common/UI/Controls/UIControl_SaveList.cpp @@ -1,8 +1,8 @@ #include "UIControl_SaveList.h" -#include "app/common/src/UI/Controls/UIControl.h" -#include "app/common/src/UI/Controls/UIControl_ButtonList.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/Controls/UIControl.h" +#include "app/common/UI/Controls/UIControl_ButtonList.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" diff --git a/targets/app/common/src/UI/Controls/UIControl_SaveList.h b/targets/app/common/UI/Controls/UIControl_SaveList.h similarity index 91% rename from targets/app/common/src/UI/Controls/UIControl_SaveList.h rename to targets/app/common/UI/Controls/UIControl_SaveList.h index c6bc50cb5..457943027 100644 --- a/targets/app/common/src/UI/Controls/UIControl_SaveList.h +++ b/targets/app/common/UI/Controls/UIControl_SaveList.h @@ -2,8 +2,8 @@ #include -#include "app/common/src/UI/Controls/UIControl_SaveList.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/Controls/UIControl_SaveList.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" diff --git a/targets/app/common/src/UI/Controls/UIControl_Slider.cpp b/targets/app/common/UI/Controls/UIControl_Slider.cpp similarity index 94% rename from targets/app/common/src/UI/Controls/UIControl_Slider.cpp rename to targets/app/common/UI/Controls/UIControl_Slider.cpp index c6dc4fc6c..055d9d1b3 100644 --- a/targets/app/common/src/UI/Controls/UIControl_Slider.cpp +++ b/targets/app/common/UI/Controls/UIControl_Slider.cpp @@ -1,9 +1,9 @@ #include "UIControl_Slider.h" -#include "app/common/src/UI/Controls/UIControl.h" -#include "app/common/src/UI/Controls/UIControl_Base.h" -#include "app/common/src/UI/UIScene.h" -#include "app/common/src/UI/UIString.h" +#include "app/common/UI/Controls/UIControl.h" +#include "app/common/UI/Controls/UIControl_Base.h" +#include "app/common/UI/UIScene.h" +#include "app/common/UI/UIString.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" diff --git a/targets/app/common/src/UI/Controls/UIControl_Slider.h b/targets/app/common/UI/Controls/UIControl_Slider.h similarity index 84% rename from targets/app/common/src/UI/Controls/UIControl_Slider.h rename to targets/app/common/UI/Controls/UIControl_Slider.h index dd26125eb..5eeab750a 100644 --- a/targets/app/common/src/UI/Controls/UIControl_Slider.h +++ b/targets/app/common/UI/Controls/UIControl_Slider.h @@ -3,10 +3,10 @@ #include #include -#include "app/common/src/UI/Controls/UIControl_Base.h" -#include "app/common/src/UI/Controls/UIControl_Slider.h" -#include "app/common/src/UI/UIScene.h" -#include "app/common/src/UI/UIString.h" +#include "app/common/UI/Controls/UIControl_Base.h" +#include "app/common/UI/Controls/UIControl_Slider.h" +#include "app/common/UI/UIScene.h" +#include "app/common/UI/UIString.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" diff --git a/targets/app/common/src/UI/Controls/UIControl_SlotList.cpp b/targets/app/common/UI/Controls/UIControl_SlotList.cpp similarity index 95% rename from targets/app/common/src/UI/Controls/UIControl_SlotList.cpp rename to targets/app/common/UI/Controls/UIControl_SlotList.cpp index b6714e551..4308839e6 100644 --- a/targets/app/common/src/UI/Controls/UIControl_SlotList.cpp +++ b/targets/app/common/UI/Controls/UIControl_SlotList.cpp @@ -1,8 +1,8 @@ #include "UIControl_SlotList.h" -#include "app/common/src/UI/Controls/UIControl.h" -#include "app/common/src/UI/Controls/UIControl_Base.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/Controls/UIControl.h" +#include "app/common/UI/Controls/UIControl_Base.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" diff --git a/targets/app/common/src/UI/Controls/UIControl_SlotList.h b/targets/app/common/UI/Controls/UIControl_SlotList.h similarity index 85% rename from targets/app/common/src/UI/Controls/UIControl_SlotList.h rename to targets/app/common/UI/Controls/UIControl_SlotList.h index 2d470273c..6a77d7608 100644 --- a/targets/app/common/src/UI/Controls/UIControl_SlotList.h +++ b/targets/app/common/UI/Controls/UIControl_SlotList.h @@ -2,9 +2,9 @@ #include -#include "app/common/src/UI/Controls/UIControl_Base.h" -#include "app/common/src/UI/Controls/UIControl_SlotList.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/Controls/UIControl_Base.h" +#include "app/common/UI/Controls/UIControl_SlotList.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" diff --git a/targets/app/common/src/UI/Controls/UIControl_SpaceIndicatorBar.cpp b/targets/app/common/UI/Controls/UIControl_SpaceIndicatorBar.cpp similarity index 95% rename from targets/app/common/src/UI/Controls/UIControl_SpaceIndicatorBar.cpp rename to targets/app/common/UI/Controls/UIControl_SpaceIndicatorBar.cpp index ac40b11c6..8f1256647 100644 --- a/targets/app/common/src/UI/Controls/UIControl_SpaceIndicatorBar.cpp +++ b/targets/app/common/UI/Controls/UIControl_SpaceIndicatorBar.cpp @@ -1,9 +1,9 @@ #include "UIControl_SpaceIndicatorBar.h" -#include "app/common/src/UI/Controls/UIControl.h" -#include "app/common/src/UI/Controls/UIControl_Base.h" -#include "app/common/src/UI/UIScene.h" -#include "app/common/src/UI/UIString.h" +#include "app/common/UI/Controls/UIControl.h" +#include "app/common/UI/Controls/UIControl_Base.h" +#include "app/common/UI/UIScene.h" +#include "app/common/UI/UIString.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" diff --git a/targets/app/common/src/UI/Controls/UIControl_SpaceIndicatorBar.h b/targets/app/common/UI/Controls/UIControl_SpaceIndicatorBar.h similarity index 83% rename from targets/app/common/src/UI/Controls/UIControl_SpaceIndicatorBar.h rename to targets/app/common/UI/Controls/UIControl_SpaceIndicatorBar.h index cb08bf528..c7323f452 100644 --- a/targets/app/common/src/UI/Controls/UIControl_SpaceIndicatorBar.h +++ b/targets/app/common/UI/Controls/UIControl_SpaceIndicatorBar.h @@ -7,10 +7,10 @@ #include #include -#include "app/common/src/UI/Controls/UIControl_Base.h" -#include "app/common/src/UI/Controls/UIControl_SpaceIndicatorBar.h" -#include "app/common/src/UI/UIScene.h" -#include "app/common/src/UI/UIString.h" +#include "app/common/UI/Controls/UIControl_Base.h" +#include "app/common/UI/Controls/UIControl_SpaceIndicatorBar.h" +#include "app/common/UI/UIScene.h" +#include "app/common/UI/UIString.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" diff --git a/targets/app/common/src/UI/Controls/UIControl_TextInput.cpp b/targets/app/common/UI/Controls/UIControl_TextInput.cpp similarity index 92% rename from targets/app/common/src/UI/Controls/UIControl_TextInput.cpp rename to targets/app/common/UI/Controls/UIControl_TextInput.cpp index 12bd53c57..b8704ad8b 100644 --- a/targets/app/common/src/UI/Controls/UIControl_TextInput.cpp +++ b/targets/app/common/UI/Controls/UIControl_TextInput.cpp @@ -1,9 +1,9 @@ #include "UIControl_TextInput.h" -#include "app/common/src/UI/Controls/UIControl.h" -#include "app/common/src/UI/Controls/UIControl_Base.h" -#include "app/common/src/UI/UIScene.h" -#include "app/common/src/UI/UIString.h" +#include "app/common/UI/Controls/UIControl.h" +#include "app/common/UI/Controls/UIControl_Base.h" +#include "app/common/UI/UIScene.h" +#include "app/common/UI/UIString.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" diff --git a/targets/app/common/src/UI/Controls/UIControl_TextInput.h b/targets/app/common/UI/Controls/UIControl_TextInput.h similarity index 76% rename from targets/app/common/src/UI/Controls/UIControl_TextInput.h rename to targets/app/common/UI/Controls/UIControl_TextInput.h index 5032eb142..5a272ebbc 100644 --- a/targets/app/common/src/UI/Controls/UIControl_TextInput.h +++ b/targets/app/common/UI/Controls/UIControl_TextInput.h @@ -2,10 +2,10 @@ #include -#include "app/common/src/UI/Controls/UIControl_Base.h" -#include "app/common/src/UI/Controls/UIControl_TextInput.h" -#include "app/common/src/UI/UIScene.h" -#include "app/common/src/UI/UIString.h" +#include "app/common/UI/Controls/UIControl_Base.h" +#include "app/common/UI/Controls/UIControl_TextInput.h" +#include "app/common/UI/UIScene.h" +#include "app/common/UI/UIString.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" diff --git a/targets/app/common/src/UI/Controls/UIControl_TexturePackList.cpp b/targets/app/common/UI/Controls/UIControl_TexturePackList.cpp similarity index 96% rename from targets/app/common/src/UI/Controls/UIControl_TexturePackList.cpp rename to targets/app/common/UI/Controls/UIControl_TexturePackList.cpp index 16c122a49..3194f5d1a 100644 --- a/targets/app/common/src/UI/Controls/UIControl_TexturePackList.cpp +++ b/targets/app/common/UI/Controls/UIControl_TexturePackList.cpp @@ -1,9 +1,9 @@ #include "UIControl_TexturePackList.h" -#include "app/common/src/UI/Controls/UIControl.h" -#include "app/common/src/UI/Controls/UIControl_Base.h" -#include "app/common/src/UI/UIScene.h" -#include "app/common/src/UI/UIString.h" +#include "app/common/UI/Controls/UIControl.h" +#include "app/common/UI/Controls/UIControl_Base.h" +#include "app/common/UI/UIScene.h" +#include "app/common/UI/UIString.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" diff --git a/targets/app/common/src/UI/Controls/UIControl_TexturePackList.h b/targets/app/common/UI/Controls/UIControl_TexturePackList.h similarity index 85% rename from targets/app/common/src/UI/Controls/UIControl_TexturePackList.h rename to targets/app/common/UI/Controls/UIControl_TexturePackList.h index c233ef40a..e687ec630 100644 --- a/targets/app/common/src/UI/Controls/UIControl_TexturePackList.h +++ b/targets/app/common/UI/Controls/UIControl_TexturePackList.h @@ -2,9 +2,9 @@ #include -#include "app/common/src/UI/Controls/UIControl_Base.h" -#include "app/common/src/UI/Controls/UIControl_TexturePackList.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/Controls/UIControl_Base.h" +#include "app/common/UI/Controls/UIControl_TexturePackList.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" diff --git a/targets/app/common/src/UI/Controls/UIControl_Touch.cpp b/targets/app/common/UI/Controls/UIControl_Touch.cpp similarity index 89% rename from targets/app/common/src/UI/Controls/UIControl_Touch.cpp rename to targets/app/common/UI/Controls/UIControl_Touch.cpp index 280031183..09da5f198 100644 --- a/targets/app/common/src/UI/Controls/UIControl_Touch.cpp +++ b/targets/app/common/UI/Controls/UIControl_Touch.cpp @@ -1,7 +1,7 @@ #include "UIControl_Touch.h" -#include "app/common/src/UI/Controls/UIControl.h" -#include "app/common/src/UI/Controls/UIControl_Base.h" +#include "app/common/UI/Controls/UIControl.h" +#include "app/common/UI/Controls/UIControl_Base.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" diff --git a/targets/app/common/src/UI/Controls/UIControl_Touch.h b/targets/app/common/UI/Controls/UIControl_Touch.h similarity index 74% rename from targets/app/common/src/UI/Controls/UIControl_Touch.h rename to targets/app/common/UI/Controls/UIControl_Touch.h index 90619683a..74329f663 100644 --- a/targets/app/common/src/UI/Controls/UIControl_Touch.h +++ b/targets/app/common/UI/Controls/UIControl_Touch.h @@ -2,9 +2,9 @@ #include -#include "app/common/src/UI/Controls/UIControl_Base.h" -#include "app/common/src/UI/Controls/UIControl_Touch.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/Controls/UIControl_Base.h" +#include "app/common/UI/Controls/UIControl_Touch.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" diff --git a/targets/app/common/src/UI/Scenes/Debug/UIScene_DebugCreateSchematic.cpp b/targets/app/common/UI/Scenes/Debug/UIScene_DebugCreateSchematic.cpp similarity index 94% rename from targets/app/common/src/UI/Scenes/Debug/UIScene_DebugCreateSchematic.cpp rename to targets/app/common/UI/Scenes/Debug/UIScene_DebugCreateSchematic.cpp index fd71dcc0c..a5e32a378 100644 --- a/targets/app/common/src/UI/Scenes/Debug/UIScene_DebugCreateSchematic.cpp +++ b/targets/app/common/UI/Scenes/Debug/UIScene_DebugCreateSchematic.cpp @@ -1,5 +1,5 @@ -#include "app/common/src/UI/Scenes/Debug/UIScene_DebugCreateSchematic.h" +#include "app/common/UI/Scenes/Debug/UIScene_DebugCreateSchematic.h" #include @@ -7,12 +7,12 @@ #include "platform/sdl2/Input.h" #include "platform/sdl2/Profile.h" #include "app/common/App_enums.h" -#include "app/common/src/GameRules/LevelGeneration/ConsoleSchematicFile.h" -#include "app/common/src/UI/Controls/UIControl_Button.h" -#include "app/common/src/UI/Controls/UIControl_CheckBox.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/Controls/UIControl_TextInput.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/GameRules/LevelGeneration/ConsoleSchematicFile.h" +#include "app/common/UI/Controls/UIControl_Button.h" +#include "app/common/UI/Controls/UIControl_CheckBox.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/Controls/UIControl_TextInput.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/rrCore.h" #include "app/linux/LinuxGame.h" #include "app/linux/Linux_UIController.h" diff --git a/targets/app/common/src/UI/Scenes/Debug/UIScene_DebugCreateSchematic.h b/targets/app/common/UI/Scenes/Debug/UIScene_DebugCreateSchematic.h similarity index 86% rename from targets/app/common/src/UI/Scenes/Debug/UIScene_DebugCreateSchematic.h rename to targets/app/common/UI/Scenes/Debug/UIScene_DebugCreateSchematic.h index 1150561c8..198852cae 100644 --- a/targets/app/common/src/UI/Scenes/Debug/UIScene_DebugCreateSchematic.h +++ b/targets/app/common/UI/Scenes/Debug/UIScene_DebugCreateSchematic.h @@ -2,13 +2,13 @@ #ifdef _DEBUG_MENUS_ENABLED #include -#include "app/common/src/GameRules/LevelGeneration/ConsoleSchematicFile.h" -#include "app/common/src/UI/All Platforms/UIEnums.h" -#include "app/common/src/UI/Controls/UIControl_Button.h" -#include "app/common/src/UI/Controls/UIControl_CheckBox.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/Controls/UIControl_TextInput.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/GameRules/LevelGeneration/ConsoleSchematicFile.h" +#include "app/common/UI/All Platforms/UIEnums.h" +#include "app/common/UI/Controls/UIControl_Button.h" +#include "app/common/UI/Controls/UIControl_CheckBox.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/Controls/UIControl_TextInput.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/rrCore.h" class UILayer; diff --git a/targets/app/common/src/UI/Scenes/Debug/UIScene_DebugOptions.cpp b/targets/app/common/UI/Scenes/Debug/UIScene_DebugOptions.cpp similarity index 96% rename from targets/app/common/src/UI/Scenes/Debug/UIScene_DebugOptions.cpp rename to targets/app/common/UI/Scenes/Debug/UIScene_DebugOptions.cpp index 5dde0006c..87045c669 100644 --- a/targets/app/common/src/UI/Scenes/Debug/UIScene_DebugOptions.cpp +++ b/targets/app/common/UI/Scenes/Debug/UIScene_DebugOptions.cpp @@ -1,9 +1,9 @@ #include "UIScene_DebugOptions.h" #include "platform/InputActions.h" -#include "app/common/src/Console_Debug_enum.h" -#include "app/common/src/UI/Controls/UIControl_CheckBox.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/Console_Debug_enum.h" +#include "app/common/UI/Controls/UIControl_CheckBox.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" diff --git a/targets/app/common/src/UI/Scenes/Debug/UIScene_DebugOptions.h b/targets/app/common/UI/Scenes/Debug/UIScene_DebugOptions.h similarity index 89% rename from targets/app/common/src/UI/Scenes/Debug/UIScene_DebugOptions.h rename to targets/app/common/UI/Scenes/Debug/UIScene_DebugOptions.h index 66bab0db1..70dd20462 100644 --- a/targets/app/common/src/UI/Scenes/Debug/UIScene_DebugOptions.h +++ b/targets/app/common/UI/Scenes/Debug/UIScene_DebugOptions.h @@ -2,10 +2,10 @@ #include -#include "app/common/src/Console_Debug_enum.h" -#include "app/common/src/UI/All Platforms/UIEnums.h" -#include "app/common/src/UI/Controls/UIControl_CheckBox.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/Console_Debug_enum.h" +#include "app/common/UI/All Platforms/UIEnums.h" +#include "app/common/UI/Controls/UIControl_CheckBox.h" +#include "app/common/UI/UIScene.h" class UILayer; diff --git a/targets/app/common/src/UI/Scenes/Debug/UIScene_DebugOverlay.cpp b/targets/app/common/UI/Scenes/Debug/UIScene_DebugOverlay.cpp similarity index 96% rename from targets/app/common/src/UI/Scenes/Debug/UIScene_DebugOverlay.cpp rename to targets/app/common/UI/Scenes/Debug/UIScene_DebugOverlay.cpp index 361d6a38f..43a94eada 100644 --- a/targets/app/common/src/UI/Scenes/Debug/UIScene_DebugOverlay.cpp +++ b/targets/app/common/UI/Scenes/Debug/UIScene_DebugOverlay.cpp @@ -1,5 +1,5 @@ -#include "app/common/src/UI/Scenes/Debug/UIScene_DebugOverlay.h" +#include "app/common/UI/Scenes/Debug/UIScene_DebugOverlay.h" #include @@ -8,12 +8,12 @@ #include "platform/InputActions.h" #include "platform/sdl2/Profile.h" #include "app/common/App_enums.h" -#include "app/common/src/Tutorial/Tutorial.h" -#include "app/common/src/UI/All Platforms/UIEnums.h" -#include "app/common/src/UI/Controls/UIControl_Button.h" -#include "app/common/src/UI/Controls/UIControl_ButtonList.h" -#include "app/common/src/UI/Controls/UIControl_Slider.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/Tutorial/Tutorial.h" +#include "app/common/UI/All Platforms/UIEnums.h" +#include "app/common/UI/Controls/UIControl_Button.h" +#include "app/common/UI/Controls/UIControl_ButtonList.h" +#include "app/common/UI/Controls/UIControl_Slider.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" diff --git a/targets/app/common/src/UI/Scenes/Debug/UIScene_DebugOverlay.h b/targets/app/common/UI/Scenes/Debug/UIScene_DebugOverlay.h similarity index 89% rename from targets/app/common/src/UI/Scenes/Debug/UIScene_DebugOverlay.h rename to targets/app/common/UI/Scenes/Debug/UIScene_DebugOverlay.h index 0e250e099..db1f3cf06 100644 --- a/targets/app/common/src/UI/Scenes/Debug/UIScene_DebugOverlay.h +++ b/targets/app/common/UI/Scenes/Debug/UIScene_DebugOverlay.h @@ -5,11 +5,11 @@ #include #include -#include "app/common/src/UI/All Platforms/UIEnums.h" -#include "app/common/src/UI/Controls/UIControl_Button.h" -#include "app/common/src/UI/Controls/UIControl_ButtonList.h" -#include "app/common/src/UI/Controls/UIControl_Slider.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/All Platforms/UIEnums.h" +#include "app/common/UI/Controls/UIControl_Button.h" +#include "app/common/UI/Controls/UIControl_ButtonList.h" +#include "app/common/UI/Controls/UIControl_Slider.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" diff --git a/targets/app/common/src/UI/Scenes/Debug/UIScene_DebugSetCamera.cpp b/targets/app/common/UI/Scenes/Debug/UIScene_DebugSetCamera.cpp similarity index 93% rename from targets/app/common/src/UI/Scenes/Debug/UIScene_DebugSetCamera.cpp rename to targets/app/common/UI/Scenes/Debug/UIScene_DebugSetCamera.cpp index cd0463c77..e932828ce 100644 --- a/targets/app/common/src/UI/Scenes/Debug/UIScene_DebugSetCamera.cpp +++ b/targets/app/common/UI/Scenes/Debug/UIScene_DebugSetCamera.cpp @@ -1,5 +1,5 @@ -#include "app/common/src/UI/Scenes/Debug/UIScene_DebugSetCamera.h" +#include "app/common/UI/Scenes/Debug/UIScene_DebugSetCamera.h" #include @@ -9,12 +9,12 @@ #include "platform/sdl2/Input.h" #include "platform/sdl2/Profile.h" #include "app/common/App_enums.h" -#include "app/common/src/UI/All Platforms/UIStructs.h" -#include "app/common/src/UI/Controls/UIControl_Button.h" -#include "app/common/src/UI/Controls/UIControl_CheckBox.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/Controls/UIControl_TextInput.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/All Platforms/UIStructs.h" +#include "app/common/UI/Controls/UIControl_Button.h" +#include "app/common/UI/Controls/UIControl_CheckBox.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/Controls/UIControl_TextInput.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/rrCore.h" #include "app/linux/LinuxGame.h" #include "app/linux/Linux_UIController.h" diff --git a/targets/app/common/src/UI/Scenes/Debug/UIScene_DebugSetCamera.h b/targets/app/common/UI/Scenes/Debug/UIScene_DebugSetCamera.h similarity index 84% rename from targets/app/common/src/UI/Scenes/Debug/UIScene_DebugSetCamera.h rename to targets/app/common/UI/Scenes/Debug/UIScene_DebugSetCamera.h index 9a90e50e3..693130c97 100644 --- a/targets/app/common/src/UI/Scenes/Debug/UIScene_DebugSetCamera.h +++ b/targets/app/common/UI/Scenes/Debug/UIScene_DebugSetCamera.h @@ -2,13 +2,13 @@ #ifdef _DEBUG_MENUS_ENABLED #include -#include "app/common/src/UI/All Platforms/UIEnums.h" -#include "app/common/src/UI/All Platforms/UIStructs.h" -#include "app/common/src/UI/Controls/UIControl_Button.h" -#include "app/common/src/UI/Controls/UIControl_CheckBox.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/Controls/UIControl_TextInput.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/All Platforms/UIEnums.h" +#include "app/common/UI/All Platforms/UIStructs.h" +#include "app/common/UI/Controls/UIControl_Button.h" +#include "app/common/UI/Controls/UIControl_CheckBox.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/Controls/UIControl_TextInput.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/rrCore.h" class UILayer; diff --git a/targets/app/common/src/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.cpp similarity index 97% rename from targets/app/common/src/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.cpp rename to targets/app/common/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.cpp index 1956c867f..05a5cfc53 100644 --- a/targets/app/common/src/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.cpp +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.cpp @@ -6,11 +6,11 @@ #include "platform/sdl2/Profile.h" #include "app/common/App_structs.h" -#include "app/common/src/DLC/DLCManager.h" -#include "app/common/src/UI/Controls/UIControl_BitmapIcon.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/Controls/UIControl_TexturePackList.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/DLC/DLCManager.h" +#include "app/common/UI/Controls/UIControl_BitmapIcon.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/Controls/UIControl_TexturePackList.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/rrCore.h" #include "app/linux/LinuxGame.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/app/common/src/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.h b/targets/app/common/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.h similarity index 85% rename from targets/app/common/src/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.h rename to targets/app/common/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.h index 0c9a60927..a7c13287d 100644 --- a/targets/app/common/src/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.h +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.h @@ -3,12 +3,12 @@ #include #include "platform/sdl2/Storage.h" -#include "app/common/src/UI/All Platforms/UIStructs.h" -#include "app/common/src/UI/Controls/UIControl.h" -#include "app/common/src/UI/Controls/UIControl_BitmapIcon.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/Controls/UIControl_TexturePackList.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/All Platforms/UIStructs.h" +#include "app/common/UI/Controls/UIControl.h" +#include "app/common/UI/Controls/UIControl_BitmapIcon.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/Controls/UIControl_TexturePackList.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/rrCore.h" class UILayer; diff --git a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp similarity index 98% rename from targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp rename to targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp index 22b90ceb4..4eec60098 100644 --- a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp @@ -12,20 +12,20 @@ #include "platform/sdl2/Profile.h" #include "app/common/App_Defines.h" #include "app/common/App_enums.h" -#include "app/common/src/DLC/DLCManager.h" -#include "app/common/src/DLC/DLCPack.h" -#include "app/common/src/Network/GameNetworkManager.h" -#include "app/common/src/UI/All Platforms/UIStructs.h" -#include "app/common/src/UI/Controls/UIControl_Button.h" -#include "app/common/src/UI/Controls/UIControl_CheckBox.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/Controls/UIControl_Slider.h" -#include "app/common/src/UI/Controls/UIControl_TextInput.h" -#include "app/common/src/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.h" -#include "app/common/src/UI/UILayer.h" +#include "app/common/DLC/DLCManager.h" +#include "app/common/DLC/DLCPack.h" +#include "app/common/Network/GameNetworkManager.h" +#include "app/common/UI/All Platforms/UIStructs.h" +#include "app/common/UI/Controls/UIControl_Button.h" +#include "app/common/UI/Controls/UIControl_CheckBox.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/Controls/UIControl_Slider.h" +#include "app/common/UI/Controls/UIControl_TextInput.h" +#include "app/common/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.h" +#include "app/common/UI/UILayer.h" #include "app/linux/LinuxGame.h" #include "app/linux/Linux_UIController.h" -#include "app/include/NetTypes.h" +#include "app/common/NetTypes.h" #include "util/StringHelpers.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/Options.h" diff --git a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.h b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.h similarity index 84% rename from targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.h rename to targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.h index 806cbe3f8..9bb7c90f3 100644 --- a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.h +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.h @@ -6,17 +6,17 @@ #include "platform/sdl2/Storage.h" #include "IUIScene_StartGame.h" -#include "app/common/src/DLC/DLCPack.h" -#include "app/common/src/UI/All Platforms/UIEnums.h" -#include "app/common/src/UI/Controls/UIControl.h" -#include "app/common/src/UI/Controls/UIControl_BitmapIcon.h" -#include "app/common/src/UI/Controls/UIControl_Button.h" -#include "app/common/src/UI/Controls/UIControl_CheckBox.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/Controls/UIControl_Slider.h" -#include "app/common/src/UI/Controls/UIControl_TextInput.h" -#include "app/common/src/UI/Controls/UIControl_TexturePackList.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/DLC/DLCPack.h" +#include "app/common/UI/All Platforms/UIEnums.h" +#include "app/common/UI/Controls/UIControl.h" +#include "app/common/UI/Controls/UIControl_BitmapIcon.h" +#include "app/common/UI/Controls/UIControl_Button.h" +#include "app/common/UI/Controls/UIControl_CheckBox.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/Controls/UIControl_Slider.h" +#include "app/common/UI/Controls/UIControl_TextInput.h" +#include "app/common/UI/Controls/UIControl_TexturePackList.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/rrCore.h" class DLCPack; diff --git a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.cpp similarity index 94% rename from targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.cpp rename to targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.cpp index 5fce56541..9aa84b2fb 100644 --- a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.cpp +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.cpp @@ -3,10 +3,10 @@ #include "platform/InputActions.h" #include "app/common/App_enums.h" -#include "app/common/src/UI/All Platforms/UIStructs.h" -#include "app/common/src/UI/Controls/UIControl_ButtonList.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/All Platforms/UIStructs.h" +#include "app/common/UI/Controls/UIControl_ButtonList.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/UIScene.h" #include "app/linux/LinuxGame.h" #include "app/linux/Linux_UIController.h" #include "strings.h" diff --git a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.h b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.h similarity index 85% rename from targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.h rename to targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.h index b5ae25c3d..84b15c452 100644 --- a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.h +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.h @@ -3,11 +3,11 @@ #include #include "platform/sdl2/Storage.h" -#include "app/common/src/UI/All Platforms/UIEnums.h" -#include "app/common/src/UI/Controls/UIControl.h" -#include "app/common/src/UI/Controls/UIControl_ButtonList.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/All Platforms/UIEnums.h" +#include "app/common/UI/Controls/UIControl.h" +#include "app/common/UI/Controls/UIControl_ButtonList.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/rrCore.h" class UILayer; diff --git a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.cpp similarity index 96% rename from targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.cpp rename to targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.cpp index 15e6dedd9..beadbe741 100644 --- a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.cpp +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.cpp @@ -6,11 +6,11 @@ #include "platform/PlatformTypes.h" #include "platform/InputActions.h" #include "platform/sdl2/Render.h" -#include "app/common/src/UI/All Platforms/UIStructs.h" -#include "app/common/src/UI/Controls/UIControl_DLCList.h" -#include "app/common/src/UI/Controls/UIControl_HTMLLabel.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/All Platforms/UIStructs.h" +#include "app/common/UI/Controls/UIControl_DLCList.h" +#include "app/common/UI/Controls/UIControl_HTMLLabel.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/UIScene.h" #include "app/linux/LinuxGame.h" #include "app/linux/Linux_UIController.h" #include "strings.h" diff --git a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.h b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.h similarity index 84% rename from targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.h rename to targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.h index 52b4c038b..8f698873f 100644 --- a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.h +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.h @@ -3,13 +3,13 @@ #include #include "platform/sdl2/Storage.h" -#include "app/common/src/UI/All Platforms/UIEnums.h" -#include "app/common/src/UI/Controls/UIControl.h" -#include "app/common/src/UI/Controls/UIControl_BitmapIcon.h" -#include "app/common/src/UI/Controls/UIControl_DLCList.h" -#include "app/common/src/UI/Controls/UIControl_HTMLLabel.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/All Platforms/UIEnums.h" +#include "app/common/UI/Controls/UIControl.h" +#include "app/common/UI/Controls/UIControl_BitmapIcon.h" +#include "app/common/UI/Controls/UIControl_DLCList.h" +#include "app/common/UI/Controls/UIControl_HTMLLabel.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/rrCore.h" class UILayer; diff --git a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_EULA.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_EULA.cpp similarity index 94% rename from targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_EULA.cpp rename to targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_EULA.cpp index 206b68273..b22ef9812 100644 --- a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_EULA.cpp +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_EULA.cpp @@ -9,10 +9,10 @@ #include "platform/sdl2/Profile.h" #include "app/common/App_Defines.h" #include "app/common/App_enums.h" -#include "app/common/src/UI/Controls/UIControl_Button.h" -#include "app/common/src/UI/Controls/UIControl_DynamicLabel.h" -#include "app/common/src/UI/UILayer.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/Controls/UIControl_Button.h" +#include "app/common/UI/Controls/UIControl_DynamicLabel.h" +#include "app/common/UI/UILayer.h" +#include "app/common/UI/UIScene.h" #include "app/linux/LinuxGame.h" #include "app/linux/Linux_UIController.h" #include "minecraft/sounds/SoundTypes.h" diff --git a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_EULA.h b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_EULA.h similarity index 84% rename from targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_EULA.h rename to targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_EULA.h index 0a631b5f0..645cb0a68 100644 --- a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_EULA.h +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_EULA.h @@ -2,10 +2,10 @@ #include -#include "app/common/src/UI/All Platforms/UIEnums.h" -#include "app/common/src/UI/Controls/UIControl_Button.h" -#include "app/common/src/UI/Controls/UIControl_DynamicLabel.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/All Platforms/UIEnums.h" +#include "app/common/UI/Controls/UIControl_Button.h" +#include "app/common/UI/Controls/UIControl_DynamicLabel.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/rrCore.h" class UILayer; diff --git a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_Intro.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_Intro.cpp similarity index 97% rename from targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_Intro.cpp rename to targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_Intro.cpp index 6bf36a4f4..64eb2b1f6 100644 --- a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_Intro.cpp +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_Intro.cpp @@ -1,8 +1,8 @@ #include "UIScene_Intro.h" #include "platform/InputActions.h" -#include "app/common/src/UI/All Platforms/UIEnums.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/All Platforms/UIEnums.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" #include "app/linux/Linux_UIController.h" diff --git a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_Intro.h b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_Intro.h similarity index 92% rename from targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_Intro.h rename to targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_Intro.h index 101b98b44..7334886dc 100644 --- a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_Intro.h +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_Intro.h @@ -2,8 +2,8 @@ #include -#include "app/common/src/UI/All Platforms/UIEnums.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/All Platforms/UIEnums.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" diff --git a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.cpp similarity index 97% rename from targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.cpp rename to targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.cpp index 34bdad051..0cf43cd4d 100644 --- a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.cpp +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.cpp @@ -9,14 +9,14 @@ #include "platform/sdl2/Profile.h" #include "app/common/App_Defines.h" #include "app/common/App_enums.h" -#include "app/common/src/Network/GameNetworkManager.h" -#include "app/common/src/Network/SessionInfo.h" -#include "app/common/src/UI/All Platforms/UIStructs.h" -#include "app/common/src/UI/Controls/UIControl_Button.h" -#include "app/common/src/UI/Controls/UIControl_ButtonList.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/UILayer.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/Network/GameNetworkManager.h" +#include "app/common/Network/SessionInfo.h" +#include "app/common/UI/All Platforms/UIStructs.h" +#include "app/common/UI/Controls/UIControl_Button.h" +#include "app/common/UI/Controls/UIControl_ButtonList.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/UILayer.h" +#include "app/common/UI/UIScene.h" #include "app/linux/LinuxGame.h" #include "app/linux/Linux_UIController.h" #include "minecraft/sounds/SoundTypes.h" diff --git a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.h b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.h similarity index 91% rename from targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.h rename to targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.h index 68e12166c..d39db7865 100644 --- a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.h +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.h @@ -3,11 +3,11 @@ #include #include "platform/sdl2/Storage.h" -#include "app/common/src/UI/All Platforms/UIEnums.h" -#include "app/common/src/UI/Controls/UIControl_Button.h" -#include "app/common/src/UI/Controls/UIControl_ButtonList.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/All Platforms/UIEnums.h" +#include "app/common/UI/Controls/UIControl_Button.h" +#include "app/common/UI/Controls/UIControl_ButtonList.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/rrCore.h" class FriendSessionInfo; diff --git a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.cpp similarity index 98% rename from targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.cpp rename to targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.cpp index 2b1ed4b83..741b81b57 100644 --- a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.cpp +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.cpp @@ -10,13 +10,13 @@ #include "platform/sdl2/Render.h" #include "app/common/App_Defines.h" #include "app/common/App_enums.h" -#include "app/common/src/UI/Controls/UIControl_CheckBox.h" -#include "app/common/src/UI/Controls/UIControl_HTMLLabel.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/Controls/UIControl_Slider.h" -#include "app/common/src/UI/Controls/UIControl_TextInput.h" -#include "app/common/src/UI/UILayer.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/Controls/UIControl_CheckBox.h" +#include "app/common/UI/Controls/UIControl_HTMLLabel.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/Controls/UIControl_Slider.h" +#include "app/common/UI/Controls/UIControl_TextInput.h" +#include "app/common/UI/UILayer.h" +#include "app/common/UI/UIScene.h" #include "app/linux/LinuxGame.h" #include "app/linux/Linux_UIController.h" #include "util/StringHelpers.h" diff --git a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.h b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.h similarity index 92% rename from targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.h rename to targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.h index da282d597..43069d299 100644 --- a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.h +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.h @@ -2,15 +2,15 @@ #include -#include "app/common/src/UI/All Platforms/UIEnums.h" -#include "app/common/src/UI/All Platforms/UIStructs.h" -#include "app/common/src/UI/Controls/UIControl.h" -#include "app/common/src/UI/Controls/UIControl_CheckBox.h" -#include "app/common/src/UI/Controls/UIControl_HTMLLabel.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/Controls/UIControl_Slider.h" -#include "app/common/src/UI/Controls/UIControl_TextInput.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/All Platforms/UIEnums.h" +#include "app/common/UI/All Platforms/UIStructs.h" +#include "app/common/UI/Controls/UIControl.h" +#include "app/common/UI/Controls/UIControl_CheckBox.h" +#include "app/common/UI/Controls/UIControl_HTMLLabel.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/Controls/UIControl_Slider.h" +#include "app/common/UI/Controls/UIControl_TextInput.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" diff --git a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.cpp similarity index 98% rename from targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.cpp rename to targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.cpp index 43f8201a8..e972b3ff1 100644 --- a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.cpp +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.cpp @@ -10,13 +10,13 @@ #include "platform/InputActions.h" #include "platform/sdl2/Profile.h" -#include "app/common/src/Console_Debug_enum.h" -#include "app/common/src/Leaderboards/LeaderboardInterface.h" -#include "app/common/src/Leaderboards/LeaderboardManager.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/Controls/UIControl_LeaderboardList.h" -#include "app/common/src/UI/UILayer.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/Console_Debug_enum.h" +#include "app/common/Leaderboards/LeaderboardInterface.h" +#include "app/common/Leaderboards/LeaderboardManager.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/Controls/UIControl_LeaderboardList.h" +#include "app/common/UI/UILayer.h" +#include "app/common/UI/UIScene.h" #include "app/linux/LinuxGame.h" #include "app/linux/Linux_UIController.h" #include "app/linux/Stubs/winapi_stubs.h" diff --git a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.h b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.h similarity index 94% rename from targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.h rename to targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.h index 0221c116c..bd934779f 100644 --- a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.h +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.h @@ -5,12 +5,12 @@ #include "platform/PlatformTypes.h" #include "platform/sdl2/Storage.h" -#include "app/common/src/Leaderboards/LeaderboardInterface.h" -#include "app/common/src/Leaderboards/LeaderboardManager.h" -#include "app/common/src/UI/All Platforms/UIEnums.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/Controls/UIControl_LeaderboardList.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/Leaderboards/LeaderboardInterface.h" +#include "app/common/Leaderboards/LeaderboardManager.h" +#include "app/common/UI/All Platforms/UIEnums.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/Controls/UIControl_LeaderboardList.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" diff --git a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp similarity index 98% rename from targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp rename to targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp index e595e3704..d6c056899 100644 --- a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp @@ -10,21 +10,21 @@ #include "platform/sdl2/Render.h" #include "app/common/App_Defines.h" #include "app/common/App_enums.h" -#include "app/common/src/DLC/DLCManager.h" -#include "app/common/src/DLC/DLCPack.h" -#include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" -#include "app/common/src/Network/GameNetworkManager.h" -#include "app/common/src/UI/All Platforms/UIStructs.h" -#include "app/common/src/UI/Controls/UIControl_BitmapIcon.h" -#include "app/common/src/UI/Controls/UIControl_Button.h" -#include "app/common/src/UI/Controls/UIControl_CheckBox.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/Controls/UIControl_Slider.h" -#include "app/common/src/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.h" -#include "app/common/src/UI/UILayer.h" +#include "app/common/DLC/DLCManager.h" +#include "app/common/DLC/DLCPack.h" +#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "app/common/Network/GameNetworkManager.h" +#include "app/common/UI/All Platforms/UIStructs.h" +#include "app/common/UI/Controls/UIControl_BitmapIcon.h" +#include "app/common/UI/Controls/UIControl_Button.h" +#include "app/common/UI/Controls/UIControl_CheckBox.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/Controls/UIControl_Slider.h" +#include "app/common/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.h" +#include "app/common/UI/UILayer.h" #include "app/linux/LinuxGame.h" #include "app/linux/Linux_UIController.h" -#include "app/include/NetTypes.h" +#include "app/common/NetTypes.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/Options.h" #include "minecraft/client/skins/DLCTexturePack.h" diff --git a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.h b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.h similarity index 89% rename from targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.h rename to targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.h index 00129c353..38cb289f3 100644 --- a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.h +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.h @@ -5,16 +5,16 @@ #include "platform/sdl2/Storage.h" #include "IUIScene_StartGame.h" -#include "app/common/src/DLC/DLCPack.h" -#include "app/common/src/UI/All Platforms/UIEnums.h" -#include "app/common/src/UI/Controls/UIControl.h" -#include "app/common/src/UI/Controls/UIControl_BitmapIcon.h" -#include "app/common/src/UI/Controls/UIControl_Button.h" -#include "app/common/src/UI/Controls/UIControl_CheckBox.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/Controls/UIControl_Slider.h" -#include "app/common/src/UI/Controls/UIControl_TexturePackList.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/DLC/DLCPack.h" +#include "app/common/UI/All Platforms/UIEnums.h" +#include "app/common/UI/Controls/UIControl.h" +#include "app/common/UI/Controls/UIControl_BitmapIcon.h" +#include "app/common/UI/Controls/UIControl_Button.h" +#include "app/common/UI/Controls/UIControl_CheckBox.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/Controls/UIControl_Slider.h" +#include "app/common/UI/Controls/UIControl_TexturePackList.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/rrCore.h" class DLCPack; diff --git a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp similarity index 99% rename from targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp rename to targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp index e1610d1f4..519c1a5dd 100644 --- a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp @@ -11,17 +11,17 @@ #include "platform/sdl2/Profile.h" #include "app/common/App_Defines.h" #include "app/common/App_enums.h" -#include "app/common/src/DLC/DLCManager.h" -#include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" -#include "app/common/src/Network/GameNetworkManager.h" -#include "app/common/src/Network/SessionInfo.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/Controls/UIControl_SaveList.h" -#include "app/common/src/UI/UILayer.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/DLC/DLCManager.h" +#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "app/common/Network/GameNetworkManager.h" +#include "app/common/Network/SessionInfo.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/Controls/UIControl_SaveList.h" +#include "app/common/UI/UILayer.h" +#include "app/common/UI/UIScene.h" #include "app/linux/LinuxGame.h" #include "app/linux/Linux_UIController.h" -#include "app/include/NetTypes.h" +#include "app/common/NetTypes.h" #include "java/File.h" #include "java/InputOutputStream/FileInputStream.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.h b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.h similarity index 96% rename from targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.h rename to targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.h index ebf7bea89..af480fcd1 100644 --- a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.h +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.h @@ -6,12 +6,12 @@ #include #include "platform/sdl2/Storage.h" -#include "app/common/src/UI/All Platforms/UIEnums.h" -#include "app/common/src/UI/All Platforms/UIStructs.h" -#include "app/common/src/UI/Controls/UIControl.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/Controls/UIControl_SaveList.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/All Platforms/UIEnums.h" +#include "app/common/UI/All Platforms/UIStructs.h" +#include "app/common/UI/Controls/UIControl.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/Controls/UIControl_SaveList.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/rrCore.h" #include "java/File.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp similarity index 99% rename from targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp rename to targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp index f765f1ef4..38dd9a44e 100644 --- a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp @@ -12,16 +12,16 @@ #include "platform/sdl2/Render.h" #include "app/common/App_Defines.h" #include "app/common/App_enums.h" -#include "app/common/src/Network/GameNetworkManager.h" -#include "app/common/src/UI/All Platforms/UIStructs.h" -#include "app/common/src/UI/Controls/UIControl_Button.h" -#include "app/common/src/UI/UILayer.h" -#include "app/common/src/UI/UIScene.h" -#include "app/common/src/UI/UIString.h" +#include "app/common/Network/GameNetworkManager.h" +#include "app/common/UI/All Platforms/UIStructs.h" +#include "app/common/UI/Controls/UIControl_Button.h" +#include "app/common/UI/UILayer.h" +#include "app/common/UI/UIScene.h" +#include "app/common/UI/UIString.h" #include "app/linux/LinuxGame.h" #include "app/linux/Linux_UIController.h" #include "app/linux/Stubs/winapi_stubs.h" -#include "app/include/NetTypes.h" +#include "app/common/NetTypes.h" #include "util/StringHelpers.h" #include "java/InputOutputStream/BufferedReader.h" diff --git a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.h b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.h similarity index 95% rename from targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.h rename to targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.h index d38764194..f79a276da 100644 --- a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.h +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.h @@ -6,10 +6,10 @@ #include #include "platform/sdl2/Storage.h" -#include "app/common/src/UI/All Platforms/UIEnums.h" -#include "app/common/src/UI/Controls/UIControl.h" -#include "app/common/src/UI/Controls/UIControl_Button.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/All Platforms/UIEnums.h" +#include "app/common/UI/Controls/UIControl.h" +#include "app/common/UI/Controls/UIControl_Button.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" diff --git a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.cpp similarity index 94% rename from targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.cpp rename to targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.cpp index b632e9668..5b1ed77e3 100644 --- a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.cpp +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.cpp @@ -6,10 +6,10 @@ #include "platform/InputActions.h" #include "app/common/App_Defines.h" #include "app/common/App_enums.h" -#include "app/common/src/UI/Controls/UIControl_Button.h" -#include "app/common/src/UI/Controls/UIControl_DynamicLabel.h" -#include "app/common/src/UI/UILayer.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/Controls/UIControl_Button.h" +#include "app/common/UI/Controls/UIControl_DynamicLabel.h" +#include "app/common/UI/UILayer.h" +#include "app/common/UI/UIScene.h" #include "app/linux/LinuxGame.h" #include "app/linux/Linux_UIController.h" #include "minecraft/sounds/SoundTypes.h" diff --git a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.h b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.h similarity index 84% rename from targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.h rename to targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.h index 778a81deb..e177d7d10 100644 --- a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.h +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.h @@ -2,10 +2,10 @@ #include -#include "app/common/src/UI/All Platforms/UIEnums.h" -#include "app/common/src/UI/Controls/UIControl_Button.h" -#include "app/common/src/UI/Controls/UIControl_DynamicLabel.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/All Platforms/UIEnums.h" +#include "app/common/UI/Controls/UIControl_Button.h" +#include "app/common/UI/Controls/UIControl_DynamicLabel.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/rrCore.h" class UILayer; diff --git a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.cpp similarity index 95% rename from targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.cpp rename to targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.cpp index 740ca06f6..931a8c4f6 100644 --- a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.cpp +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.cpp @@ -6,10 +6,10 @@ #include "platform/sdl2/Input.h" #include "platform/sdl2/Profile.h" #include "app/common/App_Defines.h" -#include "app/common/src/UI/Controls/UIControl_Button.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/UILayer.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/Controls/UIControl_Button.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/UILayer.h" +#include "app/common/UI/UIScene.h" #include "app/linux/LinuxGame.h" #include "app/linux/Linux_UIController.h" #include "minecraft/sounds/SoundTypes.h" diff --git a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.h b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.h similarity index 87% rename from targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.h rename to targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.h index 27d7b08e6..fd334e430 100644 --- a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.h +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.h @@ -2,10 +2,10 @@ #include -#include "app/common/src/UI/All Platforms/UIEnums.h" -#include "app/common/src/UI/Controls/UIControl_Button.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/All Platforms/UIEnums.h" +#include "app/common/UI/Controls/UIControl_Button.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" diff --git a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.cpp similarity index 98% rename from targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.cpp rename to targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.cpp index 226ecc828..0949775d3 100644 --- a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.cpp +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.cpp @@ -4,7 +4,7 @@ #include "platform/InputActions.h" #include "platform/sdl2/Profile.h" #include "app/common/App_Defines.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/UIScene.h" #include "app/linux/LinuxGame.h" #include "app/linux/Linux_UIController.h" #include "minecraft/sounds/SoundTypes.h" diff --git a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.h b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.h similarity index 89% rename from targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.h rename to targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.h index c4f65b0b5..fed184faf 100644 --- a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.h +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.h @@ -2,8 +2,8 @@ #include -#include "app/common/src/UI/All Platforms/UIEnums.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/All Platforms/UIEnums.h" +#include "app/common/UI/UIScene.h" class UILayer; diff --git a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_ControlsMenu.cpp b/targets/app/common/UI/Scenes/Help & Options/UIScene_ControlsMenu.cpp similarity index 97% rename from targets/app/common/src/UI/Scenes/Help & Options/UIScene_ControlsMenu.cpp rename to targets/app/common/UI/Scenes/Help & Options/UIScene_ControlsMenu.cpp index 29e35203e..a3fcc453f 100644 --- a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_ControlsMenu.cpp +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_ControlsMenu.cpp @@ -7,11 +7,11 @@ #include "platform/InputActions.h" #include "platform/sdl2/Input.h" #include "app/common/App_enums.h" -#include "app/common/src/BuildVer/BuildVer.h" -#include "app/common/src/UI/Controls/UIControl_Button.h" -#include "app/common/src/UI/Controls/UIControl_CheckBox.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/BuildVer/BuildVer.h" +#include "app/common/UI/Controls/UIControl_Button.h" +#include "app/common/UI/Controls/UIControl_CheckBox.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/UIScene.h" #include "app/linux/LinuxGame.h" #include "app/linux/Linux_UIController.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_ControlsMenu.h b/targets/app/common/UI/Scenes/Help & Options/UIScene_ControlsMenu.h similarity index 94% rename from targets/app/common/src/UI/Scenes/Help & Options/UIScene_ControlsMenu.h rename to targets/app/common/UI/Scenes/Help & Options/UIScene_ControlsMenu.h index 81083eb94..35f5bf3a1 100644 --- a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_ControlsMenu.h +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_ControlsMenu.h @@ -2,12 +2,12 @@ #include -#include "app/common/src/UI/All Platforms/UIEnums.h" -#include "app/common/src/UI/Controls/UIControl.h" -#include "app/common/src/UI/Controls/UIControl_Button.h" -#include "app/common/src/UI/Controls/UIControl_CheckBox.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/All Platforms/UIEnums.h" +#include "app/common/UI/Controls/UIControl.h" +#include "app/common/UI/Controls/UIControl_Button.h" +#include "app/common/UI/Controls/UIControl_CheckBox.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" diff --git a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_Credits.cpp b/targets/app/common/UI/Scenes/Help & Options/UIScene_Credits.cpp similarity index 99% rename from targets/app/common/src/UI/Scenes/Help & Options/UIScene_Credits.cpp rename to targets/app/common/UI/Scenes/Help & Options/UIScene_Credits.cpp index 8087f2967..1897318a1 100644 --- a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_Credits.cpp +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_Credits.cpp @@ -5,8 +5,8 @@ #include #include "platform/InputActions.h" -#include "app/common/src/UI/UILayer.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/UILayer.h" +#include "app/common/UI/UIScene.h" #include "app/linux/LinuxGame.h" #include "app/linux/Linux_UIController.h" #include "util/StringHelpers.h" diff --git a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_Credits.h b/targets/app/common/UI/Scenes/Help & Options/UIScene_Credits.h similarity index 92% rename from targets/app/common/src/UI/Scenes/Help & Options/UIScene_Credits.h rename to targets/app/common/UI/Scenes/Help & Options/UIScene_Credits.h index 008f012c4..829df3f33 100644 --- a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_Credits.h +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_Credits.h @@ -2,9 +2,9 @@ #include -#include "app/common/src/UI/All Platforms/UIEnums.h" -#include "app/common/src/UI/All Platforms/UIStructs.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/All Platforms/UIEnums.h" +#include "app/common/UI/All Platforms/UIStructs.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" diff --git a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.cpp b/targets/app/common/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.cpp similarity index 98% rename from targets/app/common/src/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.cpp rename to targets/app/common/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.cpp index ff2ca1eb7..c290b5781 100644 --- a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.cpp +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.cpp @@ -3,9 +3,9 @@ #include "platform/InputActions.h" #include "platform/sdl2/Profile.h" -#include "app/common/src/UI/Controls/UIControl_Button.h" -#include "app/common/src/UI/UILayer.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/Controls/UIControl_Button.h" +#include "app/common/UI/UILayer.h" +#include "app/common/UI/UIScene.h" #include "app/linux/LinuxGame.h" #include "app/linux/Linux_UIController.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.h b/targets/app/common/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.h similarity index 91% rename from targets/app/common/src/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.h rename to targets/app/common/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.h index ebd22e0b5..4c4b869de 100644 --- a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.h +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.h @@ -2,9 +2,9 @@ #include -#include "app/common/src/UI/All Platforms/UIEnums.h" -#include "app/common/src/UI/Controls/UIControl_Button.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/All Platforms/UIEnums.h" +#include "app/common/UI/Controls/UIControl_Button.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/rrCore.h" class UILayer; diff --git a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_HowToPlay.cpp b/targets/app/common/UI/Scenes/Help & Options/UIScene_HowToPlay.cpp similarity index 99% rename from targets/app/common/src/UI/Scenes/Help & Options/UIScene_HowToPlay.cpp rename to targets/app/common/UI/Scenes/Help & Options/UIScene_HowToPlay.cpp index 5060c2ef9..872a43ebf 100644 --- a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_HowToPlay.cpp +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_HowToPlay.cpp @@ -8,8 +8,8 @@ #include "platform/InputActions.h" #include "app/common/App_enums.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/UIScene.h" #include "app/linux/LinuxGame.h" #include "app/linux/Linux_UIController.h" #include "util/StringHelpers.h" diff --git a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_HowToPlay.h b/targets/app/common/UI/Scenes/Help & Options/UIScene_HowToPlay.h similarity index 96% rename from targets/app/common/src/UI/Scenes/Help & Options/UIScene_HowToPlay.h rename to targets/app/common/UI/Scenes/Help & Options/UIScene_HowToPlay.h index 7c8a7595a..02ecaeb5d 100644 --- a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_HowToPlay.h +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_HowToPlay.h @@ -2,10 +2,10 @@ #include -#include "app/common/src/UI/All Platforms/UIEnums.h" -#include "app/common/src/UI/Controls/UIControl_DynamicLabel.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/All Platforms/UIEnums.h" +#include "app/common/UI/Controls/UIControl_DynamicLabel.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" diff --git a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.cpp b/targets/app/common/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.cpp similarity index 97% rename from targets/app/common/src/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.cpp rename to targets/app/common/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.cpp index 70bc4b1a4..c453ff0fa 100644 --- a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.cpp +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.cpp @@ -4,9 +4,9 @@ #include #include "platform/InputActions.h" -#include "app/common/src/UI/Controls/UIControl_ButtonList.h" -#include "app/common/src/UI/UILayer.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/Controls/UIControl_ButtonList.h" +#include "app/common/UI/UILayer.h" +#include "app/common/UI/UIScene.h" #include "app/linux/LinuxGame.h" #include "app/linux/Linux_UIController.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.h b/targets/app/common/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.h similarity index 92% rename from targets/app/common/src/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.h rename to targets/app/common/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.h index 9be1c0190..69be4630f 100644 --- a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.h +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.h @@ -2,9 +2,9 @@ #include -#include "app/common/src/UI/All Platforms/UIEnums.h" -#include "app/common/src/UI/Controls/UIControl_ButtonList.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/All Platforms/UIEnums.h" +#include "app/common/UI/Controls/UIControl_ButtonList.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/rrCore.h" class UILayer; diff --git a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_LanguageSelector.cpp b/targets/app/common/UI/Scenes/Help & Options/UIScene_LanguageSelector.cpp similarity index 96% rename from targets/app/common/src/UI/Scenes/Help & Options/UIScene_LanguageSelector.cpp rename to targets/app/common/UI/Scenes/Help & Options/UIScene_LanguageSelector.cpp index fbba0d40f..f65eb66bd 100644 --- a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_LanguageSelector.cpp +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_LanguageSelector.cpp @@ -1,9 +1,9 @@ #include "UIScene_LanguageSelector.h" #include "platform/InputActions.h" -#include "app/common/src/UI/Controls/UIControl_ButtonList.h" -#include "app/common/src/UI/UILayer.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/Controls/UIControl_ButtonList.h" +#include "app/common/UI/UILayer.h" +#include "app/common/UI/UIScene.h" #include "app/linux/LinuxGame.h" #include "app/linux/Linux_UIController.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_LanguageSelector.h b/targets/app/common/UI/Scenes/Help & Options/UIScene_LanguageSelector.h similarity index 91% rename from targets/app/common/src/UI/Scenes/Help & Options/UIScene_LanguageSelector.h rename to targets/app/common/UI/Scenes/Help & Options/UIScene_LanguageSelector.h index 153fd1fd3..8f6b03cc5 100644 --- a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_LanguageSelector.h +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_LanguageSelector.h @@ -3,14 +3,14 @@ #include #include "app/common/App_Defines.h" -#include "app/common/src/UI/All Platforms/UIEnums.h" -#include "app/common/src/UI/Controls/UIControl.h" -#include "app/common/src/UI/Controls/UIControl_ButtonList.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/All Platforms/UIEnums.h" +#include "app/common/UI/Controls/UIControl.h" +#include "app/common/UI/Controls/UIControl_ButtonList.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/rrCore.h" -#include "app/include/NetTypes.h" -#include "app/include/SkinBox.h" -#include "app/include/XboxStubs.h" +#include "app/common/NetTypes.h" +#include "app/common/SkinBox.h" +#include "app/common/XboxStubs.h" class UILayer; diff --git a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_ReinstallMenu.cpp b/targets/app/common/UI/Scenes/Help & Options/UIScene_ReinstallMenu.cpp similarity index 98% rename from targets/app/common/src/UI/Scenes/Help & Options/UIScene_ReinstallMenu.cpp rename to targets/app/common/UI/Scenes/Help & Options/UIScene_ReinstallMenu.cpp index 6b37125bd..185e50dd0 100644 --- a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_ReinstallMenu.cpp +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_ReinstallMenu.cpp @@ -2,8 +2,8 @@ #include "UIScene_ReinstallMenu.h" #include "platform/InputActions.h" -#include "app/common/src/UI/UILayer.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/UILayer.h" +#include "app/common/UI/UIScene.h" #include "app/linux/LinuxGame.h" #include "app/linux/Linux_UIController.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_ReinstallMenu.h b/targets/app/common/UI/Scenes/Help & Options/UIScene_ReinstallMenu.h similarity index 90% rename from targets/app/common/src/UI/Scenes/Help & Options/UIScene_ReinstallMenu.h rename to targets/app/common/UI/Scenes/Help & Options/UIScene_ReinstallMenu.h index 42beb08f9..d799cb197 100644 --- a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_ReinstallMenu.h +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_ReinstallMenu.h @@ -2,9 +2,9 @@ #include -#include "app/common/src/UI/All Platforms/UIEnums.h" -#include "app/common/src/UI/Controls/UIControl_Button.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/All Platforms/UIEnums.h" +#include "app/common/UI/Controls/UIControl_Button.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/rrCore.h" class UILayer; diff --git a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.cpp b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.cpp similarity index 96% rename from targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.cpp rename to targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.cpp index cd2c88468..22f17594a 100644 --- a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.cpp +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.cpp @@ -5,9 +5,9 @@ #include "platform/InputActions.h" #include "app/common/App_enums.h" -#include "app/common/src/UI/Controls/UIControl_Slider.h" -#include "app/common/src/UI/UILayer.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/Controls/UIControl_Slider.h" +#include "app/common/UI/UILayer.h" +#include "app/common/UI/UIScene.h" #include "app/linux/LinuxGame.h" #include "app/linux/Linux_UIController.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.h b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.h similarity index 87% rename from targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.h rename to targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.h index 50392e508..d09d386d1 100644 --- a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.h +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.h @@ -2,9 +2,9 @@ #include -#include "app/common/src/UI/All Platforms/UIEnums.h" -#include "app/common/src/UI/Controls/UIControl_Slider.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/All Platforms/UIEnums.h" +#include "app/common/UI/Controls/UIControl_Slider.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/rrCore.h" class UILayer; diff --git a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.cpp b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.cpp similarity index 96% rename from targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.cpp rename to targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.cpp index d8d50a846..620254241 100644 --- a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.cpp +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.cpp @@ -4,9 +4,9 @@ #include "platform/InputActions.h" #include "app/common/App_enums.h" -#include "app/common/src/UI/Controls/UIControl_Slider.h" -#include "app/common/src/UI/UILayer.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/Controls/UIControl_Slider.h" +#include "app/common/UI/UILayer.h" +#include "app/common/UI/UIScene.h" #include "app/linux/LinuxGame.h" #include "app/linux/Linux_UIController.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.h b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.h similarity index 88% rename from targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.h rename to targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.h index 65f1ecc90..1659543db 100644 --- a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.h +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.h @@ -2,9 +2,9 @@ #include -#include "app/common/src/UI/All Platforms/UIEnums.h" -#include "app/common/src/UI/Controls/UIControl_Slider.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/All Platforms/UIEnums.h" +#include "app/common/UI/Controls/UIControl_Slider.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/rrCore.h" class UILayer; diff --git a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.cpp b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.cpp similarity index 96% rename from targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.cpp rename to targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.cpp index 2d4d6d324..ced6b9473 100644 --- a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.cpp +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.cpp @@ -5,11 +5,11 @@ #include "platform/InputActions.h" #include "platform/sdl2/Profile.h" #include "app/common/App_enums.h" -#include "app/common/src/Network/GameNetworkManager.h" -#include "app/common/src/UI/Controls/UIControl_CheckBox.h" -#include "app/common/src/UI/Controls/UIControl_Slider.h" -#include "app/common/src/UI/UILayer.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/Network/GameNetworkManager.h" +#include "app/common/UI/Controls/UIControl_CheckBox.h" +#include "app/common/UI/Controls/UIControl_Slider.h" +#include "app/common/UI/UILayer.h" +#include "app/common/UI/UIScene.h" #include "app/linux/LinuxGame.h" #include "app/linux/Linux_UIController.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.h b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.h similarity index 88% rename from targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.h rename to targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.h index 08a10f1cf..5b3021e6f 100644 --- a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.h +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.h @@ -2,10 +2,10 @@ #include -#include "app/common/src/UI/All Platforms/UIEnums.h" -#include "app/common/src/UI/Controls/UIControl_CheckBox.h" -#include "app/common/src/UI/Controls/UIControl_Slider.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/All Platforms/UIEnums.h" +#include "app/common/UI/Controls/UIControl_CheckBox.h" +#include "app/common/UI/Controls/UIControl_Slider.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/rrCore.h" class UILayer; diff --git a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsMenu.cpp b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsMenu.cpp similarity index 97% rename from targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsMenu.cpp rename to targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsMenu.cpp index 539f75c9e..1d9533e40 100644 --- a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsMenu.cpp +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsMenu.cpp @@ -3,9 +3,9 @@ #include "platform/InputActions.h" #include "platform/sdl2/Profile.h" -#include "app/common/src/UI/Controls/UIControl_Button.h" -#include "app/common/src/UI/UILayer.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/Controls/UIControl_Button.h" +#include "app/common/UI/UILayer.h" +#include "app/common/UI/UIScene.h" #include "app/linux/LinuxGame.h" #include "app/linux/Linux_UIController.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsMenu.h b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsMenu.h similarity index 91% rename from targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsMenu.h rename to targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsMenu.h index e3aed600f..fd47ffd53 100644 --- a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsMenu.h +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsMenu.h @@ -3,9 +3,9 @@ #include #include "platform/sdl2/Storage.h" -#include "app/common/src/UI/All Platforms/UIEnums.h" -#include "app/common/src/UI/Controls/UIControl_Button.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/All Platforms/UIEnums.h" +#include "app/common/UI/Controls/UIControl_Button.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/rrCore.h" class UILayer; diff --git a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.cpp b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.cpp similarity index 97% rename from targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.cpp rename to targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.cpp index b3bcc89a0..e6ba8479a 100644 --- a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.cpp +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.cpp @@ -7,13 +7,13 @@ #include "platform/sdl2/Profile.h" #include "platform/sdl2/Render.h" #include "app/common/App_enums.h" -#include "app/common/src/Network/GameNetworkManager.h" -#include "app/common/src/UI/Controls/UIControl_Button.h" -#include "app/common/src/UI/Controls/UIControl_CheckBox.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/Controls/UIControl_Slider.h" -#include "app/common/src/UI/UILayer.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/Network/GameNetworkManager.h" +#include "app/common/UI/Controls/UIControl_Button.h" +#include "app/common/UI/Controls/UIControl_CheckBox.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/Controls/UIControl_Slider.h" +#include "app/common/UI/UILayer.h" +#include "app/common/UI/UIScene.h" #include "app/linux/LinuxGame.h" #include "app/linux/Linux_UIController.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.h b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.h similarity index 88% rename from targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.h rename to targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.h index c01e79854..3d690947a 100644 --- a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.h +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.h @@ -2,12 +2,12 @@ #include -#include "app/common/src/UI/All Platforms/UIEnums.h" -#include "app/common/src/UI/Controls/UIControl_Button.h" -#include "app/common/src/UI/Controls/UIControl_CheckBox.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/Controls/UIControl_Slider.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/All Platforms/UIEnums.h" +#include "app/common/UI/Controls/UIControl_Button.h" +#include "app/common/UI/Controls/UIControl_CheckBox.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/Controls/UIControl_Slider.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/rrCore.h" class UILayer; diff --git a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.cpp b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.cpp similarity index 97% rename from targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.cpp rename to targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.cpp index 2012ab0bf..85c35961d 100644 --- a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.cpp +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.cpp @@ -6,10 +6,10 @@ #include "platform/InputActions.h" #include "platform/sdl2/Profile.h" #include "app/common/App_enums.h" -#include "app/common/src/UI/Controls/UIControl_CheckBox.h" -#include "app/common/src/UI/Controls/UIControl_Slider.h" -#include "app/common/src/UI/UILayer.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/Controls/UIControl_CheckBox.h" +#include "app/common/UI/Controls/UIControl_Slider.h" +#include "app/common/UI/UILayer.h" +#include "app/common/UI/UIScene.h" #include "app/linux/LinuxGame.h" #include "app/linux/Linux_UIController.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.h b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.h similarity index 90% rename from targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.h rename to targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.h index 95c12cb78..3bca46fc5 100644 --- a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.h +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.h @@ -2,10 +2,10 @@ #include -#include "app/common/src/UI/All Platforms/UIEnums.h" -#include "app/common/src/UI/Controls/UIControl_CheckBox.h" -#include "app/common/src/UI/Controls/UIControl_Slider.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/All Platforms/UIEnums.h" +#include "app/common/UI/Controls/UIControl_CheckBox.h" +#include "app/common/UI/Controls/UIControl_Slider.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/rrCore.h" class UILayer; diff --git a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp b/targets/app/common/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp similarity index 99% rename from targets/app/common/src/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp rename to targets/app/common/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp index b5d23a57e..e0c16e89e 100644 --- a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp @@ -10,17 +10,17 @@ #include "platform/sdl2/Render.h" #include "app/common/App_Defines.h" #include "app/common/Minecraft_Macros.h" -#include "app/common/src/DLC/DLCManager.h" -#include "app/common/src/DLC/DLCPack.h" -#include "app/common/src/DLC/DLCSkinFile.h" -#include "app/common/src/UI/All Platforms/UIStructs.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/Controls/UIControl_PlayerSkinPreview.h" -#include "app/common/src/UI/UILayer.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/DLC/DLCManager.h" +#include "app/common/DLC/DLCPack.h" +#include "app/common/DLC/DLCSkinFile.h" +#include "app/common/UI/All Platforms/UIStructs.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/Controls/UIControl_PlayerSkinPreview.h" +#include "app/common/UI/UILayer.h" +#include "app/common/UI/UIScene.h" #include "app/linux/LinuxGame.h" #include "app/linux/Linux_UIController.h" -#include "SkinBox.h" +#include "app/common/SkinBox.h" #include "util/StringHelpers.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.h b/targets/app/common/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.h similarity index 94% rename from targets/app/common/src/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.h rename to targets/app/common/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.h index 8801ba04c..ae3d463d5 100644 --- a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.h +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.h @@ -4,18 +4,18 @@ #include #include "platform/sdl2/Storage.h" -#include "app/common/src/DLC/DLCPack.h" -#include "app/common/src/UI/All Platforms/UIEnums.h" -#include "app/common/src/UI/Controls/UIControl.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/Controls/UIControl_PlayerSkinPreview.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/DLC/DLCPack.h" +#include "app/common/UI/All Platforms/UIEnums.h" +#include "app/common/UI/Controls/UIControl.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/Controls/UIControl_PlayerSkinPreview.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" #endif #include "app/linux/Iggy/include/rrCore.h" -#include "app/include/SkinBox.h" +#include "app/common/SkinBox.h" #include "minecraft/world/entity/player/SkinTypes.h" #include "minecraft/client/renderer/Textures.h" diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.cpp similarity index 96% rename from targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.cpp rename to targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.cpp index 6af0020b8..2345d8042 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.cpp @@ -5,14 +5,14 @@ #include #include "platform/InputActions.h" -#include "app/common/src/Tutorial/Tutorial.h" -#include "app/common/src/Tutorial/TutorialMode.h" -#include "app/common/src/UI/All Platforms/UIStructs.h" -#include "app/common/src/UI/Controls/UIControl_Cursor.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/Controls/UIControl_SlotList.h" -#include "app/common/src/UI/UILayer.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/Tutorial/Tutorial.h" +#include "app/common/Tutorial/TutorialMode.h" +#include "app/common/UI/All Platforms/UIStructs.h" +#include "app/common/UI/Controls/UIControl_Cursor.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/Controls/UIControl_SlotList.h" +#include "app/common/UI/UILayer.h" +#include "app/common/UI/UIScene.h" #include "app/linux/LinuxGame.h" #include "app/linux/Linux_UIController.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h similarity index 90% rename from targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h rename to targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h index e5d72ef0d..448135457 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h @@ -3,12 +3,12 @@ #include #include "platform/sdl2/Render.h" -#include "app/common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h" -#include "app/common/src/UI/Controls/UIControl.h" -#include "app/common/src/UI/Controls/UIControl_Cursor.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/Controls/UIControl_SlotList.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/All Platforms/IUIScene_AbstractContainerMenu.h" +#include "app/common/UI/Controls/UIControl.h" +#include "app/common/UI/Controls/UIControl_Cursor.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/Controls/UIControl_SlotList.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.cpp similarity index 96% rename from targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.cpp rename to targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.cpp index de86ffe83..6e216951c 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.cpp @@ -9,13 +9,13 @@ #include "platform/sdl2/Input.h" #include "platform/sdl2/Profile.h" -#include "app/common/src/Tutorial/Tutorial.h" -#include "app/common/src/Tutorial/TutorialEnum.h" -#include "app/common/src/Tutorial/TutorialMode.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/Controls/UIControl_SlotList.h" -#include "app/common/src/UI/Controls/UIControl_TextInput.h" -#include "app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" +#include "app/common/Tutorial/Tutorial.h" +#include "app/common/Tutorial/TutorialEnum.h" +#include "app/common/Tutorial/TutorialMode.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/Controls/UIControl_SlotList.h" +#include "app/common/UI/Controls/UIControl_TextInput.h" +#include "app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" #include "app/linux/LinuxGame.h" #include "util/StringHelpers.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.h b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.h similarity index 83% rename from targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.h rename to targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.h index 76ddd0b42..f7106a6f0 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.h +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.h @@ -3,15 +3,15 @@ #include #include "platform/sdl2/Input.h" -#include "app/common/src/Tutorial/TutorialMode.h" -#include "app/common/src/UI/All Platforms/IUIScene_AnvilMenu.h" -#include "app/common/src/UI/All Platforms/UIEnums.h" -#include "app/common/src/UI/All Platforms/UIStructs.h" -#include "app/common/src/UI/Controls/UIControl.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/Controls/UIControl_SlotList.h" -#include "app/common/src/UI/Controls/UIControl_TextInput.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/Tutorial/TutorialMode.h" +#include "app/common/UI/All Platforms/IUIScene_AnvilMenu.h" +#include "app/common/UI/All Platforms/UIEnums.h" +#include "app/common/UI/All Platforms/UIStructs.h" +#include "app/common/UI/Controls/UIControl.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/Controls/UIControl_SlotList.h" +#include "app/common/UI/Controls/UIControl_TextInput.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.cpp similarity index 97% rename from targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.cpp rename to targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.cpp index ac1ffa331..7378efa6d 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.cpp @@ -4,13 +4,13 @@ #include -#include "app/common/src/Tutorial/Tutorial.h" -#include "app/common/src/Tutorial/TutorialEnum.h" -#include "app/common/src/Tutorial/TutorialMode.h" -#include "app/common/src/UI/Controls/UIControl_BeaconEffectButton.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/Controls/UIControl_SlotList.h" -#include "app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" +#include "app/common/Tutorial/Tutorial.h" +#include "app/common/Tutorial/TutorialEnum.h" +#include "app/common/Tutorial/TutorialMode.h" +#include "app/common/UI/Controls/UIControl_BeaconEffectButton.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/Controls/UIControl_SlotList.h" +#include "app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" #include "app/linux/LinuxGame.h" #include "minecraft/client/Minecraft.h" #include "minecraft/world/entity/player/Inventory.h" diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.h b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.h similarity index 87% rename from targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.h rename to targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.h index a7dcb4b30..ef2f26f56 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.h +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.h @@ -2,14 +2,14 @@ #include -#include "app/common/src/UI/All Platforms/IUIScene_BeaconMenu.h" -#include "app/common/src/UI/All Platforms/UIEnums.h" -#include "app/common/src/UI/All Platforms/UIStructs.h" -#include "app/common/src/UI/Controls/UIControl.h" -#include "app/common/src/UI/Controls/UIControl_BeaconEffectButton.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/Controls/UIControl_SlotList.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/All Platforms/IUIScene_BeaconMenu.h" +#include "app/common/UI/All Platforms/UIEnums.h" +#include "app/common/UI/All Platforms/UIStructs.h" +#include "app/common/UI/Controls/UIControl.h" +#include "app/common/UI/Controls/UIControl_BeaconEffectButton.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/Controls/UIControl_SlotList.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.cpp similarity index 95% rename from targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.cpp rename to targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.cpp index c2a484b61..f6b1c80b7 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.cpp @@ -3,14 +3,14 @@ #include #include "platform/sdl2/Profile.h" -#include "app/common/src/Tutorial/Tutorial.h" -#include "app/common/src/Tutorial/TutorialEnum.h" -#include "app/common/src/Tutorial/TutorialMode.h" -#include "app/common/src/UI/All Platforms/UIStructs.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/Controls/UIControl_Progress.h" -#include "app/common/src/UI/Controls/UIControl_SlotList.h" -#include "app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" +#include "app/common/Tutorial/Tutorial.h" +#include "app/common/Tutorial/TutorialEnum.h" +#include "app/common/Tutorial/TutorialMode.h" +#include "app/common/UI/All Platforms/UIStructs.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/Controls/UIControl_Progress.h" +#include "app/common/UI/Controls/UIControl_SlotList.h" +#include "app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" #include "app/linux/LinuxGame.h" #include "minecraft/SharedConstants.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.h b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.h similarity index 82% rename from targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.h rename to targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.h index 7f25e6e58..20d395573 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.h +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.h @@ -3,14 +3,14 @@ #include #include -#include "app/common/src/UI/All Platforms/IUIScene_BrewingMenu.h" -#include "app/common/src/UI/All Platforms/UIEnums.h" -#include "app/common/src/UI/All Platforms/UIStructs.h" -#include "app/common/src/UI/Controls/UIControl.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/Controls/UIControl_Progress.h" -#include "app/common/src/UI/Controls/UIControl_SlotList.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/All Platforms/IUIScene_BrewingMenu.h" +#include "app/common/UI/All Platforms/UIEnums.h" +#include "app/common/UI/All Platforms/UIStructs.h" +#include "app/common/UI/Controls/UIControl.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/Controls/UIControl_Progress.h" +#include "app/common/UI/Controls/UIControl_SlotList.h" +#include "app/common/UI/UIScene.h" #include "UIScene_AbstractContainerMenu.h" class InventoryMenu; diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.cpp similarity index 93% rename from targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.cpp rename to targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.cpp index d8c0702d7..06747581b 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.cpp @@ -4,13 +4,13 @@ #include -#include "app/common/src/Tutorial/Tutorial.h" -#include "app/common/src/Tutorial/TutorialEnum.h" -#include "app/common/src/Tutorial/TutorialMode.h" -#include "app/common/src/UI/All Platforms/UIStructs.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/Controls/UIControl_SlotList.h" -#include "app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" +#include "app/common/Tutorial/Tutorial.h" +#include "app/common/Tutorial/TutorialEnum.h" +#include "app/common/Tutorial/TutorialMode.h" +#include "app/common/UI/All Platforms/UIStructs.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/Controls/UIControl_SlotList.h" +#include "app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" #include "app/linux/LinuxGame.h" #include "minecraft/client/Minecraft.h" #include "minecraft/world/Container.h" diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.h b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.h similarity index 79% rename from targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.h rename to targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.h index 945e4f542..9113ed99c 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.h +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.h @@ -2,13 +2,13 @@ #include -#include "app/common/src/UI/All Platforms/IUIScene_ContainerMenu.h" -#include "app/common/src/UI/All Platforms/UIEnums.h" -#include "app/common/src/UI/All Platforms/UIStructs.h" -#include "app/common/src/UI/Controls/UIControl.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/Controls/UIControl_SlotList.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/All Platforms/IUIScene_ContainerMenu.h" +#include "app/common/UI/All Platforms/UIEnums.h" +#include "app/common/UI/All Platforms/UIStructs.h" +#include "app/common/UI/Controls/UIControl.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/Controls/UIControl_SlotList.h" +#include "app/common/UI/UIScene.h" #include "UIScene_AbstractContainerMenu.h" class InventoryMenu; diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.cpp similarity index 96% rename from targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.cpp rename to targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.cpp index 53d1648ff..6830a88d4 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.cpp @@ -4,14 +4,14 @@ #include -#include "app/common/src/Tutorial/Tutorial.h" -#include "app/common/src/Tutorial/TutorialEnum.h" -#include "app/common/src/Tutorial/TutorialMode.h" -#include "app/common/src/UI/All Platforms/UIStructs.h" -#include "app/common/src/UI/Controls/UIControl_Base.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/Controls/UIControl_SlotList.h" -#include "app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" +#include "app/common/Tutorial/Tutorial.h" +#include "app/common/Tutorial/TutorialEnum.h" +#include "app/common/Tutorial/TutorialMode.h" +#include "app/common/UI/All Platforms/UIStructs.h" +#include "app/common/UI/Controls/UIControl_Base.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/Controls/UIControl_SlotList.h" +#include "app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" @@ -19,7 +19,7 @@ #include "app/linux/Iggy/include/rrCore.h" #include "app/linux/LinuxGame.h" #include "app/linux/Linux_UIController.h" -#include "app/include/XboxStubs.h" +#include "app/common/XboxStubs.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/player/LocalPlayer.h" #include "minecraft/sounds/SoundTypes.h" diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.h b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.h similarity index 89% rename from targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.h rename to targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.h index e9e0cc217..140664e4f 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.h +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.h @@ -2,13 +2,13 @@ #include -#include "app/common/src/UI/All Platforms/IUIScene_CreativeMenu.h" -#include "app/common/src/UI/All Platforms/UIEnums.h" -#include "app/common/src/UI/All Platforms/UIStructs.h" -#include "app/common/src/UI/Controls/UIControl.h" -#include "app/common/src/UI/Controls/UIControl_Base.h" -#include "app/common/src/UI/Controls/UIControl_SlotList.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/All Platforms/IUIScene_CreativeMenu.h" +#include "app/common/UI/All Platforms/UIEnums.h" +#include "app/common/UI/All Platforms/UIStructs.h" +#include "app/common/UI/Controls/UIControl.h" +#include "app/common/UI/Controls/UIControl_Base.h" +#include "app/common/UI/Controls/UIControl_SlotList.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.cpp similarity index 93% rename from targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.cpp rename to targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.cpp index 661aad066..466d5fdf6 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.cpp @@ -4,13 +4,13 @@ #include -#include "app/common/src/Tutorial/Tutorial.h" -#include "app/common/src/Tutorial/TutorialEnum.h" -#include "app/common/src/Tutorial/TutorialMode.h" -#include "app/common/src/UI/All Platforms/UIStructs.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/Controls/UIControl_SlotList.h" -#include "app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" +#include "app/common/Tutorial/Tutorial.h" +#include "app/common/Tutorial/TutorialEnum.h" +#include "app/common/Tutorial/TutorialMode.h" +#include "app/common/UI/All Platforms/UIStructs.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/Controls/UIControl_SlotList.h" +#include "app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" #include "app/linux/LinuxGame.h" #include "minecraft/client/Minecraft.h" #include "minecraft/world/inventory/TrapMenu.h" diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.h b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.h similarity index 79% rename from targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.h rename to targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.h index 035cbfe03..a40436d87 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.h +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.h @@ -2,13 +2,13 @@ #include -#include "app/common/src/UI/All Platforms/IUIScene_DispenserMenu.h" -#include "app/common/src/UI/All Platforms/UIEnums.h" -#include "app/common/src/UI/All Platforms/UIStructs.h" -#include "app/common/src/UI/Controls/UIControl.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/Controls/UIControl_SlotList.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/All Platforms/IUIScene_DispenserMenu.h" +#include "app/common/UI/All Platforms/UIEnums.h" +#include "app/common/UI/All Platforms/UIStructs.h" +#include "app/common/UI/Controls/UIControl.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/Controls/UIControl_SlotList.h" +#include "app/common/UI/UIScene.h" #include "UIScene_AbstractContainerMenu.h" class InventoryMenu; diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.cpp similarity index 95% rename from targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.cpp rename to targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.cpp index cff34b14f..f23df9a52 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.cpp @@ -6,14 +6,14 @@ #include #include "platform/sdl2/Profile.h" -#include "app/common/src/Tutorial/Tutorial.h" -#include "app/common/src/Tutorial/TutorialEnum.h" -#include "app/common/src/Tutorial/TutorialMode.h" -#include "app/common/src/UI/Controls/UIControl_EnchantmentBook.h" -#include "app/common/src/UI/Controls/UIControl_EnchantmentButton.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/Controls/UIControl_SlotList.h" -#include "app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" +#include "app/common/Tutorial/Tutorial.h" +#include "app/common/Tutorial/TutorialEnum.h" +#include "app/common/Tutorial/TutorialMode.h" +#include "app/common/UI/Controls/UIControl_EnchantmentBook.h" +#include "app/common/UI/Controls/UIControl_EnchantmentButton.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/Controls/UIControl_SlotList.h" +#include "app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" #include "app/linux/LinuxGame.h" #include "app/linux/Linux_UIController.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.h b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.h similarity index 79% rename from targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.h rename to targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.h index 6557fd50c..e9b1f2c68 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.h +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.h @@ -2,15 +2,15 @@ #include -#include "app/common/src/UI/All Platforms/IUIScene_EnchantingMenu.h" -#include "app/common/src/UI/All Platforms/UIEnums.h" -#include "app/common/src/UI/All Platforms/UIStructs.h" -#include "app/common/src/UI/Controls/UIControl.h" -#include "app/common/src/UI/Controls/UIControl_EnchantmentBook.h" -#include "app/common/src/UI/Controls/UIControl_EnchantmentButton.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/Controls/UIControl_SlotList.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/All Platforms/IUIScene_EnchantingMenu.h" +#include "app/common/UI/All Platforms/UIEnums.h" +#include "app/common/UI/All Platforms/UIStructs.h" +#include "app/common/UI/Controls/UIControl.h" +#include "app/common/UI/Controls/UIControl_EnchantmentBook.h" +#include "app/common/UI/Controls/UIControl_EnchantmentButton.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/Controls/UIControl_SlotList.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" #include "UIScene_AbstractContainerMenu.h" diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.cpp similarity index 95% rename from targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.cpp rename to targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.cpp index 54b885a53..5c7ffe66b 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.cpp @@ -4,12 +4,12 @@ #include -#include "app/common/src/Tutorial/Tutorial.h" -#include "app/common/src/Tutorial/TutorialEnum.h" -#include "app/common/src/Tutorial/TutorialMode.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/Controls/UIControl_SlotList.h" -#include "app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" +#include "app/common/Tutorial/Tutorial.h" +#include "app/common/Tutorial/TutorialEnum.h" +#include "app/common/Tutorial/TutorialMode.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/Controls/UIControl_SlotList.h" +#include "app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" #include "app/linux/LinuxGame.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/player/LocalPlayer.h" diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.h b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.h similarity index 82% rename from targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.h rename to targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.h index 8370c4236..888530258 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.h +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.h @@ -2,13 +2,13 @@ #include -#include "app/common/src/UI/All Platforms/IUIScene_FireworksMenu.h" -#include "app/common/src/UI/All Platforms/UIEnums.h" -#include "app/common/src/UI/All Platforms/UIStructs.h" -#include "app/common/src/UI/Controls/UIControl.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/Controls/UIControl_SlotList.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/All Platforms/IUIScene_FireworksMenu.h" +#include "app/common/UI/All Platforms/UIEnums.h" +#include "app/common/UI/All Platforms/UIStructs.h" +#include "app/common/UI/Controls/UIControl.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/Controls/UIControl_SlotList.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.cpp similarity index 94% rename from targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.cpp rename to targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.cpp index 6ba1dcb04..80bf0cf87 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.cpp @@ -4,13 +4,13 @@ #include #include "platform/sdl2/Profile.h" -#include "app/common/src/Tutorial/Tutorial.h" -#include "app/common/src/Tutorial/TutorialEnum.h" -#include "app/common/src/Tutorial/TutorialMode.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/Controls/UIControl_Progress.h" -#include "app/common/src/UI/Controls/UIControl_SlotList.h" -#include "app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" +#include "app/common/Tutorial/Tutorial.h" +#include "app/common/Tutorial/TutorialEnum.h" +#include "app/common/Tutorial/TutorialMode.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/Controls/UIControl_Progress.h" +#include "app/common/UI/Controls/UIControl_SlotList.h" +#include "app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" #include "app/linux/LinuxGame.h" #include "minecraft/client/Minecraft.h" #include "minecraft/world/inventory/FurnaceMenu.h" diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.h b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.h similarity index 82% rename from targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.h rename to targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.h index ea10109fc..4e0ea1666 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.h +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.h @@ -3,14 +3,14 @@ #include #include -#include "app/common/src/UI/All Platforms/IUIScene_FurnaceMenu.h" -#include "app/common/src/UI/All Platforms/UIEnums.h" -#include "app/common/src/UI/All Platforms/UIStructs.h" -#include "app/common/src/UI/Controls/UIControl.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/Controls/UIControl_Progress.h" -#include "app/common/src/UI/Controls/UIControl_SlotList.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/All Platforms/IUIScene_FurnaceMenu.h" +#include "app/common/UI/All Platforms/UIEnums.h" +#include "app/common/UI/All Platforms/UIStructs.h" +#include "app/common/UI/Controls/UIControl.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/Controls/UIControl_Progress.h" +#include "app/common/UI/Controls/UIControl_SlotList.h" +#include "app/common/UI/UIScene.h" #include "UIScene_AbstractContainerMenu.h" class InventoryMenu; diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.cpp similarity index 93% rename from targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.cpp rename to targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.cpp index 3bc476737..ebe8ef0ac 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.cpp @@ -4,13 +4,13 @@ #include -#include "app/common/src/Tutorial/Tutorial.h" -#include "app/common/src/Tutorial/TutorialEnum.h" -#include "app/common/src/Tutorial/TutorialMode.h" -#include "app/common/src/UI/All Platforms/UIStructs.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/Controls/UIControl_SlotList.h" -#include "app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" +#include "app/common/Tutorial/Tutorial.h" +#include "app/common/Tutorial/TutorialEnum.h" +#include "app/common/Tutorial/TutorialMode.h" +#include "app/common/UI/All Platforms/UIStructs.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/Controls/UIControl_SlotList.h" +#include "app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" #include "app/linux/LinuxGame.h" #include "minecraft/client/Minecraft.h" #include "minecraft/world/Container.h" diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.h b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.h similarity index 79% rename from targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.h rename to targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.h index 5d67ddc3a..5ff4d392b 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.h +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.h @@ -2,13 +2,13 @@ #include -#include "app/common/src/UI/All Platforms/IUIScene_HopperMenu.h" -#include "app/common/src/UI/All Platforms/UIEnums.h" -#include "app/common/src/UI/All Platforms/UIStructs.h" -#include "app/common/src/UI/Controls/UIControl.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/Controls/UIControl_SlotList.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/All Platforms/IUIScene_HopperMenu.h" +#include "app/common/UI/All Platforms/UIEnums.h" +#include "app/common/UI/All Platforms/UIStructs.h" +#include "app/common/UI/Controls/UIControl.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/Controls/UIControl_SlotList.h" +#include "app/common/UI/UIScene.h" #include "UIScene_AbstractContainerMenu.h" class InventoryMenu; diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.cpp similarity index 95% rename from targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.cpp rename to targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.cpp index d436bbc39..f95a45415 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.cpp @@ -4,14 +4,14 @@ #include -#include "app/common/src/Tutorial/Tutorial.h" -#include "app/common/src/Tutorial/TutorialEnum.h" -#include "app/common/src/Tutorial/TutorialMode.h" -#include "app/common/src/UI/All Platforms/UIStructs.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/Controls/UIControl_MinecraftHorse.h" -#include "app/common/src/UI/Controls/UIControl_SlotList.h" -#include "app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" +#include "app/common/Tutorial/Tutorial.h" +#include "app/common/Tutorial/TutorialEnum.h" +#include "app/common/Tutorial/TutorialMode.h" +#include "app/common/UI/All Platforms/UIStructs.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/Controls/UIControl_MinecraftHorse.h" +#include "app/common/UI/Controls/UIControl_SlotList.h" +#include "app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.h b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.h similarity index 82% rename from targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.h rename to targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.h index 3819b9184..6bcf7ff75 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.h +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.h @@ -2,14 +2,14 @@ #include -#include "app/common/src/UI/All Platforms/IUIScene_HorseInventoryMenu.h" -#include "app/common/src/UI/All Platforms/UIEnums.h" -#include "app/common/src/UI/All Platforms/UIStructs.h" -#include "app/common/src/UI/Controls/UIControl.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/Controls/UIControl_MinecraftHorse.h" -#include "app/common/src/UI/Controls/UIControl_SlotList.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/All Platforms/IUIScene_HorseInventoryMenu.h" +#include "app/common/UI/All Platforms/UIEnums.h" +#include "app/common/UI/All Platforms/UIStructs.h" +#include "app/common/UI/Controls/UIControl.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/Controls/UIControl_MinecraftHorse.h" +#include "app/common/UI/Controls/UIControl_SlotList.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.cpp similarity index 96% rename from targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.cpp rename to targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.cpp index bc0cfeb02..a588c1ff1 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.cpp @@ -7,12 +7,12 @@ #include #include -#include "app/common/src/Tutorial/Tutorial.h" -#include "app/common/src/Tutorial/TutorialEnum.h" -#include "app/common/src/Tutorial/TutorialMode.h" -#include "app/common/src/UI/Controls/UIControl_MinecraftPlayer.h" -#include "app/common/src/UI/Controls/UIControl_SlotList.h" -#include "app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" +#include "app/common/Tutorial/Tutorial.h" +#include "app/common/Tutorial/TutorialEnum.h" +#include "app/common/Tutorial/TutorialMode.h" +#include "app/common/UI/Controls/UIControl_MinecraftPlayer.h" +#include "app/common/UI/Controls/UIControl_SlotList.h" +#include "app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" #include "app/linux/LinuxGame.h" #include "app/linux/Linux_UIController.h" #include "util/StringHelpers.h" diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.h b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.h similarity index 83% rename from targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.h rename to targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.h index a47a6524d..fe400fac7 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.h +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.h @@ -2,13 +2,13 @@ #include -#include "app/common/src/UI/All Platforms/IUIScene_InventoryMenu.h" -#include "app/common/src/UI/All Platforms/UIEnums.h" -#include "app/common/src/UI/All Platforms/UIStructs.h" -#include "app/common/src/UI/Controls/UIControl.h" -#include "app/common/src/UI/Controls/UIControl_MinecraftPlayer.h" -#include "app/common/src/UI/Controls/UIControl_SlotList.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/All Platforms/IUIScene_InventoryMenu.h" +#include "app/common/UI/All Platforms/UIEnums.h" +#include "app/common/UI/All Platforms/UIStructs.h" +#include "app/common/UI/Controls/UIControl.h" +#include "app/common/UI/Controls/UIControl_MinecraftPlayer.h" +#include "app/common/UI/Controls/UIControl_SlotList.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.cpp similarity index 96% rename from targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.cpp rename to targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.cpp index 1d2ad093f..cef0b16fa 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.cpp @@ -7,13 +7,13 @@ #include "platform/InputActions.h" #include "platform/sdl2/Profile.h" -#include "app/common/src/Tutorial/Tutorial.h" -#include "app/common/src/Tutorial/TutorialEnum.h" -#include "app/common/src/Tutorial/TutorialMode.h" -#include "app/common/src/UI/All Platforms/UIStructs.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/Controls/UIControl_SlotList.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/Tutorial/Tutorial.h" +#include "app/common/Tutorial/TutorialEnum.h" +#include "app/common/Tutorial/TutorialMode.h" +#include "app/common/UI/All Platforms/UIStructs.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/Controls/UIControl_SlotList.h" +#include "app/common/UI/UIScene.h" #include "app/linux/LinuxGame.h" #include "app/linux/Linux_UIController.h" #include "util/StringHelpers.h" diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.h b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.h similarity index 89% rename from targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.h rename to targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.h index c64f2eb0c..4e04f6b38 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.h +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.h @@ -2,13 +2,13 @@ #include -#include "app/common/src/UI/All Platforms/IUIScene_TradingMenu.h" -#include "app/common/src/UI/All Platforms/UIEnums.h" -#include "app/common/src/UI/Controls/UIControl.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/Controls/UIControl_SlotList.h" -#include "app/common/src/UI/UILayer.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/All Platforms/IUIScene_TradingMenu.h" +#include "app/common/UI/All Platforms/UIEnums.h" +#include "app/common/UI/Controls/UIControl.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/Controls/UIControl_SlotList.h" +#include "app/common/UI/UILayer.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.cpp similarity index 98% rename from targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.cpp rename to targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.cpp index 466ace887..1ac22cb8d 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.cpp @@ -3,14 +3,14 @@ #include "platform/InputActions.h" #include "platform/sdl2/Profile.h" -#include "app/common/src/Tutorial/Tutorial.h" -#include "app/common/src/Tutorial/TutorialEnum.h" -#include "app/common/src/Tutorial/TutorialMode.h" -#include "app/common/src/UI/All Platforms/UIStructs.h" -#include "app/common/src/UI/Controls/UIControl_HTMLLabel.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/Controls/UIControl_SlotList.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/Tutorial/Tutorial.h" +#include "app/common/Tutorial/TutorialEnum.h" +#include "app/common/Tutorial/TutorialMode.h" +#include "app/common/UI/All Platforms/UIStructs.h" +#include "app/common/UI/Controls/UIControl_HTMLLabel.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/Controls/UIControl_SlotList.h" +#include "app/common/UI/UIScene.h" #include "app/linux/LinuxGame.h" #include "app/linux/Linux_UIController.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.h b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.h similarity index 95% rename from targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.h rename to targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.h index 15c651658..3a475c621 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.h +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.h @@ -3,13 +3,13 @@ #include #include -#include "app/common/src/UI/All Platforms/IUIScene_CraftingMenu.h" -#include "app/common/src/UI/All Platforms/UIEnums.h" -#include "app/common/src/UI/Controls/UIControl.h" -#include "app/common/src/UI/Controls/UIControl_HTMLLabel.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/Controls/UIControl_SlotList.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/All Platforms/IUIScene_CraftingMenu.h" +#include "app/common/UI/All Platforms/UIEnums.h" +#include "app/common/UI/Controls/UIControl.h" +#include "app/common/UI/Controls/UIControl_HTMLLabel.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/Controls/UIControl_SlotList.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.cpp similarity index 93% rename from targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.cpp rename to targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.cpp index b9c7efccb..0197e91be 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.cpp @@ -7,13 +7,13 @@ #include "platform/sdl2/Profile.h" #include "platform/sdl2/Storage.h" #include "app/common/App_enums.h" -#include "app/common/src/Network/GameNetworkManager.h" -#include "app/common/src/Tutorial/Tutorial.h" -#include "app/common/src/Tutorial/TutorialMode.h" -#include "app/common/src/UI/All Platforms/IUIScene_PauseMenu.h" -#include "app/common/src/UI/Controls/UIControl_Button.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/Network/GameNetworkManager.h" +#include "app/common/Tutorial/Tutorial.h" +#include "app/common/Tutorial/TutorialMode.h" +#include "app/common/UI/All Platforms/IUIScene_PauseMenu.h" +#include "app/common/UI/Controls/UIControl_Button.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/UIScene.h" #include "app/linux/LinuxGame.h" #include "app/linux/Linux_UIController.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.h b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.h similarity index 84% rename from targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.h rename to targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.h index 9935cf3f1..7b2c387d7 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.h +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.h @@ -2,10 +2,10 @@ #include -#include "app/common/src/UI/All Platforms/UIEnums.h" -#include "app/common/src/UI/Controls/UIControl_Button.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/All Platforms/UIEnums.h" +#include "app/common/UI/Controls/UIControl_Button.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/rrCore.h" class UILayer; diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.cpp similarity index 99% rename from targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.cpp rename to targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.cpp index 38db9a44e..09627e855 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.cpp @@ -10,8 +10,8 @@ #include "platform/InputActions.h" #include "platform/sdl2/Profile.h" #include "app/common/App_enums.h" -#include "app/common/src/Tutorial/Tutorial.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/Tutorial/Tutorial.h" +#include "app/common/UI/UIScene.h" #include "app/linux/LinuxGame.h" #include "app/linux/Linux_UIController.h" #include "util/StringHelpers.h" diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.h b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.h similarity index 92% rename from targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.h rename to targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.h index 7d31736fe..d4e9d2d5a 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.h +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.h @@ -3,8 +3,8 @@ #include #include -#include "app/common/src/UI/All Platforms/UIEnums.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/All Platforms/UIEnums.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.cpp similarity index 96% rename from targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.cpp rename to targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.cpp index 8029686fa..ef72faa51 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.cpp @@ -5,12 +5,12 @@ #include "platform/InputActions.h" #include "app/common/App_enums.h" -#include "app/common/src/Network/GameNetworkManager.h" -#include "app/common/src/Network/NetworkPlayerInterface.h" -#include "app/common/src/UI/All Platforms/UIStructs.h" -#include "app/common/src/UI/Controls/UIControl_Button.h" -#include "app/common/src/UI/Controls/UIControl_CheckBox.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/Network/GameNetworkManager.h" +#include "app/common/Network/NetworkPlayerInterface.h" +#include "app/common/UI/All Platforms/UIStructs.h" +#include "app/common/UI/Controls/UIControl_Button.h" +#include "app/common/UI/Controls/UIControl_CheckBox.h" +#include "app/common/UI/UIScene.h" #include "app/linux/LinuxGame.h" #include "app/linux/Linux_UIController.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.h b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.h similarity index 91% rename from targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.h rename to targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.h index 30613973b..40e605fd5 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.h +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.h @@ -2,10 +2,10 @@ #include -#include "app/common/src/UI/All Platforms/UIEnums.h" -#include "app/common/src/UI/Controls/UIControl_Button.h" -#include "app/common/src/UI/Controls/UIControl_CheckBox.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/All Platforms/UIEnums.h" +#include "app/common/UI/Controls/UIControl_Button.h" +#include "app/common/UI/Controls/UIControl_CheckBox.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/rrCore.h" class UILayer; diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.cpp similarity index 97% rename from targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.cpp rename to targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.cpp index 4e608dbd2..d15737608 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.cpp @@ -6,15 +6,15 @@ #include "platform/InputActions.h" #include "platform/sdl2/Profile.h" #include "app/common/App_enums.h" -#include "app/common/src/Console_Debug_enum.h" -#include "app/common/src/Network/GameNetworkManager.h" -#include "app/common/src/Network/NetworkPlayerInterface.h" -#include "app/common/src/UI/All Platforms/UIStructs.h" -#include "app/common/src/UI/Controls/UIControl_Button.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/Controls/UIControl_PlayerList.h" -#include "app/common/src/UI/UILayer.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/Console_Debug_enum.h" +#include "app/common/Network/GameNetworkManager.h" +#include "app/common/Network/NetworkPlayerInterface.h" +#include "app/common/UI/All Platforms/UIStructs.h" +#include "app/common/UI/Controls/UIControl_Button.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/Controls/UIControl_PlayerList.h" +#include "app/common/UI/UILayer.h" +#include "app/common/UI/UIScene.h" #include "app/linux/LinuxGame.h" #include "app/linux/Linux_UIController.h" #include "app/linux/Stubs/winapi_stubs.h" diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.h b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.h similarity index 87% rename from targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.h rename to targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.h index 719579929..cd670822e 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.h +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.h @@ -5,12 +5,12 @@ #include #include "platform/sdl2/Storage.h" -#include "app/common/src/Network/GameNetworkManager.h" -#include "app/common/src/UI/All Platforms/UIEnums.h" -#include "app/common/src/UI/Controls/UIControl_Button.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/Controls/UIControl_PlayerList.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/Network/GameNetworkManager.h" +#include "app/common/UI/All Platforms/UIEnums.h" +#include "app/common/UI/Controls/UIControl_Button.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/Controls/UIControl_PlayerList.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/rrCore.h" class INetworkPlayer; diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.cpp similarity index 98% rename from targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.cpp rename to targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.cpp index 1a3bd04f0..1a31ea9c5 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.cpp @@ -5,14 +5,14 @@ #include "platform/InputActions.h" #include "app/common/App_enums.h" -#include "app/common/src/Network/GameNetworkManager.h" -#include "app/common/src/Network/NetworkPlayerInterface.h" -#include "app/common/src/UI/All Platforms/UIStructs.h" -#include "app/common/src/UI/Controls/UIControl_Button.h" -#include "app/common/src/UI/Controls/UIControl_CheckBox.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/Network/GameNetworkManager.h" +#include "app/common/Network/NetworkPlayerInterface.h" +#include "app/common/UI/All Platforms/UIStructs.h" +#include "app/common/UI/Controls/UIControl_Button.h" +#include "app/common/UI/Controls/UIControl_CheckBox.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.h" +#include "app/common/UI/UIScene.h" #include "app/linux/LinuxGame.h" #include "app/linux/Linux_UIController.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.h b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.h similarity index 91% rename from targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.h rename to targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.h index b74347a80..7a1863f6f 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.h +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.h @@ -4,12 +4,12 @@ #include #include "platform/sdl2/Storage.h" -#include "app/common/src/Network/GameNetworkManager.h" -#include "app/common/src/UI/All Platforms/UIEnums.h" -#include "app/common/src/UI/Controls/UIControl_Button.h" -#include "app/common/src/UI/Controls/UIControl_CheckBox.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/Network/GameNetworkManager.h" +#include "app/common/UI/All Platforms/UIEnums.h" +#include "app/common/UI/Controls/UIControl_Button.h" +#include "app/common/UI/Controls/UIControl_CheckBox.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameSaveManagementMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameSaveManagementMenu.cpp similarity index 100% rename from targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameSaveManagementMenu.cpp rename to targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameSaveManagementMenu.cpp diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameSaveManagementMenu.h b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameSaveManagementMenu.h similarity index 94% rename from targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameSaveManagementMenu.h rename to targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameSaveManagementMenu.h index c22d441c4..bd95c92c5 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameSaveManagementMenu.h +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameSaveManagementMenu.h @@ -2,9 +2,9 @@ #include -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/Controls/UIControl_SaveList.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/Controls/UIControl_SaveList.h" +#include "app/common/UI/UIScene.h" class UIScene_InGameSaveManagementMenu : public UIScene { private: diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.cpp similarity index 97% rename from targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.cpp rename to targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.cpp index e09b8e88c..9922ddaff 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.cpp @@ -8,15 +8,15 @@ #include "platform/InputActions.h" #include "platform/sdl2/Profile.h" #include "app/common/App_enums.h" -#include "app/common/src/DLC/DLCManager.h" -#include "app/common/src/DLC/DLCPack.h" -#include "app/common/src/Network/GameNetworkManager.h" -#include "app/common/src/Tutorial/Tutorial.h" -#include "app/common/src/Tutorial/TutorialMode.h" -#include "app/common/src/UI/All Platforms/IUIScene_PauseMenu.h" -#include "app/common/src/UI/Controls/UIControl_Button.h" -#include "app/common/src/UI/UILayer.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/DLC/DLCManager.h" +#include "app/common/DLC/DLCPack.h" +#include "app/common/Network/GameNetworkManager.h" +#include "app/common/Tutorial/Tutorial.h" +#include "app/common/Tutorial/TutorialMode.h" +#include "app/common/UI/All Platforms/IUIScene_PauseMenu.h" +#include "app/common/UI/Controls/UIControl_Button.h" +#include "app/common/UI/UILayer.h" +#include "app/common/UI/UIScene.h" #include "app/linux/LinuxGame.h" #include "app/linux/Linux_UIController.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h similarity index 91% rename from targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h rename to targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h index 7b510ea0c..1bbc797af 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h @@ -3,10 +3,10 @@ #include #include "platform/sdl2/Storage.h" -#include "app/common/src/UI/All Platforms/IUIScene_PauseMenu.h" -#include "app/common/src/UI/All Platforms/UIEnums.h" -#include "app/common/src/UI/Controls/UIControl_Button.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/All Platforms/IUIScene_PauseMenu.h" +#include "app/common/UI/All Platforms/UIEnums.h" +#include "app/common/UI/Controls/UIControl_Button.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/rrCore.h" class UILayer; diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.cpp similarity index 95% rename from targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.cpp rename to targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.cpp index f75806778..a86982b93 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.cpp @@ -3,12 +3,12 @@ #include "platform/InputActions.h" #include "platform/sdl2/Input.h" -#include "app/common/src/UI/All Platforms/UIStructs.h" -#include "app/common/src/UI/Controls/UIControl_Button.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/Controls/UIControl_TextInput.h" -#include "app/common/src/UI/UILayer.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/All Platforms/UIStructs.h" +#include "app/common/UI/Controls/UIControl_Button.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/Controls/UIControl_TextInput.h" +#include "app/common/UI/UILayer.h" +#include "app/common/UI/UIScene.h" #include "app/linux/LinuxGame.h" #include "app/linux/Linux_UIController.h" #include "util/StringHelpers.h" diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.h b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.h similarity index 85% rename from targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.h rename to targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.h index c3c540398..1b565038e 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.h +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.h @@ -3,11 +3,11 @@ #include #include -#include "app/common/src/UI/All Platforms/UIEnums.h" -#include "app/common/src/UI/Controls/UIControl_Button.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/Controls/UIControl_TextInput.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/All Platforms/UIEnums.h" +#include "app/common/UI/Controls/UIControl_Button.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/Controls/UIControl_TextInput.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/rrCore.h" class SignTileEntity; diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.cpp similarity index 96% rename from targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.cpp rename to targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.cpp index f28476144..7609c73a1 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.cpp @@ -4,14 +4,14 @@ #include #include "platform/InputActions.h" -#include "app/common/src/Console_Debug_enum.h" -#include "app/common/src/Network/GameNetworkManager.h" -#include "app/common/src/Network/NetworkPlayerInterface.h" -#include "app/common/src/UI/All Platforms/UIStructs.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/Controls/UIControl_PlayerList.h" -#include "app/common/src/UI/UILayer.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/Console_Debug_enum.h" +#include "app/common/Network/GameNetworkManager.h" +#include "app/common/Network/NetworkPlayerInterface.h" +#include "app/common/UI/All Platforms/UIStructs.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/Controls/UIControl_PlayerList.h" +#include "app/common/UI/UILayer.h" +#include "app/common/UI/UIScene.h" #include "app/linux/LinuxGame.h" #include "app/linux/Linux_UIController.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.h b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.h similarity index 84% rename from targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.h rename to targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.h index 5d5353e4a..b92fa134a 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.h +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.h @@ -3,13 +3,13 @@ #include #include -#include "app/common/src/Network/GameNetworkManager.h" -#include "app/common/src/UI/All Platforms/UIEnums.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/Controls/UIControl_PlayerList.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/Network/GameNetworkManager.h" +#include "app/common/UI/All Platforms/UIEnums.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/Controls/UIControl_PlayerList.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/rrCore.h" -#include "app/include/NetTypes.h" +#include "app/common/NetTypes.h" class INetworkPlayer; class UILayer; diff --git a/targets/app/common/src/UI/Scenes/UIScene_ConnectingProgress.cpp b/targets/app/common/UI/Scenes/UIScene_ConnectingProgress.cpp similarity index 96% rename from targets/app/common/src/UI/Scenes/UIScene_ConnectingProgress.cpp rename to targets/app/common/UI/Scenes/UIScene_ConnectingProgress.cpp index 30a840eb3..0dfd409f6 100644 --- a/targets/app/common/src/UI/Scenes/UIScene_ConnectingProgress.cpp +++ b/targets/app/common/UI/Scenes/UIScene_ConnectingProgress.cpp @@ -4,13 +4,13 @@ #include "platform/InputActions.h" #include "platform/sdl2/Profile.h" #include "app/common/App_enums.h" -#include "app/common/src/Network/GameNetworkManager.h" -#include "app/common/src/UI/All Platforms/UIStructs.h" -#include "app/common/src/UI/Controls/UIControl_Button.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/Controls/UIControl_Progress.h" -#include "app/common/src/UI/UILayer.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/Network/GameNetworkManager.h" +#include "app/common/UI/All Platforms/UIStructs.h" +#include "app/common/UI/Controls/UIControl_Button.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/Controls/UIControl_Progress.h" +#include "app/common/UI/UILayer.h" +#include "app/common/UI/UIScene.h" #include "app/linux/LinuxGame.h" #include "app/linux/Linux_UIController.h" #include "java/System.h" diff --git a/targets/app/common/src/UI/Scenes/UIScene_ConnectingProgress.h b/targets/app/common/UI/Scenes/UIScene_ConnectingProgress.h similarity index 83% rename from targets/app/common/src/UI/Scenes/UIScene_ConnectingProgress.h rename to targets/app/common/UI/Scenes/UIScene_ConnectingProgress.h index fc93b21dd..7866c9959 100644 --- a/targets/app/common/src/UI/Scenes/UIScene_ConnectingProgress.h +++ b/targets/app/common/UI/Scenes/UIScene_ConnectingProgress.h @@ -2,12 +2,12 @@ #include -#include "app/common/src/UI/All Platforms/UIEnums.h" -#include "app/common/src/UI/Controls/UIControl.h" -#include "app/common/src/UI/Controls/UIControl_Button.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/Controls/UIControl_Progress.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/All Platforms/UIEnums.h" +#include "app/common/UI/Controls/UIControl.h" +#include "app/common/UI/Controls/UIControl_Button.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/Controls/UIControl_Progress.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/rrCore.h" class UILayer; diff --git a/targets/app/common/src/UI/Scenes/UIScene_FullscreenProgress.cpp b/targets/app/common/UI/Scenes/UIScene_FullscreenProgress.cpp similarity index 97% rename from targets/app/common/src/UI/Scenes/UIScene_FullscreenProgress.cpp rename to targets/app/common/UI/Scenes/UIScene_FullscreenProgress.cpp index bd0fb1c4c..1b5fed537 100644 --- a/targets/app/common/src/UI/Scenes/UIScene_FullscreenProgress.cpp +++ b/targets/app/common/UI/Scenes/UIScene_FullscreenProgress.cpp @@ -8,13 +8,13 @@ #include "platform/InputActions.h" #include "platform/sdl2/Profile.h" #include "app/common/App_enums.h" -#include "app/common/src/Network/GameNetworkManager.h" -#include "app/common/src/Tutorial/Tutorial.h" -#include "app/common/src/UI/Controls/UIControl_Button.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/Controls/UIControl_Progress.h" -#include "app/common/src/UI/UILayer.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/Network/GameNetworkManager.h" +#include "app/common/Tutorial/Tutorial.h" +#include "app/common/UI/Controls/UIControl_Button.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/Controls/UIControl_Progress.h" +#include "app/common/UI/UILayer.h" +#include "app/common/UI/UIScene.h" #include "app/linux/LinuxGame.h" #include "app/linux/Linux_UIController.h" #include "app/linux/Stubs/winapi_stubs.h" diff --git a/targets/app/common/src/UI/Scenes/UIScene_FullscreenProgress.h b/targets/app/common/UI/Scenes/UIScene_FullscreenProgress.h similarity index 84% rename from targets/app/common/src/UI/Scenes/UIScene_FullscreenProgress.h rename to targets/app/common/UI/Scenes/UIScene_FullscreenProgress.h index 549329eda..e3b5b54cf 100644 --- a/targets/app/common/src/UI/Scenes/UIScene_FullscreenProgress.h +++ b/targets/app/common/UI/Scenes/UIScene_FullscreenProgress.h @@ -2,13 +2,13 @@ #include -#include "app/common/src/UI/All Platforms/UIEnums.h" -#include "app/common/src/UI/All Platforms/UIStructs.h" -#include "app/common/src/UI/Controls/UIControl.h" -#include "app/common/src/UI/Controls/UIControl_Button.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/Controls/UIControl_Progress.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/All Platforms/UIEnums.h" +#include "app/common/UI/All Platforms/UIStructs.h" +#include "app/common/UI/Controls/UIControl.h" +#include "app/common/UI/Controls/UIControl_Button.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/Controls/UIControl_Progress.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/rrCore.h" class C4JThread; diff --git a/targets/app/common/src/UI/Scenes/UIScene_Keyboard.cpp b/targets/app/common/UI/Scenes/UIScene_Keyboard.cpp similarity index 96% rename from targets/app/common/src/UI/Scenes/UIScene_Keyboard.cpp rename to targets/app/common/UI/Scenes/UIScene_Keyboard.cpp index 23b1a8567..44dbaa8d1 100644 --- a/targets/app/common/src/UI/Scenes/UIScene_Keyboard.cpp +++ b/targets/app/common/UI/Scenes/UIScene_Keyboard.cpp @@ -2,11 +2,11 @@ #include "platform/InputActions.h" #include "app/common/App_Defines.h" -#include "app/common/src/UI/Controls/UIControl_Button.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/Controls/UIControl_TextInput.h" -#include "app/common/src/UI/UILayer.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/Controls/UIControl_Button.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/Controls/UIControl_TextInput.h" +#include "app/common/UI/UILayer.h" +#include "app/common/UI/UIScene.h" #include "app/linux/LinuxGame.h" #include "app/linux/Linux_UIController.h" #include "util/StringHelpers.h" diff --git a/targets/app/common/src/UI/Scenes/UIScene_Keyboard.h b/targets/app/common/UI/Scenes/UIScene_Keyboard.h similarity index 92% rename from targets/app/common/src/UI/Scenes/UIScene_Keyboard.h rename to targets/app/common/UI/Scenes/UIScene_Keyboard.h index 2ace04f7c..61defc8f3 100644 --- a/targets/app/common/src/UI/Scenes/UIScene_Keyboard.h +++ b/targets/app/common/UI/Scenes/UIScene_Keyboard.h @@ -2,11 +2,11 @@ #include -#include "app/common/src/UI/All Platforms/UIEnums.h" -#include "app/common/src/UI/Controls/UIControl_Button.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/Controls/UIControl_TextInput.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/All Platforms/UIEnums.h" +#include "app/common/UI/Controls/UIControl_Button.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/Controls/UIControl_TextInput.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" diff --git a/targets/app/common/src/UI/Scenes/UIScene_MessageBox.cpp b/targets/app/common/UI/Scenes/UIScene_MessageBox.cpp similarity index 95% rename from targets/app/common/src/UI/Scenes/UIScene_MessageBox.cpp rename to targets/app/common/UI/Scenes/UIScene_MessageBox.cpp index 60a02ef5e..348461ba0 100644 --- a/targets/app/common/src/UI/Scenes/UIScene_MessageBox.cpp +++ b/targets/app/common/UI/Scenes/UIScene_MessageBox.cpp @@ -4,11 +4,11 @@ #include "platform/PlatformTypes.h" #include "platform/InputActions.h" #include "platform/sdl2/Profile.h" -#include "app/common/src/UI/All Platforms/UIStructs.h" -#include "app/common/src/UI/Controls/UIControl_Button.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/UILayer.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/All Platforms/UIStructs.h" +#include "app/common/UI/Controls/UIControl_Button.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/UILayer.h" +#include "app/common/UI/UIScene.h" #include "app/linux/LinuxGame.h" #include "app/linux/Linux_UIController.h" #include "strings.h" diff --git a/targets/app/common/src/UI/Scenes/UIScene_MessageBox.h b/targets/app/common/UI/Scenes/UIScene_MessageBox.h similarity index 90% rename from targets/app/common/src/UI/Scenes/UIScene_MessageBox.h rename to targets/app/common/UI/Scenes/UIScene_MessageBox.h index de4d0d2cc..69c91028d 100644 --- a/targets/app/common/src/UI/Scenes/UIScene_MessageBox.h +++ b/targets/app/common/UI/Scenes/UIScene_MessageBox.h @@ -3,10 +3,10 @@ #include #include "platform/sdl2/Storage.h" -#include "app/common/src/UI/All Platforms/UIEnums.h" -#include "app/common/src/UI/Controls/UIControl_Button.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/All Platforms/UIEnums.h" +#include "app/common/UI/Controls/UIControl_Button.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" diff --git a/targets/app/common/src/UI/Scenes/UIScene_QuadrantSignin.cpp b/targets/app/common/UI/Scenes/UIScene_QuadrantSignin.cpp similarity index 97% rename from targets/app/common/src/UI/Scenes/UIScene_QuadrantSignin.cpp rename to targets/app/common/UI/Scenes/UIScene_QuadrantSignin.cpp index 6cd46d396..1cfb41e50 100644 --- a/targets/app/common/src/UI/Scenes/UIScene_QuadrantSignin.cpp +++ b/targets/app/common/UI/Scenes/UIScene_QuadrantSignin.cpp @@ -7,10 +7,10 @@ #include "platform/InputActions.h" #include "platform/sdl2/Input.h" #include "platform/sdl2/Profile.h" -#include "app/common/src/UI/Controls/UIControl_BitmapIcon.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/UILayer.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/Controls/UIControl_BitmapIcon.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/UILayer.h" +#include "app/common/UI/UIScene.h" #include "app/linux/LinuxGame.h" #include "app/linux/Linux_UIController.h" #include "strings.h" diff --git a/targets/app/common/src/UI/Scenes/UIScene_QuadrantSignin.h b/targets/app/common/UI/Scenes/UIScene_QuadrantSignin.h similarity index 93% rename from targets/app/common/src/UI/Scenes/UIScene_QuadrantSignin.h rename to targets/app/common/UI/Scenes/UIScene_QuadrantSignin.h index 02196ad87..a360ae6e5 100644 --- a/targets/app/common/src/UI/Scenes/UIScene_QuadrantSignin.h +++ b/targets/app/common/UI/Scenes/UIScene_QuadrantSignin.h @@ -3,12 +3,12 @@ #include #include -#include "app/common/src/UI/All Platforms/UIEnums.h" -#include "app/common/src/UI/All Platforms/UIStructs.h" -#include "app/common/src/UI/Controls/UIControl.h" -#include "app/common/src/UI/Controls/UIControl_BitmapIcon.h" -#include "app/common/src/UI/Controls/UIControl_Label.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/All Platforms/UIEnums.h" +#include "app/common/UI/All Platforms/UIStructs.h" +#include "app/common/UI/Controls/UIControl.h" +#include "app/common/UI/Controls/UIControl_BitmapIcon.h" +#include "app/common/UI/Controls/UIControl_Label.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" diff --git a/targets/app/common/src/UI/Scenes/UIScene_Timer.cpp b/targets/app/common/UI/Scenes/UIScene_Timer.cpp similarity index 88% rename from targets/app/common/src/UI/Scenes/UIScene_Timer.cpp rename to targets/app/common/UI/Scenes/UIScene_Timer.cpp index 66ade73ed..97d4e59e0 100644 --- a/targets/app/common/src/UI/Scenes/UIScene_Timer.cpp +++ b/targets/app/common/UI/Scenes/UIScene_Timer.cpp @@ -1,7 +1,7 @@ #include "UIScene_Timer.h" -#include "app/common/src/UI/Controls/UIControl.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/Controls/UIControl.h" +#include "app/common/UI/UIScene.h" class UILayer; diff --git a/targets/app/common/src/UI/Scenes/UIScene_Timer.h b/targets/app/common/UI/Scenes/UIScene_Timer.h similarity index 84% rename from targets/app/common/src/UI/Scenes/UIScene_Timer.h rename to targets/app/common/UI/Scenes/UIScene_Timer.h index 788f64055..f8830a6b4 100644 --- a/targets/app/common/src/UI/Scenes/UIScene_Timer.h +++ b/targets/app/common/UI/Scenes/UIScene_Timer.h @@ -2,9 +2,9 @@ #include -#include "app/common/src/UI/All Platforms/UIEnums.h" -#include "app/common/src/UI/Controls/UIControl.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/All Platforms/UIEnums.h" +#include "app/common/UI/Controls/UIControl.h" +#include "app/common/UI/UIScene.h" class UILayer; diff --git a/targets/app/common/src/UI/UIBitmapFont.cpp b/targets/app/common/UI/UIBitmapFont.cpp similarity index 99% rename from targets/app/common/src/UI/UIBitmapFont.cpp rename to targets/app/common/UI/UIBitmapFont.cpp index 651ce19b9..d01ac915c 100644 --- a/targets/app/common/src/UI/UIBitmapFont.cpp +++ b/targets/app/common/UI/UIBitmapFont.cpp @@ -5,7 +5,7 @@ #include "app/linux/Stubs/iggy_stubs.h" #endif #include "app/linux/Iggy/include/rrCore.h" -#include "app/include/BufferedImage.h" +#include "app/common/BufferedImage.h" #include "UIFontData.h" ///////////////////////////// diff --git a/targets/app/common/src/UI/UIBitmapFont.h b/targets/app/common/UI/UIBitmapFont.h similarity index 100% rename from targets/app/common/src/UI/UIBitmapFont.h rename to targets/app/common/UI/UIBitmapFont.h diff --git a/targets/app/common/src/UI/UIController.cpp b/targets/app/common/UI/UIController.cpp similarity index 98% rename from targets/app/common/src/UI/UIController.cpp rename to targets/app/common/UI/UIController.cpp index 6f2ade9b1..530b308a1 100644 --- a/targets/app/common/src/UI/UIController.cpp +++ b/targets/app/common/UI/UIController.cpp @@ -13,31 +13,31 @@ #include "platform/sdl2/Input.h" #include "platform/sdl2/Profile.h" #include "app/common/App_enums.h" -#include "app/common/src/Audio/SoundEngine.h" -#include "app/common/src/DLC/DLCManager.h" -#include "app/common/src/Network/GameNetworkManager.h" -#include "app/common/src/UI/All Platforms/UIEnums.h" -#include "app/common/src/UI/All Platforms/UIStructs.h" -#include "app/common/src/UI/Components/UIComponent_DebugUIConsole.h" -#include "app/common/src/UI/Components/UIComponent_DebugUIMarketingGuide.h" -#include "app/common/src/UI/Components/UIComponent_PressStartToPlay.h" -#include "app/common/src/UI/Components/UIComponent_Tooltips.h" -#include "app/common/src/UI/Components/UIComponent_TutorialPopup.h" -#include "app/common/src/UI/Components/UIScene_HUD.h" -#include "app/common/src/UI/UIBitmapFont.h" -#include "app/common/src/UI/UIGroup.h" -#include "app/common/src/UI/UIScene.h" -#include "app/common/src/UI/UIString.h" -#include "app/common/src/UI/UITTFFont.h" +#include "app/common/Audio/SoundEngine.h" +#include "app/common/DLC/DLCManager.h" +#include "app/common/Network/GameNetworkManager.h" +#include "app/common/UI/All Platforms/UIEnums.h" +#include "app/common/UI/All Platforms/UIStructs.h" +#include "app/common/UI/Components/UIComponent_DebugUIConsole.h" +#include "app/common/UI/Components/UIComponent_DebugUIMarketingGuide.h" +#include "app/common/UI/Components/UIComponent_PressStartToPlay.h" +#include "app/common/UI/Components/UIComponent_Tooltips.h" +#include "app/common/UI/Components/UIComponent_TutorialPopup.h" +#include "app/common/UI/Components/UIScene_HUD.h" +#include "app/common/UI/UIBitmapFont.h" +#include "app/common/UI/UIGroup.h" +#include "app/common/UI/UIScene.h" +#include "app/common/UI/UIString.h" +#include "app/common/UI/UITTFFont.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" #endif #include "app/linux/LinuxGame.h" #include "app/linux/Linux_UIController.h" -#include "app/include/BufferedImage.h" +#include "app/common/BufferedImage.h" #include "UIFontData.h" -#include "XboxStubs.h" +#include "app/common/XboxStubs.h" #include "platform/C4JThread.h" #include "util/Timer.h" diff --git a/targets/app/common/src/UI/UIController.h b/targets/app/common/UI/UIController.h similarity index 98% rename from targets/app/common/src/UI/UIController.h rename to targets/app/common/UI/UIController.h index d5a22b2a8..dfd92ec1a 100644 --- a/targets/app/common/src/UI/UIController.h +++ b/targets/app/common/UI/UIController.h @@ -24,10 +24,10 @@ #include "platform/InputActions.h" #include "platform/sdl2/Render.h" #include "platform/sdl2/Storage.h" -#include "app/common/src/UI/All Platforms/IUIController.h" -#include "app/common/src/UI/All Platforms/UIEnums.h" -#include "app/common/src/UI/All Platforms/UIStructs.h" -#include "app/common/src/UI/Controls/UIControl.h" +#include "app/common/UI/All Platforms/IUIController.h" +#include "app/common/UI/All Platforms/UIEnums.h" +#include "app/common/UI/All Platforms/UIStructs.h" +#include "app/common/UI/Controls/UIControl.h" #include "app/linux/Iggy/include/rrCore.h" #include "UIGroup.h" #include "minecraft/sounds/SoundTypes.h" diff --git a/targets/app/common/src/UI/UIFontData.cpp b/targets/app/common/UI/UIFontData.cpp similarity index 100% rename from targets/app/common/src/UI/UIFontData.cpp rename to targets/app/common/UI/UIFontData.cpp diff --git a/targets/app/common/src/UI/UIFontData.h b/targets/app/common/UI/UIFontData.h similarity index 100% rename from targets/app/common/src/UI/UIFontData.h rename to targets/app/common/UI/UIFontData.h diff --git a/targets/app/common/src/UI/UIGroup.cpp b/targets/app/common/UI/UIGroup.cpp similarity index 98% rename from targets/app/common/src/UI/UIGroup.cpp rename to targets/app/common/UI/UIGroup.cpp index f992e39a1..fb9fe99f7 100644 --- a/targets/app/common/src/UI/UIGroup.cpp +++ b/targets/app/common/UI/UIGroup.cpp @@ -2,10 +2,10 @@ #include "platform/sdl2/Profile.h" #include "platform/sdl2/Render.h" -#include "app/common/src/Tutorial/Tutorial.h" -#include "app/common/src/Tutorial/TutorialMode.h" -#include "app/common/src/UI/All Platforms/UIEnums.h" -#include "app/common/src/UI/UILayer.h" +#include "app/common/Tutorial/Tutorial.h" +#include "app/common/Tutorial/TutorialMode.h" +#include "app/common/UI/All Platforms/UIEnums.h" +#include "app/common/UI/UILayer.h" #include "app/linux/Iggy/include/rrCore.h" #include "app/linux/LinuxGame.h" #include "app/linux/Linux_UIController.h" diff --git a/targets/app/common/src/UI/UIGroup.h b/targets/app/common/UI/UIGroup.h similarity index 98% rename from targets/app/common/src/UI/UIGroup.h rename to targets/app/common/UI/UIGroup.h index a71a4e1eb..4d796989d 100644 --- a/targets/app/common/src/UI/UIGroup.h +++ b/targets/app/common/UI/UIGroup.h @@ -2,7 +2,7 @@ #include #include "platform/sdl2/Render.h" -#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/common/UI/All Platforms/UIEnums.h" #include "app/linux/Iggy/include/rrCore.h" #include "UILayer.h" diff --git a/targets/app/common/src/UI/UILayer.cpp b/targets/app/common/UI/UILayer.cpp similarity index 83% rename from targets/app/common/src/UI/UILayer.cpp rename to targets/app/common/UI/UILayer.cpp index 39390a1e0..6db553aa1 100644 --- a/targets/app/common/src/UI/UILayer.cpp +++ b/targets/app/common/UI/UILayer.cpp @@ -3,79 +3,79 @@ #include #include "platform/sdl2/Render.h" -#include "app/common/src/UI/All Platforms/UIEnums.h" -#include "app/common/src/UI/Components/UIComponent_Chat.h" -#include "app/common/src/UI/Components/UIComponent_DebugUIConsole.h" -#include "app/common/src/UI/Components/UIComponent_DebugUIMarketingGuide.h" -#include "app/common/src/UI/Components/UIComponent_Logo.h" -#include "app/common/src/UI/Components/UIComponent_MenuBackground.h" -#include "app/common/src/UI/Components/UIComponent_Panorama.h" -#include "app/common/src/UI/Components/UIComponent_PressStartToPlay.h" -#include "app/common/src/UI/Components/UIComponent_Tooltips.h" -#include "app/common/src/UI/Components/UIComponent_TutorialPopup.h" -#include "app/common/src/UI/Components/UIScene_HUD.h" -#include "app/common/src/UI/Scenes/Debug/UIScene_DebugCreateSchematic.h" -#include "app/common/src/UI/Scenes/Debug/UIScene_DebugOptions.h" -#include "app/common/src/UI/Scenes/Debug/UIScene_DebugOverlay.h" -#include "app/common/src/UI/Scenes/Debug/UIScene_DebugSetCamera.h" -#include "app/common/src/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.h" -#include "app/common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.h" -#include "app/common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.h" -#include "app/common/src/UI/Scenes/Frontend Menu screens/UIScene_EULA.h" -#include "app/common/src/UI/Scenes/Frontend Menu screens/UIScene_Intro.h" -#include "app/common/src/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.h" -#include "app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.h" -#include "app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.h" -#include "app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.h" -#include "app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.h" -#include "app/common/src/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.h" -#include "app/common/src/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.h" -#include "app/common/src/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.h" -#include "app/common/src/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.h" -#include "app/common/src/UI/Scenes/Help & Options/UIScene_ControlsMenu.h" -#include "app/common/src/UI/Scenes/Help & Options/UIScene_Credits.h" -#include "app/common/src/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.h" -#include "app/common/src/UI/Scenes/Help & Options/UIScene_HowToPlay.h" -#include "app/common/src/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.h" -#include "app/common/src/UI/Scenes/Help & Options/UIScene_LanguageSelector.h" -#include "app/common/src/UI/Scenes/Help & Options/UIScene_ReinstallMenu.h" -#include "app/common/src/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.h" -#include "app/common/src/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.h" -#include "app/common/src/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.h" -#include "app/common/src/UI/Scenes/Help & Options/UIScene_SettingsMenu.h" -#include "app/common/src/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.h" -#include "app/common/src/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.h" -#include "app/common/src/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.h" -#include "app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.h" -#include "app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.h" -#include "app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.h" -#include "app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.h" -#include "app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.h" -#include "app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.h" -#include "app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.h" -#include "app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.h" -#include "app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.h" -#include "app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.h" -#include "app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.h" -#include "app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.h" -#include "app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.h" -#include "app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.h" -#include "app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.h" -#include "app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.h" -#include "app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.h" -#include "app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.h" -#include "app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.h" -#include "app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h" -#include "app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.h" -#include "app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.h" -#include "app/common/src/UI/Scenes/UIScene_ConnectingProgress.h" -#include "app/common/src/UI/Scenes/UIScene_FullscreenProgress.h" -#include "app/common/src/UI/Scenes/UIScene_Keyboard.h" -#include "app/common/src/UI/Scenes/UIScene_MessageBox.h" -#include "app/common/src/UI/Scenes/UIScene_QuadrantSignin.h" -#include "app/common/src/UI/Scenes/UIScene_Timer.h" -#include "app/common/src/UI/UIGroup.h" -#include "app/common/src/UI/UIScene.h" +#include "app/common/UI/All Platforms/UIEnums.h" +#include "app/common/UI/Components/UIComponent_Chat.h" +#include "app/common/UI/Components/UIComponent_DebugUIConsole.h" +#include "app/common/UI/Components/UIComponent_DebugUIMarketingGuide.h" +#include "app/common/UI/Components/UIComponent_Logo.h" +#include "app/common/UI/Components/UIComponent_MenuBackground.h" +#include "app/common/UI/Components/UIComponent_Panorama.h" +#include "app/common/UI/Components/UIComponent_PressStartToPlay.h" +#include "app/common/UI/Components/UIComponent_Tooltips.h" +#include "app/common/UI/Components/UIComponent_TutorialPopup.h" +#include "app/common/UI/Components/UIScene_HUD.h" +#include "app/common/UI/Scenes/Debug/UIScene_DebugCreateSchematic.h" +#include "app/common/UI/Scenes/Debug/UIScene_DebugOptions.h" +#include "app/common/UI/Scenes/Debug/UIScene_DebugOverlay.h" +#include "app/common/UI/Scenes/Debug/UIScene_DebugSetCamera.h" +#include "app/common/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.h" +#include "app/common/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.h" +#include "app/common/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.h" +#include "app/common/UI/Scenes/Frontend Menu screens/UIScene_EULA.h" +#include "app/common/UI/Scenes/Frontend Menu screens/UIScene_Intro.h" +#include "app/common/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.h" +#include "app/common/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.h" +#include "app/common/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.h" +#include "app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.h" +#include "app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.h" +#include "app/common/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.h" +#include "app/common/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.h" +#include "app/common/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.h" +#include "app/common/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.h" +#include "app/common/UI/Scenes/Help & Options/UIScene_ControlsMenu.h" +#include "app/common/UI/Scenes/Help & Options/UIScene_Credits.h" +#include "app/common/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.h" +#include "app/common/UI/Scenes/Help & Options/UIScene_HowToPlay.h" +#include "app/common/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.h" +#include "app/common/UI/Scenes/Help & Options/UIScene_LanguageSelector.h" +#include "app/common/UI/Scenes/Help & Options/UIScene_ReinstallMenu.h" +#include "app/common/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.h" +#include "app/common/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.h" +#include "app/common/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.h" +#include "app/common/UI/Scenes/Help & Options/UIScene_SettingsMenu.h" +#include "app/common/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.h" +#include "app/common/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.h" +#include "app/common/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.h" +#include "app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.h" +#include "app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.h" +#include "app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.h" +#include "app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.h" +#include "app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.h" +#include "app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.h" +#include "app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.h" +#include "app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.h" +#include "app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.h" +#include "app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.h" +#include "app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.h" +#include "app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.h" +#include "app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.h" +#include "app/common/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.h" +#include "app/common/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.h" +#include "app/common/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.h" +#include "app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.h" +#include "app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.h" +#include "app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.h" +#include "app/common/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h" +#include "app/common/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.h" +#include "app/common/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.h" +#include "app/common/UI/Scenes/UIScene_ConnectingProgress.h" +#include "app/common/UI/Scenes/UIScene_FullscreenProgress.h" +#include "app/common/UI/Scenes/UIScene_Keyboard.h" +#include "app/common/UI/Scenes/UIScene_MessageBox.h" +#include "app/common/UI/Scenes/UIScene_QuadrantSignin.h" +#include "app/common/UI/Scenes/UIScene_Timer.h" +#include "app/common/UI/UIGroup.h" +#include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/rrCore.h" #include "app/linux/LinuxGame.h" #include "app/linux/Linux_UIController.h" diff --git a/targets/app/common/src/UI/UILayer.h b/targets/app/common/UI/UILayer.h similarity index 98% rename from targets/app/common/src/UI/UILayer.h rename to targets/app/common/UI/UILayer.h index 651d360cb..77f1a582a 100644 --- a/targets/app/common/src/UI/UILayer.h +++ b/targets/app/common/UI/UILayer.h @@ -7,7 +7,7 @@ #include #include "platform/sdl2/Render.h" -#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/common/UI/All Platforms/UIEnums.h" #include "app/linux/Iggy/include/rrCore.h" // using namespace std; diff --git a/targets/app/common/src/UI/UIScene.cpp b/targets/app/common/UI/UIScene.cpp similarity index 99% rename from targets/app/common/src/UI/UIScene.cpp rename to targets/app/common/UI/UIScene.cpp index 20c833581..8bded15d2 100644 --- a/targets/app/common/src/UI/UIScene.cpp +++ b/targets/app/common/UI/UIScene.cpp @@ -7,13 +7,13 @@ #include "platform/PlatformTypes.h" #include "platform/InputActions.h" #include "platform/sdl2/Render.h" -#include "app/common/src/UI/All Platforms/UIEnums.h" -#include "app/common/src/UI/All Platforms/UIStructs.h" -#include "app/common/src/UI/Controls/UIControl.h" -#include "app/common/src/UI/Controls/UIControl_Base.h" -#include "app/common/src/UI/UIController.h" -#include "app/common/src/UI/UIGroup.h" -#include "app/common/src/UI/UILayer.h" +#include "app/common/UI/All Platforms/UIEnums.h" +#include "app/common/UI/All Platforms/UIStructs.h" +#include "app/common/UI/Controls/UIControl.h" +#include "app/common/UI/Controls/UIControl_Base.h" +#include "app/common/UI/UIController.h" +#include "app/common/UI/UIGroup.h" +#include "app/common/UI/UILayer.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" diff --git a/targets/app/common/src/UI/UIScene.h b/targets/app/common/UI/UIScene.h similarity index 98% rename from targets/app/common/src/UI/UIScene.h rename to targets/app/common/UI/UIScene.h index 765e3947e..b76240fce 100644 --- a/targets/app/common/src/UI/UIScene.h +++ b/targets/app/common/UI/UIScene.h @@ -14,9 +14,9 @@ #include #include "platform/sdl2/Render.h" -#include "app/common/src/UI/All Platforms/UIEnums.h" -#include "app/common/src/UI/All Platforms/UIStructs.h" -#include "app/common/src/UI/Controls/UIControl_Base.h" +#include "app/common/UI/All Platforms/UIEnums.h" +#include "app/common/UI/All Platforms/UIStructs.h" +#include "app/common/UI/Controls/UIControl_Base.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" diff --git a/targets/app/common/src/UI/UIString.cpp b/targets/app/common/UI/UIString.cpp similarity index 99% rename from targets/app/common/src/UI/UIString.cpp rename to targets/app/common/UI/UIString.cpp index b53d70b26..4ead1f49f 100644 --- a/targets/app/common/src/UI/UIString.cpp +++ b/targets/app/common/UI/UIString.cpp @@ -1,7 +1,7 @@ #include "UIString.h" #include "app/linux/LinuxGame.h" -#include "app/include/XboxStubs.h" +#include "app/common/XboxStubs.h" #include "util/StringHelpers.h" bool UIString::setCurrentLanguage() { diff --git a/targets/app/common/src/UI/UIString.h b/targets/app/common/UI/UIString.h similarity index 100% rename from targets/app/common/src/UI/UIString.h rename to targets/app/common/UI/UIString.h diff --git a/targets/app/common/src/UI/UITTFFont.cpp b/targets/app/common/UI/UITTFFont.cpp similarity index 100% rename from targets/app/common/src/UI/UITTFFont.cpp rename to targets/app/common/UI/UITTFFont.cpp diff --git a/targets/app/common/src/UI/UITTFFont.h b/targets/app/common/UI/UITTFFont.h similarity index 100% rename from targets/app/common/src/UI/UITTFFont.h rename to targets/app/common/UI/UITTFFont.h diff --git a/targets/app/src/XboxStubs.cpp b/targets/app/common/XboxStubs.cpp similarity index 98% rename from targets/app/src/XboxStubs.cpp rename to targets/app/common/XboxStubs.cpp index ad9d690dd..0475f0a9c 100644 --- a/targets/app/src/XboxStubs.cpp +++ b/targets/app/common/XboxStubs.cpp @@ -6,8 +6,8 @@ #include "platform/PlatformTypes.h" #include "app/linux/Stubs/winapi_stubs.h" -#include "app/include/NetTypes.h" -#include "app/include/XboxStubs.h" +#include "app/common/NetTypes.h" +#include "app/common/XboxStubs.h" class INVITE_INFO; diff --git a/targets/app/include/XboxStubs.h b/targets/app/common/XboxStubs.h similarity index 100% rename from targets/app/include/XboxStubs.h rename to targets/app/common/XboxStubs.h diff --git a/targets/app/common/src/GameRules/ConsoleGameRules.h b/targets/app/common/src/GameRules/ConsoleGameRules.h deleted file mode 100644 index 7a4521fc0..000000000 --- a/targets/app/common/src/GameRules/ConsoleGameRules.h +++ /dev/null @@ -1,25 +0,0 @@ -#pragma once -#include "ConsoleGameRulesConstants.h" -#include "GameRuleManager.h" -#include "app/common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h" -#include "app/common/src/GameRules/LevelGeneration/BiomeOverride.h" -#include "app/common/src/GameRules/LevelGeneration/ConsoleGenerateStructure.h" -#include "app/common/src/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h" -#include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" -#include "app/common/src/GameRules/LevelGeneration/StartFeature.h" -#include "app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.h" -#include "app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h" -#include "app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.h" -#include "app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.h" -#include "app/common/src/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.h" -#include "app/common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h" -#include "app/common/src/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.h" -#include "app/common/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h" -#include "app/common/src/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h" -#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" -#include "app/common/src/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h" -#include "app/common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h" -#include "app/common/src/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.h" -#include "app/common/src/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h" -#include "app/common/src/GameRules/LevelRules/Rules/GameRule.h" -#include "app/common/src/GameRules/LevelRules/Rules/GameRulesInstance.h" diff --git a/targets/app/src/stubs.cpp b/targets/app/common/stubs.cpp similarity index 97% rename from targets/app/src/stubs.cpp rename to targets/app/common/stubs.cpp index e7b0bf301..ea141a25d 100644 --- a/targets/app/src/stubs.cpp +++ b/targets/app/common/stubs.cpp @@ -1,5 +1,5 @@ -#include "app/include/stubs.h" +#include "app/common/stubs.h" #include "app/linux/LinuxGame.h" #if defined(__linux__) diff --git a/targets/app/include/stubs.h b/targets/app/common/stubs.h similarity index 100% rename from targets/app/include/stubs.h rename to targets/app/common/stubs.h diff --git a/targets/app/linux/Leaderboards/LinuxLeaderboardManager.cpp b/targets/app/linux/Leaderboards/LinuxLeaderboardManager.cpp index e05e76820..dda0e9728 100644 --- a/targets/app/linux/Leaderboards/LinuxLeaderboardManager.cpp +++ b/targets/app/linux/Leaderboards/LinuxLeaderboardManager.cpp @@ -1,6 +1,6 @@ #include "LinuxLeaderboardManager.h" -#include "app/common/src/Leaderboards/LeaderboardManager.h" +#include "app/common/Leaderboards/LeaderboardManager.h" LeaderboardManager* LeaderboardManager::m_instance = new LinuxLeaderboardManager(); // Singleton instance of the diff --git a/targets/app/linux/Leaderboards/LinuxLeaderboardManager.h b/targets/app/linux/Leaderboards/LinuxLeaderboardManager.h index b831d8e28..72fe03e0e 100644 --- a/targets/app/linux/Leaderboards/LinuxLeaderboardManager.h +++ b/targets/app/linux/Leaderboards/LinuxLeaderboardManager.h @@ -1,7 +1,7 @@ #pragma once #include "platform/PlatformTypes.h" -#include "app/common/src/Leaderboards/LeaderboardManager.h" +#include "app/common/Leaderboards/LeaderboardManager.h" class LinuxLeaderboardManager : public LeaderboardManager { public: diff --git a/targets/app/linux/LinuxGL.cpp b/targets/app/linux/LinuxGL.cpp index 19a3ea8c0..5c2bd1241 100644 --- a/targets/app/linux/LinuxGL.cpp +++ b/targets/app/linux/LinuxGL.cpp @@ -1,7 +1,7 @@ #ifdef __linux__ #include "platform/sdl2/Render.h" -#include "app/include/stubs.h" +#include "app/common/stubs.h" #include "java/ByteBuffer.h" #include "java/FloatBuffer.h" diff --git a/targets/app/linux/LinuxGame.cpp b/targets/app/linux/LinuxGame.cpp index 844f43c09..8db25144a 100644 --- a/targets/app/linux/LinuxGame.cpp +++ b/targets/app/linux/LinuxGame.cpp @@ -9,8 +9,8 @@ #include "platform/sdl2/Storage.h" #include "app/common/App_enums.h" #include "app/common/Game.h" -#include "app/common/src/Network/GameNetworkManager.h" -#include "app/common/src/UI/All Platforms/UIStructs.h" +#include "app/common/Network/GameNetworkManager.h" +#include "app/common/UI/All Platforms/UIStructs.h" #include "platform/C4JThread.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/User.h" diff --git a/targets/app/linux/Linux_Minecraft.cpp b/targets/app/linux/Linux_Minecraft.cpp index 4c7ac5631..01b1b4c1c 100644 --- a/targets/app/linux/Linux_Minecraft.cpp +++ b/targets/app/linux/Linux_Minecraft.cpp @@ -48,7 +48,7 @@ static void sigsegv_handler(int sig) { #include "minecraft/stats/StatsCounter.h" #include "minecraft/world/level/Level.h" -// #include "app/common/src/Leaderboards/LeaderboardManager.h" +// #include "app/common/Leaderboards/LeaderboardManager.h" // #include "../Common/XUI/XUI_Scene_Container.h" // #include "NetworkManager.h" #include "platform/PlatformTypes.h" @@ -58,8 +58,8 @@ static void sigsegv_handler(int sig) { #include "platform/sdl2/Render.h" #include "platform/sdl2/Storage.h" #include "app/common/App_Defines.h" -#include "app/common/src/Audio/SoundEngine.h" -#include "app/common/src/Network/GameNetworkManager.h" +#include "app/common/Audio/SoundEngine.h" +#include "app/common/Network/GameNetworkManager.h" #include "app/linux/LinuxGame.h" #include "app/linux/Linux_UIController.h" #include "minecraft/world/level/storage/ConsoleSaveFileIO/compression.h" diff --git a/targets/app/linux/Linux_UIController.cpp b/targets/app/linux/Linux_UIController.cpp index e6cf502b2..8a5417a43 100644 --- a/targets/app/linux/Linux_UIController.cpp +++ b/targets/app/linux/Linux_UIController.cpp @@ -3,7 +3,7 @@ // GDraw GL backend for Linux #include "platform/sdl2/Render.h" #include "Linux_UIController.h" -#include "app/common/src/UI/All Platforms/UIStructs.h" +#include "app/common/UI/All Platforms/UIStructs.h" #include "app/linux/Iggy/gdraw/gdraw.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY diff --git a/targets/app/linux/Linux_UIController.h b/targets/app/linux/Linux_UIController.h index 38dcd6d12..09f5dfc30 100644 --- a/targets/app/linux/Linux_UIController.h +++ b/targets/app/linux/Linux_UIController.h @@ -1,7 +1,7 @@ #pragma once -#include "app/common/src/UI/All Platforms/UIStructs.h" -#include "app/common/src/UI/UIController.h" +#include "app/common/UI/All Platforms/UIStructs.h" +#include "app/common/UI/UIController.h" #include "app/linux/Iggy/include/iggy.h" #include "app/linux/Iggy/include/rrCore.h" diff --git a/targets/app/linux/linux_game_stubs.cpp b/targets/app/linux/linux_game_stubs.cpp index 0fea096da..b54318a2d 100644 --- a/targets/app/linux/linux_game_stubs.cpp +++ b/targets/app/linux/linux_game_stubs.cpp @@ -1,7 +1,7 @@ #ifdef __linux__ #include "app/common/Game.h" -#include "app/include/stubs.h" +#include "app/common/stubs.h" void Display::update() {} diff --git a/targets/app/meson.build b/targets/app/meson.build index db074a2c6..bdaec6d56 100644 --- a/targets/app/meson.build +++ b/targets/app/meson.build @@ -1,19 +1,3 @@ -exclude_sources = [ - ' ! -path "*/common/*"', - ' ! -path "*/linux/*"', - ' ! -path "*/windows/*"', -] - -# all sources except common/, linux/, windows/ -client_sources = run_command( - 'sh', - '-c', 'find "' - + meson.current_source_dir() - + '" \\( -name "*.cpp" -o -name "*.c" \\)' - + ' '.join(exclude_sources), - check: true, -).stdout().strip().split('\n') - exclude_platform_common_sources = [ ' ! -name "UIScene_InGameSaveManagementMenu.cpp"', ] @@ -71,8 +55,8 @@ platform_services_src = files('../platform/PlatformServices.cpp') client = executable( 'Minecraft.Client', - client_sources + platform_sources + platform_services_src + localisation[1], - include_directories: include_directories('include', '..'), + platform_sources + platform_services_src + localisation[1], + include_directories: include_directories('..'), dependencies: client_dependencies, cpp_args: global_cpp_args + global_cpp_defs diff --git a/targets/app/windows/Windows64_UIController.h b/targets/app/windows/Windows64_UIController.h index 4f0749f6a..70e05b148 100644 --- a/targets/app/windows/Windows64_UIController.h +++ b/targets/app/windows/Windows64_UIController.h @@ -1,6 +1,6 @@ #pragma once -#include "app/common/src/UI/UIController.h" +#include "app/common/UI/UIController.h" class ConsoleUIController : public UIController { private: diff --git a/targets/app/windows/Source Files/Leaderboards/WindowsLeaderboardManager.cpp b/targets/app/windows/src/Leaderboards/WindowsLeaderboardManager.cpp similarity index 100% rename from targets/app/windows/Source Files/Leaderboards/WindowsLeaderboardManager.cpp rename to targets/app/windows/src/Leaderboards/WindowsLeaderboardManager.cpp diff --git a/targets/app/windows/Source Files/Leaderboards/WindowsLeaderboardManager.h b/targets/app/windows/src/Leaderboards/WindowsLeaderboardManager.h similarity index 96% rename from targets/app/windows/Source Files/Leaderboards/WindowsLeaderboardManager.h rename to targets/app/windows/src/Leaderboards/WindowsLeaderboardManager.h index 7f4cdc1bb..df81e27d6 100644 --- a/targets/app/windows/Source Files/Leaderboards/WindowsLeaderboardManager.h +++ b/targets/app/windows/src/Leaderboards/WindowsLeaderboardManager.h @@ -1,6 +1,6 @@ #pragma once -#include "app/common/src/Leaderboards/LeaderboardManager.h" +#include "app/common/Leaderboards/LeaderboardManager.h" class WindowsLeaderboardManager : public LeaderboardManager { public: diff --git a/targets/app/windows/Source Files/Windows64_Minecraft.cpp b/targets/app/windows/src/Windows64_Minecraft.cpp similarity index 99% rename from targets/app/windows/Source Files/Windows64_Minecraft.cpp rename to targets/app/windows/src/Windows64_Minecraft.cpp index 985594685..7b43f2d06 100644 --- a/targets/app/windows/Source Files/Windows64_Minecraft.cpp +++ b/targets/app/windows/src/Windows64_Minecraft.cpp @@ -5,7 +5,7 @@ #include -#include "app/common/src/Network/Socket.h" +#include "app/common/Network/Socket.h" #include "util/StringHelpers.h" #include "minecraft/client/User.h" #include "minecraft/client/multiplayer/ClientConnection.h" @@ -23,7 +23,7 @@ #include "minecraft/world/phys/AABB.h" #include "minecraft/world/phys/Vec3.h" // #include "Social/SocialManager.h" -// #include "app/common/src/Leaderboards/LeaderboardManager.h" +// #include "app/common/Leaderboards/LeaderboardManager.h" // #include "../Common/XUI/XUI_Scene_Container.h" // #include "NetworkManager.h" #include "../Resource.h" diff --git a/targets/minecraft/client/Camera.cpp b/targets/minecraft/client/Camera.cpp index 8963c1cfd..6b3f93926 100644 --- a/targets/minecraft/client/Camera.cpp +++ b/targets/minecraft/client/Camera.cpp @@ -8,7 +8,7 @@ #include #include "MemoryTracker.h" -#include "app/include/stubs.h" +#include "app/common/stubs.h" #include "java/FloatBuffer.h" #include "minecraft/world/entity/LivingEntity.h" #include "minecraft/world/entity/player/Player.h" diff --git a/targets/minecraft/client/ClientConstants.cpp b/targets/minecraft/client/ClientConstants.cpp index e74b1fa38..f2cc01850 100644 --- a/targets/minecraft/client/ClientConstants.cpp +++ b/targets/minecraft/client/ClientConstants.cpp @@ -1,6 +1,6 @@ #include "ClientConstants.h" -#include "app/common/src/BuildVer/BuildVer.h" +#include "app/common/BuildVer/BuildVer.h" const std::wstring ClientConstants::VERSION_STRING = std::wstring(L"Minecraft Xbox ") + VER_FILEVERSION_STR_W + diff --git a/targets/minecraft/client/Lighting.cpp b/targets/minecraft/client/Lighting.cpp index 77bfbddd6..720bc13ee 100644 --- a/targets/minecraft/client/Lighting.cpp +++ b/targets/minecraft/client/Lighting.cpp @@ -3,7 +3,7 @@ #include #include "platform/sdl2/Render.h" -#include "app/include/stubs.h" +#include "app/common/stubs.h" #include "java/FloatBuffer.h" #include "minecraft/world/phys/Vec3.h" diff --git a/targets/minecraft/client/Minecraft.cpp b/targets/minecraft/client/Minecraft.cpp index 80875804d..e06691b99 100644 --- a/targets/minecraft/client/Minecraft.cpp +++ b/targets/minecraft/client/Minecraft.cpp @@ -15,17 +15,17 @@ #include "platform/sdl2/Render.h" #include "platform/sdl2/Storage.h" #include "app/common/App_enums.h" -#include "app/common/src/Audio/SoundEngine.h" -#include "app/common/src/DLC/DLCManager.h" -#include "app/common/src/Network/GameNetworkManager.h" -#include "app/common/src/Network/NetworkPlayerInterface.h" -#include "app/common/src/Tutorial/Tutorial.h" -#include "app/common/src/UI/All Platforms/UIEnums.h" -#include "app/common/src/UI/All Platforms/UIStructs.h" +#include "app/common/Audio/SoundEngine.h" +#include "app/common/DLC/DLCManager.h" +#include "app/common/Network/GameNetworkManager.h" +#include "app/common/Network/NetworkPlayerInterface.h" +#include "app/common/Tutorial/Tutorial.h" +#include "app/common/UI/All Platforms/UIEnums.h" +#include "app/common/UI/All Platforms/UIStructs.h" #include "app/linux/LinuxGame.h" #include "app/linux/Linux_UIController.h" #include "app/linux/Stubs/winapi_stubs.h" -#include "app/include/XboxStubs.h" +#include "app/common/XboxStubs.h" #include "Options.h" #include "Pos.h" #include "ProgressRenderer.h" @@ -104,13 +104,13 @@ #endif #include "platform/sdl2/Input.h" #include "app/common/Minecraft_Macros.h" -#include "app/common/src/Colours/ColourTable.h" -#include "app/common/src/ConsoleGameMode.h" -#include "app/common/src/DLC/DLCPack.h" -#include "app/common/src/Tutorial/FullTutorialMode.h" -#include "app/common/src/UI/All Platforms/IUIScene_CreativeMenu.h" -#include "app/common/src/UI/UIFontData.h" -#include "app/include/stubs.h" +#include "app/common/Colours/ColourTable.h" +#include "app/common/ConsoleGameMode.h" +#include "app/common/DLC/DLCPack.h" +#include "app/common/Tutorial/FullTutorialMode.h" +#include "app/common/UI/All Platforms/IUIScene_CreativeMenu.h" +#include "app/common/UI/UIFontData.h" +#include "app/common/stubs.h" #include "util/StringHelpers.h" #include "java/File.h" #include "java/System.h" diff --git a/targets/minecraft/client/Options.cpp b/targets/minecraft/client/Options.cpp index 20a7c4b9c..2c5332133 100644 --- a/targets/minecraft/client/Options.cpp +++ b/targets/minecraft/client/Options.cpp @@ -1,9 +1,9 @@ #include "Options.h" #include "KeyMapping.h" -#include "app/common/src/Audio/SoundEngine.h" +#include "app/common/Audio/SoundEngine.h" #include "app/linux/LinuxGame.h" -#include "app/include/stubs.h" +#include "app/common/stubs.h" #include "util/StringHelpers.h" #include "java/File.h" #include "java/InputOutputStream/BufferedReader.h" diff --git a/targets/minecraft/client/gui/ChatScreen.cpp b/targets/minecraft/client/gui/ChatScreen.cpp index cd811c59b..4fcfade47 100644 --- a/targets/minecraft/client/gui/ChatScreen.cpp +++ b/targets/minecraft/client/gui/ChatScreen.cpp @@ -2,7 +2,7 @@ #include -#include "app/include/stubs.h" +#include "app/common/stubs.h" #include "util/StringHelpers.h" #include "minecraft/SharedConstants.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/minecraft/client/gui/CreateWorldScreen.cpp b/targets/minecraft/client/gui/CreateWorldScreen.cpp index 68beb3d40..ac6ffdd85 100644 --- a/targets/minecraft/client/gui/CreateWorldScreen.cpp +++ b/targets/minecraft/client/gui/CreateWorldScreen.cpp @@ -11,13 +11,13 @@ #include "EditBox.h" #include "MessageScreen.h" #include "app/common/App_enums.h" -#include "app/common/src/Network/GameNetworkManager.h" -#include "app/common/src/UI/All Platforms/UIEnums.h" -#include "app/common/src/UI/All Platforms/UIStructs.h" +#include "app/common/Network/GameNetworkManager.h" +#include "app/common/UI/All Platforms/UIEnums.h" +#include "app/common/UI/All Platforms/UIStructs.h" #include "app/linux/LinuxGame.h" #include "app/linux/Linux_UIController.h" -#include "app/include/NetTypes.h" -#include "app/include/stubs.h" +#include "app/common/NetTypes.h" +#include "app/common/stubs.h" #include "util/StringHelpers.h" #include "minecraft/SharedConstants.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/minecraft/client/gui/EditBox.cpp b/targets/minecraft/client/gui/EditBox.cpp index 29776b5c0..ea167636c 100644 --- a/targets/minecraft/client/gui/EditBox.cpp +++ b/targets/minecraft/client/gui/EditBox.cpp @@ -1,6 +1,6 @@ #include "EditBox.h" -#include "app/include/stubs.h" +#include "app/common/stubs.h" #include "minecraft/SharedConstants.h" #include "minecraft/client/gui/Screen.h" diff --git a/targets/minecraft/client/gui/Font.cpp b/targets/minecraft/client/gui/Font.cpp index ae8ac9a0a..d5dd395fd 100644 --- a/targets/minecraft/client/gui/Font.cpp +++ b/targets/minecraft/client/gui/Font.cpp @@ -6,7 +6,7 @@ #include #include "platform/sdl2/Render.h" -#include "app/include/BufferedImage.h" +#include "app/common/BufferedImage.h" #include "util/StringHelpers.h" #include "java/Random.h" #include "minecraft/SharedConstants.h" diff --git a/targets/minecraft/client/gui/Gui.cpp b/targets/minecraft/client/gui/Gui.cpp index 6e9a8290d..8adede127 100644 --- a/targets/minecraft/client/gui/Gui.cpp +++ b/targets/minecraft/client/gui/Gui.cpp @@ -11,7 +11,7 @@ #include "app/common/App_structs.h" #include "app/linux/LinuxGame.h" #include "app/linux/Linux_UIController.h" -#include "app/include/XboxStubs.h" +#include "app/common/XboxStubs.h" #include "util/StringHelpers.h" #include "java/JavaMath.h" #include "java/Random.h" @@ -55,7 +55,7 @@ #include "minecraft/world/level/storage/LevelData.h" #include "minecraft/world/level/tile/PortalTile.h" #include "minecraft/world/level/tile/Tile.h" -#include "app/include/stubs.h" +#include "app/common/stubs.h" #include "strings.h" diff --git a/targets/minecraft/client/gui/GuiComponent.cpp b/targets/minecraft/client/gui/GuiComponent.cpp index e6e40ac8c..d8c5be69b 100644 --- a/targets/minecraft/client/gui/GuiComponent.cpp +++ b/targets/minecraft/client/gui/GuiComponent.cpp @@ -4,7 +4,7 @@ #include #include "platform/sdl2/Render.h" -#include "app/include/stubs.h" +#include "app/common/stubs.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/gui/Font.h" #include "minecraft/client/gui/Gui.h" diff --git a/targets/minecraft/client/gui/InBedChatScreen.cpp b/targets/minecraft/client/gui/InBedChatScreen.cpp index fdf2e1cdc..7da518d5d 100644 --- a/targets/minecraft/client/gui/InBedChatScreen.cpp +++ b/targets/minecraft/client/gui/InBedChatScreen.cpp @@ -5,7 +5,7 @@ #include #include "Button.h" -#include "app/include/stubs.h" +#include "app/common/stubs.h" #include "util/StringHelpers.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/gui/ChatScreen.h" diff --git a/targets/minecraft/client/gui/JoinMultiplayerScreen.cpp b/targets/minecraft/client/gui/JoinMultiplayerScreen.cpp index 3f49e52fc..d2fa35e7d 100644 --- a/targets/minecraft/client/gui/JoinMultiplayerScreen.cpp +++ b/targets/minecraft/client/gui/JoinMultiplayerScreen.cpp @@ -4,7 +4,7 @@ #include "Button.h" #include "EditBox.h" -#include "app/include/stubs.h" +#include "app/common/stubs.h" #include "util/StringHelpers.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/Options.h" diff --git a/targets/minecraft/client/gui/Minimap.cpp b/targets/minecraft/client/gui/Minimap.cpp index c59353751..f294ffa56 100644 --- a/targets/minecraft/client/gui/Minimap.cpp +++ b/targets/minecraft/client/gui/Minimap.cpp @@ -10,8 +10,8 @@ #include "platform/sdl2/Render.h" #include "Font.h" #include "app/common/App_enums.h" -#include "app/common/src/Colours/ColourTable.h" -#include "app/include/BufferedImage.h" +#include "app/common/Colours/ColourTable.h" +#include "app/common/BufferedImage.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/renderer/Tesselator.h" #include "minecraft/client/renderer/Textures.h" diff --git a/targets/minecraft/client/gui/NameEntryScreen.cpp b/targets/minecraft/client/gui/NameEntryScreen.cpp index 309389a0d..647f8574c 100644 --- a/targets/minecraft/client/gui/NameEntryScreen.cpp +++ b/targets/minecraft/client/gui/NameEntryScreen.cpp @@ -3,7 +3,7 @@ #include #include "Button.h" -#include "app/include/stubs.h" +#include "app/common/stubs.h" #include "util/StringHelpers.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/gui/Screen.h" diff --git a/targets/minecraft/client/gui/PauseScreen.cpp b/targets/minecraft/client/gui/PauseScreen.cpp index da12bf5d7..32c3ae68a 100644 --- a/targets/minecraft/client/gui/PauseScreen.cpp +++ b/targets/minecraft/client/gui/PauseScreen.cpp @@ -11,7 +11,7 @@ #include "Button.h" #include "MessageScreen.h" #include "app/common/App_enums.h" -#include "app/common/src/Network/GameNetworkManager.h" +#include "app/common/Network/GameNetworkManager.h" #include "app/linux/LinuxGame.h" #include "OptionsScreen.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/minecraft/client/gui/RenameWorldScreen.cpp b/targets/minecraft/client/gui/RenameWorldScreen.cpp index c56701630..de312d0e5 100644 --- a/targets/minecraft/client/gui/RenameWorldScreen.cpp +++ b/targets/minecraft/client/gui/RenameWorldScreen.cpp @@ -4,7 +4,7 @@ #include "Button.h" #include "EditBox.h" -#include "app/include/stubs.h" +#include "app/common/stubs.h" #include "util/StringHelpers.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/gui/Screen.h" diff --git a/targets/minecraft/client/gui/Screen.cpp b/targets/minecraft/client/gui/Screen.cpp index a08d6050f..880a8ad99 100644 --- a/targets/minecraft/client/gui/Screen.cpp +++ b/targets/minecraft/client/gui/Screen.cpp @@ -5,10 +5,10 @@ #include "platform/sdl2/Profile.h" #include "Button.h" #include "app/common/App_enums.h" -#include "app/common/src/Audio/SoundEngine.h" -#include "app/common/src/Network/GameNetworkManager.h" +#include "app/common/Audio/SoundEngine.h" +#include "app/common/Network/GameNetworkManager.h" #include "app/linux/LinuxGame.h" -#include "app/include/stubs.h" +#include "app/common/stubs.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/gui/Screen.h" #include "minecraft/client/gui/particle/GuiParticles.h" diff --git a/targets/minecraft/client/gui/achievement/AchievementScreen.cpp b/targets/minecraft/client/gui/achievement/AchievementScreen.cpp index 45e98cb32..f63215b83 100644 --- a/targets/minecraft/client/gui/achievement/AchievementScreen.cpp +++ b/targets/minecraft/client/gui/achievement/AchievementScreen.cpp @@ -6,7 +6,7 @@ #include #include "platform/sdl2/Render.h" -#include "app/include/stubs.h" +#include "app/common/stubs.h" #include "minecraft/client/KeyMapping.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/Options.h" diff --git a/targets/minecraft/client/gui/achievement/StatsScreen.cpp b/targets/minecraft/client/gui/achievement/StatsScreen.cpp index f210421b2..14584f195 100644 --- a/targets/minecraft/client/gui/achievement/StatsScreen.cpp +++ b/targets/minecraft/client/gui/achievement/StatsScreen.cpp @@ -1,7 +1,7 @@ #include "StatsScreen.h" -#include "app/common/src/Audio/SoundEngine.h" -#include "app/include/stubs.h" +#include "app/common/Audio/SoundEngine.h" +#include "app/common/stubs.h" #include "util/StringHelpers.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/gui/Button.h" diff --git a/targets/minecraft/client/gui/inventory/AbstractContainerScreen.cpp b/targets/minecraft/client/gui/inventory/AbstractContainerScreen.cpp index 3e76f6922..87f8baa23 100644 --- a/targets/minecraft/client/gui/inventory/AbstractContainerScreen.cpp +++ b/targets/minecraft/client/gui/inventory/AbstractContainerScreen.cpp @@ -5,7 +5,7 @@ #include #include "app/linux/LinuxGame.h" -#include "app/include/stubs.h" +#include "app/common/stubs.h" #include "minecraft/client/KeyMapping.h" #include "minecraft/client/Lighting.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/minecraft/client/gui/inventory/CreativeInventoryScreen.cpp b/targets/minecraft/client/gui/inventory/CreativeInventoryScreen.cpp index e3e88aa76..a7da8ae18 100644 --- a/targets/minecraft/client/gui/inventory/CreativeInventoryScreen.cpp +++ b/targets/minecraft/client/gui/inventory/CreativeInventoryScreen.cpp @@ -9,9 +9,9 @@ #include "platform/sdl2/Input.h" #include "platform/sdl2/Render.h" #include "AbstractContainerScreen.h" -#include "app/common/src/UI/All Platforms/IUIScene_CreativeMenu.h" +#include "app/common/UI/All Platforms/IUIScene_CreativeMenu.h" #include "app/linux/LinuxGame.h" -#include "app/include/stubs.h" +#include "app/common/stubs.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/Lighting.h" #include "minecraft/client/gui/Screen.h" diff --git a/targets/minecraft/client/gui/inventory/CreativeInventoryScreen.h b/targets/minecraft/client/gui/inventory/CreativeInventoryScreen.h index b3ad21b39..c67636193 100644 --- a/targets/minecraft/client/gui/inventory/CreativeInventoryScreen.h +++ b/targets/minecraft/client/gui/inventory/CreativeInventoryScreen.h @@ -3,7 +3,7 @@ #include #include "AbstractContainerScreen.h" -#include "app/common/src/UI/All Platforms/IUIScene_CreativeMenu.h" +#include "app/common/UI/All Platforms/IUIScene_CreativeMenu.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "minecraft/world/inventory/AbstractContainerMenu.h" diff --git a/targets/minecraft/client/gui/inventory/TextEditScreen.cpp b/targets/minecraft/client/gui/inventory/TextEditScreen.cpp index 0e838cba6..094f315c1 100644 --- a/targets/minecraft/client/gui/inventory/TextEditScreen.cpp +++ b/targets/minecraft/client/gui/inventory/TextEditScreen.cpp @@ -3,7 +3,7 @@ #include #include "platform/sdl2/Render.h" -#include "app/include/stubs.h" +#include "app/common/stubs.h" #include "minecraft/SharedConstants.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/gui/Button.h" diff --git a/targets/minecraft/client/gui/particle/GuiParticle.cpp b/targets/minecraft/client/gui/particle/GuiParticle.cpp index 83ea20131..51e37513b 100644 --- a/targets/minecraft/client/gui/particle/GuiParticle.cpp +++ b/targets/minecraft/client/gui/particle/GuiParticle.cpp @@ -1,6 +1,6 @@ #include "GuiParticle.h" -#include "app/include/stubs.h" +#include "app/common/stubs.h" #include "java/Random.h" Random* GuiParticle::random = new Random(); diff --git a/targets/minecraft/client/model/HumanoidModel.h b/targets/minecraft/client/model/HumanoidModel.h index 0a7705102..02dba22af 100644 --- a/targets/minecraft/client/model/HumanoidModel.h +++ b/targets/minecraft/client/model/HumanoidModel.h @@ -1,5 +1,5 @@ #pragma once -#include "app/include/SkinBox.h" +#include "app/common/SkinBox.h" #include "minecraft/client/model/geom/Model.h" class ModelPart; diff --git a/targets/minecraft/client/model/geom/Model.h b/targets/minecraft/client/model/geom/Model.h index 8dec7bef1..e755e7e8f 100644 --- a/targets/minecraft/client/model/geom/Model.h +++ b/targets/minecraft/client/model/geom/Model.h @@ -5,7 +5,7 @@ #include #include -#include "app/include/SkinBox.h" +#include "app/common/SkinBox.h" #include "java/Random.h" class Mob; diff --git a/targets/minecraft/client/model/geom/ModelPart.h b/targets/minecraft/client/model/geom/ModelPart.h index 818d1af5f..9d673098b 100644 --- a/targets/minecraft/client/model/geom/ModelPart.h +++ b/targets/minecraft/client/model/geom/ModelPart.h @@ -2,7 +2,7 @@ #include #include -#include "app/include/SkinBox.h" +#include "app/common/SkinBox.h" #include "Model.h" #include "minecraft/client/model/Polygon.h" #include "minecraft/client/model/Vertex.h" diff --git a/targets/minecraft/client/multiplayer/ClientConnection.cpp b/targets/minecraft/client/multiplayer/ClientConnection.cpp index 807bfe18c..481f056b2 100644 --- a/targets/minecraft/client/multiplayer/ClientConnection.cpp +++ b/targets/minecraft/client/multiplayer/ClientConnection.cpp @@ -15,21 +15,21 @@ #include "platform/sdl2/Profile.h" #include "app/common/App_enums.h" #include "app/common/App_structs.h" -#include "app/common/src/ConsoleGameMode.h" -#include "app/common/src/DLC/DLCManager.h" -#include "app/common/src/DLC/DLCPack.h" -#include "app/common/src/DLC/DLCSkinFile.h" -#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" -#include "app/common/src/Network/GameNetworkManager.h" -#include "app/common/src/Network/NetworkPlayerInterface.h" -#include "app/common/src/Network/Socket.h" -#include "app/common/src/Tutorial/FullTutorialMode.h" -#include "app/common/src/Tutorial/Tutorial.h" -#include "app/common/src/Tutorial/TutorialEnum.h" -#include "app/common/src/Tutorial/TutorialMode.h" -#include "app/common/src/UI/All Platforms/UIEnums.h" -#include "app/common/src/UI/All Platforms/UIStructs.h" -#include "app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.h" +#include "app/common/ConsoleGameMode.h" +#include "app/common/DLC/DLCManager.h" +#include "app/common/DLC/DLCPack.h" +#include "app/common/DLC/DLCSkinFile.h" +#include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "app/common/Network/GameNetworkManager.h" +#include "app/common/Network/NetworkPlayerInterface.h" +#include "app/common/Network/Socket.h" +#include "app/common/Tutorial/FullTutorialMode.h" +#include "app/common/Tutorial/Tutorial.h" +#include "app/common/Tutorial/TutorialEnum.h" +#include "app/common/Tutorial/TutorialMode.h" +#include "app/common/UI/All Platforms/UIEnums.h" +#include "app/common/UI/All Platforms/UIStructs.h" +#include "app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.h" #include "app/linux/LinuxGame.h" #include "app/linux/Linux_UIController.h" #include "app/linux/Stubs/winapi_stubs.h" diff --git a/targets/minecraft/client/multiplayer/MultiPlayerChunkCache.cpp b/targets/minecraft/client/multiplayer/MultiPlayerChunkCache.cpp index cb6d44fa5..7e1802a17 100644 --- a/targets/minecraft/client/multiplayer/MultiPlayerChunkCache.cpp +++ b/targets/minecraft/client/multiplayer/MultiPlayerChunkCache.cpp @@ -3,7 +3,7 @@ #include #include -#include "app/common/src/Network/GameNetworkManager.h" +#include "app/common/Network/GameNetworkManager.h" #include "app/linux/Stubs/winapi_stubs.h" #include "util/StringHelpers.h" #include "minecraft/server/MinecraftServer.h" diff --git a/targets/minecraft/client/multiplayer/MultiPlayerGameMode.cpp b/targets/minecraft/client/multiplayer/MultiPlayerGameMode.cpp index 33fc83836..21869e797 100644 --- a/targets/minecraft/client/multiplayer/MultiPlayerGameMode.cpp +++ b/targets/minecraft/client/multiplayer/MultiPlayerGameMode.cpp @@ -3,7 +3,7 @@ #include #include "ClientConnection.h" -#include "app/common/src/Audio/SoundEngine.h" +#include "app/common/Audio/SoundEngine.h" #include "MultiPlayerLevel.h" #include "java/Class.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/minecraft/client/multiplayer/MultiPlayerLevel.cpp b/targets/minecraft/client/multiplayer/MultiPlayerLevel.cpp index 0cd434f1d..ee24f947e 100644 --- a/targets/minecraft/client/multiplayer/MultiPlayerLevel.cpp +++ b/targets/minecraft/client/multiplayer/MultiPlayerLevel.cpp @@ -12,9 +12,9 @@ #include "platform/PlatformTypes.h" #include "platform/sdl2/Input.h" #include "ClientConnection.h" -#include "app/common/src/Audio/SoundEngine.h" -#include "app/common/src/Console_Debug_enum.h" -#include "app/common/src/Network/GameNetworkManager.h" +#include "app/common/Audio/SoundEngine.h" +#include "app/common/Console_Debug_enum.h" +#include "app/common/Network/GameNetworkManager.h" #include "app/linux/LinuxGame.h" #include "MultiPlayerChunkCache.h" #include "MultiPlayerLocalPlayer.h" diff --git a/targets/minecraft/client/multiplayer/MultiPlayerLocalPlayer.cpp b/targets/minecraft/client/multiplayer/MultiPlayerLocalPlayer.cpp index 0bbf3b91a..7cc772879 100644 --- a/targets/minecraft/client/multiplayer/MultiPlayerLocalPlayer.cpp +++ b/targets/minecraft/client/multiplayer/MultiPlayerLocalPlayer.cpp @@ -5,9 +5,9 @@ #include #include "ClientConnection.h" -#include "app/common/src/Tutorial/Tutorial.h" -#include "app/common/src/Tutorial/TutorialEnum.h" -#include "app/common/src/Tutorial/TutorialMode.h" +#include "app/common/Tutorial/Tutorial.h" +#include "app/common/Tutorial/TutorialEnum.h" +#include "app/common/Tutorial/TutorialMode.h" #include "app/linux/LinuxGame.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/MultiPlayerGameMode.h" diff --git a/targets/minecraft/client/particle/DragonBreathParticle.cpp b/targets/minecraft/client/particle/DragonBreathParticle.cpp index acce371c6..c492d7599 100644 --- a/targets/minecraft/client/particle/DragonBreathParticle.cpp +++ b/targets/minecraft/client/particle/DragonBreathParticle.cpp @@ -1,7 +1,7 @@ #include "DragonBreathParticle.h" #include "app/common/App_enums.h" -#include "app/common/src/Colours/ColourTable.h" +#include "app/common/Colours/ColourTable.h" #include "java/JavaMath.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/particle/Particle.h" diff --git a/targets/minecraft/client/particle/DripParticle.cpp b/targets/minecraft/client/particle/DripParticle.cpp index 03ca1196d..f841597e9 100644 --- a/targets/minecraft/client/particle/DripParticle.cpp +++ b/targets/minecraft/client/particle/DripParticle.cpp @@ -3,7 +3,7 @@ #include #include "app/common/App_enums.h" -#include "app/common/src/Colours/ColourTable.h" +#include "app/common/Colours/ColourTable.h" #include "java/JavaMath.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/particle/Particle.h" diff --git a/targets/minecraft/client/particle/EnchantmentTableParticle.cpp b/targets/minecraft/client/particle/EnchantmentTableParticle.cpp index ef886bb78..825d1f50a 100644 --- a/targets/minecraft/client/particle/EnchantmentTableParticle.cpp +++ b/targets/minecraft/client/particle/EnchantmentTableParticle.cpp @@ -1,7 +1,7 @@ #include "EnchantmentTableParticle.h" #include "app/common/App_enums.h" -#include "app/common/src/Colours/ColourTable.h" +#include "app/common/Colours/ColourTable.h" #include "java/JavaMath.h" #include "java/Random.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/minecraft/client/particle/EnderParticle.cpp b/targets/minecraft/client/particle/EnderParticle.cpp index 5e4d40d12..d6a223566 100644 --- a/targets/minecraft/client/particle/EnderParticle.cpp +++ b/targets/minecraft/client/particle/EnderParticle.cpp @@ -1,7 +1,7 @@ #include "EnderParticle.h" #include "app/common/App_enums.h" -#include "app/common/src/Colours/ColourTable.h" +#include "app/common/Colours/ColourTable.h" #include "java/JavaMath.h" #include "java/Random.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/minecraft/client/particle/ExplodeParticle.cpp b/targets/minecraft/client/particle/ExplodeParticle.cpp index 9a8cf6f55..d3a08edae 100644 --- a/targets/minecraft/client/particle/ExplodeParticle.cpp +++ b/targets/minecraft/client/particle/ExplodeParticle.cpp @@ -1,7 +1,7 @@ #include "ExplodeParticle.h" #include "app/common/App_enums.h" -#include "app/common/src/Colours/ColourTable.h" +#include "app/common/Colours/ColourTable.h" #include "java/JavaMath.h" #include "java/Random.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/minecraft/client/particle/HugeExplosionParticle.cpp b/targets/minecraft/client/particle/HugeExplosionParticle.cpp index 428de1d37..8f4934ba1 100644 --- a/targets/minecraft/client/particle/HugeExplosionParticle.cpp +++ b/targets/minecraft/client/particle/HugeExplosionParticle.cpp @@ -4,7 +4,7 @@ #include "platform/sdl2/Render.h" #include "app/common/App_enums.h" -#include "app/common/src/Colours/ColourTable.h" +#include "app/common/Colours/ColourTable.h" #include "java/Random.h" #include "minecraft/client/Lighting.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/minecraft/client/particle/NetherPortalParticle.cpp b/targets/minecraft/client/particle/NetherPortalParticle.cpp index 059ea537f..fd758dead 100644 --- a/targets/minecraft/client/particle/NetherPortalParticle.cpp +++ b/targets/minecraft/client/particle/NetherPortalParticle.cpp @@ -1,7 +1,7 @@ #include "NetherPortalParticle.h" #include "app/common/App_enums.h" -#include "app/common/src/Colours/ColourTable.h" +#include "app/common/Colours/ColourTable.h" #include "java/JavaMath.h" #include "java/Random.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/minecraft/client/particle/NoteParticle.cpp b/targets/minecraft/client/particle/NoteParticle.cpp index d047f1f4e..265f1e9d5 100644 --- a/targets/minecraft/client/particle/NoteParticle.cpp +++ b/targets/minecraft/client/particle/NoteParticle.cpp @@ -3,7 +3,7 @@ #include #include "app/common/App_enums.h" -#include "app/common/src/Colours/ColourTable.h" +#include "app/common/Colours/ColourTable.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/particle/Particle.h" diff --git a/targets/minecraft/client/particle/SmokeParticle.cpp b/targets/minecraft/client/particle/SmokeParticle.cpp index 185f94fb5..a1f5a2690 100644 --- a/targets/minecraft/client/particle/SmokeParticle.cpp +++ b/targets/minecraft/client/particle/SmokeParticle.cpp @@ -1,7 +1,7 @@ #include "SmokeParticle.h" #include "app/common/App_enums.h" -#include "app/common/src/Colours/ColourTable.h" +#include "app/common/Colours/ColourTable.h" #include "java/JavaMath.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/particle/Particle.h" diff --git a/targets/minecraft/client/particle/SuspendedParticle.cpp b/targets/minecraft/client/particle/SuspendedParticle.cpp index 9d284581b..1cd551b34 100644 --- a/targets/minecraft/client/particle/SuspendedParticle.cpp +++ b/targets/minecraft/client/particle/SuspendedParticle.cpp @@ -3,7 +3,7 @@ #include #include "app/common/App_enums.h" -#include "app/common/src/Colours/ColourTable.h" +#include "app/common/Colours/ColourTable.h" #include "java/JavaMath.h" #include "java/Random.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/minecraft/client/player/LocalPlayer.cpp b/targets/minecraft/client/player/LocalPlayer.cpp index fff0a7612..ae53c24f1 100644 --- a/targets/minecraft/client/player/LocalPlayer.cpp +++ b/targets/minecraft/client/player/LocalPlayer.cpp @@ -30,11 +30,11 @@ #include "platform/sdl2/Profile.h" #include "platform/sdl2/Render.h" #include "app/common/App_structs.h" -#include "app/common/src/Audio/SoundEngine.h" -#include "app/common/src/Network/GameNetworkManager.h" -#include "app/common/src/Tutorial/Tutorial.h" -#include "app/common/src/Tutorial/TutorialMode.h" -#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/common/Audio/SoundEngine.h" +#include "app/common/Network/GameNetworkManager.h" +#include "app/common/Tutorial/Tutorial.h" +#include "app/common/Tutorial/TutorialMode.h" +#include "app/common/UI/All Platforms/UIEnums.h" #include "app/linux/LinuxGame.h" #include "app/linux/Linux_UIController.h" #include "app/linux/Stubs/winapi_stubs.h" diff --git a/targets/minecraft/client/renderer/Chunk.cpp b/targets/minecraft/client/renderer/Chunk.cpp index d89a7385f..5d50383d4 100644 --- a/targets/minecraft/client/renderer/Chunk.cpp +++ b/targets/minecraft/client/renderer/Chunk.cpp @@ -12,7 +12,7 @@ #include "platform/sdl2/Render.h" #include "LevelRenderer.h" #include "app/linux/Stubs/winapi_stubs.h" -#include "app/include/FrameProfiler.h" +#include "app/common/FrameProfiler.h" #include "TileRenderer.h" #include "minecraft/client/renderer/Tesselator.h" #include "minecraft/client/renderer/culling/Culler.h" diff --git a/targets/minecraft/client/renderer/GameRenderer.cpp b/targets/minecraft/client/renderer/GameRenderer.cpp index 744e27a79..f8a8757fc 100644 --- a/targets/minecraft/client/renderer/GameRenderer.cpp +++ b/targets/minecraft/client/renderer/GameRenderer.cpp @@ -15,12 +15,12 @@ #include "LevelRenderer.h" #include "app/common/App_enums.h" #include "platform/ShutdownManager.h" -#include "app/common/src/Colours/ColourTable.h" +#include "app/common/Colours/ColourTable.h" #include "app/linux/LinuxGame.h" #include "app/linux/Stubs/winapi_stubs.h" -#include "app/include/BufferedImage.h" -#include "app/include/FrameProfiler.h" -#include "app/include/stubs.h" +#include "app/common/BufferedImage.h" +#include "app/common/FrameProfiler.h" +#include "app/common/stubs.h" #include "Tesselator.h" #include "minecraft/world/level/storage/ConsoleSaveFileIO/compression.h" diff --git a/targets/minecraft/client/renderer/ItemInHandRenderer.cpp b/targets/minecraft/client/renderer/ItemInHandRenderer.cpp index bc85fa098..4334f2fc7 100644 --- a/targets/minecraft/client/renderer/ItemInHandRenderer.cpp +++ b/targets/minecraft/client/renderer/ItemInHandRenderer.cpp @@ -8,7 +8,7 @@ #include "platform/sdl2/Render.h" #include "app/common/App_enums.h" -#include "app/common/src/Colours/ColourTable.h" +#include "app/common/Colours/ColourTable.h" #include "app/linux/LinuxGame.h" #include "Tesselator.h" #include "Textures.h" diff --git a/targets/minecraft/client/renderer/LevelRenderer.cpp b/targets/minecraft/client/renderer/LevelRenderer.cpp index 2651d019f..ffd6a7561 100644 --- a/targets/minecraft/client/renderer/LevelRenderer.cpp +++ b/targets/minecraft/client/renderer/LevelRenderer.cpp @@ -19,13 +19,13 @@ #include "Chunk.h" #include "GameRenderer.h" #include "app/common/App_enums.h" -#include "app/common/src/Audio/SoundEngine.h" -#include "app/common/src/Colours/ColourTable.h" -#include "app/common/src/Console_Debug_enum.h" +#include "app/common/Audio/SoundEngine.h" +#include "app/common/Colours/ColourTable.h" +#include "app/common/Console_Debug_enum.h" #include "app/linux/LinuxGame.h" -#include "app/include/FrameProfiler.h" -#include "app/include/MobSkinMemTextureProcessor.h" -#include "app/include/stubs.h" +#include "app/common/FrameProfiler.h" +#include "app/common/MobSkinMemTextureProcessor.h" +#include "app/common/stubs.h" #include "Tesselator.h" #include "util/StringHelpers.h" #include "java/Class.h" diff --git a/targets/minecraft/client/renderer/LevelRenderer.h b/targets/minecraft/client/renderer/LevelRenderer.h index c66590063..9b4f038f8 100644 --- a/targets/minecraft/client/renderer/LevelRenderer.h +++ b/targets/minecraft/client/renderer/LevelRenderer.h @@ -1,7 +1,7 @@ #pragma once -#include "app/include/NetTypes.h" -#include "app/include/SkinBox.h" -#include "app/include/XboxStubs.h" +#include "app/common/NetTypes.h" +#include "app/common/SkinBox.h" +#include "app/common/XboxStubs.h" #include "OffsettedRenderList.h" #include "platform/C4JThread.h" #include "util/Definitions.h" diff --git a/targets/minecraft/client/renderer/MemTexture.cpp b/targets/minecraft/client/renderer/MemTexture.cpp index 25f70fdef..adbf8d0e8 100644 --- a/targets/minecraft/client/renderer/MemTexture.cpp +++ b/targets/minecraft/client/renderer/MemTexture.cpp @@ -1,9 +1,9 @@ -#include "app/include/MemTexture.h" +#include "app/common/MemTexture.h" #include #include -#include "app/include/BufferedImage.h" +#include "app/common/BufferedImage.h" class MemTextureProcessor; diff --git a/targets/minecraft/client/renderer/MobSkinMemTextureProcessor.cpp b/targets/minecraft/client/renderer/MobSkinMemTextureProcessor.cpp index 866225074..69f82f61b 100644 --- a/targets/minecraft/client/renderer/MobSkinMemTextureProcessor.cpp +++ b/targets/minecraft/client/renderer/MobSkinMemTextureProcessor.cpp @@ -1,7 +1,7 @@ -#include "app/include/MobSkinMemTextureProcessor.h" +#include "app/common/MobSkinMemTextureProcessor.h" -#include "app/include/BufferedImage.h" -#include "app/include/stubs.h" +#include "app/common/BufferedImage.h" +#include "app/common/stubs.h" BufferedImage* MobSkinMemTextureProcessor::process(BufferedImage* in) { if (in == nullptr) return nullptr; diff --git a/targets/minecraft/client/renderer/MobSkinTextureProcessor.cpp b/targets/minecraft/client/renderer/MobSkinTextureProcessor.cpp index ddc4c28a1..ae8bd1729 100644 --- a/targets/minecraft/client/renderer/MobSkinTextureProcessor.cpp +++ b/targets/minecraft/client/renderer/MobSkinTextureProcessor.cpp @@ -1,7 +1,7 @@ #include "MobSkinTextureProcessor.h" -#include "app/include/BufferedImage.h" -#include "app/include/stubs.h" +#include "app/common/BufferedImage.h" +#include "app/common/stubs.h" BufferedImage* MobSkinTextureProcessor::process(BufferedImage* in) { if (in == nullptr) return nullptr; diff --git a/targets/minecraft/client/renderer/Tesselator.cpp b/targets/minecraft/client/renderer/Tesselator.cpp index b10c8fd3f..b652fb6e2 100644 --- a/targets/minecraft/client/renderer/Tesselator.cpp +++ b/targets/minecraft/client/renderer/Tesselator.cpp @@ -6,7 +6,7 @@ #include "platform/sdl2/Render.h" #include "app/linux/LinuxGame.h" -#include "app/include/stubs.h" +#include "app/common/stubs.h" #include "minecraft/client/MemoryTracker.h" bool Tesselator::TRIANGLE_MODE = false; diff --git a/targets/minecraft/client/renderer/Textures.cpp b/targets/minecraft/client/renderer/Textures.cpp index eccbbe06f..5943b8b31 100644 --- a/targets/minecraft/client/renderer/Textures.cpp +++ b/targets/minecraft/client/renderer/Textures.cpp @@ -10,10 +10,10 @@ #include "platform/sdl2/Render.h" #include "HttpTexture.h" #include "app/linux/LinuxGame.h" -#include "app/include/BufferedImage.h" -#include "app/include/MemTexture.h" -#include "app/include/MemTextureProcessor.h" -#include "app/include/MobSkinMemTextureProcessor.h" +#include "app/common/BufferedImage.h" +#include "app/common/MemTexture.h" +#include "app/common/MemTextureProcessor.h" +#include "app/common/MobSkinMemTextureProcessor.h" #include "util/StringHelpers.h" #include "java/Buffer.h" diff --git a/targets/minecraft/client/renderer/TileRenderer.cpp b/targets/minecraft/client/renderer/TileRenderer.cpp index cb4390a3a..9e76453c1 100644 --- a/targets/minecraft/client/renderer/TileRenderer.cpp +++ b/targets/minecraft/client/renderer/TileRenderer.cpp @@ -13,8 +13,8 @@ #include "EntityTileRenderer.h" #include "GameRenderer.h" #include "app/common/App_enums.h" -#include "app/common/src/Colours/ColourTable.h" -#include "app/include/FrameProfiler.h" +#include "app/common/Colours/ColourTable.h" +#include "app/common/FrameProfiler.h" #include "Tesselator.h" #include "minecraft/Direction.h" #include "minecraft/Facing.h" diff --git a/targets/minecraft/client/renderer/entity/MobRenderer.cpp b/targets/minecraft/client/renderer/entity/MobRenderer.cpp index c694e55eb..81381c4cc 100644 --- a/targets/minecraft/client/renderer/entity/MobRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/MobRenderer.cpp @@ -8,7 +8,7 @@ #include "EntityRenderDispatcher.h" #include "LivingEntityRenderer.h" #include "app/common/App_enums.h" -#include "app/common/src/Colours/ColourTable.h" +#include "app/common/Colours/ColourTable.h" #include "java/Class.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/minecraft/client/renderer/entity/PlayerRenderer.h b/targets/minecraft/client/renderer/entity/PlayerRenderer.h index 86ba38bb5..79c348a1f 100644 --- a/targets/minecraft/client/renderer/entity/PlayerRenderer.h +++ b/targets/minecraft/client/renderer/entity/PlayerRenderer.h @@ -2,9 +2,9 @@ #include #include -#include "app/include/NetTypes.h" -#include "app/include/SkinBox.h" -#include "app/include/XboxStubs.h" +#include "app/common/NetTypes.h" +#include "app/common/SkinBox.h" +#include "app/common/XboxStubs.h" #include "MobRenderer.h" #include "minecraft/client/renderer/entity/LivingEntityRenderer.h" #include "minecraft/world/entity/player/Player.h" diff --git a/targets/minecraft/client/renderer/texture/PreStitchedTextureMap.cpp b/targets/minecraft/client/renderer/texture/PreStitchedTextureMap.cpp index e0b83b47c..07be9512a 100644 --- a/targets/minecraft/client/renderer/texture/PreStitchedTextureMap.cpp +++ b/targets/minecraft/client/renderer/texture/PreStitchedTextureMap.cpp @@ -5,7 +5,7 @@ #include "app/linux/LinuxGame.h" #include "app/linux/Stubs/winapi_stubs.h" -#include "app/include/BufferedImage.h" +#include "app/common/BufferedImage.h" #include "SimpleIcon.h" #include "StitchedTexture.h" #include "Texture.h" diff --git a/targets/minecraft/client/renderer/texture/Texture.cpp b/targets/minecraft/client/renderer/texture/Texture.cpp index 74d720e11..e62c47d27 100644 --- a/targets/minecraft/client/renderer/texture/Texture.cpp +++ b/targets/minecraft/client/renderer/texture/Texture.cpp @@ -7,7 +7,7 @@ #include "platform/sdl2/Render.h" #include "app/linux/LinuxGame.h" -#include "app/include/BufferedImage.h" +#include "app/common/BufferedImage.h" #include "TextureManager.h" #include "java/Buffer.h" #include "java/ByteBuffer.h" diff --git a/targets/minecraft/client/renderer/texture/TextureManager.cpp b/targets/minecraft/client/renderer/texture/TextureManager.cpp index b03f23e1b..9014d4907 100644 --- a/targets/minecraft/client/renderer/texture/TextureManager.cpp +++ b/targets/minecraft/client/renderer/texture/TextureManager.cpp @@ -6,7 +6,7 @@ #include #include "app/linux/LinuxGame.h" -#include "app/include/BufferedImage.h" +#include "app/common/BufferedImage.h" #include "Stitcher.h" #include "Texture.h" #include "java/File.h" diff --git a/targets/minecraft/client/renderer/texture/TextureMap.cpp b/targets/minecraft/client/renderer/texture/TextureMap.cpp index c32a5249d..0e50a73bf 100644 --- a/targets/minecraft/client/renderer/texture/TextureMap.cpp +++ b/targets/minecraft/client/renderer/texture/TextureMap.cpp @@ -7,7 +7,7 @@ #include "app/linux/LinuxGame.h" #include "app/linux/Stubs/winapi_stubs.h" -#include "app/include/BufferedImage.h" +#include "app/common/BufferedImage.h" #include "StitchSlot.h" #include "StitchedTexture.h" #include "Stitcher.h" diff --git a/targets/minecraft/client/renderer/tileentity/SignRenderer.cpp b/targets/minecraft/client/renderer/tileentity/SignRenderer.cpp index 8e65c852a..fe3885404 100644 --- a/targets/minecraft/client/renderer/tileentity/SignRenderer.cpp +++ b/targets/minecraft/client/renderer/tileentity/SignRenderer.cpp @@ -6,9 +6,9 @@ #include "platform/sdl2/Render.h" #include "app/common/App_enums.h" -#include "app/common/src/Colours/ColourTable.h" +#include "app/common/Colours/ColourTable.h" #include "app/linux/LinuxGame.h" -#include "app/include/XboxStubs.h" +#include "app/common/XboxStubs.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/gui/Font.h" diff --git a/targets/minecraft/client/skins/AbstractTexturePack.cpp b/targets/minecraft/client/skins/AbstractTexturePack.cpp index 688e2cc7f..b6e3352c4 100644 --- a/targets/minecraft/client/skins/AbstractTexturePack.cpp +++ b/targets/minecraft/client/skins/AbstractTexturePack.cpp @@ -5,11 +5,11 @@ #include -#include "app/common/src/Colours/ColourTable.h" +#include "app/common/Colours/ColourTable.h" #include "app/linux/LinuxGame.h" #include "app/linux/Linux_UIController.h" #include "app/linux/Stubs/winapi_stubs.h" -#include "app/include/BufferedImage.h" +#include "app/common/BufferedImage.h" #include "util/StringHelpers.h" #include "java/File.h" #include "java/InputOutputStream/BufferedReader.h" diff --git a/targets/minecraft/client/skins/DLCTexturePack.cpp b/targets/minecraft/client/skins/DLCTexturePack.cpp index 7f95d6f7c..74e2452b3 100644 --- a/targets/minecraft/client/skins/DLCTexturePack.cpp +++ b/targets/minecraft/client/skins/DLCTexturePack.cpp @@ -8,25 +8,25 @@ #include "platform/sdl2/Input.h" #include "platform/sdl2/Storage.h" #include "app/common/App_enums.h" -#include "app/common/src/Audio/SoundEngine.h" -#include "app/common/src/Colours/ColourTable.h" -#include "app/common/src/DLC/DLCAudioFile.h" -#include "app/common/src/DLC/DLCColourTableFile.h" -#include "app/common/src/DLC/DLCFile.h" -#include "app/common/src/DLC/DLCGameRulesHeader.h" -#include "app/common/src/DLC/DLCLocalisationFile.h" -#include "app/common/src/DLC/DLCManager.h" -#include "app/common/src/DLC/DLCPack.h" -#include "app/common/src/DLC/DLCTextureFile.h" -#include "app/common/src/DLC/DLCUIDataFile.h" -#include "app/common/src/GameRules/GameRuleManager.h" -#include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" -#include "app/common/src/Localisation/StringTable.h" -#include "app/common/src/UI/All Platforms/ArchiveFile.h" +#include "app/common/Audio/SoundEngine.h" +#include "app/common/Colours/ColourTable.h" +#include "app/common/DLC/DLCAudioFile.h" +#include "app/common/DLC/DLCColourTableFile.h" +#include "app/common/DLC/DLCFile.h" +#include "app/common/DLC/DLCGameRulesHeader.h" +#include "app/common/DLC/DLCLocalisationFile.h" +#include "app/common/DLC/DLCManager.h" +#include "app/common/DLC/DLCPack.h" +#include "app/common/DLC/DLCTextureFile.h" +#include "app/common/DLC/DLCUIDataFile.h" +#include "app/common/GameRules/GameRuleManager.h" +#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "app/common/Localisation/StringTable.h" +#include "app/common/UI/All Platforms/ArchiveFile.h" #include "app/linux/LinuxGame.h" #include "app/linux/Linux_UIController.h" #include "app/linux/Stubs/winapi_stubs.h" -#include "app/include/BufferedImage.h" +#include "app/common/BufferedImage.h" #include "platform/PlatformServices.h" #include "java/File.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/minecraft/client/skins/DLCTexturePack.h b/targets/minecraft/client/skins/DLCTexturePack.h index ddf4a7786..ccec65f84 100644 --- a/targets/minecraft/client/skins/DLCTexturePack.h +++ b/targets/minecraft/client/skins/DLCTexturePack.h @@ -5,7 +5,7 @@ #include "platform/PlatformTypes.h" #include "AbstractTexturePack.h" -#include "app/common/src/Localisation/StringTable.h" +#include "app/common/Localisation/StringTable.h" class DLCPack; class StringTable; diff --git a/targets/minecraft/client/skins/TexturePackRepository.cpp b/targets/minecraft/client/skins/TexturePackRepository.cpp index 640f4b945..2f6b2215a 100644 --- a/targets/minecraft/client/skins/TexturePackRepository.cpp +++ b/targets/minecraft/client/skins/TexturePackRepository.cpp @@ -9,8 +9,8 @@ #include "DLCTexturePack.h" #include "DefaultTexturePack.h" #include "app/common/App_enums.h" -#include "app/common/src/DLC/DLCManager.h" -#include "app/common/src/DLC/DLCPack.h" +#include "app/common/DLC/DLCManager.h" +#include "app/common/DLC/DLCPack.h" #include "app/linux/LinuxGame.h" #include "app/linux/Linux_UIController.h" #include "java/File.h" diff --git a/targets/minecraft/client/title/TitleScreen.cpp b/targets/minecraft/client/title/TitleScreen.cpp index 52633dada..f097ba06e 100644 --- a/targets/minecraft/client/title/TitleScreen.cpp +++ b/targets/minecraft/client/title/TitleScreen.cpp @@ -8,7 +8,7 @@ #include "platform/sdl2/Render.h" #include "app/linux/LinuxGame.h" #include "app/linux/Stubs/winapi_stubs.h" -#include "app/include/BufferedImage.h" +#include "app/common/BufferedImage.h" #include "util/StringHelpers.h" #include "java/InputOutputStream/BufferedReader.h" #include "java/InputOutputStream/ByteArrayInputStream.h" diff --git a/targets/minecraft/network/Connection.cpp b/targets/minecraft/network/Connection.cpp index 2b049ccd1..9a77e473b 100644 --- a/targets/minecraft/network/Connection.cpp +++ b/targets/minecraft/network/Connection.cpp @@ -7,9 +7,9 @@ #include #include "platform/ShutdownManager.h" -#include "app/common/src/Network/GameNetworkManager.h" -#include "app/common/src/Network/NetworkPlayerInterface.h" -#include "app/common/src/Network/Socket.h" +#include "app/common/Network/GameNetworkManager.h" +#include "app/common/Network/NetworkPlayerInterface.h" +#include "app/common/Network/Socket.h" #include "util/StringHelpers.h" #include "minecraft/world/level/storage/ConsoleSaveFileIO/compression.h" #include "java/InputOutputStream/BufferedOutputStream.h" diff --git a/targets/minecraft/network/Connection.h b/targets/minecraft/network/Connection.h index af77b3ddc..c38b5a808 100644 --- a/targets/minecraft/network/Connection.h +++ b/targets/minecraft/network/Connection.h @@ -7,7 +7,7 @@ #include #include -#include "app/common/src/Network/Socket.h" +#include "app/common/Network/Socket.h" #include "app/linux/Stubs/winapi_stubs.h" #include "platform/C4JThread.h" #include "java/InputOutputStream/DataInputStream.h" diff --git a/targets/minecraft/network/packet/PlayerInfoPacket.cpp b/targets/minecraft/network/packet/PlayerInfoPacket.cpp index a85ee6d89..7ea79b2a3 100644 --- a/targets/minecraft/network/packet/PlayerInfoPacket.cpp +++ b/targets/minecraft/network/packet/PlayerInfoPacket.cpp @@ -1,4 +1,4 @@ -#include "app/common/src/Network/NetworkPlayerInterface.h" +#include "app/common/Network/NetworkPlayerInterface.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" #include "minecraft/network/packet/PacketListener.h" diff --git a/targets/minecraft/network/packet/PreLoginPacket.cpp b/targets/minecraft/network/packet/PreLoginPacket.cpp index e5542db9b..41978ed7b 100644 --- a/targets/minecraft/network/packet/PreLoginPacket.cpp +++ b/targets/minecraft/network/packet/PreLoginPacket.cpp @@ -3,7 +3,7 @@ #include #include -#include "app/common/src/BuildVer/BuildVer.h" +#include "app/common/BuildVer/BuildVer.h" #include "platform/IPlatformNetwork.h" #include "app/linux/LinuxGame.h" #include "app/linux/Stubs/winapi_stubs.h" diff --git a/targets/minecraft/network/packet/TextureAndGeometryPacket.cpp b/targets/minecraft/network/packet/TextureAndGeometryPacket.cpp index 13b72c513..b1348769b 100644 --- a/targets/minecraft/network/packet/TextureAndGeometryPacket.cpp +++ b/targets/minecraft/network/packet/TextureAndGeometryPacket.cpp @@ -4,7 +4,7 @@ #include #include "app/common/Minecraft_Macros.h" -#include "app/common/src/DLC/DLCSkinFile.h" +#include "app/common/DLC/DLCSkinFile.h" #include "PacketListener.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" diff --git a/targets/minecraft/network/packet/TextureAndGeometryPacket.h b/targets/minecraft/network/packet/TextureAndGeometryPacket.h index 0a4c0908a..09261b9e3 100644 --- a/targets/minecraft/network/packet/TextureAndGeometryPacket.h +++ b/targets/minecraft/network/packet/TextureAndGeometryPacket.h @@ -5,7 +5,7 @@ #include #include -#include "app/include/SkinBox.h" +#include "app/common/SkinBox.h" #include "Packet.h" #include "minecraft/client/model/geom/Model.h" #include "minecraft/network/packet/Packet.h" diff --git a/targets/minecraft/network/packet/UpdateGameRuleProgressPacket.h b/targets/minecraft/network/packet/UpdateGameRuleProgressPacket.h index aee4f5b6d..4cf9694ed 100644 --- a/targets/minecraft/network/packet/UpdateGameRuleProgressPacket.h +++ b/targets/minecraft/network/packet/UpdateGameRuleProgressPacket.h @@ -6,7 +6,7 @@ #include #include -#include "app/common/src/GameRules/ConsoleGameRulesConstants.h" +#include "app/common/GameRules/ConsoleGameRulesConstants.h" #include "Packet.h" #include "minecraft/network/packet/Packet.h" diff --git a/targets/minecraft/server/MinecraftServer.cpp b/targets/minecraft/server/MinecraftServer.cpp index e022c7eec..0d9307758 100644 --- a/targets/minecraft/server/MinecraftServer.cpp +++ b/targets/minecraft/server/MinecraftServer.cpp @@ -16,10 +16,10 @@ #include "ConsoleInput.h" #include "DispenserBootstrap.h" #include "app/common/App_enums.h" -#include "app/common/src/GameRules/GameRuleManager.h" -#include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" -#include "app/common/src/Network/GameNetworkManager.h" -#include "app/common/src/Network/NetworkPlayerInterface.h" +#include "app/common/GameRules/GameRuleManager.h" +#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "app/common/Network/GameNetworkManager.h" +#include "app/common/Network/NetworkPlayerInterface.h" #include "app/linux/LinuxGame.h" #include "PlayerList.h" #include "Settings.h" @@ -66,10 +66,10 @@ #endif #include "platform/sdl2/Input.h" #include "platform/ShutdownManager.h" -#include "app/common/src/Console_Debug_enum.h" -#include "app/common/src/GameRules/LevelGeneration/ConsoleSchematicFile.h" -#include "app/common/src/Network/Socket.h" -#include "app/common/src/UI/All Platforms/UIStructs.h" +#include "app/common/Console_Debug_enum.h" +#include "app/common/GameRules/LevelGeneration/ConsoleSchematicFile.h" +#include "app/common/Network/Socket.h" +#include "app/common/UI/All Platforms/UIStructs.h" #include "minecraft/world/level/storage/ConsoleSaveFileIO/compression.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/ProgressRenderer.h" diff --git a/targets/minecraft/server/PlayerList.cpp b/targets/minecraft/server/PlayerList.cpp index c9b00588a..ab48402ff 100644 --- a/targets/minecraft/server/PlayerList.cpp +++ b/targets/minecraft/server/PlayerList.cpp @@ -10,17 +10,17 @@ #include "platform/sdl2/Profile.h" #include "app/common/App_enums.h" -#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" -#include "app/common/src/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h" -#include "app/common/src/GameRules/LevelRules/Rules/GameRulesInstance.h" -#include "app/common/src/Network/GameNetworkManager.h" -#include "app/common/src/Network/NetworkPlayerInterface.h" -#include "app/common/src/Network/Socket.h" -#include "app/common/src/Tutorial/Tutorial.h" -#include "app/common/src/Tutorial/TutorialEnum.h" +#include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "app/common/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h" +#include "app/common/GameRules/LevelRules/Rules/GameRulesInstance.h" +#include "app/common/Network/GameNetworkManager.h" +#include "app/common/Network/NetworkPlayerInterface.h" +#include "app/common/Network/Socket.h" +#include "app/common/Tutorial/Tutorial.h" +#include "app/common/Tutorial/TutorialEnum.h" #include "app/linux/LinuxGame.h" #include "app/linux/Stubs/winapi_stubs.h" -#include "app/include/NetTypes.h" +#include "app/common/NetTypes.h" #include "MinecraftServer.h" #include "Settings.h" #include "minecraft/world/entity/player/SkinTypes.h" diff --git a/targets/minecraft/server/level/EntityTracker.cpp b/targets/minecraft/server/level/EntityTracker.cpp index af5d0da43..3768ef7a1 100644 --- a/targets/minecraft/server/level/EntityTracker.cpp +++ b/targets/minecraft/server/level/EntityTracker.cpp @@ -7,7 +7,7 @@ #include #include -#include "app/common/src/Network/NetworkPlayerInterface.h" +#include "app/common/Network/NetworkPlayerInterface.h" #include "app/linux/Stubs/winapi_stubs.h" #include "ServerLevel.h" #include "ServerPlayer.h" diff --git a/targets/minecraft/server/level/PlayerChunkMap.cpp b/targets/minecraft/server/level/PlayerChunkMap.cpp index fb4ae3e27..61f4eef9e 100644 --- a/targets/minecraft/server/level/PlayerChunkMap.cpp +++ b/targets/minecraft/server/level/PlayerChunkMap.cpp @@ -9,8 +9,8 @@ #include #include -#include "app/common/src/Network/GameNetworkManager.h" -#include "app/common/src/Network/NetworkPlayerInterface.h" +#include "app/common/Network/GameNetworkManager.h" +#include "app/common/Network/NetworkPlayerInterface.h" #include "app/linux/LinuxGame.h" #include "ServerChunkCache.h" #include "ServerLevel.h" diff --git a/targets/minecraft/server/level/ServerLevel.cpp b/targets/minecraft/server/level/ServerLevel.cpp index 94275453f..789838738 100644 --- a/targets/minecraft/server/level/ServerLevel.cpp +++ b/targets/minecraft/server/level/ServerLevel.cpp @@ -9,10 +9,10 @@ #include "platform/sdl2/Storage.h" #include "EntityTracker.h" #include "platform/ShutdownManager.h" -#include "app/common/src/Console_Debug_enum.h" -#include "app/common/src/DLC/DLCManager.h" -#include "app/common/src/DLC/DLCPack.h" -#include "app/common/src/Network/NetworkPlayerInterface.h" +#include "app/common/Console_Debug_enum.h" +#include "app/common/DLC/DLCManager.h" +#include "app/common/DLC/DLCPack.h" +#include "app/common/Network/NetworkPlayerInterface.h" #include "app/linux/LinuxGame.h" #include "PlayerChunkMap.h" #include "Pos.h" diff --git a/targets/minecraft/server/level/ServerPlayer.cpp b/targets/minecraft/server/level/ServerPlayer.cpp index 3d6764379..2630c28a3 100644 --- a/targets/minecraft/server/level/ServerPlayer.cpp +++ b/targets/minecraft/server/level/ServerPlayer.cpp @@ -10,10 +10,10 @@ #include "platform/sdl2/Input.h" #include "EntityTracker.h" -#include "app/common/src/Console_Debug_enum.h" -#include "app/common/src/GameRules/LevelRules/Rules/GameRulesInstance.h" -#include "app/common/src/Network/GameNetworkManager.h" -#include "app/common/src/Network/NetworkPlayerInterface.h" +#include "app/common/Console_Debug_enum.h" +#include "app/common/GameRules/LevelRules/Rules/GameRulesInstance.h" +#include "app/common/Network/GameNetworkManager.h" +#include "app/common/Network/NetworkPlayerInterface.h" #include "app/linux/LinuxGame.h" #include "ServerLevel.h" #include "ServerPlayerGameMode.h" diff --git a/targets/minecraft/server/level/ServerPlayerGameMode.cpp b/targets/minecraft/server/level/ServerPlayerGameMode.cpp index 1b72ca5a8..2b96a055d 100644 --- a/targets/minecraft/server/level/ServerPlayerGameMode.cpp +++ b/targets/minecraft/server/level/ServerPlayerGameMode.cpp @@ -2,7 +2,7 @@ #include -#include "app/common/src/GameRules/LevelRules/Rules/GameRulesInstance.h" +#include "app/common/GameRules/LevelRules/Rules/GameRulesInstance.h" #include "ServerLevel.h" #include "ServerPlayer.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/minecraft/server/level/TrackedEntity.cpp b/targets/minecraft/server/level/TrackedEntity.cpp index fed155b53..a54b48b93 100644 --- a/targets/minecraft/server/level/TrackedEntity.cpp +++ b/targets/minecraft/server/level/TrackedEntity.cpp @@ -10,7 +10,7 @@ #include "platform/PlatformTypes.h" #include "EntityTracker.h" -#include "app/common/src/Network/NetworkPlayerInterface.h" +#include "app/common/Network/NetworkPlayerInterface.h" #include "app/linux/LinuxGame.h" #include "ServerPlayer.h" #include "java/Class.h" diff --git a/targets/minecraft/server/network/PendingConnection.cpp b/targets/minecraft/server/network/PendingConnection.cpp index bdb7ca9c6..408955bfa 100644 --- a/targets/minecraft/server/network/PendingConnection.cpp +++ b/targets/minecraft/server/network/PendingConnection.cpp @@ -8,12 +8,12 @@ #include "platform/PlatformTypes.h" #include "platform/sdl2/Storage.h" #include "app/common/App_enums.h" -#include "app/common/src/BuildVer/BuildVer.h" -#include "app/common/src/Network/NetworkPlayerInterface.h" +#include "app/common/BuildVer/BuildVer.h" +#include "app/common/Network/NetworkPlayerInterface.h" #include "platform/IPlatformNetwork.h" #include "app/linux/LinuxGame.h" #include "app/linux/Stubs/winapi_stubs.h" -#include "app/include/NetTypes.h" +#include "app/common/NetTypes.h" #include "PlayerConnection.h" #include "ServerConnection.h" #include "java/Random.h" diff --git a/targets/minecraft/server/network/PlayerConnection.cpp b/targets/minecraft/server/network/PlayerConnection.cpp index 37d49ec11..8fd7c8bcd 100644 --- a/targets/minecraft/server/network/PlayerConnection.cpp +++ b/targets/minecraft/server/network/PlayerConnection.cpp @@ -9,14 +9,14 @@ #include #include "app/common/App_enums.h" -#include "app/common/src/Console_Debug_enum.h" -#include "app/common/src/DLC/DLCManager.h" -#include "app/common/src/DLC/DLCSkinFile.h" -#include "app/common/src/Network/GameNetworkManager.h" -#include "app/common/src/Network/NetworkPlayerInterface.h" -#include "app/common/src/Network/Socket.h" +#include "app/common/Console_Debug_enum.h" +#include "app/common/DLC/DLCManager.h" +#include "app/common/DLC/DLCSkinFile.h" +#include "app/common/Network/GameNetworkManager.h" +#include "app/common/Network/NetworkPlayerInterface.h" +#include "app/common/Network/Socket.h" #include "app/linux/LinuxGame.h" -#include "app/include/SkinBox.h" +#include "app/common/SkinBox.h" #include "ServerConnection.h" #include "java/Class.h" #include "java/InputOutputStream/ByteArrayInputStream.h" diff --git a/targets/minecraft/stats/Achievements.cpp b/targets/minecraft/stats/Achievements.cpp index 345839fef..8804318de 100644 --- a/targets/minecraft/stats/Achievements.cpp +++ b/targets/minecraft/stats/Achievements.cpp @@ -5,7 +5,7 @@ #include #include "Achievement.h" -#include "app/common/src/Console_Awards_enum.h" +#include "app/common/Console_Awards_enum.h" #include "minecraft/world/item/BowItem.h" #include "minecraft/world/item/Item.h" #include "minecraft/world/item/PotionItem.h" diff --git a/targets/minecraft/stats/CommonStats.h b/targets/minecraft/stats/CommonStats.h index 1bf022de3..47eacd2d4 100644 --- a/targets/minecraft/stats/CommonStats.h +++ b/targets/minecraft/stats/CommonStats.h @@ -6,7 +6,7 @@ #include #include "GenericStats.h" -#include "app/common/src/Console_Awards_enum.h" +#include "app/common/Console_Awards_enum.h" #include "java/Class.h" class CommonStats : public GenericStats { diff --git a/targets/minecraft/stats/GenericStats.h b/targets/minecraft/stats/GenericStats.h index b899c167d..6d25d356a 100644 --- a/targets/minecraft/stats/GenericStats.h +++ b/targets/minecraft/stats/GenericStats.h @@ -6,7 +6,7 @@ #include #include -#include "app/common/src/Console_Awards_enum.h" +#include "app/common/Console_Awards_enum.h" #include "Stat.h" #include "Stats.h" #include "java/Class.h" @@ -19,7 +19,7 @@ class Stat; // #include "minecraft/world/damageSource/DamageSource.h" -// #include "app/common/src/Console_Awards_enum.h" +// #include "app/common/Console_Awards_enum.h" /** 4J-JEV: diff --git a/targets/minecraft/stats/StatsCounter.cpp b/targets/minecraft/stats/StatsCounter.cpp index d525d0d52..db31ad09a 100644 --- a/targets/minecraft/stats/StatsCounter.cpp +++ b/targets/minecraft/stats/StatsCounter.cpp @@ -11,7 +11,7 @@ #include "platform/sdl2/Profile.h" #include "app/common/App_structs.h" -#include "app/common/src/Leaderboards/LeaderboardManager.h" +#include "app/common/Leaderboards/LeaderboardManager.h" #include "app/linux/LinuxGame.h" #include "minecraft/stats/Achievement.h" #include "minecraft/stats/Achievements.h" diff --git a/targets/minecraft/world/entity/EntityIO.h b/targets/minecraft/world/entity/EntityIO.h index 19c4cdaef..4f70e5001 100644 --- a/targets/minecraft/world/entity/EntityIO.h +++ b/targets/minecraft/world/entity/EntityIO.h @@ -6,7 +6,7 @@ #include "Entity.h" #include "app/common/App_enums.h" -#include "app/common/src/Colours/ColourTable.h" +#include "app/common/Colours/ColourTable.h" #include "java/Class.h" #include "java/JavaIntHash.h" diff --git a/targets/minecraft/world/entity/player/Player.cpp b/targets/minecraft/world/entity/player/Player.cpp index 942b575b0..ea5f71bb8 100644 --- a/targets/minecraft/world/entity/player/Player.cpp +++ b/targets/minecraft/world/entity/player/Player.cpp @@ -23,8 +23,8 @@ #include "app/common/App_enums.h" #include "app/common/App_structs.h" #include "app/common/Minecraft_Macros.h" -#include "app/common/src/DLC/DLCManager.h" -#include "app/common/src/DLC/DLCSkinFile.h" +#include "app/common/DLC/DLCManager.h" +#include "app/common/DLC/DLCSkinFile.h" #include "app/linux/LinuxGame.h" #include "java/JavaMath.h" #include "java/Random.h" diff --git a/targets/minecraft/world/item/ArmorItem.cpp b/targets/minecraft/world/item/ArmorItem.cpp index c329e0ba3..9a7c38108 100644 --- a/targets/minecraft/world/item/ArmorItem.cpp +++ b/targets/minecraft/world/item/ArmorItem.cpp @@ -5,7 +5,7 @@ #include #include -#include "app/common/src/Colours/ColourTable.h" +#include "app/common/Colours/ColourTable.h" #include "app/linux/Stubs/winapi_stubs.h" #include "java/Class.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/minecraft/world/item/PlanterTileItem.cpp b/targets/minecraft/world/item/PlanterTileItem.cpp index 13277fb4b..649501434 100644 --- a/targets/minecraft/world/item/PlanterTileItem.cpp +++ b/targets/minecraft/world/item/PlanterTileItem.cpp @@ -2,7 +2,7 @@ #include -#include "app/common/src/Console_Debug_enum.h" +#include "app/common/Console_Debug_enum.h" #include "app/linux/LinuxGame.h" #include "minecraft/Facing.h" #include "minecraft/stats/GenericStats.h" diff --git a/targets/minecraft/world/item/SpawnEggItem.cpp b/targets/minecraft/world/item/SpawnEggItem.cpp index 012595571..fc667bb60 100644 --- a/targets/minecraft/world/item/SpawnEggItem.cpp +++ b/targets/minecraft/world/item/SpawnEggItem.cpp @@ -4,7 +4,7 @@ #include #include "Facing.h" -#include "app/common/src/Colours/ColourTable.h" +#include "app/common/Colours/ColourTable.h" #include "app/linux/LinuxGame.h" #include "util/StringHelpers.h" #include "java/Class.h" diff --git a/targets/minecraft/world/item/TileItem.cpp b/targets/minecraft/world/item/TileItem.cpp index e1fea3621..7d374f61c 100644 --- a/targets/minecraft/world/item/TileItem.cpp +++ b/targets/minecraft/world/item/TileItem.cpp @@ -4,7 +4,7 @@ #include -#include "app/common/src/Console_Debug_enum.h" +#include "app/common/Console_Debug_enum.h" #include "app/linux/LinuxGame.h" #include "java/Class.h" #include "minecraft/Facing.h" diff --git a/targets/minecraft/world/item/alchemy/PotionBrewing.cpp b/targets/minecraft/world/item/alchemy/PotionBrewing.cpp index d38a597d2..165836c7e 100644 --- a/targets/minecraft/world/item/alchemy/PotionBrewing.cpp +++ b/targets/minecraft/world/item/alchemy/PotionBrewing.cpp @@ -3,7 +3,7 @@ #include #include "app/common/App_enums.h" -#include "app/common/src/Colours/ColourTable.h" +#include "app/common/Colours/ColourTable.h" #include "java/JavaMath.h" #include "minecraft/SharedConstants.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/minecraft/world/level/FoliageColor.cpp b/targets/minecraft/world/level/FoliageColor.cpp index e0ee7c2a8..adb4d396d 100644 --- a/targets/minecraft/world/level/FoliageColor.cpp +++ b/targets/minecraft/world/level/FoliageColor.cpp @@ -1,7 +1,7 @@ #include "FoliageColor.h" #include "app/common/App_enums.h" -#include "app/common/src/Colours/ColourTable.h" +#include "app/common/Colours/ColourTable.h" #include "minecraft/client/Minecraft.h" // 4J Stu - Don't use this any more diff --git a/targets/minecraft/world/level/Level.cpp b/targets/minecraft/world/level/Level.cpp index 4989cbcce..63088bc1f 100644 --- a/targets/minecraft/world/level/Level.cpp +++ b/targets/minecraft/world/level/Level.cpp @@ -16,12 +16,12 @@ #include "IPlatformInput.h" #include "LevelListener.h" #include "app/common/App_enums.h" -#include "app/common/src/Colours/ColourTable.h" -#include "app/common/src/Console_Debug_enum.h" -#include "app/common/src/Network/GameNetworkManager.h" +#include "app/common/Colours/ColourTable.h" +#include "app/common/Console_Debug_enum.h" +#include "app/common/Network/GameNetworkManager.h" #include "app/linux/LinuxGame.h" #include "app/linux/Stubs/winapi_stubs.h" -#include "app/include/FrameProfiler.h" +#include "app/common/FrameProfiler.h" #include "java/Random.h" #include "minecraft/Direction.h" #include "minecraft/Facing.h" diff --git a/targets/minecraft/world/level/biome/Biome.cpp b/targets/minecraft/world/level/biome/Biome.cpp index f181729fc..10f1e9645 100644 --- a/targets/minecraft/world/level/biome/Biome.cpp +++ b/targets/minecraft/world/level/biome/Biome.cpp @@ -7,7 +7,7 @@ #include #include "app/common/App_enums.h" -#include "app/common/src/Colours/ColourTable.h" +#include "app/common/Colours/ColourTable.h" #include "java/Class.h" #include "java/Random.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/minecraft/world/level/biome/BiomeSource.cpp b/targets/minecraft/world/level/biome/BiomeSource.cpp index 5026ee7eb..85dd09069 100644 --- a/targets/minecraft/world/level/biome/BiomeSource.cpp +++ b/targets/minecraft/world/level/biome/BiomeSource.cpp @@ -5,7 +5,7 @@ #include #include "IPlatformInput.h" -#include "app/common/src/Console_Debug_enum.h" +#include "app/common/Console_Debug_enum.h" #include "app/linux/LinuxGame.h" #include "java/Random.h" #include "java/System.h" diff --git a/targets/minecraft/world/level/chunk/CompressedTileStorage.cpp b/targets/minecraft/world/level/chunk/CompressedTileStorage.cpp index 7ecf7ab8d..407d8b8ea 100644 --- a/targets/minecraft/world/level/chunk/CompressedTileStorage.cpp +++ b/targets/minecraft/world/level/chunk/CompressedTileStorage.cpp @@ -9,7 +9,7 @@ #include #include "app/linux/Stubs/winapi_stubs.h" -#include "app/include/NetTypes.h" +#include "app/common/NetTypes.h" #include "util/Definitions.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" diff --git a/targets/minecraft/world/level/chunk/LevelChunk.cpp b/targets/minecraft/world/level/chunk/LevelChunk.cpp index e92cb29d8..f1bab0fba 100644 --- a/targets/minecraft/world/level/chunk/LevelChunk.cpp +++ b/targets/minecraft/world/level/chunk/LevelChunk.cpp @@ -8,7 +8,7 @@ #include #include -#include "app/common/src/Network/GameNetworkManager.h" +#include "app/common/Network/GameNetworkManager.h" #include "app/linux/LinuxGame.h" #include "SparseLightStorage.h" #include "java/Class.h" diff --git a/targets/minecraft/world/level/chunk/SparseDataStorage.cpp b/targets/minecraft/world/level/chunk/SparseDataStorage.cpp index f713b11e6..ff6279c4e 100644 --- a/targets/minecraft/world/level/chunk/SparseDataStorage.cpp +++ b/targets/minecraft/world/level/chunk/SparseDataStorage.cpp @@ -7,7 +7,7 @@ #include #include "app/linux/Stubs/winapi_stubs.h" -#include "app/include/NetTypes.h" +#include "app/common/NetTypes.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" diff --git a/targets/minecraft/world/level/chunk/SparseLightStorage.cpp b/targets/minecraft/world/level/chunk/SparseLightStorage.cpp index 98def52b1..c0836b13d 100644 --- a/targets/minecraft/world/level/chunk/SparseLightStorage.cpp +++ b/targets/minecraft/world/level/chunk/SparseLightStorage.cpp @@ -7,7 +7,7 @@ #include #include "app/linux/Stubs/winapi_stubs.h" -#include "app/include/NetTypes.h" +#include "app/common/NetTypes.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" diff --git a/targets/minecraft/world/level/chunk/storage/McRegionChunkStorage.cpp b/targets/minecraft/world/level/chunk/storage/McRegionChunkStorage.cpp index 41e24a74b..9fc077222 100644 --- a/targets/minecraft/world/level/chunk/storage/McRegionChunkStorage.cpp +++ b/targets/minecraft/world/level/chunk/storage/McRegionChunkStorage.cpp @@ -9,7 +9,7 @@ #include #include "IPlatformInput.h" -#include "app/common/src/Console_Debug_enum.h" +#include "app/common/Console_Debug_enum.h" #include "app/linux/LinuxGame.h" #include "platform/C4JThread.h" #include "minecraft/world/level/storage/ConsoleSaveFileIO/compression.h" diff --git a/targets/minecraft/world/level/chunk/storage/OldChunkStorage.cpp b/targets/minecraft/world/level/chunk/storage/OldChunkStorage.cpp index c3754e0ad..9bc13c8be 100644 --- a/targets/minecraft/world/level/chunk/storage/OldChunkStorage.cpp +++ b/targets/minecraft/world/level/chunk/storage/OldChunkStorage.cpp @@ -11,7 +11,7 @@ #include #include "IPlatformInput.h" -#include "app/common/src/Console_Debug_enum.h" +#include "app/common/Console_Debug_enum.h" #include "app/linux/LinuxGame.h" #include "util/Definitions.h" #include "java/File.h" diff --git a/targets/minecraft/world/level/dimension/Dimension.cpp b/targets/minecraft/world/level/dimension/Dimension.cpp index f46257b2e..848918b44 100644 --- a/targets/minecraft/world/level/dimension/Dimension.cpp +++ b/targets/minecraft/world/level/dimension/Dimension.cpp @@ -7,8 +7,8 @@ #include "HellDimension.h" #include "IPlatformInput.h" #include "app/common/App_enums.h" -#include "app/common/src/Colours/ColourTable.h" -#include "app/common/src/Console_Debug_enum.h" +#include "app/common/Colours/ColourTable.h" +#include "app/common/Console_Debug_enum.h" #include "app/linux/LinuxGame.h" #include "NormalDimension.h" #include "TheEndDimension.h" diff --git a/targets/minecraft/world/level/dimension/HellDimension.cpp b/targets/minecraft/world/level/dimension/HellDimension.cpp index 2f7dc19b4..222d7d8f5 100644 --- a/targets/minecraft/world/level/dimension/HellDimension.cpp +++ b/targets/minecraft/world/level/dimension/HellDimension.cpp @@ -4,8 +4,8 @@ #include "IPlatformInput.h" #include "app/common/App_enums.h" -#include "app/common/src/Colours/ColourTable.h" -#include "app/common/src/Console_Debug_enum.h" +#include "app/common/Colours/ColourTable.h" +#include "app/common/Console_Debug_enum.h" #include "app/linux/LinuxGame.h" #include "minecraft/client/Minecraft.h" #include "minecraft/world/level/Level.h" diff --git a/targets/minecraft/world/level/dimension/TheEndDimension.cpp b/targets/minecraft/world/level/dimension/TheEndDimension.cpp index 75c4dd45e..f9dbf1f9d 100644 --- a/targets/minecraft/world/level/dimension/TheEndDimension.cpp +++ b/targets/minecraft/world/level/dimension/TheEndDimension.cpp @@ -5,7 +5,7 @@ #include #include "app/common/App_enums.h" -#include "app/common/src/Colours/ColourTable.h" +#include "app/common/Colours/ColourTable.h" #include "minecraft/Pos.h" #include "minecraft/client/Minecraft.h" #include "minecraft/world/level/Level.h" diff --git a/targets/minecraft/world/level/levelgen/CustomLevelSource.cpp b/targets/minecraft/world/level/levelgen/CustomLevelSource.cpp index 671dbc961..6944df755 100644 --- a/targets/minecraft/world/level/levelgen/CustomLevelSource.cpp +++ b/targets/minecraft/world/level/levelgen/CustomLevelSource.cpp @@ -4,7 +4,7 @@ #include #include -#include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h" #include "app/linux/LinuxGame.h" #include "platform/PlatformServices.h" #include "minecraft/world/level/biome/Biome.h" diff --git a/targets/minecraft/world/level/levelgen/RandomLevelSource.cpp b/targets/minecraft/world/level/levelgen/RandomLevelSource.cpp index a98f0f523..b6b614504 100644 --- a/targets/minecraft/world/level/levelgen/RandomLevelSource.cpp +++ b/targets/minecraft/world/level/levelgen/RandomLevelSource.cpp @@ -5,7 +5,7 @@ #include -#include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h" #include "app/linux/LinuxGame.h" #include "util/Timer.h" #include "java/Random.h" diff --git a/targets/minecraft/world/level/levelgen/feature/BasicTreeFeature.cpp b/targets/minecraft/world/level/levelgen/feature/BasicTreeFeature.cpp index a2f877de2..193c7a6ec 100644 --- a/targets/minecraft/world/level/levelgen/feature/BasicTreeFeature.cpp +++ b/targets/minecraft/world/level/levelgen/feature/BasicTreeFeature.cpp @@ -5,7 +5,7 @@ #include #include -#include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h" #include "app/linux/LinuxGame.h" #include "java/Random.h" #include "minecraft/util/Mth.h" diff --git a/targets/minecraft/world/level/levelgen/feature/BirchFeature.cpp b/targets/minecraft/world/level/levelgen/feature/BirchFeature.cpp index 1b80880ad..81c78dca7 100644 --- a/targets/minecraft/world/level/levelgen/feature/BirchFeature.cpp +++ b/targets/minecraft/world/level/levelgen/feature/BirchFeature.cpp @@ -2,7 +2,7 @@ #include -#include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h" #include "app/linux/LinuxGame.h" #include "java/Random.h" #include "minecraft/world/level/Level.h" diff --git a/targets/minecraft/world/level/levelgen/feature/CaveFeature.cpp b/targets/minecraft/world/level/levelgen/feature/CaveFeature.cpp index 711774532..177a34e52 100644 --- a/targets/minecraft/world/level/levelgen/feature/CaveFeature.cpp +++ b/targets/minecraft/world/level/levelgen/feature/CaveFeature.cpp @@ -5,7 +5,7 @@ #include #include -#include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h" #include "app/linux/LinuxGame.h" #include "java/Random.h" #include "minecraft/util/Mth.h" diff --git a/targets/minecraft/world/level/levelgen/feature/FlowerFeature.cpp b/targets/minecraft/world/level/levelgen/feature/FlowerFeature.cpp index 95e1645cb..8ea66ab0d 100644 --- a/targets/minecraft/world/level/levelgen/feature/FlowerFeature.cpp +++ b/targets/minecraft/world/level/levelgen/feature/FlowerFeature.cpp @@ -1,6 +1,6 @@ #include "FlowerFeature.h" -#include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h" #include "app/linux/LinuxGame.h" #include "java/Random.h" #include "minecraft/world/level/Level.h" diff --git a/targets/minecraft/world/level/levelgen/feature/LakeFeature.cpp b/targets/minecraft/world/level/levelgen/feature/LakeFeature.cpp index 8bda16c58..bbb2eeb3b 100644 --- a/targets/minecraft/world/level/levelgen/feature/LakeFeature.cpp +++ b/targets/minecraft/world/level/levelgen/feature/LakeFeature.cpp @@ -1,6 +1,6 @@ #include "LakeFeature.h" -#include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h" #include "app/linux/LinuxGame.h" #include "java/Random.h" #include "minecraft/world/level/Level.h" diff --git a/targets/minecraft/world/level/levelgen/feature/MegaTreeFeature.cpp b/targets/minecraft/world/level/levelgen/feature/MegaTreeFeature.cpp index 386604164..f84d29d32 100644 --- a/targets/minecraft/world/level/levelgen/feature/MegaTreeFeature.cpp +++ b/targets/minecraft/world/level/levelgen/feature/MegaTreeFeature.cpp @@ -2,7 +2,7 @@ #include -#include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h" #include "app/linux/LinuxGame.h" #include "java/Random.h" #include "minecraft/util/Mth.h" diff --git a/targets/minecraft/world/level/levelgen/feature/OreFeature.cpp b/targets/minecraft/world/level/levelgen/feature/OreFeature.cpp index 93d748087..0d4bcb0d7 100644 --- a/targets/minecraft/world/level/levelgen/feature/OreFeature.cpp +++ b/targets/minecraft/world/level/levelgen/feature/OreFeature.cpp @@ -2,7 +2,7 @@ #include -#include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h" #include "app/linux/LinuxGame.h" #include "java/Random.h" #include "minecraft/util/Mth.h" diff --git a/targets/minecraft/world/level/levelgen/feature/PineFeature.cpp b/targets/minecraft/world/level/levelgen/feature/PineFeature.cpp index 18cf4734f..7c47d19a6 100644 --- a/targets/minecraft/world/level/levelgen/feature/PineFeature.cpp +++ b/targets/minecraft/world/level/levelgen/feature/PineFeature.cpp @@ -2,7 +2,7 @@ #include -#include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h" #include "app/linux/LinuxGame.h" #include "java/Random.h" #include "minecraft/world/level/Level.h" diff --git a/targets/minecraft/world/level/levelgen/feature/ReedsFeature.cpp b/targets/minecraft/world/level/levelgen/feature/ReedsFeature.cpp index e48443ab0..9c18c71ed 100644 --- a/targets/minecraft/world/level/levelgen/feature/ReedsFeature.cpp +++ b/targets/minecraft/world/level/levelgen/feature/ReedsFeature.cpp @@ -1,6 +1,6 @@ #include "ReedsFeature.h" -#include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h" #include "app/linux/LinuxGame.h" #include "java/Random.h" #include "minecraft/world/level/Level.h" diff --git a/targets/minecraft/world/level/levelgen/feature/SandFeature.cpp b/targets/minecraft/world/level/levelgen/feature/SandFeature.cpp index 6ac800f6a..a7dae77d0 100644 --- a/targets/minecraft/world/level/levelgen/feature/SandFeature.cpp +++ b/targets/minecraft/world/level/levelgen/feature/SandFeature.cpp @@ -1,6 +1,6 @@ #include "SandFeature.h" -#include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h" #include "app/linux/LinuxGame.h" #include "java/Random.h" #include "minecraft/world/level/Level.h" diff --git a/targets/minecraft/world/level/levelgen/feature/SpringFeature.cpp b/targets/minecraft/world/level/levelgen/feature/SpringFeature.cpp index d2d946620..633afa53f 100644 --- a/targets/minecraft/world/level/levelgen/feature/SpringFeature.cpp +++ b/targets/minecraft/world/level/levelgen/feature/SpringFeature.cpp @@ -1,6 +1,6 @@ #include "SpringFeature.h" -#include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h" #include "app/linux/LinuxGame.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/tile/Tile.h" diff --git a/targets/minecraft/world/level/levelgen/feature/SpruceFeature.cpp b/targets/minecraft/world/level/levelgen/feature/SpruceFeature.cpp index 202ac78dd..ca3979440 100644 --- a/targets/minecraft/world/level/levelgen/feature/SpruceFeature.cpp +++ b/targets/minecraft/world/level/levelgen/feature/SpruceFeature.cpp @@ -2,7 +2,7 @@ #include -#include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h" #include "app/linux/LinuxGame.h" #include "java/Random.h" #include "minecraft/world/level/Level.h" diff --git a/targets/minecraft/world/level/levelgen/feature/SwampTreeFeature.cpp b/targets/minecraft/world/level/levelgen/feature/SwampTreeFeature.cpp index 773fba1af..32f20a82d 100644 --- a/targets/minecraft/world/level/levelgen/feature/SwampTreeFeature.cpp +++ b/targets/minecraft/world/level/levelgen/feature/SwampTreeFeature.cpp @@ -2,7 +2,7 @@ #include -#include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h" #include "app/linux/LinuxGame.h" #include "java/Random.h" #include "minecraft/world/level/Level.h" diff --git a/targets/minecraft/world/level/levelgen/feature/TreeFeature.cpp b/targets/minecraft/world/level/levelgen/feature/TreeFeature.cpp index 6acad9303..1ef0e6ddf 100644 --- a/targets/minecraft/world/level/levelgen/feature/TreeFeature.cpp +++ b/targets/minecraft/world/level/levelgen/feature/TreeFeature.cpp @@ -2,7 +2,7 @@ #include -#include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h" #include "app/linux/LinuxGame.h" #include "java/Random.h" #include "minecraft/Direction.h" diff --git a/targets/minecraft/world/level/levelgen/structure/MineShaftFeature.cpp b/targets/minecraft/world/level/levelgen/structure/MineShaftFeature.cpp index af89bbe44..cd1ab4062 100644 --- a/targets/minecraft/world/level/levelgen/structure/MineShaftFeature.cpp +++ b/targets/minecraft/world/level/levelgen/structure/MineShaftFeature.cpp @@ -9,7 +9,7 @@ #include #include "app/common/App_enums.h" -#include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h" #include "app/linux/LinuxGame.h" #include "java/Random.h" #include "minecraft/util/Mth.h" diff --git a/targets/minecraft/world/level/levelgen/structure/NetherBridgeFeature.cpp b/targets/minecraft/world/level/levelgen/structure/NetherBridgeFeature.cpp index 0ead8b346..45225b771 100644 --- a/targets/minecraft/world/level/levelgen/structure/NetherBridgeFeature.cpp +++ b/targets/minecraft/world/level/levelgen/structure/NetherBridgeFeature.cpp @@ -3,7 +3,7 @@ #include #include -#include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h" #include "app/linux/LinuxGame.h" #include "NetherBridgePieces.h" #include "java/Class.h" diff --git a/targets/minecraft/world/level/levelgen/structure/RandomScatteredLargeFeature.cpp b/targets/minecraft/world/level/levelgen/structure/RandomScatteredLargeFeature.cpp index 05e1932bf..12d7e12bf 100644 --- a/targets/minecraft/world/level/levelgen/structure/RandomScatteredLargeFeature.cpp +++ b/targets/minecraft/world/level/levelgen/structure/RandomScatteredLargeFeature.cpp @@ -3,7 +3,7 @@ #include #include -#include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h" #include "app/linux/LinuxGame.h" #include "ScatteredFeaturePieces.h" #include "java/Class.h" diff --git a/targets/minecraft/world/level/levelgen/structure/ScatteredFeaturePieces.cpp b/targets/minecraft/world/level/levelgen/structure/ScatteredFeaturePieces.cpp index a74726325..46dbd99c2 100644 --- a/targets/minecraft/world/level/levelgen/structure/ScatteredFeaturePieces.cpp +++ b/targets/minecraft/world/level/levelgen/structure/ScatteredFeaturePieces.cpp @@ -5,7 +5,7 @@ #include #include -#include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h" #include "app/linux/LinuxGame.h" #include "java/Random.h" #include "minecraft/Direction.h" diff --git a/targets/minecraft/world/level/levelgen/structure/StrongholdFeature.cpp b/targets/minecraft/world/level/levelgen/structure/StrongholdFeature.cpp index 8d2f06d5d..f4846fe40 100644 --- a/targets/minecraft/world/level/levelgen/structure/StrongholdFeature.cpp +++ b/targets/minecraft/world/level/levelgen/structure/StrongholdFeature.cpp @@ -9,7 +9,7 @@ #include #include "app/common/App_enums.h" -#include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h" #include "app/linux/LinuxGame.h" #include "app/linux/Stubs/winapi_stubs.h" #include "StrongholdPieces.h" diff --git a/targets/minecraft/world/level/levelgen/structure/VillageFeature.cpp b/targets/minecraft/world/level/levelgen/structure/VillageFeature.cpp index 790e66aa9..ba261b23a 100644 --- a/targets/minecraft/world/level/levelgen/structure/VillageFeature.cpp +++ b/targets/minecraft/world/level/levelgen/structure/VillageFeature.cpp @@ -5,7 +5,7 @@ #include #include "app/common/App_enums.h" -#include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h" #include "app/linux/LinuxGame.h" #include "VillagePieces.h" #include "java/Random.h" diff --git a/targets/minecraft/world/level/newbiome/layer/Layer.cpp b/targets/minecraft/world/level/newbiome/layer/Layer.cpp index c73a4db47..755f56352 100644 --- a/targets/minecraft/world/level/newbiome/layer/Layer.cpp +++ b/targets/minecraft/world/level/newbiome/layer/Layer.cpp @@ -7,7 +7,7 @@ #include "BiomeOverrideLayer.h" #include "IPlatformInput.h" -#include "app/common/src/Console_Debug_enum.h" +#include "app/common/Console_Debug_enum.h" #include "app/linux/LinuxGame.h" #include "minecraft/world/level/LevelType.h" #include "minecraft/world/level/newbiome/layer/AddIslandLayer.h" diff --git a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileConverter.cpp b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileConverter.cpp index 6b67ddfce..ad6efcbd5 100644 --- a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileConverter.cpp +++ b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileConverter.cpp @@ -8,7 +8,7 @@ #include #include -#include "app/common/src/GameRules/GameRuleManager.h" +#include "app/common/GameRules/GameRuleManager.h" #include "java/InputOutputStream/BufferedOutputStream.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" diff --git a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.cpp b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.cpp index a46f9615f..cb38fca94 100644 --- a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.cpp +++ b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.cpp @@ -14,8 +14,8 @@ #include "platform/PlatformTypes.h" #include "app/common/App_enums.h" -#include "app/common/src/BuildVer/BuildVer.h" -#include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "app/common/BuildVer/BuildVer.h" +#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h" #include "app/linux/LinuxGame.h" #include "app/linux/Stubs/winapi_stubs.h" #include "minecraft/world/level/storage/ConsoleSaveFileIO/compression.h" diff --git a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp index 92645bd2f..631ca084a 100644 --- a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp +++ b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp @@ -15,8 +15,8 @@ #include "platform/PlatformTypes.h" #include "app/common/App_enums.h" -#include "app/common/src/BuildVer/BuildVer.h" -#include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "app/common/BuildVer/BuildVer.h" +#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h" #include "app/linux/LinuxGame.h" #include "app/linux/Stubs/winapi_stubs.h" #include "util/Timer.h" diff --git a/targets/minecraft/world/level/storage/DirectoryLevelStorage.cpp b/targets/minecraft/world/level/storage/DirectoryLevelStorage.cpp index 6ba4a2049..0d41605c6 100644 --- a/targets/minecraft/world/level/storage/DirectoryLevelStorage.cpp +++ b/targets/minecraft/world/level/storage/DirectoryLevelStorage.cpp @@ -12,8 +12,8 @@ #include "IPlatformInput.h" #include "LevelData.h" -#include "app/common/src/Console_Debug_enum.h" -#include "app/common/src/GameRules/GameRuleManager.h" +#include "app/common/Console_Debug_enum.h" +#include "app/common/GameRules/GameRuleManager.h" #include "app/linux/LinuxGame.h" #include "app/linux/Stubs/winapi_stubs.h" #include "util/StringHelpers.h" diff --git a/targets/minecraft/world/level/tile/GrassTile.cpp b/targets/minecraft/world/level/tile/GrassTile.cpp index 8e90949ce..c7b04b999 100644 --- a/targets/minecraft/world/level/tile/GrassTile.cpp +++ b/targets/minecraft/world/level/tile/GrassTile.cpp @@ -3,7 +3,7 @@ #include #include "app/common/App_enums.h" -#include "app/common/src/Colours/ColourTable.h" +#include "app/common/Colours/ColourTable.h" #include "java/Random.h" #include "minecraft/Facing.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/minecraft/world/level/tile/LeafTile.cpp b/targets/minecraft/world/level/tile/LeafTile.cpp index b7fc672cd..f1321c3d0 100644 --- a/targets/minecraft/world/level/tile/LeafTile.cpp +++ b/targets/minecraft/world/level/tile/LeafTile.cpp @@ -3,7 +3,7 @@ #include #include "app/common/App_enums.h" -#include "app/common/src/Colours/ColourTable.h" +#include "app/common/Colours/ColourTable.h" #include "java/Random.h" #include "minecraft/client/Minecraft.h" #include "minecraft/core/particles/ParticleTypes.h" diff --git a/targets/minecraft/world/level/tile/RedStoneDustTile.cpp b/targets/minecraft/world/level/tile/RedStoneDustTile.cpp index fe188b611..8992d8968 100644 --- a/targets/minecraft/world/level/tile/RedStoneDustTile.cpp +++ b/targets/minecraft/world/level/tile/RedStoneDustTile.cpp @@ -7,7 +7,7 @@ #include "DiodeTile.h" #include "app/common/App_enums.h" -#include "app/common/src/Colours/ColourTable.h" +#include "app/common/Colours/ColourTable.h" #include "java/Random.h" #include "minecraft/Direction.h" #include "minecraft/Facing.h" diff --git a/targets/minecraft/world/level/tile/StemTile.cpp b/targets/minecraft/world/level/tile/StemTile.cpp index 7b50a4f1c..6d778b074 100644 --- a/targets/minecraft/world/level/tile/StemTile.cpp +++ b/targets/minecraft/world/level/tile/StemTile.cpp @@ -3,7 +3,7 @@ #include #include "app/common/App_enums.h" -#include "app/common/src/Colours/ColourTable.h" +#include "app/common/Colours/ColourTable.h" #include "java/Random.h" #include "minecraft/client/Minecraft.h" #include "minecraft/world/IconRegister.h" diff --git a/targets/minecraft/world/level/tile/TallGrassPlantTile.cpp b/targets/minecraft/world/level/tile/TallGrassPlantTile.cpp index 4e65b1ae8..e54120810 100644 --- a/targets/minecraft/world/level/tile/TallGrassPlantTile.cpp +++ b/targets/minecraft/world/level/tile/TallGrassPlantTile.cpp @@ -3,7 +3,7 @@ #include #include "app/common/App_enums.h" -#include "app/common/src/Colours/ColourTable.h" +#include "app/common/Colours/ColourTable.h" #include "java/Random.h" #include "minecraft/client/Minecraft.h" #include "minecraft/stats/GenericStats.h" diff --git a/targets/minecraft/world/level/tile/WaterLilyTile.cpp b/targets/minecraft/world/level/tile/WaterLilyTile.cpp index 896b82c5c..0d4976d56 100644 --- a/targets/minecraft/world/level/tile/WaterLilyTile.cpp +++ b/targets/minecraft/world/level/tile/WaterLilyTile.cpp @@ -4,7 +4,7 @@ #include #include "app/common/App_enums.h" -#include "app/common/src/Colours/ColourTable.h" +#include "app/common/Colours/ColourTable.h" #include "java/Class.h" #include "minecraft/client/Minecraft.h" #include "minecraft/world/entity/Entity.h" diff --git a/targets/platform/IPlatformNetwork.h b/targets/platform/IPlatformNetwork.h index 1dc546e8a..7373be495 100644 --- a/targets/platform/IPlatformNetwork.h +++ b/targets/platform/IPlatformNetwork.h @@ -6,7 +6,7 @@ #include #include "PlatformTypes.h" -#include "app/include/NetTypes.h" +#include "app/common/NetTypes.h" #ifndef VER_NETWORK #define VER_NETWORK 560 diff --git a/targets/util/include/util/Definitions.h b/targets/util/Definitions.h similarity index 100% rename from targets/util/include/util/Definitions.h rename to targets/util/Definitions.h diff --git a/targets/util/src/StringHelpers.cpp b/targets/util/StringHelpers.cpp similarity index 100% rename from targets/util/src/StringHelpers.cpp rename to targets/util/StringHelpers.cpp diff --git a/targets/util/include/util/StringHelpers.h b/targets/util/StringHelpers.h similarity index 100% rename from targets/util/include/util/StringHelpers.h rename to targets/util/StringHelpers.h diff --git a/targets/util/include/util/Timer.h b/targets/util/Timer.h similarity index 100% rename from targets/util/include/util/Timer.h rename to targets/util/Timer.h diff --git a/targets/util/meson.build b/targets/util/meson.build index 8f33dc703..b0f4c4303 100644 --- a/targets/util/meson.build +++ b/targets/util/meson.build @@ -4,13 +4,13 @@ simdutf_dep = dependency('simdutf', ) lib_util = static_library('util', - files('src/StringHelpers.cpp'), + files('StringHelpers.cpp'), dependencies: [simdutf_dep], - include_directories : include_directories('include', '..'), + include_directories : include_directories('.', '..'), cpp_args : global_cpp_args + global_cpp_defs, ) util_dep = declare_dependency( link_with : lib_util, - include_directories : include_directories('include'), + include_directories : include_directories('.'), )