refactor: dissolve console_helpers into util, platform, and minecraft

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')

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"

targets/app/common/Consoles_App.h

@@ -3,7 +3,7 @@
 #include <cstdint>
 #include <mutex>
 
-#include "console_helpers/Timer.h"
+#include "util/Timer.h"
 #include "platform/sdl2/Profile.h"
 #include "platform/sdl2/Storage.h"
 

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"

targets/app/common/src/Colours/ColourTable.cpp

@@ -5,7 +5,7 @@
 #include <vector>
 
 #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"
 

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"

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"";

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"

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"

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() {

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"

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"

targets/app/common/src/GameRules/LevelGeneration/ConsoleSchematicFile.h

@@ -14,7 +14,7 @@
 #include <vector>
 
 #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;

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"

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() {

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"
 

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"
 

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"

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"

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"

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"

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"
 

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;

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;

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() {

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"

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() {

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"};

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"

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;

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;

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;
 

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;

targets/app/common/src/Network/Socket.cpp

@@ -7,7 +7,7 @@
 #include <vector>
 
 // 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"

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"
 

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"

targets/app/common/src/Tutorial/Tutorial.h

@@ -9,7 +9,7 @@
 #include <utility>
 #include <vector>
 
-#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"

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"

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"

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"

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;

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)

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"

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"

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;

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) {

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() {}
 

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;

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() {}
 

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) {

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() {}
 

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"

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() {}
 

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() {}
 

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) {

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;

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) {

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() {

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;

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; }
 

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() {}
 

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,

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"

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"
 

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"

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"
 

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"

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

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"
 

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"

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;

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"

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"

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"

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"

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"

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"

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

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"

targets/app/common/src/UI/UIController.h

@@ -8,7 +8,7 @@
 #include <unordered_map>
 #include <vector>
 
-#include "console_helpers/Timer.h"
+#include "util/Timer.h"
 
 #ifdef __linux__
 #include "app/linux/Iggy/include/iggy.h"

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"

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;

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,

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"

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"

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'

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) {

targets/app/windows/Source Files/Windows64_Minecraft.cpp

@@ -6,7 +6,7 @@
 #include <mutex>
 
 #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"

targets/console_helpers/meson.build

@@ -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'),
-)

targets/java/include/java/ByteBuffer.h

@@ -4,7 +4,7 @@
 #include <vector>
 
 #include "Buffer.h"
-#include "console_helpers/Definitions.h"  // 4jcraft TODO
+#include "util/Definitions.h"  // 4jcraft TODO
 
 class IntBuffer;
 class FloatBuffer;

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,

targets/java/src/File.cpp

@@ -8,7 +8,7 @@
 #include <system_error>
 #include <vector>
 
-#include "console_helpers/StringHelpers.h"  // 4jcraft TODO
+#include "util/StringHelpers.h"  // 4jcraft TODO
 #include "platform/PlatformServices.h"
 #include "java/FileFilter.h"
 

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"

targets/minecraft/client/Minecraft.h

@@ -7,7 +7,7 @@
 #include <vector>
 
 #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"

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"

targets/minecraft/client/gui/ChatScreen.cpp

@@ -3,7 +3,7 @@
 #include <memory>
 
 #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"

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"

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"

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"

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"