diff --git a/meson.build b/meson.build index 2b9d29ff6..77053fa91 100644 --- a/meson.build +++ b/meson.build @@ -79,7 +79,7 @@ stb_dep = declare_dependency(include_directories: stb) miniaudio_dep = dependency('miniaudio') -subdir('targets/console_helpers') +subdir('targets/util') subdir('targets/java') subdir('targets/nbt') subdir('targets/platform') diff --git a/targets/app/common/Consoles_App.cpp b/targets/app/common/Consoles_App.cpp index 694fd065f..145a0c469 100644 --- a/targets/app/common/Consoles_App.cpp +++ b/targets/app/common/Consoles_App.cpp @@ -81,9 +81,9 @@ #include "app/common/src/UI/All Platforms/ArchiveFile.h" #include "app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h" #include "Minecraft_Macros.h" -#include "console_helpers/Timer.h" -#include "console_helpers/StringHelpers.h" -#include "console_helpers/compression.h" +#include "util/Timer.h" +#include "util/StringHelpers.h" +#include "minecraft/world/level/storage/compression.h" #include "minecraft/client/User.h" #include "minecraft/client/gui/Gui.h" #include "minecraft/client/renderer/entity/EntityRenderDispatcher.h" diff --git a/targets/app/common/Consoles_App.h b/targets/app/common/Consoles_App.h index 4a81e8ece..966231bd5 100644 --- a/targets/app/common/Consoles_App.h +++ b/targets/app/common/Consoles_App.h @@ -3,7 +3,7 @@ #include #include -#include "console_helpers/Timer.h" +#include "util/Timer.h" #include "platform/sdl2/Profile.h" #include "platform/sdl2/Storage.h" diff --git a/targets/app/common/src/Audio/SoundEngine.cpp b/targets/app/common/src/Audio/SoundEngine.cpp index d0cf17a7c..c5ad3d676 100644 --- a/targets/app/common/src/Audio/SoundEngine.cpp +++ b/targets/app/common/src/Audio/SoundEngine.cpp @@ -15,7 +15,7 @@ #include "app/common/src/Audio/Consoles_SoundEngine.h" #include "app/linux/Iggy/include/rrCore.h" #include "app/linux/Linux_App.h" -#include "console_helpers/C4JThread.h" +#include "platform/C4JThread.h" #include "platform/PlatformServices.h" #include "java/Random.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/app/common/src/Colours/ColourTable.cpp b/targets/app/common/src/Colours/ColourTable.cpp index 9e712200b..d665efcdf 100644 --- a/targets/app/common/src/Colours/ColourTable.cpp +++ b/targets/app/common/src/Colours/ColourTable.cpp @@ -5,7 +5,7 @@ #include #include "app/common/App_enums.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" #include "java/InputOutputStream/ByteArrayInputStream.h" #include "java/InputOutputStream/DataInputStream.h" diff --git a/targets/app/common/src/DLC/DLCManager.cpp b/targets/app/common/src/DLC/DLCManager.cpp index 8bc2270db..5cf7d161c 100644 --- a/targets/app/common/src/DLC/DLCManager.cpp +++ b/targets/app/common/src/DLC/DLCManager.cpp @@ -21,7 +21,7 @@ #include "app/linux/Linux_App.h" #include "app/linux/Linux_UIController.h" #include "platform/PlatformServices.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/skins/TexturePackRepository.h" #include "strings.h" diff --git a/targets/app/common/src/DLC/DLCPack.cpp b/targets/app/common/src/DLC/DLCPack.cpp index cf9f848b6..a4e35b11c 100644 --- a/targets/app/common/src/DLC/DLCPack.cpp +++ b/targets/app/common/src/DLC/DLCPack.cpp @@ -22,7 +22,7 @@ #include "app/common/src/Localisation/StringTable.h" #include "app/linux/Linux_App.h" #include "app/linux/Stubs/winapi_stubs.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" DLCPack::DLCPack(const std::wstring& name, std::uint32_t dwLicenseMask) { m_dataPath = L""; diff --git a/targets/app/common/src/GameRules/GameRuleManager.cpp b/targets/app/common/src/GameRules/GameRuleManager.cpp index 0c6c6781d..d25f369dd 100644 --- a/targets/app/common/src/GameRules/GameRuleManager.cpp +++ b/targets/app/common/src/GameRules/GameRuleManager.cpp @@ -20,7 +20,7 @@ #include "app/common/src/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h" #include "app/common/src/Localisation/StringTable.h" #include "app/linux/Linux_App.h" -#include "console_helpers/compression.h" +#include "minecraft/world/level/storage/compression.h" #include "java/File.h" #include "java/InputOutputStream/ByteArrayInputStream.h" #include "java/InputOutputStream/ByteArrayOutputStream.h" diff --git a/targets/app/common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.cpp b/targets/app/common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.cpp index 9e880ac13..8f14fdba9 100644 --- a/targets/app/common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.cpp +++ b/targets/app/common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.cpp @@ -8,7 +8,7 @@ #include "app/common/src/GameRules/ConsoleGameRulesConstants.h" #include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" #include "app/linux/Linux_App.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" #include "java/InputOutputStream/DataOutputStream.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/chunk/LevelChunk.h" diff --git a/targets/app/common/src/GameRules/LevelGeneration/BiomeOverride.cpp b/targets/app/common/src/GameRules/LevelGeneration/BiomeOverride.cpp index 458309d19..89cf4303c 100644 --- a/targets/app/common/src/GameRules/LevelGeneration/BiomeOverride.cpp +++ b/targets/app/common/src/GameRules/LevelGeneration/BiomeOverride.cpp @@ -3,7 +3,7 @@ #include "app/common/src/GameRules/ConsoleGameRulesConstants.h" #include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" #include "app/linux/Linux_App.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" #include "java/InputOutputStream/DataOutputStream.h" BiomeOverride::BiomeOverride() { diff --git a/targets/app/common/src/GameRules/LevelGeneration/ConsoleGenerateStructure.cpp b/targets/app/common/src/GameRules/LevelGeneration/ConsoleGenerateStructure.cpp index caa601a00..f2247c4a0 100644 --- a/targets/app/common/src/GameRules/LevelGeneration/ConsoleGenerateStructure.cpp +++ b/targets/app/common/src/GameRules/LevelGeneration/ConsoleGenerateStructure.cpp @@ -12,7 +12,7 @@ #include "app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.h" #include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" #include "app/linux/Linux_App.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" #include "java/InputOutputStream/DataOutputStream.h" #include "minecraft/Direction.h" #include "minecraft/world/level/Level.h" diff --git a/targets/app/common/src/GameRules/LevelGeneration/ConsoleSchematicFile.cpp b/targets/app/common/src/GameRules/LevelGeneration/ConsoleSchematicFile.cpp index e157bef11..85c538ae2 100644 --- a/targets/app/common/src/GameRules/LevelGeneration/ConsoleSchematicFile.cpp +++ b/targets/app/common/src/GameRules/LevelGeneration/ConsoleSchematicFile.cpp @@ -10,7 +10,7 @@ #include "app/linux/Linux_App.h" #include "app/linux/Stubs/winapi_stubs.h" -#include "console_helpers/compression.h" +#include "minecraft/world/level/storage/compression.h" #include "java/Class.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" diff --git a/targets/app/common/src/GameRules/LevelGeneration/ConsoleSchematicFile.h b/targets/app/common/src/GameRules/LevelGeneration/ConsoleSchematicFile.h index 5f0ad5537..66d4bf0db 100644 --- a/targets/app/common/src/GameRules/LevelGeneration/ConsoleSchematicFile.h +++ b/targets/app/common/src/GameRules/LevelGeneration/ConsoleSchematicFile.h @@ -14,7 +14,7 @@ #include #include "app/linux/Stubs/winapi_stubs.h" -#include "console_helpers/compression.h" +#include "minecraft/world/level/storage/compression.h" #include "minecraft/world/phys/Vec3.h" class Level; diff --git a/targets/app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.cpp b/targets/app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.cpp index 121ed4ebd..072922bcf 100644 --- a/targets/app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.cpp +++ b/targets/app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.cpp @@ -22,7 +22,7 @@ #include "app/common/src/Localisation/StringTable.h" #include "app/linux/Linux_App.h" #include "app/linux/Stubs/winapi_stubs.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" #include "platform/PlatformServices.h" #include "java/File.h" #include "java/InputOutputStream/ByteArrayInputStream.h" diff --git a/targets/app/common/src/GameRules/LevelGeneration/StartFeature.cpp b/targets/app/common/src/GameRules/LevelGeneration/StartFeature.cpp index abc3c2ae1..8755c704d 100644 --- a/targets/app/common/src/GameRules/LevelGeneration/StartFeature.cpp +++ b/targets/app/common/src/GameRules/LevelGeneration/StartFeature.cpp @@ -3,7 +3,7 @@ #include "app/common/src/GameRules/ConsoleGameRulesConstants.h" #include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" #include "app/linux/Linux_App.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" #include "java/InputOutputStream/DataOutputStream.h" StartFeature::StartFeature() { diff --git a/targets/app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.cpp b/targets/app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.cpp index 3b2305602..2f1877dbe 100644 --- a/targets/app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.cpp +++ b/targets/app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.cpp @@ -4,7 +4,7 @@ #include "app/common/src/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h" #include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" #include "app/linux/Linux_App.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" #include "java/InputOutputStream/DataOutputStream.h" #include "minecraft/world/level/levelgen/structure/StructurePiece.h" diff --git a/targets/app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.cpp b/targets/app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.cpp index bd52c5294..2919130d5 100644 --- a/targets/app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.cpp +++ b/targets/app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.cpp @@ -4,7 +4,7 @@ #include "app/common/src/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h" #include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" #include "app/linux/Linux_App.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" #include "java/InputOutputStream/DataOutputStream.h" #include "minecraft/world/level/levelgen/structure/StructurePiece.h" diff --git a/targets/app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.cpp b/targets/app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.cpp index 494a1b045..e58bdce05 100644 --- a/targets/app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.cpp +++ b/targets/app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.cpp @@ -8,7 +8,7 @@ #include "app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h" #include "app/common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h" #include "app/linux/Linux_App.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" #include "minecraft/world/Container.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/levelgen/structure/BoundingBox.h" diff --git a/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.cpp b/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.cpp index 083694c70..9fdfcf69f 100644 --- a/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.cpp +++ b/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.cpp @@ -6,7 +6,7 @@ #include "app/common/src/GameRules/ConsoleGameRulesConstants.h" #include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" #include "app/linux/Linux_App.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" #include "java/InputOutputStream/DataOutputStream.h" #include "minecraft/world/item/EnchantedBookItem.h" #include "minecraft/world/item/Item.h" diff --git a/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.cpp b/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.cpp index 95bbf9a26..36d819c62 100644 --- a/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.cpp +++ b/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.cpp @@ -5,7 +5,7 @@ #include "AddEnchantmentRuleDefinition.h" #include "app/common/src/GameRules/ConsoleGameRulesConstants.h" #include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" #include "java/InputOutputStream/DataOutputStream.h" #include "minecraft/world/Container.h" #include "minecraft/world/entity/player/Inventory.h" diff --git a/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.cpp b/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.cpp index 1df6d61a4..95be010ba 100644 --- a/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.cpp +++ b/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.cpp @@ -5,7 +5,7 @@ #include "app/common/src/GameRules/LevelRules/Rules/GameRule.h" #include "app/common/src/GameRules/LevelRules/Rules/GameRulesInstance.h" #include "app/linux/Linux_App.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" #include "java/InputOutputStream/DataOutputStream.h" #include "minecraft/network/Connection.h" #include "minecraft/network/packet/UpdateGameRuleProgressPacket.h" diff --git a/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.cpp b/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.cpp index 31f8e0295..ed69bfb88 100644 --- a/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.cpp +++ b/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.cpp @@ -8,7 +8,7 @@ #include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" #include "app/common/src/GameRules/LevelRules/Rules/GameRule.h" #include "app/linux/Linux_App.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" #include "minecraft/network/Connection.h" #include "minecraft/network/packet/UpdateGameRuleProgressPacket.h" diff --git a/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.cpp b/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.cpp index 0315ca658..a15522aa8 100644 --- a/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.cpp +++ b/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.cpp @@ -15,7 +15,7 @@ #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 "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" CompoundGameRuleDefinition::CompoundGameRuleDefinition() { m_lastRuleStatusChanged = nullptr; diff --git a/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.cpp b/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.cpp index 9b2695642..8813cc4ef 100644 --- a/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.cpp +++ b/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.cpp @@ -14,7 +14,7 @@ #include "app/common/src/GameRules/LevelRules/Rules/GameRule.h" #include "app/common/src/GameRules/LevelRules/Rules/GameRulesInstance.h" #include "app/linux/Linux_App.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" #include "java/InputOutputStream/DataOutputStream.h" class Connection; diff --git a/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.cpp b/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.cpp index c1ec25f2c..1b6f6dd81 100644 --- a/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.cpp +++ b/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.cpp @@ -5,7 +5,7 @@ #include "app/common/src/GameRules/ConsoleGameRulesConstants.h" #include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" #include "app/linux/Linux_App.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" #include "java/InputOutputStream/DataOutputStream.h" NamedAreaRuleDefinition::NamedAreaRuleDefinition() { diff --git a/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.cpp b/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.cpp index 42efd98f0..ea32dbfa4 100644 --- a/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.cpp +++ b/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.cpp @@ -8,7 +8,7 @@ #include "app/common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h" #include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" #include "app/linux/Linux_App.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" #include "java/InputOutputStream/DataOutputStream.h" #include "minecraft/Pos.h" #include "minecraft/world/entity/player/Inventory.h" diff --git a/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.cpp b/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.cpp index 9e063dfff..f3c2eb704 100644 --- a/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.cpp +++ b/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.cpp @@ -3,7 +3,7 @@ #include "app/common/src/GameRules/ConsoleGameRulesConstants.h" #include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" #include "app/linux/Linux_App.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" #include "java/InputOutputStream/DataOutputStream.h" UseTileRuleDefinition::UseTileRuleDefinition() { diff --git a/targets/app/common/src/Leaderboards/LeaderboardManager.cpp b/targets/app/common/src/Leaderboards/LeaderboardManager.cpp index 01d11d5a6..a6c18c106 100644 --- a/targets/app/common/src/Leaderboards/LeaderboardManager.cpp +++ b/targets/app/common/src/Leaderboards/LeaderboardManager.cpp @@ -1,7 +1,7 @@ #include "LeaderboardManager.h" #include "app/linux/Linux_App.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" const std::wstring LeaderboardManager::filterNames[eNumFilterModes] = { L"Friends", L"MyScore", L"TopRank"}; diff --git a/targets/app/common/src/Network/GameNetworkManager.cpp b/targets/app/common/src/Network/GameNetworkManager.cpp index f1e7d7ebc..70939f46c 100644 --- a/targets/app/common/src/Network/GameNetworkManager.cpp +++ b/targets/app/common/src/Network/GameNetworkManager.cpp @@ -27,9 +27,9 @@ #include "app/linux/Stubs/winapi_stubs.h" #include "Socket.h" #include "XboxStubs.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" #include "platform/PlatformServices.h" -#include "console_helpers/compression.h" +#include "minecraft/world/level/storage/compression.h" #include "java/File.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/ProgressRenderer.h" diff --git a/targets/app/common/src/Network/GameNetworkManager.h b/targets/app/common/src/Network/GameNetworkManager.h index 16441a670..29445d8c5 100644 --- a/targets/app/common/src/Network/GameNetworkManager.h +++ b/targets/app/common/src/Network/GameNetworkManager.h @@ -13,7 +13,7 @@ #include "NetworkPlayerInterface.h" #include "PlatformNetworkManagerStub.h" #include "SessionInfo.h" -#include "console_helpers/C4JThread.h" +#include "platform/C4JThread.h" class ClientConnection; class Minecraft; diff --git a/targets/app/common/src/Network/PlatformNetworkManagerInterface.h b/targets/app/common/src/Network/PlatformNetworkManagerInterface.h index f4e9742f2..ae1873626 100644 --- a/targets/app/common/src/Network/PlatformNetworkManagerInterface.h +++ b/targets/app/common/src/Network/PlatformNetworkManagerInterface.h @@ -9,7 +9,7 @@ #include "app/include/XboxStubs.h" #include "NetworkPlayerInterface.h" #include "SessionInfo.h" -#include "console_helpers/C4JThread.h" +#include "platform/C4JThread.h" class ClientConnection; class Minecraft; diff --git a/targets/app/common/src/Network/PlatformNetworkManagerStub.cpp b/targets/app/common/src/Network/PlatformNetworkManagerStub.cpp index e37d7744e..c80ea2280 100644 --- a/targets/app/common/src/Network/PlatformNetworkManagerStub.cpp +++ b/targets/app/common/src/Network/PlatformNetworkManagerStub.cpp @@ -12,7 +12,7 @@ #include "app/include/NetTypes.h" #include "NetworkPlayerQNet.h" #include "Socket.h" -#include "console_helpers/C4JThread.h" +#include "platform/C4JThread.h" IPlatformNetworkStub* g_pPlatformNetworkManager; diff --git a/targets/app/common/src/Network/PlatformNetworkManagerStub.h b/targets/app/common/src/Network/PlatformNetworkManagerStub.h index 802c6830f..945e41906 100644 --- a/targets/app/common/src/Network/PlatformNetworkManagerStub.h +++ b/targets/app/common/src/Network/PlatformNetworkManagerStub.h @@ -11,7 +11,7 @@ #include "NetworkPlayerInterface.h" #include "platform/IPlatformNetwork.h" #include "SessionInfo.h" -#include "console_helpers/C4JThread.h" +#include "platform/C4JThread.h" class C4JThread; class CGameNetworkManager; diff --git a/targets/app/common/src/Network/Socket.cpp b/targets/app/common/src/Network/Socket.cpp index 77f8d5e46..befdd7478 100644 --- a/targets/app/common/src/Network/Socket.cpp +++ b/targets/app/common/src/Network/Socket.cpp @@ -7,7 +7,7 @@ #include // 4jcraft TODO -#include "app/common/ShutdownManager.h" +#include "platform/ShutdownManager.h" #include "app/common/src/Network/GameNetworkManager.h" #include "app/common/src/Network/NetworkPlayerInterface.h" #include "app/include/NetTypes.h" diff --git a/targets/app/common/src/Network/Socket.h b/targets/app/common/src/Network/Socket.h index 2f6c614f3..b862d5c77 100644 --- a/targets/app/common/src/Network/Socket.h +++ b/targets/app/common/src/Network/Socket.h @@ -12,7 +12,7 @@ #include "app/common/src/Network/GameNetworkManager.h" #include "app/common/src/Network/NetworkPlayerInterface.h" -#include "console_helpers/C4JThread.h" +#include "platform/C4JThread.h" #include "java/InputOutputStream/InputStream.h" #include "java/InputOutputStream/OutputStream.h" diff --git a/targets/app/common/src/Tutorial/Tutorial.cpp b/targets/app/common/src/Tutorial/Tutorial.cpp index 4a97e30b9..508ee29ff 100644 --- a/targets/app/common/src/Tutorial/Tutorial.cpp +++ b/targets/app/common/src/Tutorial/Tutorial.cpp @@ -25,8 +25,8 @@ #include "app/linux/Linux_App.h" #include "app/linux/Linux_UIController.h" #include "TutorialMessage.h" -#include "console_helpers/Timer.h" -#include "console_helpers/StringHelpers.h" +#include "util/Timer.h" +#include "util/StringHelpers.h" #include "java/Class.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/MultiPlayerLevel.h" diff --git a/targets/app/common/src/Tutorial/Tutorial.h b/targets/app/common/src/Tutorial/Tutorial.h index 453fc3029..def40763e 100644 --- a/targets/app/common/src/Tutorial/Tutorial.h +++ b/targets/app/common/src/Tutorial/Tutorial.h @@ -9,7 +9,7 @@ #include #include -#include "console_helpers/Timer.h" +#include "util/Timer.h" #include "app/common/src/Tutorial/Constraints/TutorialConstraint.h" #include "app/common/src/Tutorial/Hints/TutorialHint.h" diff --git a/targets/app/common/src/UI/All Platforms/ArchiveFile.cpp b/targets/app/common/src/UI/All Platforms/ArchiveFile.cpp index fb30fa7b4..06b4b1f08 100644 --- a/targets/app/common/src/UI/All Platforms/ArchiveFile.cpp +++ b/targets/app/common/src/UI/All Platforms/ArchiveFile.cpp @@ -8,7 +8,7 @@ #include "app/linux/Linux_App.h" #include "app/linux/Stubs/winapi_stubs.h" #include "platform/PlatformServices.h" -#include "console_helpers/compression.h" +#include "minecraft/world/level/storage/compression.h" #include "java/InputOutputStream/ByteArrayInputStream.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/FileInputStream.h" diff --git a/targets/app/common/src/UI/All Platforms/IUIScene_PauseMenu.cpp b/targets/app/common/src/UI/All Platforms/IUIScene_PauseMenu.cpp index 5e7234cfc..77eb21579 100644 --- a/targets/app/common/src/UI/All Platforms/IUIScene_PauseMenu.cpp +++ b/targets/app/common/src/UI/All Platforms/IUIScene_PauseMenu.cpp @@ -19,7 +19,7 @@ #include "app/linux/Linux_App.h" #include "app/linux/Linux_UIController.h" #include "app/linux/Stubs/winapi_stubs.h" -#include "console_helpers/compression.h" +#include "minecraft/world/level/storage/compression.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/ProgressRenderer.h" #include "minecraft/client/multiplayer/MultiPlayerLevel.h" diff --git a/targets/app/common/src/UI/All Platforms/IUIScene_TradingMenu.cpp b/targets/app/common/src/UI/All Platforms/IUIScene_TradingMenu.cpp index d19fefb2b..ee02ef4e2 100644 --- a/targets/app/common/src/UI/All Platforms/IUIScene_TradingMenu.cpp +++ b/targets/app/common/src/UI/All Platforms/IUIScene_TradingMenu.cpp @@ -9,7 +9,7 @@ #include "app/common/src/UI/All Platforms/UIEnums.h" #include "app/linux/Linux_App.h" #include "app/linux/Linux_UIController.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" #include "java/InputOutputStream/ByteArrayOutputStream.h" #include "java/InputOutputStream/DataOutputStream.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/app/common/src/UI/All Platforms/UIStructs.h b/targets/app/common/src/UI/All Platforms/UIStructs.h index 5473162bb..14616795b 100644 --- a/targets/app/common/src/UI/All Platforms/UIStructs.h +++ b/targets/app/common/src/UI/All Platforms/UIStructs.h @@ -8,7 +8,7 @@ #include "platform/sdl2/Storage.h" #include "app/common/App_Defines.h" #include "UIEnums.h" -#include "console_helpers/C4JThread.h" +#include "platform/C4JThread.h" class Container; class Inventory; diff --git a/targets/app/common/src/UI/Components/UIComponent_Tooltips.cpp b/targets/app/common/src/UI/Components/UIComponent_Tooltips.cpp index 7abf7cca0..bf568215f 100644 --- a/targets/app/common/src/UI/Components/UIComponent_Tooltips.cpp +++ b/targets/app/common/src/UI/Components/UIComponent_Tooltips.cpp @@ -14,7 +14,7 @@ #include "app/linux/Iggy/include/rrCore.h" #include "app/linux/Linux_App.h" #include "app/linux/Linux_UIController.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" UIComponent_Tooltips::UIComponent_Tooltips(int iPad, void* initData, UILayer* parentLayer) diff --git a/targets/app/common/src/UI/Components/UIComponent_TutorialPopup.cpp b/targets/app/common/src/UI/Components/UIComponent_TutorialPopup.cpp index bbe944792..6ba9667a9 100644 --- a/targets/app/common/src/UI/Components/UIComponent_TutorialPopup.cpp +++ b/targets/app/common/src/UI/Components/UIComponent_TutorialPopup.cpp @@ -13,7 +13,7 @@ #include "app/common/src/UI/UIScene.h" #include "app/linux/Linux_App.h" #include "app/linux/Linux_UIController.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "minecraft/world/item/Item.h" diff --git a/targets/app/common/src/UI/Components/UIScene_HUD.cpp b/targets/app/common/src/UI/Components/UIScene_HUD.cpp index 1b089d445..9fa4c1bb9 100644 --- a/targets/app/common/src/UI/Components/UIScene_HUD.cpp +++ b/targets/app/common/src/UI/Components/UIScene_HUD.cpp @@ -12,7 +12,7 @@ #include "app/common/src/UI/UIScene.h" #include "app/linux/Linux_App.h" #include "app/linux/Linux_UIController.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" #include "minecraft/SharedConstants.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/gui/Gui.h" diff --git a/targets/app/common/src/UI/Controls/UIControl_Base.cpp b/targets/app/common/src/UI/Controls/UIControl_Base.cpp index b2cf3d497..c812d2871 100644 --- a/targets/app/common/src/UI/Controls/UIControl_Base.cpp +++ b/targets/app/common/src/UI/Controls/UIControl_Base.cpp @@ -11,7 +11,7 @@ #include "app/linux/Stubs/iggy_stubs.h" #endif #include "app/linux/Iggy/include/rrCore.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" UIControl_Base::UIControl_Base() { m_bLabelChanged = false; diff --git a/targets/app/common/src/UI/Controls/UIControl_BitmapIcon.cpp b/targets/app/common/src/UI/Controls/UIControl_BitmapIcon.cpp index 526a1de01..a7237bdd3 100644 --- a/targets/app/common/src/UI/Controls/UIControl_BitmapIcon.cpp +++ b/targets/app/common/src/UI/Controls/UIControl_BitmapIcon.cpp @@ -6,7 +6,7 @@ #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" #endif -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" bool UIControl_BitmapIcon::setupControl(UIScene* scene, IggyValuePath* parent, const std::string& controlName) { diff --git a/targets/app/common/src/UI/Controls/UIControl_Button.cpp b/targets/app/common/src/UI/Controls/UIControl_Button.cpp index da428eed4..425c11143 100644 --- a/targets/app/common/src/UI/Controls/UIControl_Button.cpp +++ b/targets/app/common/src/UI/Controls/UIControl_Button.cpp @@ -8,7 +8,7 @@ #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" #endif -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" UIControl_Button::UIControl_Button() {} diff --git a/targets/app/common/src/UI/Controls/UIControl_ButtonList.cpp b/targets/app/common/src/UI/Controls/UIControl_ButtonList.cpp index 5e9c72962..84339ec2d 100644 --- a/targets/app/common/src/UI/Controls/UIControl_ButtonList.cpp +++ b/targets/app/common/src/UI/Controls/UIControl_ButtonList.cpp @@ -9,7 +9,7 @@ #include "app/linux/Stubs/iggy_stubs.h" #endif #include "app/linux/Iggy/include/rrCore.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" UIControl_ButtonList::UIControl_ButtonList() { m_itemCount = 0; diff --git a/targets/app/common/src/UI/Controls/UIControl_CheckBox.cpp b/targets/app/common/src/UI/Controls/UIControl_CheckBox.cpp index 65183b184..a0432ba01 100644 --- a/targets/app/common/src/UI/Controls/UIControl_CheckBox.cpp +++ b/targets/app/common/src/UI/Controls/UIControl_CheckBox.cpp @@ -9,7 +9,7 @@ #include "app/linux/Stubs/iggy_stubs.h" #endif #include "app/linux/Iggy/include/rrCore.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" UIControl_CheckBox::UIControl_CheckBox() {} diff --git a/targets/app/common/src/UI/Controls/UIControl_DLCList.cpp b/targets/app/common/src/UI/Controls/UIControl_DLCList.cpp index 95ecfbddc..6f135eb02 100644 --- a/targets/app/common/src/UI/Controls/UIControl_DLCList.cpp +++ b/targets/app/common/src/UI/Controls/UIControl_DLCList.cpp @@ -8,7 +8,7 @@ #include "app/linux/Stubs/iggy_stubs.h" #endif #include "app/linux/Iggy/include/rrCore.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" bool UIControl_DLCList::setupControl(UIScene* scene, IggyValuePath* parent, const std::string& controlName) { diff --git a/targets/app/common/src/UI/Controls/UIControl_DynamicLabel.cpp b/targets/app/common/src/UI/Controls/UIControl_DynamicLabel.cpp index 3ae950fc7..e376f9e76 100644 --- a/targets/app/common/src/UI/Controls/UIControl_DynamicLabel.cpp +++ b/targets/app/common/src/UI/Controls/UIControl_DynamicLabel.cpp @@ -8,7 +8,7 @@ #include "app/linux/Stubs/iggy_stubs.h" #endif #include "app/linux/Iggy/include/rrCore.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" UIControl_DynamicLabel::UIControl_DynamicLabel() {} diff --git a/targets/app/common/src/UI/Controls/UIControl_EnchantmentButton.cpp b/targets/app/common/src/UI/Controls/UIControl_EnchantmentButton.cpp index 68c72955b..d2c87fd83 100644 --- a/targets/app/common/src/UI/Controls/UIControl_EnchantmentButton.cpp +++ b/targets/app/common/src/UI/Controls/UIControl_EnchantmentButton.cpp @@ -16,7 +16,7 @@ #include "app/linux/Stubs/iggy_stubs.h" #endif #include "app/linux/Linux_App.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/gui/Font.h" diff --git a/targets/app/common/src/UI/Controls/UIControl_Label.cpp b/targets/app/common/src/UI/Controls/UIControl_Label.cpp index b7209e059..bc8e883c2 100644 --- a/targets/app/common/src/UI/Controls/UIControl_Label.cpp +++ b/targets/app/common/src/UI/Controls/UIControl_Label.cpp @@ -8,7 +8,7 @@ #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" #endif -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" UIControl_Label::UIControl_Label() {} diff --git a/targets/app/common/src/UI/Controls/UIControl_LeaderboardList.cpp b/targets/app/common/src/UI/Controls/UIControl_LeaderboardList.cpp index ae1520d71..182ebd80b 100644 --- a/targets/app/common/src/UI/Controls/UIControl_LeaderboardList.cpp +++ b/targets/app/common/src/UI/Controls/UIControl_LeaderboardList.cpp @@ -7,7 +7,7 @@ #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" #endif -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" UIControl_LeaderboardList::UIControl_LeaderboardList() {} diff --git a/targets/app/common/src/UI/Controls/UIControl_PlayerList.cpp b/targets/app/common/src/UI/Controls/UIControl_PlayerList.cpp index b0d8cad1b..e62ba1e9b 100644 --- a/targets/app/common/src/UI/Controls/UIControl_PlayerList.cpp +++ b/targets/app/common/src/UI/Controls/UIControl_PlayerList.cpp @@ -8,7 +8,7 @@ #include "app/linux/Stubs/iggy_stubs.h" #endif #include "app/linux/Iggy/include/rrCore.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" bool UIControl_PlayerList::setupControl(UIScene* scene, IggyValuePath* parent, const std::string& controlName) { diff --git a/targets/app/common/src/UI/Controls/UIControl_Progress.cpp b/targets/app/common/src/UI/Controls/UIControl_Progress.cpp index 059953f11..93d81ca0e 100644 --- a/targets/app/common/src/UI/Controls/UIControl_Progress.cpp +++ b/targets/app/common/src/UI/Controls/UIControl_Progress.cpp @@ -8,7 +8,7 @@ #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" #endif -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" UIControl_Progress::UIControl_Progress() { m_min = 0; diff --git a/targets/app/common/src/UI/Controls/UIControl_SaveList.cpp b/targets/app/common/src/UI/Controls/UIControl_SaveList.cpp index cb57b4e35..86cd16160 100644 --- a/targets/app/common/src/UI/Controls/UIControl_SaveList.cpp +++ b/targets/app/common/src/UI/Controls/UIControl_SaveList.cpp @@ -8,7 +8,7 @@ #include "app/linux/Stubs/iggy_stubs.h" #endif #include "app/linux/Iggy/include/rrCore.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" bool UIControl_SaveList::setupControl(UIScene* scene, IggyValuePath* parent, const std::string& controlName) { diff --git a/targets/app/common/src/UI/Controls/UIControl_Slider.cpp b/targets/app/common/src/UI/Controls/UIControl_Slider.cpp index d538e3a9f..c6dc4fc6c 100644 --- a/targets/app/common/src/UI/Controls/UIControl_Slider.cpp +++ b/targets/app/common/src/UI/Controls/UIControl_Slider.cpp @@ -10,7 +10,7 @@ #endif #include "app/linux/Iggy/include/rrCore.h" #include "app/linux/Linux_UIController.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" #include "minecraft/sounds/SoundTypes.h" UIControl_Slider::UIControl_Slider() { diff --git a/targets/app/common/src/UI/Controls/UIControl_SpaceIndicatorBar.cpp b/targets/app/common/src/UI/Controls/UIControl_SpaceIndicatorBar.cpp index 276eb6499..ac40b11c6 100644 --- a/targets/app/common/src/UI/Controls/UIControl_SpaceIndicatorBar.cpp +++ b/targets/app/common/src/UI/Controls/UIControl_SpaceIndicatorBar.cpp @@ -8,7 +8,7 @@ #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" #endif -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" UIControl_SpaceIndicatorBar::UIControl_SpaceIndicatorBar() { m_min = 0; diff --git a/targets/app/common/src/UI/Controls/UIControl_TextInput.cpp b/targets/app/common/src/UI/Controls/UIControl_TextInput.cpp index 4bde4f53a..12bd53c57 100644 --- a/targets/app/common/src/UI/Controls/UIControl_TextInput.cpp +++ b/targets/app/common/src/UI/Controls/UIControl_TextInput.cpp @@ -8,7 +8,7 @@ #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" #endif -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" UIControl_TextInput::UIControl_TextInput() { m_bHasFocus = false; } diff --git a/targets/app/common/src/UI/Controls/UIControl_TexturePackList.cpp b/targets/app/common/src/UI/Controls/UIControl_TexturePackList.cpp index 43b01d5aa..16c122a49 100644 --- a/targets/app/common/src/UI/Controls/UIControl_TexturePackList.cpp +++ b/targets/app/common/src/UI/Controls/UIControl_TexturePackList.cpp @@ -9,7 +9,7 @@ #include "app/linux/Stubs/iggy_stubs.h" #endif #include "app/linux/Iggy/include/rrCore.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" UIControl_TexturePackList::UIControl_TexturePackList() {} diff --git a/targets/app/common/src/UI/Scenes/Debug/UIScene_DebugCreateSchematic.cpp b/targets/app/common/src/UI/Scenes/Debug/UIScene_DebugCreateSchematic.cpp index c5ab1ab3a..f827bc213 100644 --- a/targets/app/common/src/UI/Scenes/Debug/UIScene_DebugCreateSchematic.cpp +++ b/targets/app/common/src/UI/Scenes/Debug/UIScene_DebugCreateSchematic.cpp @@ -16,13 +16,13 @@ #include "app/linux/Iggy/include/rrCore.h" #include "app/linux/Linux_App.h" #include "app/linux/Linux_UIController.h" -#include "console_helpers/compression.h" +#include "minecraft/world/level/storage/compression.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/chunk/ChunkSource.h" class UILayer; #ifdef _DEBUG_MENUS_ENABLED -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" UIScene_DebugCreateSchematic::UIScene_DebugCreateSchematic(int iPad, void* initData, diff --git a/targets/app/common/src/UI/Scenes/Debug/UIScene_DebugOverlay.cpp b/targets/app/common/src/UI/Scenes/Debug/UIScene_DebugOverlay.cpp index 16b665004..5b8b41c69 100644 --- a/targets/app/common/src/UI/Scenes/Debug/UIScene_DebugOverlay.cpp +++ b/targets/app/common/src/UI/Scenes/Debug/UIScene_DebugOverlay.cpp @@ -34,7 +34,7 @@ class Player; class UILayer; #ifdef _DEBUG_MENUS_ENABLED -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/ClientConnection.h" #include "minecraft/client/multiplayer/MultiPlayerLevel.h" diff --git a/targets/app/common/src/UI/Scenes/Debug/UIScene_DebugSetCamera.cpp b/targets/app/common/src/UI/Scenes/Debug/UIScene_DebugSetCamera.cpp index 0e00d4895..aef46e535 100644 --- a/targets/app/common/src/UI/Scenes/Debug/UIScene_DebugSetCamera.cpp +++ b/targets/app/common/src/UI/Scenes/Debug/UIScene_DebugSetCamera.cpp @@ -22,7 +22,7 @@ class UILayer; #ifdef _DEBUG_MENUS_ENABLED -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" diff --git a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp index f1b737430..85372b9db 100644 --- a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp +++ b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp @@ -26,7 +26,7 @@ #include "app/linux/Linux_App.h" #include "app/linux/Linux_UIController.h" #include "app/include/NetTypes.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.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_LaunchMoreOptionsMenu.cpp b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.cpp index e86f50582..0187f6b12 100644 --- a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.cpp +++ b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.cpp @@ -19,7 +19,7 @@ #include "app/common/src/UI/UIScene.h" #include "app/linux/Linux_App.h" #include "app/linux/Linux_UIController.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" #include "minecraft/sounds/SoundTypes.h" #include "strings.h" diff --git a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp index 468093c5a..059e12f98 100644 --- a/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp +++ b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp @@ -21,7 +21,7 @@ #include "app/linux/Linux_UIController.h" #include "app/linux/Stubs/winapi_stubs.h" #include "app/include/NetTypes.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" #include "java/InputOutputStream/BufferedReader.h" #include "java/InputOutputStream/ByteArrayInputStream.h" diff --git a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_Credits.cpp b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_Credits.cpp index 0160d460e..a161624cc 100644 --- a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_Credits.cpp +++ b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_Credits.cpp @@ -9,7 +9,7 @@ #include "app/common/src/UI/UIScene.h" #include "app/linux/Linux_App.h" #include "app/linux/Linux_UIController.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" #include "strings.h" #define CREDIT_ICON -2 diff --git a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_HowToPlay.cpp b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_HowToPlay.cpp index 5a7793544..f34f24463 100644 --- a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_HowToPlay.cpp +++ b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_HowToPlay.cpp @@ -12,7 +12,7 @@ #include "app/common/src/UI/UIScene.h" #include "app/linux/Linux_App.h" #include "app/linux/Linux_UIController.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" #include "minecraft/sounds/SoundTypes.h" #include "strings.h" diff --git a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp index 7b03feccc..4d454fd1e 100644 --- a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp +++ b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp @@ -21,7 +21,7 @@ #include "app/linux/Linux_App.h" #include "app/linux/Linux_UIController.h" #include "SkinBox.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" #include "minecraft/client/Minecraft.h" #include "minecraft/sounds/SoundTypes.h" diff --git a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.h b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.h index 94c79f901..81a2a9535 100644 --- a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.h +++ b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.h @@ -16,7 +16,7 @@ #endif #include "app/linux/Iggy/include/rrCore.h" #include "app/include/SkinBox.h" -#include "console_helpers/Definitions.h" +#include "util/Definitions.h" #include "minecraft/client/renderer/Textures.h" class DLCPack; diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.cpp b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.cpp index 22e637c17..34376b936 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.cpp +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.cpp @@ -17,7 +17,7 @@ #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/linux/Linux_App.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "minecraft/world/entity/player/Abilities.h" diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.cpp b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.cpp index 0b985210f..807fe6e6f 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.cpp +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.cpp @@ -15,7 +15,7 @@ #include "app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" #include "app/linux/Linux_App.h" #include "app/linux/Linux_UIController.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" #include "minecraft/SharedConstants.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.cpp b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.cpp index d6428251b..8f6bb8070 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.cpp +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.cpp @@ -16,7 +16,7 @@ #include "app/common/src/UI/UIScene.h" #include "app/linux/Linux_App.h" #include "app/linux/Linux_UIController.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "minecraft/util/HtmlString.h" diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.cpp b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.cpp index ed3e0469a..099bfe1cc 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.cpp +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.cpp @@ -14,7 +14,7 @@ #include "app/common/src/UI/UIScene.h" #include "app/linux/Linux_App.h" #include "app/linux/Linux_UIController.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" #include "java/Random.h" #include "minecraft/SharedConstants.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.cpp b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.cpp index 2452b5f8c..a533a8e61 100644 --- a/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.cpp +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.cpp @@ -11,7 +11,7 @@ #include "app/common/src/UI/UIScene.h" #include "app/linux/Linux_App.h" #include "app/linux/Linux_UIController.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/ClientConnection.h" #include "minecraft/client/multiplayer/MultiPlayerLevel.h" diff --git a/targets/app/common/src/UI/Scenes/UIScene_FullscreenProgress.cpp b/targets/app/common/src/UI/Scenes/UIScene_FullscreenProgress.cpp index bd9359b5d..660ac4f24 100644 --- a/targets/app/common/src/UI/Scenes/UIScene_FullscreenProgress.cpp +++ b/targets/app/common/src/UI/Scenes/UIScene_FullscreenProgress.cpp @@ -18,7 +18,7 @@ #include "app/linux/Linux_App.h" #include "app/linux/Linux_UIController.h" #include "app/linux/Stubs/winapi_stubs.h" -#include "console_helpers/C4JThread.h" +#include "platform/C4JThread.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/ProgressRenderer.h" #include "minecraft/client/multiplayer/MultiPlayerGameMode.h" diff --git a/targets/app/common/src/UI/Scenes/UIScene_Keyboard.cpp b/targets/app/common/src/UI/Scenes/UIScene_Keyboard.cpp index a33801285..5c8d14ae8 100644 --- a/targets/app/common/src/UI/Scenes/UIScene_Keyboard.cpp +++ b/targets/app/common/src/UI/Scenes/UIScene_Keyboard.cpp @@ -9,7 +9,7 @@ #include "app/common/src/UI/UIScene.h" #include "app/linux/Linux_App.h" #include "app/linux/Linux_UIController.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" #include "strings.h" #define KEYBOARD_DONE_TIMER_ID 0 diff --git a/targets/app/common/src/UI/UIController.cpp b/targets/app/common/src/UI/UIController.cpp index f0cbcaed7..72bae84d5 100644 --- a/targets/app/common/src/UI/UIController.cpp +++ b/targets/app/common/src/UI/UIController.cpp @@ -38,10 +38,10 @@ #include "app/include/BufferedImage.h" #include "UIFontData.h" #include "XboxStubs.h" -#include "console_helpers/C4JThread.h" -#include "console_helpers/Timer.h" +#include "platform/C4JThread.h" +#include "util/Timer.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" #include "java/System.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/app/common/src/UI/UIController.h b/targets/app/common/src/UI/UIController.h index 7f4a008e6..ac22fb140 100644 --- a/targets/app/common/src/UI/UIController.h +++ b/targets/app/common/src/UI/UIController.h @@ -8,7 +8,7 @@ #include #include -#include "console_helpers/Timer.h" +#include "util/Timer.h" #ifdef __linux__ #include "app/linux/Iggy/include/iggy.h" diff --git a/targets/app/common/src/UI/UIScene.cpp b/targets/app/common/src/UI/UIScene.cpp index 48215e96f..c0d37bc91 100644 --- a/targets/app/common/src/UI/UIScene.cpp +++ b/targets/app/common/src/UI/UIScene.cpp @@ -22,7 +22,7 @@ #include "app/linux/Linux_App.h" #include "app/linux/Linux_UIController.h" #include "app/linux/Stubs/winapi_stubs.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" #include "java/System.h" #include "minecraft/client/Lighting.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/app/common/src/UI/UIString.cpp b/targets/app/common/src/UI/UIString.cpp index 314512ee2..c185a1d96 100644 --- a/targets/app/common/src/UI/UIString.cpp +++ b/targets/app/common/src/UI/UIString.cpp @@ -2,7 +2,7 @@ #include "app/linux/Linux_App.h" #include "app/include/XboxStubs.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" bool UIString::setCurrentLanguage() { int nextLanguage, nextLocale; diff --git a/targets/app/common/src/UI/UITTFFont.cpp b/targets/app/common/src/UI/UITTFFont.cpp index dc8ce76cc..c93397ec6 100644 --- a/targets/app/common/src/UI/UITTFFont.cpp +++ b/targets/app/common/src/UI/UITTFFont.cpp @@ -8,7 +8,7 @@ #endif #include "app/linux/Iggy/include/rrCore.h" #include "app/linux/Linux_App.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" #include "platform/PlatformServices.h" UITTFFont::UITTFFont(const std::string& name, const std::string& path, diff --git a/targets/app/linux/Linux_App.cpp b/targets/app/linux/Linux_App.cpp index 51abccd06..5b38f1bc9 100644 --- a/targets/app/linux/Linux_App.cpp +++ b/targets/app/linux/Linux_App.cpp @@ -11,7 +11,7 @@ #include "app/common/Consoles_App.h" #include "app/common/src/Network/GameNetworkManager.h" #include "app/common/src/UI/All Platforms/UIStructs.h" -#include "console_helpers/C4JThread.h" +#include "platform/C4JThread.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/User.h" #include "minecraft/server/MinecraftServer.h" diff --git a/targets/app/linux/Linux_Minecraft.cpp b/targets/app/linux/Linux_Minecraft.cpp index 199ba2592..29bb1d4db 100644 --- a/targets/app/linux/Linux_Minecraft.cpp +++ b/targets/app/linux/Linux_Minecraft.cpp @@ -60,8 +60,7 @@ static void sigsegv_handler(int sig) { #include "app/common/src/Network/GameNetworkManager.h" #include "app/linux/Linux_App.h" #include "app/linux/Linux_UIController.h" -#include "console_helpers/compression.h" -#include "console_helpers/StringHelpers.h" +#include "minecraft/world/level/storage/compression.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/renderer/Tesselator.h" #include "minecraft/client/renderer/Textures.h" diff --git a/targets/app/meson.build b/targets/app/meson.build index 9721ff177..db074a2c6 100644 --- a/targets/app/meson.build +++ b/targets/app/meson.build @@ -56,7 +56,7 @@ client_dependencies = [ dependency('zlib'), miniaudio_dep, stb_dep, - console_helpers_dep, + util_dep, ] if get_option('ui_backend') == 'shiggy' diff --git a/targets/app/src/BufferedImage.cpp b/targets/app/src/BufferedImage.cpp index fd60333bb..176a72cc6 100644 --- a/targets/app/src/BufferedImage.cpp +++ b/targets/app/src/BufferedImage.cpp @@ -13,7 +13,7 @@ #include "app/linux/Linux_App.h" #include "app/linux/Stubs/winapi_stubs.h" #include "PlatformTypes.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" #include "platform/PlatformServices.h" BufferedImage::BufferedImage(int width, int height, int type) { diff --git a/targets/app/windows/Source Files/Windows64_Minecraft.cpp b/targets/app/windows/Source Files/Windows64_Minecraft.cpp index d18960f18..5003d8d7a 100644 --- a/targets/app/windows/Source Files/Windows64_Minecraft.cpp +++ b/targets/app/windows/Source Files/Windows64_Minecraft.cpp @@ -6,7 +6,7 @@ #include #include "app/common/src/Network/Socket.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" #include "minecraft/client/User.h" #include "minecraft/client/multiplayer/ClientConnection.h" #include "minecraft/client/multiplayer/ConnectScreen.h" @@ -28,7 +28,7 @@ // #include "NetworkManager.h" #include "../Resource.h" #include "Sentient/SentientManager.h" -#include "console_helpers/compression.h" +#include "minecraft/world/level/storage/compression.h" #include "minecraft/client/Options.h" #include "minecraft/client/renderer/Tesselator.h" #include "minecraft/client/renderer/Textures.h" diff --git a/targets/console_helpers/meson.build b/targets/console_helpers/meson.build deleted file mode 100644 index 7c2e09ae0..000000000 --- a/targets/console_helpers/meson.build +++ /dev/null @@ -1,22 +0,0 @@ -console_helpers_sources = files( - 'src/C4JThread.cpp', - 'src/StringHelpers.cpp', - 'src/compression.cpp', -) - -simdutf_dep = dependency('simdutf', - fallback: ['simdutf', 'simdutf_dep'], - default_options: ['utf8=true', 'utf16=true', 'utf32=true'] -) - -lib_console_helpers = static_library('console_helpers', - console_helpers_sources, - dependencies: [simdutf_dep, dependency('zlib')], - include_directories : include_directories('include', '..'), - cpp_args : global_cpp_args + global_cpp_defs, -) - -console_helpers_dep = declare_dependency( - link_with : lib_console_helpers, - include_directories : include_directories('include'), -) diff --git a/targets/java/include/java/ByteBuffer.h b/targets/java/include/java/ByteBuffer.h index c4c9be5c1..6982223ea 100644 --- a/targets/java/include/java/ByteBuffer.h +++ b/targets/java/include/java/ByteBuffer.h @@ -4,7 +4,7 @@ #include #include "Buffer.h" -#include "console_helpers/Definitions.h" // 4jcraft TODO +#include "util/Definitions.h" // 4jcraft TODO class IntBuffer; class FloatBuffer; diff --git a/targets/java/meson.build b/targets/java/meson.build index 5e489f82f..4d50b3b76 100644 --- a/targets/java/meson.build +++ b/targets/java/meson.build @@ -24,7 +24,7 @@ java_sources = files( lib_java = static_library('java', java_sources, - dependencies: [console_helpers_dep], + dependencies: [util_dep], # TODO: remove the .. path once arrayWithLength are evaporated include_directories: include_directories('include', '..'), cpp_args : global_cpp_args + global_cpp_defs, diff --git a/targets/java/src/File.cpp b/targets/java/src/File.cpp index b1036d281..4af84d5de 100644 --- a/targets/java/src/File.cpp +++ b/targets/java/src/File.cpp @@ -8,7 +8,7 @@ #include #include -#include "console_helpers/StringHelpers.h" // 4jcraft TODO +#include "util/StringHelpers.h" // 4jcraft TODO #include "platform/PlatformServices.h" #include "java/FileFilter.h" diff --git a/targets/minecraft/client/Minecraft.cpp b/targets/minecraft/client/Minecraft.cpp index 52f0586f6..e4372f1d3 100644 --- a/targets/minecraft/client/Minecraft.cpp +++ b/targets/minecraft/client/Minecraft.cpp @@ -32,8 +32,8 @@ #include "SharedConstants.h" #include "Timer.h" #include "User.h" -#include "console_helpers/Definitions.h" -#include "console_helpers/compression.h" +#include "util/Definitions.h" +#include "minecraft/world/level/storage/compression.h" #include "java/Class.h" #include "java/Random.h" #include "minecraft/client/gui/DeathScreen.h" @@ -111,7 +111,7 @@ #include "app/common/src/UI/All Platforms/IUIScene_CreativeMenu.h" #include "app/common/src/UI/UIFontData.h" #include "app/include/stubs.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" #include "java/File.h" #include "java/System.h" #include "minecraft/StaticConstructors.h" diff --git a/targets/minecraft/client/Minecraft.h b/targets/minecraft/client/Minecraft.h index 9c03c44a6..7d1ec07ed 100644 --- a/targets/minecraft/client/Minecraft.h +++ b/targets/minecraft/client/Minecraft.h @@ -7,7 +7,7 @@ #include #include "platform/PlatformTypes.h" -#include "console_helpers/C4JThread.h" +#include "platform/C4JThread.h" #include "java/File.h" #include "minecraft/client/resources/ResourceLocation.h" #include "minecraft/network/packet/DisconnectPacket.h" diff --git a/targets/minecraft/client/Options.cpp b/targets/minecraft/client/Options.cpp index 3e45c00d3..0c8268291 100644 --- a/targets/minecraft/client/Options.cpp +++ b/targets/minecraft/client/Options.cpp @@ -4,7 +4,7 @@ #include "app/common/src/Audio/SoundEngine.h" #include "app/linux/Linux_App.h" #include "app/include/stubs.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" #include "java/File.h" #include "java/InputOutputStream/BufferedReader.h" #include "java/InputOutputStream/DataOutputStream.h" diff --git a/targets/minecraft/client/gui/ChatScreen.cpp b/targets/minecraft/client/gui/ChatScreen.cpp index b7407713b..cd811c59b 100644 --- a/targets/minecraft/client/gui/ChatScreen.cpp +++ b/targets/minecraft/client/gui/ChatScreen.cpp @@ -3,7 +3,7 @@ #include #include "app/include/stubs.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" #include "minecraft/SharedConstants.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/gui/Gui.h" diff --git a/targets/minecraft/client/gui/CreateWorldScreen.cpp b/targets/minecraft/client/gui/CreateWorldScreen.cpp index f0ccca193..01ab7ea3c 100644 --- a/targets/minecraft/client/gui/CreateWorldScreen.cpp +++ b/targets/minecraft/client/gui/CreateWorldScreen.cpp @@ -18,7 +18,7 @@ #include "app/linux/Linux_UIController.h" #include "app/include/NetTypes.h" #include "app/include/stubs.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" #include "minecraft/SharedConstants.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/Options.h" diff --git a/targets/minecraft/client/gui/DeathScreen.cpp b/targets/minecraft/client/gui/DeathScreen.cpp index 5bffc11f1..6a61079ae 100644 --- a/targets/minecraft/client/gui/DeathScreen.cpp +++ b/targets/minecraft/client/gui/DeathScreen.cpp @@ -7,7 +7,7 @@ #include "platform/sdl2/Render.h" #include "Button.h" #include "PauseScreen.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/gui/Screen.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" diff --git a/targets/minecraft/client/gui/Font.cpp b/targets/minecraft/client/gui/Font.cpp index 5f3d74106..e63d10303 100644 --- a/targets/minecraft/client/gui/Font.cpp +++ b/targets/minecraft/client/gui/Font.cpp @@ -7,7 +7,7 @@ #include "platform/sdl2/Render.h" #include "app/include/BufferedImage.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" #include "java/Random.h" #include "minecraft/SharedConstants.h" #include "minecraft/client/Options.h" diff --git a/targets/minecraft/client/gui/Gui.cpp b/targets/minecraft/client/gui/Gui.cpp index 034a7fb54..5540d81a8 100644 --- a/targets/minecraft/client/gui/Gui.cpp +++ b/targets/minecraft/client/gui/Gui.cpp @@ -12,7 +12,7 @@ #include "app/linux/Linux_App.h" #include "app/linux/Linux_UIController.h" #include "app/include/XboxStubs.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" #include "java/JavaMath.h" #include "java/Random.h" #include "java/System.h" diff --git a/targets/minecraft/client/gui/InBedChatScreen.cpp b/targets/minecraft/client/gui/InBedChatScreen.cpp index 8cc7460cc..fdf2e1cdc 100644 --- a/targets/minecraft/client/gui/InBedChatScreen.cpp +++ b/targets/minecraft/client/gui/InBedChatScreen.cpp @@ -6,7 +6,7 @@ #include "Button.h" #include "app/include/stubs.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/gui/ChatScreen.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" diff --git a/targets/minecraft/client/gui/JoinMultiplayerScreen.cpp b/targets/minecraft/client/gui/JoinMultiplayerScreen.cpp index d6bc03671..8e8b4d904 100644 --- a/targets/minecraft/client/gui/JoinMultiplayerScreen.cpp +++ b/targets/minecraft/client/gui/JoinMultiplayerScreen.cpp @@ -5,7 +5,7 @@ #include "Button.h" #include "EditBox.h" #include "app/include/stubs.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/Options.h" #include "minecraft/client/gui/Screen.h" diff --git a/targets/minecraft/client/gui/NameEntryScreen.cpp b/targets/minecraft/client/gui/NameEntryScreen.cpp index d846a3ea6..309389a0d 100644 --- a/targets/minecraft/client/gui/NameEntryScreen.cpp +++ b/targets/minecraft/client/gui/NameEntryScreen.cpp @@ -4,7 +4,7 @@ #include "Button.h" #include "app/include/stubs.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/gui/Screen.h" diff --git a/targets/minecraft/client/gui/RenameWorldScreen.cpp b/targets/minecraft/client/gui/RenameWorldScreen.cpp index e5d6602d2..c56701630 100644 --- a/targets/minecraft/client/gui/RenameWorldScreen.cpp +++ b/targets/minecraft/client/gui/RenameWorldScreen.cpp @@ -5,7 +5,7 @@ #include "Button.h" #include "EditBox.h" #include "app/include/stubs.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/gui/Screen.h" #include "minecraft/locale/Language.h" diff --git a/targets/minecraft/client/gui/SelectWorldScreen.cpp b/targets/minecraft/client/gui/SelectWorldScreen.cpp index ff19c75e6..8b2cfea85 100644 --- a/targets/minecraft/client/gui/SelectWorldScreen.cpp +++ b/targets/minecraft/client/gui/SelectWorldScreen.cpp @@ -11,7 +11,7 @@ #include "app/linux/Linux_App.h" #include "app/linux/Stubs/winapi_stubs.h" #include "RenameWorldScreen.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/gui/Screen.h" #include "minecraft/client/gui/ScrolledSelectionList.h" diff --git a/targets/minecraft/client/gui/achievement/StatsScreen.cpp b/targets/minecraft/client/gui/achievement/StatsScreen.cpp index 19b264aff..f210421b2 100644 --- a/targets/minecraft/client/gui/achievement/StatsScreen.cpp +++ b/targets/minecraft/client/gui/achievement/StatsScreen.cpp @@ -2,7 +2,7 @@ #include "app/common/src/Audio/SoundEngine.h" #include "app/include/stubs.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/gui/Button.h" #include "minecraft/client/gui/Font.h" diff --git a/targets/minecraft/client/multiplayer/ClientConnection.cpp b/targets/minecraft/client/multiplayer/ClientConnection.cpp index 844cf49f9..31f0987a5 100644 --- a/targets/minecraft/client/multiplayer/ClientConnection.cpp +++ b/targets/minecraft/client/multiplayer/ClientConnection.cpp @@ -35,8 +35,8 @@ #include "app/linux/Stubs/winapi_stubs.h" #include "MultiPlayerLevel.h" #include "ReceivingLevelScreen.h" -#include "console_helpers/Timer.h" -#include "console_helpers/StringHelpers.h" +#include "util/Timer.h" +#include "util/StringHelpers.h" #include "java/Class.h" #include "java/InputOutputStream/ByteArrayInputStream.h" #include "java/InputOutputStream/DataInputStream.h" diff --git a/targets/minecraft/client/multiplayer/ClientConnection.h b/targets/minecraft/client/multiplayer/ClientConnection.h index ebd7b7fb1..1285bc367 100644 --- a/targets/minecraft/client/multiplayer/ClientConnection.h +++ b/targets/minecraft/client/multiplayer/ClientConnection.h @@ -5,7 +5,7 @@ #include #include -#include "console_helpers/Timer.h" +#include "util/Timer.h" #include "platform/sdl2/Storage.h" #include "minecraft/network/Connection.h" diff --git a/targets/minecraft/client/multiplayer/MultiPlayerChunkCache.cpp b/targets/minecraft/client/multiplayer/MultiPlayerChunkCache.cpp index bc76257a0..c7f5eff8f 100644 --- a/targets/minecraft/client/multiplayer/MultiPlayerChunkCache.cpp +++ b/targets/minecraft/client/multiplayer/MultiPlayerChunkCache.cpp @@ -5,7 +5,7 @@ #include "app/common/src/Network/GameNetworkManager.h" #include "app/linux/Stubs/winapi_stubs.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" #include "minecraft/server/MinecraftServer.h" #include "minecraft/server/level/ServerChunkCache.h" #include "minecraft/server/level/ServerLevel.h" diff --git a/targets/minecraft/client/particle/ParticleEngine.cpp b/targets/minecraft/client/particle/ParticleEngine.cpp index 140bfb606..3b628fa38 100644 --- a/targets/minecraft/client/particle/ParticleEngine.cpp +++ b/targets/minecraft/client/particle/ParticleEngine.cpp @@ -9,7 +9,7 @@ #include "platform/sdl2/Render.h" #include "Particle.h" #include "TerrainParticle.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" #include "java/Class.h" #include "java/Random.h" #include "minecraft/SharedConstants.h" diff --git a/targets/minecraft/client/renderer/GameRenderer.cpp b/targets/minecraft/client/renderer/GameRenderer.cpp index 32a1aa7b6..c90b1496e 100644 --- a/targets/minecraft/client/renderer/GameRenderer.cpp +++ b/targets/minecraft/client/renderer/GameRenderer.cpp @@ -14,7 +14,7 @@ #include "ItemInHandRenderer.h" #include "LevelRenderer.h" #include "app/common/App_enums.h" -#include "app/common/ShutdownManager.h" +#include "platform/ShutdownManager.h" #include "app/common/src/Colours/ColourTable.h" #include "app/linux/Linux_App.h" #include "app/linux/Stubs/winapi_stubs.h" @@ -22,7 +22,7 @@ #include "app/include/FrameProfiler.h" #include "app/include/stubs.h" #include "Tesselator.h" -#include "console_helpers/compression.h" +#include "minecraft/world/level/storage/compression.h" #include "java/Class.h" #include "java/FloatBuffer.h" diff --git a/targets/minecraft/client/renderer/GameRenderer.h b/targets/minecraft/client/renderer/GameRenderer.h index 8f8fd368e..708e078dd 100644 --- a/targets/minecraft/client/renderer/GameRenderer.h +++ b/targets/minecraft/client/renderer/GameRenderer.h @@ -7,7 +7,7 @@ #include #include "app/common/App_Defines.h" -#include "console_helpers/C4JThread.h" +#include "platform/C4JThread.h" #include "minecraft/client/resources/ResourceLocation.h" #include "minecraft/util/SmoothFloat.h" #include "minecraft/world/phys/Vec3.h" diff --git a/targets/minecraft/client/renderer/LevelRenderer.cpp b/targets/minecraft/client/renderer/LevelRenderer.cpp index 5edd77c25..e9e4ef27c 100644 --- a/targets/minecraft/client/renderer/LevelRenderer.cpp +++ b/targets/minecraft/client/renderer/LevelRenderer.cpp @@ -27,7 +27,7 @@ #include "app/include/MobSkinMemTextureProcessor.h" #include "app/include/stubs.h" #include "Tesselator.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" #include "java/Class.h" #include "java/JavaMath.h" #include "java/Random.h" diff --git a/targets/minecraft/client/renderer/LevelRenderer.h b/targets/minecraft/client/renderer/LevelRenderer.h index c2cfdd9f6..c66590063 100644 --- a/targets/minecraft/client/renderer/LevelRenderer.h +++ b/targets/minecraft/client/renderer/LevelRenderer.h @@ -3,8 +3,8 @@ #include "app/include/SkinBox.h" #include "app/include/XboxStubs.h" #include "OffsettedRenderList.h" -#include "console_helpers/C4JThread.h" -#include "console_helpers/Definitions.h" +#include "platform/C4JThread.h" +#include "util/Definitions.h" #include "java/JavaIntHash.h" #include "minecraft/core/particles/ParticleTypes.h" #include "minecraft/world/level/Level.h" diff --git a/targets/minecraft/client/renderer/Textures.cpp b/targets/minecraft/client/renderer/Textures.cpp index 30cdf4f0b..da05ad108 100644 --- a/targets/minecraft/client/renderer/Textures.cpp +++ b/targets/minecraft/client/renderer/Textures.cpp @@ -14,7 +14,7 @@ #include "app/include/MemTexture.h" #include "app/include/MemTextureProcessor.h" #include "app/include/MobSkinMemTextureProcessor.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" #include "java/Buffer.h" #include "java/ByteBuffer.h" diff --git a/targets/minecraft/client/renderer/entity/HumanoidMobRenderer.cpp b/targets/minecraft/client/renderer/entity/HumanoidMobRenderer.cpp index f02884946..b73c0a143 100644 --- a/targets/minecraft/client/renderer/entity/HumanoidMobRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/HumanoidMobRenderer.cpp @@ -5,7 +5,7 @@ #include "platform/sdl2/Render.h" #include "EntityRenderDispatcher.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" #include "minecraft/Facing.h" #include "minecraft/SharedConstants.h" #include "minecraft/client/model/HumanoidModel.h" diff --git a/targets/minecraft/client/renderer/entity/ItemRenderer.cpp b/targets/minecraft/client/renderer/entity/ItemRenderer.cpp index e9e5bdcdf..7598a9de1 100644 --- a/targets/minecraft/client/renderer/entity/ItemRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/ItemRenderer.cpp @@ -6,7 +6,7 @@ #include "platform/sdl2/Render.h" #include "EntityRenderDispatcher.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" #include "java/JavaMath.h" #include "java/Random.h" diff --git a/targets/minecraft/client/renderer/texture/StitchSlot.cpp b/targets/minecraft/client/renderer/texture/StitchSlot.cpp index da6e75ce9..d4b5e57e3 100644 --- a/targets/minecraft/client/renderer/texture/StitchSlot.cpp +++ b/targets/minecraft/client/renderer/texture/StitchSlot.cpp @@ -4,7 +4,7 @@ #include #include "TextureHolder.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" StitchSlot::StitchSlot(int originX, int originY, int width, int height) : originX(originX), originY(originY), width(width), height(height) { diff --git a/targets/minecraft/client/renderer/texture/StitchedTexture.cpp b/targets/minecraft/client/renderer/texture/StitchedTexture.cpp index 658aaae11..1bf676764 100644 --- a/targets/minecraft/client/renderer/texture/StitchedTexture.cpp +++ b/targets/minecraft/client/renderer/texture/StitchedTexture.cpp @@ -4,7 +4,7 @@ #include "Texture.h" #include "TextureManager.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" #include "java/InputOutputStream/BufferedReader.h" #include "minecraft/SharedConstants.h" #include "minecraft/client/renderer/texture/custom/ClockTexture.h" diff --git a/targets/minecraft/client/renderer/texture/TextureHolder.cpp b/targets/minecraft/client/renderer/texture/TextureHolder.cpp index 405374769..ee0989111 100644 --- a/targets/minecraft/client/renderer/texture/TextureHolder.cpp +++ b/targets/minecraft/client/renderer/texture/TextureHolder.cpp @@ -4,7 +4,7 @@ #include "Stitcher.h" #include "Texture.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" TextureHolder::TextureHolder(Texture* texture) { scale = 1.0f; diff --git a/targets/minecraft/client/skins/AbstractTexturePack.cpp b/targets/minecraft/client/skins/AbstractTexturePack.cpp index a7cc16101..dbef0b984 100644 --- a/targets/minecraft/client/skins/AbstractTexturePack.cpp +++ b/targets/minecraft/client/skins/AbstractTexturePack.cpp @@ -10,7 +10,7 @@ #include "app/linux/Linux_UIController.h" #include "app/linux/Stubs/winapi_stubs.h" #include "app/include/BufferedImage.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" #include "java/File.h" #include "java/InputOutputStream/BufferedReader.h" #include "java/InputOutputStream/FileInputStream.h" diff --git a/targets/minecraft/client/title/TitleScreen.cpp b/targets/minecraft/client/title/TitleScreen.cpp index d69d8174d..8f0844af5 100644 --- a/targets/minecraft/client/title/TitleScreen.cpp +++ b/targets/minecraft/client/title/TitleScreen.cpp @@ -9,7 +9,7 @@ #include "app/linux/Linux_App.h" #include "app/linux/Stubs/winapi_stubs.h" #include "app/include/BufferedImage.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" #include "java/InputOutputStream/BufferedReader.h" #include "java/InputOutputStream/ByteArrayInputStream.h" #include "java/InputOutputStream/InputStreamReader.h" diff --git a/targets/minecraft/meson.build b/targets/minecraft/meson.build index 4623b1e05..a01210c79 100644 --- a/targets/minecraft/meson.build +++ b/targets/minecraft/meson.build @@ -57,7 +57,8 @@ lib_minecraft = static_library('minecraft', java_dep, assets_localisation_dep, platform_dep, - console_helpers_dep, + util_dep, + dependency('zlib'), ], include_directories : include_directories('..'), cpp_args : global_cpp_args + global_cpp_defs, diff --git a/targets/minecraft/network/Connection.cpp b/targets/minecraft/network/Connection.cpp index b4e042aa2..b63df4411 100644 --- a/targets/minecraft/network/Connection.cpp +++ b/targets/minecraft/network/Connection.cpp @@ -6,12 +6,12 @@ #include #include -#include "app/common/ShutdownManager.h" +#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 "console_helpers/StringHelpers.h" -#include "console_helpers/compression.h" +#include "util/StringHelpers.h" +#include "minecraft/world/level/storage/compression.h" #include "java/InputOutputStream/BufferedOutputStream.h" #include "java/InputOutputStream/ByteArrayOutputStream.h" #include "java/InputOutputStream/DataInputStream.h" diff --git a/targets/minecraft/network/Connection.h b/targets/minecraft/network/Connection.h index f974a9935..af77b3ddc 100644 --- a/targets/minecraft/network/Connection.h +++ b/targets/minecraft/network/Connection.h @@ -9,7 +9,7 @@ #include "app/common/src/Network/Socket.h" #include "app/linux/Stubs/winapi_stubs.h" -#include "console_helpers/C4JThread.h" +#include "platform/C4JThread.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" #include "java/System.h" diff --git a/targets/minecraft/network/packet/BlockRegionUpdatePacket.cpp b/targets/minecraft/network/packet/BlockRegionUpdatePacket.cpp index d312ad74c..d07f4586d 100644 --- a/targets/minecraft/network/packet/BlockRegionUpdatePacket.cpp +++ b/targets/minecraft/network/packet/BlockRegionUpdatePacket.cpp @@ -5,7 +5,7 @@ #include "app/linux/Linux_App.h" #include "PacketListener.h" -#include "console_helpers/compression.h" +#include "minecraft/world/level/storage/compression.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" #include "minecraft/world/level/Level.h" diff --git a/targets/minecraft/server/MinecraftServer.cpp b/targets/minecraft/server/MinecraftServer.cpp index c33e88c4c..a420852d1 100644 --- a/targets/minecraft/server/MinecraftServer.cpp +++ b/targets/minecraft/server/MinecraftServer.cpp @@ -23,7 +23,7 @@ #include "app/linux/Linux_App.h" #include "PlayerList.h" #include "Settings.h" -#include "console_helpers/Timer.h" +#include "util/Timer.h" #include "java/Class.h" #include "java/File.h" #include "java/InputOutputStream/DataOutputStream.h" @@ -65,12 +65,12 @@ #include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.h" #endif #include "platform/sdl2/Input.h" -#include "app/common/ShutdownManager.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 "console_helpers/compression.h" +#include "minecraft/world/level/storage/compression.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/ProgressRenderer.h" #include "minecraft/client/renderer/GameRenderer.h" diff --git a/targets/minecraft/server/MinecraftServer.h b/targets/minecraft/server/MinecraftServer.h index 841cd3277..6d9836c48 100644 --- a/targets/minecraft/server/MinecraftServer.h +++ b/targets/minecraft/server/MinecraftServer.h @@ -7,8 +7,8 @@ #include #include "ConsoleInputSource.h" -#include "console_helpers/C4JThread.h" -#include "console_helpers/Timer.h" +#include "platform/C4JThread.h" +#include "util/Timer.h" #include "minecraft/SharedConstants.h" #include "minecraft/world/level/chunk/ChunkSource.h" #include "minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h" diff --git a/targets/minecraft/server/PlayerList.cpp b/targets/minecraft/server/PlayerList.cpp index f87077392..347f1a14f 100644 --- a/targets/minecraft/server/PlayerList.cpp +++ b/targets/minecraft/server/PlayerList.cpp @@ -23,7 +23,7 @@ #include "app/include/NetTypes.h" #include "MinecraftServer.h" #include "Settings.h" -#include "console_helpers/Definitions.h" +#include "util/Definitions.h" #include "java/Class.h" #include "java/JavaMath.h" #include "minecraft/Pos.h" diff --git a/targets/minecraft/server/Settings.cpp b/targets/minecraft/server/Settings.cpp index 6599a7edf..21f5edec7 100644 --- a/targets/minecraft/server/Settings.cpp +++ b/targets/minecraft/server/Settings.cpp @@ -1,6 +1,6 @@ #include "Settings.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" // 4J - TODO - serialise/deserialise from file Settings::Settings(File* file) {} diff --git a/targets/minecraft/server/level/ServerChunkCache.cpp b/targets/minecraft/server/level/ServerChunkCache.cpp index de94a0514..fc6dcf23d 100644 --- a/targets/minecraft/server/level/ServerChunkCache.cpp +++ b/targets/minecraft/server/level/ServerChunkCache.cpp @@ -9,7 +9,7 @@ #include "app/linux/Linux_App.h" #include "app/linux/Stubs/winapi_stubs.h" #include "ServerLevel.h" -#include "console_helpers/compression.h" +#include "minecraft/world/level/storage/compression.h" #include "minecraft/server/MinecraftServer.h" #include "minecraft/util/ProgressListener.h" #include "minecraft/world/level/Level.h" diff --git a/targets/minecraft/server/level/ServerChunkCache.h b/targets/minecraft/server/level/ServerChunkCache.h index 32b9e1c47..c7734225d 100644 --- a/targets/minecraft/server/level/ServerChunkCache.h +++ b/targets/minecraft/server/level/ServerChunkCache.h @@ -5,7 +5,7 @@ #include #include -#include "console_helpers/C4JThread.h" +#include "platform/C4JThread.h" #include "java/File.h" #include "java/JavaIntHash.h" #include "minecraft/world/level/biome/Biome.h" diff --git a/targets/minecraft/server/level/ServerLevel.cpp b/targets/minecraft/server/level/ServerLevel.cpp index daee70b7f..34ff511d8 100644 --- a/targets/minecraft/server/level/ServerLevel.cpp +++ b/targets/minecraft/server/level/ServerLevel.cpp @@ -8,7 +8,7 @@ #include "platform/sdl2/Input.h" #include "platform/sdl2/Storage.h" #include "EntityTracker.h" -#include "app/common/ShutdownManager.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" diff --git a/targets/minecraft/server/level/ServerLevel.h b/targets/minecraft/server/level/ServerLevel.h index 8e717a776..819467196 100644 --- a/targets/minecraft/server/level/ServerLevel.h +++ b/targets/minecraft/server/level/ServerLevel.h @@ -12,7 +12,7 @@ #include #include "SharedConstants.h" -#include "console_helpers/C4JThread.h" +#include "platform/C4JThread.h" #include "java/JavaIntHash.h" #include "minecraft/world/entity/Entity.h" #include "minecraft/world/level/Level.h" diff --git a/targets/minecraft/server/network/ServerConnection.cpp b/targets/minecraft/server/network/ServerConnection.cpp index 982ef3080..700290fff 100644 --- a/targets/minecraft/server/network/ServerConnection.cpp +++ b/targets/minecraft/server/network/ServerConnection.cpp @@ -5,7 +5,7 @@ #include "app/linux/Linux_App.h" #include "PendingConnection.h" #include "PlayerConnection.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/MultiPlayerLevel.h" #include "minecraft/network/Connection.h" diff --git a/targets/minecraft/stats/Stat.cpp b/targets/minecraft/stats/Stat.cpp index 515e5f6bb..2ed5957c4 100644 --- a/targets/minecraft/stats/Stat.cpp +++ b/targets/minecraft/stats/Stat.cpp @@ -7,7 +7,7 @@ #include "NumberFormatters.h" #include "StatFormatter.h" #include "Stats.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" Stat::DefaultFormat* Stat::defaultFormatter = new DefaultFormat(); Stat::TimeFormatter* Stat::timeFormatter = new TimeFormatter(); diff --git a/targets/minecraft/stats/Stats.cpp b/targets/minecraft/stats/Stats.cpp index a93ab6ae4..5f0a022ef 100644 --- a/targets/minecraft/stats/Stats.cpp +++ b/targets/minecraft/stats/Stats.cpp @@ -6,7 +6,7 @@ #include "Achievements.h" #include "GeneralStat.h" #include "ItemStat.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" #include "minecraft/stats/Stat.h" #include "minecraft/stats/StatsCounter.h" #include "minecraft/world/item/FishingRodItem.h" diff --git a/targets/minecraft/util/HtmlString.cpp b/targets/minecraft/util/HtmlString.cpp index 72b348edc..442303f18 100644 --- a/targets/minecraft/util/HtmlString.cpp +++ b/targets/minecraft/util/HtmlString.cpp @@ -5,7 +5,7 @@ #include #include "app/linux/Linux_App.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" HtmlString::HtmlString(std::wstring text, eMinecraftColour hexColor, bool italics, bool indent) { diff --git a/targets/minecraft/world/entity/Entity.cpp b/targets/minecraft/world/entity/Entity.cpp index 3260b5400..a285748ee 100644 --- a/targets/minecraft/world/entity/Entity.cpp +++ b/targets/minecraft/world/entity/Entity.cpp @@ -18,7 +18,7 @@ #include "app/linux/Linux_App.h" #include "app/linux/Stubs/winapi_stubs.h" #include "SyncedEntityData.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" #include "java/Class.h" #include "java/Random.h" #include "minecraft/Direction.h" diff --git a/targets/minecraft/world/entity/Entity.h b/targets/minecraft/world/entity/Entity.h index cc0216bc5..5b074e121 100644 --- a/targets/minecraft/world/entity/Entity.h +++ b/targets/minecraft/world/entity/Entity.h @@ -6,7 +6,6 @@ #include #include -#include "console_helpers/Definitions.h" #include "java/Class.h" #include "minecraft/world/phys/AABB.h" #include "minecraft/world/phys/Vec3.h" diff --git a/targets/minecraft/world/entity/Mob.cpp b/targets/minecraft/world/entity/Mob.cpp index bee087835..0b1d9cccf 100644 --- a/targets/minecraft/world/entity/Mob.cpp +++ b/targets/minecraft/world/entity/Mob.cpp @@ -9,7 +9,7 @@ #include #include -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" #include "java/Class.h" #include "java/Random.h" #include "minecraft/core/particles/ParticleTypes.h" diff --git a/targets/minecraft/world/entity/animal/EntityHorse.cpp b/targets/minecraft/world/entity/animal/EntityHorse.cpp index 86d41c2cc..af42a882e 100644 --- a/targets/minecraft/world/entity/animal/EntityHorse.cpp +++ b/targets/minecraft/world/entity/animal/EntityHorse.cpp @@ -7,7 +7,7 @@ #include #include "app/linux/Linux_App.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" #include "java/Random.h" #include "minecraft/client/renderer/Textures.h" #include "minecraft/core/particles/ParticleTypes.h" diff --git a/targets/minecraft/world/entity/animal/Ocelot.cpp b/targets/minecraft/world/entity/animal/Ocelot.cpp index a97ab9657..950729c98 100644 --- a/targets/minecraft/world/entity/animal/Ocelot.cpp +++ b/targets/minecraft/world/entity/animal/Ocelot.cpp @@ -7,7 +7,7 @@ #include "IPlatformInput.h" #include "app/linux/Linux_App.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" #include "java/Random.h" #include "minecraft/SharedConstants.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/minecraft/world/entity/animal/Wolf.cpp b/targets/minecraft/world/entity/animal/Wolf.cpp index e48cc0661..d63c22833 100644 --- a/targets/minecraft/world/entity/animal/Wolf.cpp +++ b/targets/minecraft/world/entity/animal/Wolf.cpp @@ -6,7 +6,7 @@ #include #include "Sheep.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" #include "java/Random.h" #include "minecraft/SharedConstants.h" #include "minecraft/core/particles/ParticleTypes.h" diff --git a/targets/minecraft/world/entity/player/Player.h b/targets/minecraft/world/entity/player/Player.h index 0a3b1a691..631bca4ff 100644 --- a/targets/minecraft/world/entity/player/Player.h +++ b/targets/minecraft/world/entity/player/Player.h @@ -8,7 +8,7 @@ #include "platform/PlatformTypes.h" #include "Abilities.h" -#include "console_helpers/Definitions.h" +#include "util/Definitions.h" #include "java/Class.h" #include "minecraft/commands/CommandSender.h" #include "minecraft/network/packet/ChatPacket.h" diff --git a/targets/minecraft/world/inventory/AnvilMenu.cpp b/targets/minecraft/world/inventory/AnvilMenu.cpp index ad0148b71..83d0e7196 100644 --- a/targets/minecraft/world/inventory/AnvilMenu.cpp +++ b/targets/minecraft/world/inventory/AnvilMenu.cpp @@ -6,7 +6,7 @@ #include #include "app/linux/Linux_App.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" #include "minecraft/world/Container.h" #include "minecraft/world/entity/player/Abilities.h" #include "minecraft/world/entity/player/Inventory.h" diff --git a/targets/minecraft/world/item/FireworksItem.cpp b/targets/minecraft/world/item/FireworksItem.cpp index 2b1ccef99..16a5f7808 100644 --- a/targets/minecraft/world/item/FireworksItem.cpp +++ b/targets/minecraft/world/item/FireworksItem.cpp @@ -4,7 +4,7 @@ #include #include "app/linux/Linux_App.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" #include "minecraft/util/HtmlString.h" #include "minecraft/world/entity/player/Abilities.h" #include "minecraft/world/entity/player/Player.h" diff --git a/targets/minecraft/world/item/ItemInstance.cpp b/targets/minecraft/world/item/ItemInstance.cpp index bd567d3da..28b5c8bc1 100644 --- a/targets/minecraft/world/item/ItemInstance.cpp +++ b/targets/minecraft/world/item/ItemInstance.cpp @@ -11,7 +11,7 @@ #include #include "Item.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" #include "minecraft/stats/GenericStats.h" #include "minecraft/util/HtmlString.h" #include "minecraft/world/entity/LivingEntity.h" diff --git a/targets/minecraft/world/item/MapItem.cpp b/targets/minecraft/world/item/MapItem.cpp index 9e2f66d3c..faffce44f 100644 --- a/targets/minecraft/world/item/MapItem.cpp +++ b/targets/minecraft/world/item/MapItem.cpp @@ -7,7 +7,7 @@ #include #include -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" #include "java/Class.h" #include "java/JavaMath.h" #include "minecraft/network/packet/ComplexItemDataPacket.h" diff --git a/targets/minecraft/world/item/PotionItem.cpp b/targets/minecraft/world/item/PotionItem.cpp index b20be0317..79693f799 100644 --- a/targets/minecraft/world/item/PotionItem.cpp +++ b/targets/minecraft/world/item/PotionItem.cpp @@ -4,7 +4,7 @@ #include "app/common/App_enums.h" #include "app/linux/Linux_App.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" #include "java/Random.h" #include "minecraft/SharedConstants.h" #include "minecraft/sounds/SoundTypes.h" diff --git a/targets/minecraft/world/item/SpawnEggItem.cpp b/targets/minecraft/world/item/SpawnEggItem.cpp index 286913955..6cb1fad1b 100644 --- a/targets/minecraft/world/item/SpawnEggItem.cpp +++ b/targets/minecraft/world/item/SpawnEggItem.cpp @@ -6,7 +6,7 @@ #include "Facing.h" #include "app/common/src/Colours/ColourTable.h" #include "app/linux/Linux_App.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" #include "java/Class.h" #include "java/Random.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/minecraft/world/level/ChunkPos.cpp b/targets/minecraft/world/level/ChunkPos.cpp index b08c043ae..023ce6739 100644 --- a/targets/minecraft/world/level/ChunkPos.cpp +++ b/targets/minecraft/world/level/ChunkPos.cpp @@ -4,7 +4,7 @@ #include #include -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" #include "minecraft/world/entity/Entity.h" #include "minecraft/world/level/TilePos.h" diff --git a/targets/minecraft/world/level/Level.h b/targets/minecraft/world/level/Level.h index c60c4b84c..137bd7bbf 100644 --- a/targets/minecraft/world/level/Level.h +++ b/targets/minecraft/world/level/Level.h @@ -15,8 +15,7 @@ #include "LevelSource.h" #include "LightLayer.h" #include "TickNextTickData.h" -#include "console_helpers/C4JThread.h" -#include "console_helpers/Definitions.h" +#include "platform/C4JThread.h" #include "java/Class.h" #include "minecraft/core/particles/ParticleTypes.h" #include "minecraft/world/level/ChunkPos.h" diff --git a/targets/minecraft/world/level/chunk/CompressedTileStorage.cpp b/targets/minecraft/world/level/chunk/CompressedTileStorage.cpp index 5b81fc601..c95285847 100644 --- a/targets/minecraft/world/level/chunk/CompressedTileStorage.cpp +++ b/targets/minecraft/world/level/chunk/CompressedTileStorage.cpp @@ -9,7 +9,7 @@ #include "app/linux/Stubs/winapi_stubs.h" #include "app/include/NetTypes.h" -#include "console_helpers/Definitions.h" +#include "util/Definitions.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" #include "java/System.h" diff --git a/targets/minecraft/world/level/chunk/EmptyLevelChunk.h b/targets/minecraft/world/level/chunk/EmptyLevelChunk.h index a447f80d3..aa6bc5eee 100644 --- a/targets/minecraft/world/level/chunk/EmptyLevelChunk.h +++ b/targets/minecraft/world/level/chunk/EmptyLevelChunk.h @@ -7,7 +7,6 @@ #include #include "LevelChunk.h" -#include "console_helpers/Definitions.h" #include "minecraft/world/level/LightLayer.h" class Level; diff --git a/targets/minecraft/world/level/chunk/WaterLevelChunk.h b/targets/minecraft/world/level/chunk/WaterLevelChunk.h index 8f82e8f71..d3a37f01d 100644 --- a/targets/minecraft/world/level/chunk/WaterLevelChunk.h +++ b/targets/minecraft/world/level/chunk/WaterLevelChunk.h @@ -7,7 +7,6 @@ #include #include "LevelChunk.h" -#include "console_helpers/Definitions.h" #include "minecraft/world/level/LightLayer.h" class Level; diff --git a/targets/minecraft/world/level/chunk/storage/McRegionChunkStorage.cpp b/targets/minecraft/world/level/chunk/storage/McRegionChunkStorage.cpp index 0bab79858..2d75fee22 100644 --- a/targets/minecraft/world/level/chunk/storage/McRegionChunkStorage.cpp +++ b/targets/minecraft/world/level/chunk/storage/McRegionChunkStorage.cpp @@ -11,8 +11,8 @@ #include "IPlatformInput.h" #include "app/common/src/Console_Debug_enum.h" #include "app/linux/Linux_App.h" -#include "console_helpers/C4JThread.h" -#include "console_helpers/compression.h" +#include "platform/C4JThread.h" +#include "minecraft/world/level/storage/compression.h" #include "java/InputOutputStream/BufferedOutputStream.h" #include "java/InputOutputStream/ByteArrayInputStream.h" #include "java/InputOutputStream/ByteArrayOutputStream.h" diff --git a/targets/minecraft/world/level/chunk/storage/OldChunkStorage.cpp b/targets/minecraft/world/level/chunk/storage/OldChunkStorage.cpp index c446124f2..67bc3f739 100644 --- a/targets/minecraft/world/level/chunk/storage/OldChunkStorage.cpp +++ b/targets/minecraft/world/level/chunk/storage/OldChunkStorage.cpp @@ -13,7 +13,7 @@ #include "IPlatformInput.h" #include "app/common/src/Console_Debug_enum.h" #include "app/linux/Linux_App.h" -#include "console_helpers/Definitions.h" +#include "util/Definitions.h" #include "java/File.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" diff --git a/targets/minecraft/world/level/chunk/storage/RegionFile.cpp b/targets/minecraft/world/level/chunk/storage/RegionFile.cpp index d5c8c1277..648bac6de 100644 --- a/targets/minecraft/world/level/chunk/storage/RegionFile.cpp +++ b/targets/minecraft/world/level/chunk/storage/RegionFile.cpp @@ -7,7 +7,7 @@ #include #include "app/linux/Stubs/winapi_stubs.h" -#include "console_helpers/compression.h" +#include "minecraft/world/level/storage/compression.h" #include "java/File.h" #include "java/InputOutputStream/ByteArrayInputStream.h" #include "java/InputOutputStream/DataInputStream.h" diff --git a/targets/minecraft/world/level/chunk/storage/RegionFile.h b/targets/minecraft/world/level/chunk/storage/RegionFile.h index 049431186..88ed22fac 100644 --- a/targets/minecraft/world/level/chunk/storage/RegionFile.h +++ b/targets/minecraft/world/level/chunk/storage/RegionFile.h @@ -4,7 +4,7 @@ #include #include -#include "console_helpers/compression.h" +#include "minecraft/world/level/storage/compression.h" #include "java/InputOutputStream/ByteArrayOutputStream.h" #include "java/InputOutputStream/InputOutputStream.h" diff --git a/targets/minecraft/world/level/chunk/storage/RegionFileCache.cpp b/targets/minecraft/world/level/chunk/storage/RegionFileCache.cpp index 4f69a86b1..33bcff68a 100644 --- a/targets/minecraft/world/level/chunk/storage/RegionFileCache.cpp +++ b/targets/minecraft/world/level/chunk/storage/RegionFileCache.cpp @@ -2,7 +2,7 @@ #include -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" #include "java/File.h" #include "minecraft/world/level/chunk/storage/RegionFile.h" #include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h" diff --git a/targets/minecraft/world/level/levelgen/RandomLevelSource.cpp b/targets/minecraft/world/level/levelgen/RandomLevelSource.cpp index 8428d2db4..eee85ca0b 100644 --- a/targets/minecraft/world/level/levelgen/RandomLevelSource.cpp +++ b/targets/minecraft/world/level/levelgen/RandomLevelSource.cpp @@ -7,7 +7,7 @@ #include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" #include "app/linux/Linux_App.h" -#include "console_helpers/Timer.h" +#include "util/Timer.h" #include "java/Random.h" #include "minecraft/util/Mth.h" #include "minecraft/world/entity/MobCategory.h" diff --git a/targets/minecraft/world/level/levelgen/flat/FlatGeneratorInfo.cpp b/targets/minecraft/world/level/levelgen/flat/FlatGeneratorInfo.cpp index 818b69caa..9d9c5a353 100644 --- a/targets/minecraft/world/level/levelgen/flat/FlatGeneratorInfo.cpp +++ b/targets/minecraft/world/level/levelgen/flat/FlatGeneratorInfo.cpp @@ -1,6 +1,6 @@ #include "FlatGeneratorInfo.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" #include "minecraft/world/level/biome/Biome.h" #include "minecraft/world/level/levelgen/flat/FlatLayerInfo.h" #include "minecraft/world/level/tile/Tile.h" diff --git a/targets/minecraft/world/level/levelgen/flat/FlatLayerInfo.cpp b/targets/minecraft/world/level/levelgen/flat/FlatLayerInfo.cpp index dc4a9ff95..e462ef551 100644 --- a/targets/minecraft/world/level/levelgen/flat/FlatLayerInfo.cpp +++ b/targets/minecraft/world/level/levelgen/flat/FlatLayerInfo.cpp @@ -1,6 +1,6 @@ #include "FlatLayerInfo.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" void FlatLayerInfo::_init(int height, int id) { this->height = height; diff --git a/targets/minecraft/world/level/levelgen/structure/BoundingBox.cpp b/targets/minecraft/world/level/levelgen/structure/BoundingBox.cpp index 732cf1a31..3572b0ae3 100644 --- a/targets/minecraft/world/level/levelgen/structure/BoundingBox.cpp +++ b/targets/minecraft/world/level/levelgen/structure/BoundingBox.cpp @@ -5,7 +5,7 @@ #include #include -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" #include "java/JavaMath.h" #include "minecraft/Direction.h" #include "nbt/IntArrayTag.h" diff --git a/targets/minecraft/world/level/levelgen/structure/StrongholdPieces.cpp b/targets/minecraft/world/level/levelgen/structure/StrongholdPieces.cpp index 42f87dc7c..647f8b3ea 100644 --- a/targets/minecraft/world/level/levelgen/structure/StrongholdPieces.cpp +++ b/targets/minecraft/world/level/levelgen/structure/StrongholdPieces.cpp @@ -8,7 +8,7 @@ #include "app/common/App_enums.h" #include "app/linux/Linux_App.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" #include "java/Random.h" #include "minecraft/Direction.h" #include "minecraft/Facing.h" diff --git a/targets/minecraft/world/level/levelgen/structure/StructureFeatureSavedData.cpp b/targets/minecraft/world/level/levelgen/structure/StructureFeatureSavedData.cpp index 06fbe5037..ae9a68421 100644 --- a/targets/minecraft/world/level/levelgen/structure/StructureFeatureSavedData.cpp +++ b/targets/minecraft/world/level/levelgen/structure/StructureFeatureSavedData.cpp @@ -2,7 +2,7 @@ #include -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" #include "minecraft/world/level/saveddata/SavedData.h" #include "nbt/CompoundTag.h" diff --git a/targets/minecraft/world/level/pathfinder/Node.cpp b/targets/minecraft/world/level/pathfinder/Node.cpp index 421cdef0c..aa5e792e3 100644 --- a/targets/minecraft/world/level/pathfinder/Node.cpp +++ b/targets/minecraft/world/level/pathfinder/Node.cpp @@ -7,7 +7,7 @@ #include -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" #include "minecraft/util/Mth.h" void Node::_init() { diff --git a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.cpp b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.cpp index 9df39c8f9..2d5d2cf33 100644 --- a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.cpp +++ b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.cpp @@ -18,7 +18,7 @@ #include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" #include "app/linux/Linux_App.h" #include "app/linux/Stubs/winapi_stubs.h" -#include "console_helpers/compression.h" +#include "minecraft/world/level/storage/compression.h" #include "java/File.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" diff --git a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.h b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.h index 5e99bb8f8..6db4e52c5 100644 --- a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.h +++ b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.h @@ -2,7 +2,7 @@ #include #include -#include "console_helpers/Definitions.h" +#include "util/Definitions.h" #include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h" #include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h" #include "minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h" diff --git a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp index a88230b8d..70534965c 100644 --- a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp +++ b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp @@ -19,9 +19,9 @@ #include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" #include "app/linux/Linux_App.h" #include "app/linux/Stubs/winapi_stubs.h" -#include "console_helpers/Timer.h" -#include "console_helpers/StringHelpers.h" -#include "console_helpers/compression.h" +#include "util/Timer.h" +#include "util/StringHelpers.h" +#include "minecraft/world/level/storage/compression.h" #include "java/File.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" diff --git a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.h b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.h index d3e02251a..44bc76632 100644 --- a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.h +++ b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.h @@ -5,7 +5,7 @@ #include #include -#include "console_helpers/Definitions.h" +#include "util/Definitions.h" #include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h" #include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h" #include "minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h" diff --git a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.cpp b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.cpp index 46fa45702..4271ca3e2 100644 --- a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.cpp +++ b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.cpp @@ -13,7 +13,7 @@ #include "app/linux/Linux_App.h" #include "app/linux/Stubs/winapi_stubs.h" -#include "console_helpers/Definitions.h" +#include "util/Definitions.h" #include "java/System.h" extern CConsoleMinecraftApp app; diff --git a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h index 2315974ec..66bb7953b 100644 --- a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h +++ b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h @@ -6,7 +6,7 @@ #include #include -#include "console_helpers/Definitions.h" +#include "util/Definitions.h" #define MAKE_FOURCC(ch0, ch1, ch2, ch3) \ (static_cast(static_cast(ch0)) | \ diff --git a/targets/minecraft/world/level/storage/DirectoryLevelStorage.cpp b/targets/minecraft/world/level/storage/DirectoryLevelStorage.cpp index 7d4347c43..e7d77bb93 100644 --- a/targets/minecraft/world/level/storage/DirectoryLevelStorage.cpp +++ b/targets/minecraft/world/level/storage/DirectoryLevelStorage.cpp @@ -16,7 +16,7 @@ #include "app/common/src/GameRules/GameRuleManager.h" #include "app/linux/Linux_App.h" #include "app/linux/Stubs/winapi_stubs.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" #include "java/File.h" #include "java/InputOutputStream/ByteArrayInputStream.h" #include "java/InputOutputStream/ByteArrayOutputStream.h" diff --git a/targets/console_helpers/src/compression.cpp b/targets/minecraft/world/level/storage/compression.cpp similarity index 99% rename from targets/console_helpers/src/compression.cpp rename to targets/minecraft/world/level/storage/compression.cpp index a1805d0ec..420ac882b 100644 --- a/targets/console_helpers/src/compression.cpp +++ b/targets/minecraft/world/level/storage/compression.cpp @@ -1,4 +1,4 @@ -#include "console_helpers/compression.h" +#include "minecraft/world/level/storage/compression.h" #include #include diff --git a/targets/console_helpers/include/console_helpers/compression.h b/targets/minecraft/world/level/storage/compression.h similarity index 100% rename from targets/console_helpers/include/console_helpers/compression.h rename to targets/minecraft/world/level/storage/compression.h diff --git a/targets/minecraft/world/level/tile/BaseRailTile.h b/targets/minecraft/world/level/tile/BaseRailTile.h index 85316a3d9..e9e200ca6 100644 --- a/targets/minecraft/world/level/tile/BaseRailTile.h +++ b/targets/minecraft/world/level/tile/BaseRailTile.h @@ -3,7 +3,6 @@ #include #include "Tile.h" -#include "console_helpers/Definitions.h" #include "minecraft/world/level/TilePos.h" class Random; diff --git a/targets/minecraft/world/level/tile/ButtonTile.h b/targets/minecraft/world/level/tile/ButtonTile.h index f3596547a..6a00ec6c3 100644 --- a/targets/minecraft/world/level/tile/ButtonTile.h +++ b/targets/minecraft/world/level/tile/ButtonTile.h @@ -2,7 +2,6 @@ #include #include "Tile.h" -#include "console_helpers/Definitions.h" class Player; class Random; diff --git a/targets/minecraft/world/level/tile/CactusTile.h b/targets/minecraft/world/level/tile/CactusTile.h index d2102d038..4c995bead 100644 --- a/targets/minecraft/world/level/tile/CactusTile.h +++ b/targets/minecraft/world/level/tile/CactusTile.h @@ -1,6 +1,5 @@ #pragma once #include "Tile.h" -#include "console_helpers/Definitions.h" #include "minecraft/world/level/material/Material.h" class Random; diff --git a/targets/minecraft/world/level/tile/CakeTile.h b/targets/minecraft/world/level/tile/CakeTile.h index 36c152e21..658fd8724 100644 --- a/targets/minecraft/world/level/tile/CakeTile.h +++ b/targets/minecraft/world/level/tile/CakeTile.h @@ -2,7 +2,6 @@ #include #include "Tile.h" -#include "console_helpers/Definitions.h" #include "minecraft/world/level/material/Material.h" class Player; diff --git a/targets/minecraft/world/level/tile/CarrotTile.cpp b/targets/minecraft/world/level/tile/CarrotTile.cpp index 9e84af894..5a49b2de1 100644 --- a/targets/minecraft/world/level/tile/CarrotTile.cpp +++ b/targets/minecraft/world/level/tile/CarrotTile.cpp @@ -2,7 +2,7 @@ #include -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" #include "minecraft/world/IconRegister.h" #include "minecraft/world/item/Item.h" #include "minecraft/world/level/tile/CropTile.h" diff --git a/targets/minecraft/world/level/tile/CropTile.cpp b/targets/minecraft/world/level/tile/CropTile.cpp index b101c1050..59e640901 100644 --- a/targets/minecraft/world/level/tile/CropTile.cpp +++ b/targets/minecraft/world/level/tile/CropTile.cpp @@ -3,7 +3,7 @@ #include #include -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" #include "java/Random.h" #include "minecraft/world/IconRegister.h" #include "minecraft/world/item/Item.h" diff --git a/targets/minecraft/world/level/tile/DoorTile.h b/targets/minecraft/world/level/tile/DoorTile.h index 3888b4bd2..e0fedbc62 100644 --- a/targets/minecraft/world/level/tile/DoorTile.h +++ b/targets/minecraft/world/level/tile/DoorTile.h @@ -3,7 +3,6 @@ #include #include "Tile.h" -#include "console_helpers/Definitions.h" class Player; class HitResult; diff --git a/targets/minecraft/world/level/tile/FarmTile.h b/targets/minecraft/world/level/tile/FarmTile.h index 4bdb1cad4..30420a06f 100644 --- a/targets/minecraft/world/level/tile/FarmTile.h +++ b/targets/minecraft/world/level/tile/FarmTile.h @@ -1,6 +1,5 @@ #pragma once #include "Tile.h" -#include "console_helpers/Definitions.h" class Random; class ChunkRebuildData; diff --git a/targets/minecraft/world/level/tile/FenceTile.h b/targets/minecraft/world/level/tile/FenceTile.h index a826e13d6..3d0b04981 100644 --- a/targets/minecraft/world/level/tile/FenceTile.h +++ b/targets/minecraft/world/level/tile/FenceTile.h @@ -3,7 +3,6 @@ #include #include "Tile.h" -#include "console_helpers/Definitions.h" class LevelSource; class Material; diff --git a/targets/minecraft/world/level/tile/FireTile.h b/targets/minecraft/world/level/tile/FireTile.h index e1cb2ab83..ea18df1e6 100644 --- a/targets/minecraft/world/level/tile/FireTile.h +++ b/targets/minecraft/world/level/tile/FireTile.h @@ -2,7 +2,6 @@ #include #include "Tile.h" -#include "console_helpers/Definitions.h" class Random; class ChunkRebuildData; diff --git a/targets/minecraft/world/level/tile/LadderTile.h b/targets/minecraft/world/level/tile/LadderTile.h index ead47ba02..65f589829 100644 --- a/targets/minecraft/world/level/tile/LadderTile.h +++ b/targets/minecraft/world/level/tile/LadderTile.h @@ -2,7 +2,6 @@ #include #include "Tile.h" -#include "console_helpers/Definitions.h" class Random; diff --git a/targets/minecraft/world/level/tile/LiquidTile.h b/targets/minecraft/world/level/tile/LiquidTile.h index ebf3eb67c..1471a1840 100644 --- a/targets/minecraft/world/level/tile/LiquidTile.h +++ b/targets/minecraft/world/level/tile/LiquidTile.h @@ -3,7 +3,6 @@ #include #include "Tile.h" -#include "console_helpers/Definitions.h" #include "minecraft/world/phys/Vec3.h" class Random; diff --git a/targets/minecraft/world/level/tile/NetherWartTile.cpp b/targets/minecraft/world/level/tile/NetherWartTile.cpp index 17bd7ab8e..adbc414e4 100644 --- a/targets/minecraft/world/level/tile/NetherWartTile.cpp +++ b/targets/minecraft/world/level/tile/NetherWartTile.cpp @@ -3,7 +3,7 @@ #include #include -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" #include "java/Random.h" #include "minecraft/world/IconRegister.h" #include "minecraft/world/item/Item.h" diff --git a/targets/minecraft/world/level/tile/PlantTile.h b/targets/minecraft/world/level/tile/PlantTile.h index d23e1c09a..923e34ca0 100644 --- a/targets/minecraft/world/level/tile/PlantTile.h +++ b/targets/minecraft/world/level/tile/PlantTile.h @@ -1,6 +1,5 @@ #pragma once #include "Tile.h" -#include "console_helpers/Definitions.h" #include "minecraft/world/level/material/Material.h" class Random; diff --git a/targets/minecraft/world/level/tile/PortalTile.h b/targets/minecraft/world/level/tile/PortalTile.h index bd4448a85..4d822865a 100644 --- a/targets/minecraft/world/level/tile/PortalTile.h +++ b/targets/minecraft/world/level/tile/PortalTile.h @@ -3,7 +3,6 @@ #include #include "HalfTransparentTile.h" -#include "console_helpers/Definitions.h" class Random; class Level; diff --git a/targets/minecraft/world/level/tile/PotatoTile.cpp b/targets/minecraft/world/level/tile/PotatoTile.cpp index 61dc02fe0..601f675fb 100644 --- a/targets/minecraft/world/level/tile/PotatoTile.cpp +++ b/targets/minecraft/world/level/tile/PotatoTile.cpp @@ -3,7 +3,7 @@ #include #include -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" #include "java/Random.h" #include "minecraft/world/IconRegister.h" #include "minecraft/world/item/Item.h" diff --git a/targets/minecraft/world/level/tile/RedStoneDustTile.h b/targets/minecraft/world/level/tile/RedStoneDustTile.h index 26b6af6b9..f53fbe9c4 100644 --- a/targets/minecraft/world/level/tile/RedStoneDustTile.h +++ b/targets/minecraft/world/level/tile/RedStoneDustTile.h @@ -4,7 +4,6 @@ #include #include "Tile.h" -#include "console_helpers/Definitions.h" #include "minecraft/world/level/TilePos.h" class Random; diff --git a/targets/minecraft/world/level/tile/ReedTile.h b/targets/minecraft/world/level/tile/ReedTile.h index a20c444a6..be70e5b00 100644 --- a/targets/minecraft/world/level/tile/ReedTile.h +++ b/targets/minecraft/world/level/tile/ReedTile.h @@ -3,7 +3,6 @@ #include #include "Tile.h" -#include "console_helpers/Definitions.h" class Random; class Level; diff --git a/targets/minecraft/world/level/tile/SoulSandTile.h b/targets/minecraft/world/level/tile/SoulSandTile.h index 2ebfc1c4c..5e0fe9d9d 100644 --- a/targets/minecraft/world/level/tile/SoulSandTile.h +++ b/targets/minecraft/world/level/tile/SoulSandTile.h @@ -1,6 +1,5 @@ #pragma once #include "Tile.h" -#include "console_helpers/Definitions.h" class SoulSandTile : public Tile { public: diff --git a/targets/minecraft/world/level/tile/ThinFenceTile.h b/targets/minecraft/world/level/tile/ThinFenceTile.h index d919dad6e..041835b94 100644 --- a/targets/minecraft/world/level/tile/ThinFenceTile.h +++ b/targets/minecraft/world/level/tile/ThinFenceTile.h @@ -3,7 +3,6 @@ #include #include "Tile.h" -#include "console_helpers/Definitions.h" class Icon; class Material; diff --git a/targets/minecraft/world/level/tile/Tile.cpp b/targets/minecraft/world/level/tile/Tile.cpp index c965ae31e..6b5dfb1b6 100644 --- a/targets/minecraft/world/level/tile/Tile.cpp +++ b/targets/minecraft/world/level/tile/Tile.cpp @@ -6,7 +6,7 @@ #include "Facing.h" #include "app/linux/Linux_App.h" -#include "console_helpers/StringHelpers.h" +#include "util/StringHelpers.h" #include "java/Class.h" #include "java/Random.h" #include "minecraft/sounds/SoundTypes.h" diff --git a/targets/minecraft/world/level/tile/Tile.h b/targets/minecraft/world/level/tile/Tile.h index ea199dab5..8a4c4717c 100644 --- a/targets/minecraft/world/level/tile/Tile.h +++ b/targets/minecraft/world/level/tile/Tile.h @@ -5,7 +5,6 @@ #include #include -#include "console_helpers/Definitions.h" #include "minecraft/sounds/SoundTypes.h" #include "minecraft/world/level/material/Material.h" #include "minecraft/world/phys/AABB.h" diff --git a/targets/minecraft/world/level/tile/TorchTile.h b/targets/minecraft/world/level/tile/TorchTile.h index 997e9dcab..b9b66ea62 100644 --- a/targets/minecraft/world/level/tile/TorchTile.h +++ b/targets/minecraft/world/level/tile/TorchTile.h @@ -2,7 +2,6 @@ #include #include "Tile.h" -#include "console_helpers/Definitions.h" class Random; class HitResult; diff --git a/targets/minecraft/world/phys/AABB.h b/targets/minecraft/world/phys/AABB.h index a89942bc1..201b94b4b 100644 --- a/targets/minecraft/world/phys/AABB.h +++ b/targets/minecraft/world/phys/AABB.h @@ -4,7 +4,6 @@ #include #include "Vec3.h" -#include "console_helpers/Definitions.h" class HitResult; class Vec3; diff --git a/targets/console_helpers/src/C4JThread.cpp b/targets/platform/C4JThread.cpp similarity index 99% rename from targets/console_helpers/src/C4JThread.cpp rename to targets/platform/C4JThread.cpp index c951ff78d..112b5b8b3 100644 --- a/targets/console_helpers/src/C4JThread.cpp +++ b/targets/platform/C4JThread.cpp @@ -26,8 +26,8 @@ #include #endif -#include "app/common/ShutdownManager.h" -#include "console_helpers/C4JThread.h" +#include "platform/ShutdownManager.h" +#include "platform/C4JThread.h" class Level; diff --git a/targets/console_helpers/include/console_helpers/C4JThread.h b/targets/platform/C4JThread.h similarity index 100% rename from targets/console_helpers/include/console_helpers/C4JThread.h rename to targets/platform/C4JThread.h diff --git a/targets/app/linux/Linux_ShutdownManager.cpp b/targets/platform/ShutdownManager.cpp similarity index 89% rename from targets/app/linux/Linux_ShutdownManager.cpp rename to targets/platform/ShutdownManager.cpp index 1ad6954ee..cd3b82678 100644 --- a/targets/app/linux/Linux_ShutdownManager.cpp +++ b/targets/platform/ShutdownManager.cpp @@ -1,7 +1,7 @@ // Linux stub implementations for ShutdownManager // The PS3/PSVita versions have full implementations; on Linux these are no-ops. -#include "app/common/ShutdownManager.h" -#include "console_helpers/C4JThread.h" +#include "platform/ShutdownManager.h" +#include "platform/C4JThread.h" void ShutdownManager::Initialise() {} void ShutdownManager::StartShutdown() {} diff --git a/targets/app/common/ShutdownManager.h b/targets/platform/ShutdownManager.h similarity index 96% rename from targets/app/common/ShutdownManager.h rename to targets/platform/ShutdownManager.h index 36d48e177..c56ab13fe 100644 --- a/targets/app/common/ShutdownManager.h +++ b/targets/platform/ShutdownManager.h @@ -6,7 +6,7 @@ #include #include -#include "console_helpers/C4JThread.h" +#include "platform/C4JThread.h" class ShutdownManager { public: diff --git a/targets/platform/meson.build b/targets/platform/meson.build index 49aed3276..02c33afe1 100644 --- a/targets/platform/meson.build +++ b/targets/platform/meson.build @@ -1,6 +1,14 @@ platform_inc = include_directories('.') +lib_platform_core = static_library('platform_core', + files('C4JThread.cpp', 'ShutdownManager.cpp'), + include_directories: [platform_inc, include_directories('..')], + dependencies: [dependency('threads')], + cpp_args: global_cpp_args + global_cpp_defs, +) + platform_dep = declare_dependency( + link_with: lib_platform_core, include_directories: platform_inc, ) diff --git a/targets/console_helpers/include/console_helpers/Definitions.h b/targets/util/include/util/Definitions.h similarity index 100% rename from targets/console_helpers/include/console_helpers/Definitions.h rename to targets/util/include/util/Definitions.h diff --git a/targets/console_helpers/include/console_helpers/StringHelpers.h b/targets/util/include/util/StringHelpers.h similarity index 100% rename from targets/console_helpers/include/console_helpers/StringHelpers.h rename to targets/util/include/util/StringHelpers.h diff --git a/targets/console_helpers/include/console_helpers/Timer.h b/targets/util/include/util/Timer.h similarity index 100% rename from targets/console_helpers/include/console_helpers/Timer.h rename to targets/util/include/util/Timer.h diff --git a/targets/util/meson.build b/targets/util/meson.build new file mode 100644 index 000000000..8f33dc703 --- /dev/null +++ b/targets/util/meson.build @@ -0,0 +1,16 @@ +simdutf_dep = dependency('simdutf', + fallback: ['simdutf', 'simdutf_dep'], + default_options: ['utf8=true', 'utf16=true', 'utf32=true'] +) + +lib_util = static_library('util', + files('src/StringHelpers.cpp'), + dependencies: [simdutf_dep], + include_directories : include_directories('include', '..'), + cpp_args : global_cpp_args + global_cpp_defs, +) + +util_dep = declare_dependency( + link_with : lib_util, + include_directories : include_directories('include'), +) diff --git a/targets/console_helpers/src/StringHelpers.cpp b/targets/util/src/StringHelpers.cpp similarity index 100% rename from targets/console_helpers/src/StringHelpers.cpp rename to targets/util/src/StringHelpers.cpp