move ConsoleHelpers out of Minecraft.World

2026-05-17 07:22:53 +00:00 · 2026-04-01 11:36:19 -05:00 · 2026-04-01 11:36:19 -05:00 · 1c22f1e1b4
parent c49c0a7f27
commit 1c22f1e1b4
247 changed files with 364 additions and 343 deletions
--- a/meson.build
+++ b/meson.build
@ -63,6 +63,7 @@ stb_dep = declare_dependency(include_directories: stb)

 miniaudio_dep = dependency('miniaudio')

+subdir('minecraft/console_helpers')
 subdir('minecraft/java')
 subdir('minecraft/nbt')
 subdir('minecraft/platform')
--- a/minecraft/Minecraft.Client/Common/Consoles_App.cpp
+++ b/minecraft/Minecraft.Client/Common/Consoles_App.cpp
@ -20,7 +20,7 @@
 #include "Minecraft.World/net/minecraft/world/level/tile/entity/DispenserTileEntity.h"
 #include "Minecraft.World/net/minecraft/world/level/tile/entity/SignTileEntity.h"
 #include "Minecraft.World/net/minecraft/world/level/tile/entity/HopperTileEntity.h"
-#include "Minecraft.World/ConsoleHelpers/PathHelper.h"
+#include "console_helpers/PathHelper.h"
 #include "Minecraft.Client/net/minecraft/stats/StatsCounter.h"
 #include "Minecraft.Client/net/minecraft/server/level/GameMode.h"
 #include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h"
@ -28,7 +28,7 @@
 #include "Minecraft.Client/Windows64/XML/ATGXmlParser.h"
 #include "Minecraft.Client/Windows64/XML/xmlFilesCallback.h"
 #endif
-#include "Minecraft.World/ConsoleHelpers/PlatformTime.h"
+#include "console_helpers/PlatformTime.h"
 #include "Minecraft_Macros.h"
 #include "Minecraft.Client/net/minecraft/server/PlayerList.h"
 #include "Minecraft.Client/net/minecraft/server/level/ServerPlayer.h"
@ -41,7 +41,7 @@
 #include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h"
 #include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h"
 #include "Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderDispatcher.h"
-#include "Minecraft.World/ConsoleHelpers/compression.h"
+#include "console_helpers/compression.h"
 #include "Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h"
 #include "Minecraft.Client/net/minecraft/client/skins/DLCTexturePack.h"
 #include "Minecraft.Client/Common/src/DLC/DLCPack.h"
@ -50,7 +50,7 @@
 #include "Minecraft.Client/net/minecraft/client/Minecraft.h"
 #include "Minecraft.Client/Common/src/Leaderboards/LeaderboardManager.h"
 #include "Minecraft.Client/Common/src/Colours/ColourTable.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"

 #include "4J_Input.h"
 #include "Minecraft.Client/net/minecraft/client/gui/Gui.h"
--- a/minecraft/Minecraft.Client/Common/ShutdownManager.h
+++ b/minecraft/Minecraft.Client/Common/ShutdownManager.h
@ -6,7 +6,7 @@
 #include <cstddef>
 #include <mutex>

-#include "../../Minecraft.World/ConsoleHelpers/C4JThread.h"
+#include "console_helpers/C4JThread.h"

 class ShutdownManager {
 public:
--- a/minecraft/Minecraft.Client/Common/src/Audio/SoundEngine.cpp
+++ b/minecraft/Minecraft.Client/Common/src/Audio/SoundEngine.cpp
@ -11,7 +11,7 @@

 #include "SoundEngine.h"
 #include <filesystem>
-#include "Minecraft.World/ConsoleHelpers/PathHelper.h"
+#include "console_helpers/PathHelper.h"
 #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h"
 #include "Minecraft.World/net/minecraft/util/Mth.h"
@ -19,7 +19,7 @@
 #include "Minecraft.Client/Common/src/Audio/SoundEngine.h"
 #include "4J.Common/4J_Compat.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
-#include "Minecraft.World/ConsoleHelpers/C4JThread.h"
+#include "console_helpers/C4JThread.h"
 #include "Minecraft.World/net/minecraft/world/entity/Mob.h"
 #include "java/Random.h"
 #include "Minecraft.Client/net/minecraft/client/Minecraft.h"
--- a/minecraft/Minecraft.Client/Common/src/Colours/ColourTable.cpp
+++ b/minecraft/Minecraft.Client/Common/src/Colours/ColourTable.cpp
@ -3,7 +3,7 @@
 #include <cstring>

 #include "ColourTable.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.Client/Common/src/Colours/ColourTable.h"
 #include "Minecraft.Client/include/NetTypes.h"
 #include "Minecraft.Client/include/XboxStubs.h"
--- a/minecraft/Minecraft.Client/Common/src/DLC/DLCManager.cpp
+++ b/minecraft/Minecraft.Client/Common/src/DLC/DLCManager.cpp
@ -5,8 +5,8 @@
 #include "DLCManager.h"
 #include "DLCPack.h"
 #include "DLCFile.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
-#include "Minecraft.World/ConsoleHelpers/PortableFileIO.h"
+#include "console_helpers/StringHelpers.h"
+#include "console_helpers/PortableFileIO.h"
 #include "Minecraft.Client/Common/src/UI/UIController.h"
 #include "Minecraft.Client/net/minecraft/client/Minecraft.h"
 #include "Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h"
--- a/minecraft/Minecraft.Client/Common/src/DLC/DLCPack.cpp
+++ b/minecraft/Minecraft.Client/Common/src/DLC/DLCPack.cpp
@ -13,7 +13,7 @@
 #include "DLCGameRulesHeader.h"
 #include "DLCAudioFile.h"
 #include "DLCColourTableFile.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.Client/Common/src/DLC/DLCPack.h"
 #include "4J_Profile.h"
 #include "Minecraft.Client/Common/src/Console_Debug_enum.h"
--- a/minecraft/Minecraft.Client/Common/src/GameRules/GameRuleManager.cpp
+++ b/minecraft/Minecraft.Client/Common/src/GameRules/GameRuleManager.cpp
@ -1,9 +1,8 @@
 #include "Minecraft.Client/include/stdafx.h"

-#include "Minecraft.World/ConsoleHelpers/compression.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/compression.h"
+#include "console_helpers/StringHelpers.h"
 #include "java/File.h"
-#include "Minecraft.World/ConsoleHelpers/compression.h"
 #include "Minecraft.Client/Common/src/DLC/DLCPack.h"
 #include "Minecraft.Client/Common/src/DLC/DLCLocalisationFile.h"
 #include "Minecraft.Client/Common/src/DLC/DLCGameRulesFile.h"
--- a/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.cpp
+++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.cpp
@ -1,7 +1,7 @@
 #include <algorithm>
 #include <cmath>

-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "ApplySchematicRuleDefinition.h"
 #include "LevelGenerationOptions.h"
 #include "ConsoleSchematicFile.h"
--- a/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/BiomeOverride.cpp
+++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/BiomeOverride.cpp
@ -1,4 +1,4 @@
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "BiomeOverride.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/BiomeOverride.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
--- a/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructure.cpp
+++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructure.cpp
@ -2,7 +2,7 @@
 #include <algorithm>

 #include "ConsoleGenerateStructure.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructure.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.h"
--- a/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.cpp
+++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.cpp
@ -6,7 +6,7 @@
 #include <unordered_map>

 #include "ConsoleSchematicFile.h"
-#include "Minecraft.World/ConsoleHelpers/compression.h"
+#include "console_helpers/compression.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "Minecraft.World/net/minecraft/world/entity/Entity.h"
 #include "Minecraft.World/net/minecraft/world/entity/EntityIO.h"
--- a/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.h
+++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.h
@ -12,7 +12,7 @@
 #include <vector>

 #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
-#include "Minecraft.World/ConsoleHelpers/compression.h"
+#include "console_helpers/compression.h"
 #include "Minecraft.World/net/minecraft/world/phys/Vec3.h"

 class Level;
--- a/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.cpp
+++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.cpp
@ -4,7 +4,7 @@

 #include "Minecraft.Client/include/stdafx.h"

-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.World/net/minecraft/Pos.h"
 #include "Minecraft.World/net/minecraft/world/phys/net.minecraft.world.phys.h"
 #include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h"
--- a/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/StartFeature.cpp
+++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/StartFeature.cpp
@ -1,4 +1,4 @@
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "StartFeature.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StartFeature.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
--- a/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.cpp
+++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.cpp
@ -1,5 +1,5 @@
 #include "XboxStructureActionGenerateBox.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
--- a/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.cpp
+++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.cpp
@ -1,5 +1,5 @@
 #include "XboxStructureActionPlaceBlock.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
--- a/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.cpp
+++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.cpp
@ -1,7 +1,7 @@
 #include <wchar.h>
 #include <memory>

-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "XboxStructureActionPlaceContainer.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.h"
--- a/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.cpp
+++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.cpp
@ -1,7 +1,7 @@
 #include <algorithm>
 #include <vector>

-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "AddEnchantmentRuleDefinition.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
--- a/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.cpp
+++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.cpp
@ -1,6 +1,6 @@
 #include <algorithm>

-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "AddItemRuleDefinition.h"
 #include "AddEnchantmentRuleDefinition.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h"
--- a/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.cpp
+++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.cpp
@ -1,4 +1,4 @@
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "CollectItemRuleDefinition.h"
 #include "Minecraft.World/net/minecraft/network/Connection.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.h"
--- a/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.cpp
+++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.cpp
@ -3,7 +3,7 @@
 #include <utility>

 #include "CompleteAllRuleDefinition.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.World/net/minecraft/network/Connection.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h"
--- a/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.cpp
+++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.cpp
@ -4,7 +4,7 @@
 #include <unordered_map>
 #include <utility>

-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "CompoundGameRuleDefinition.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h"
--- a/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.cpp
+++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.cpp
@ -6,7 +6,7 @@
 #include <utility>
 #include <vector>

-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
--- a/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.cpp
+++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.cpp
@ -1,7 +1,7 @@
 #include <wchar.h>

 #include "NamedAreaRuleDefinition.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
--- a/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.cpp
+++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.cpp
@ -3,7 +3,7 @@

 #include "UpdatePlayerRuleDefinition.h"
 #include "Minecraft.World/net/minecraft/Pos.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
--- a/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.cpp
+++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.cpp
@ -1,4 +1,4 @@
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "UseTileRuleDefinition.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
--- a/minecraft/Minecraft.Client/Common/src/Leaderboards/LeaderboardManager.cpp
+++ b/minecraft/Minecraft.Client/Common/src/Leaderboards/LeaderboardManager.cpp
@ -1,4 +1,4 @@
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "LeaderboardManager.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "Minecraft.Client/include/NetTypes.h"
--- a/minecraft/Minecraft.Client/Common/src/Network/GameNetworkManager.cpp
+++ b/minecraft/Minecraft.Client/Common/src/Network/GameNetworkManager.cpp
@ -5,11 +5,11 @@
 #include <fstream>
 #include <filesystem>

-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.World/net/minecraft/world/phys/AABB.h"
 #include "Minecraft.World/net/minecraft/world/phys/Vec3.h"
 #include "Socket.h"
-#include "Minecraft.World/ConsoleHelpers/ThreadName.h"
+#include "console_helpers/ThreadName.h"
 #include "Minecraft.World/net/minecraft/world/entity/Entity.h"
 #include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h"
 #include "Minecraft.World/net/minecraft/world/item/crafting/FireworksRecipe.h"
@ -24,7 +24,7 @@
 #include "Minecraft.Client/net/minecraft/client/ProgressRenderer.h"
 #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "Minecraft.World/net/minecraft/network/packet/DisconnectPacket.h"
-#include "Minecraft.World/ConsoleHelpers/compression.h"
+#include "console_helpers/compression.h"
 #include "Minecraft.World/net/minecraft/world/level/chunk/storage/OldChunkStorage.h"
 #include "Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h"
 #include "Minecraft.Client/net/minecraft/client/skins/TexturePack.h"
--- a/minecraft/Minecraft.Client/Common/src/Network/GameNetworkManager.h
+++ b/minecraft/Minecraft.Client/Common/src/Network/GameNetworkManager.h
@ -4,7 +4,7 @@
 #if !defined(__linux__)
 #include <qnet.h>
 #endif
-#include "Minecraft.World/ConsoleHelpers/C4JThread.h"
+#include "console_helpers/C4JThread.h"
 #include "NetworkPlayerInterface.h"
 #include "PlatformNetworkManagerStub.h"
 #include "SessionInfo.h"
--- a/minecraft/Minecraft.Client/Common/src/Network/PlatformNetworkManagerInterface.h
+++ b/minecraft/Minecraft.Client/Common/src/Network/PlatformNetworkManagerInterface.h
@ -4,7 +4,7 @@
 #if !defined(__linux__)
 #include <qnet.h>
 #endif
-#include "Minecraft.World/ConsoleHelpers/C4JThread.h"
+#include "console_helpers/C4JThread.h"
 #include "Minecraft.Client/include/NetTypes.h"
 #include "Minecraft.Client/include/XboxStubs.h"
 #include "Minecraft.Client/include/SkinBox.h"
--- a/minecraft/Minecraft.Client/Common/src/Network/PlatformNetworkManagerStub.cpp
+++ b/minecraft/Minecraft.Client/Common/src/Network/PlatformNetworkManagerStub.cpp
@ -9,7 +9,7 @@
 #include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
-#include "Minecraft.World/ConsoleHelpers/C4JThread.h"
+#include "console_helpers/C4JThread.h"

 CPlatformNetworkManagerStub* g_pPlatformNetworkManager;

--- a/minecraft/Minecraft.Client/Common/src/Network/PlatformNetworkManagerStub.h
+++ b/minecraft/Minecraft.Client/Common/src/Network/PlatformNetworkManagerStub.h
@ -4,7 +4,7 @@
 #include <vector>
 #include <string>

-#include "Minecraft.World/ConsoleHelpers/C4JThread.h"
+#include "console_helpers/C4JThread.h"
 #include "NetworkPlayerInterface.h"
 #include "PlatformNetworkManagerInterface.h"
 #include "SessionInfo.h"
--- a/minecraft/Minecraft.Client/Common/src/Network/Socket.h
+++ b/minecraft/Minecraft.Client/Common/src/Network/Socket.h
@ -11,8 +11,8 @@

 #include "java/InputOutputStream/InputStream.h"
 #include "java/InputOutputStream/OutputStream.h"
-#include "Minecraft.World/ConsoleHelpers/C4JThread.h" // 4jcraft TODO
-#include "Minecraft.World/ConsoleHelpers/ThreadName.h" // 4jcraft TODO
+#include "console_helpers/C4JThread.h" // 4jcraft TODO
+#include "console_helpers/ThreadName.h" // 4jcraft TODO
 #include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h"
 #include "Minecraft.Client/Common/src/Network/GameNetworkManager.h"

--- a/minecraft/Minecraft.Client/Common/src/Tutorial/Tutorial.cpp
+++ b/minecraft/Minecraft.Client/Common/src/Tutorial/Tutorial.cpp
@ -1,6 +1,6 @@
 #include "Minecraft.Client/include/stdafx.h"

-#include "Minecraft.World/ConsoleHelpers/PlatformTime.h"
+#include "console_helpers/PlatformTime.h"
 #include "Minecraft.World/net/minecraft/stats/net.minecraft.stats.h"
 #include "Minecraft.Client/net/minecraft/client/player/LocalPlayer.h"
 #include "Minecraft.World/net/minecraft/world/entity/Entity.h"
@ -19,7 +19,7 @@
 #include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTasks.h"
 #include "Minecraft.Client/Common/src/Tutorial/Constraints/TutorialConstraints.h"
 #include "Minecraft.Client/Common/src/Tutorial/Hints/TutorialHints.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"

 #include "4J.Common/4J_InputActions.h"

--- a/minecraft/Minecraft.Client/Common/src/Tutorial/TutorialMode.cpp
+++ b/minecraft/Minecraft.Client/Common/src/Tutorial/TutorialMode.cpp
@ -1,5 +1,5 @@
 #include "Minecraft.World/stdafx.h"
-#include "Minecraft.World/ConsoleHelpers/PlatformTime.h"
+#include "console_helpers/PlatformTime.h"
 #include <memory>

 #include "Minecraft.Client/net/minecraft/client/Minecraft.h"
--- a/minecraft/Minecraft.Client/Common/src/UI/All
+++ b/minecraft/Minecraft.Client/Common/src/UI/All
@ -2,8 +2,8 @@
 #include <cstdlib>
 #include <utility>

-#include "Minecraft.World/ConsoleHelpers/PortableFileIO.h"
-#include "Minecraft.World/ConsoleHelpers/compression.h"
+#include "console_helpers/PortableFileIO.h"
+#include "console_helpers/compression.h"
 #include "ArchiveFile.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/ArchiveFile.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
--- a/minecraft/Minecraft.Client/Common/src/UI/All
+++ b/minecraft/Minecraft.Client/Common/src/UI/All
@ -13,9 +13,9 @@
 #include "Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h"
 #include "Minecraft.Client/net/minecraft/client/skins/TexturePack.h"
 #include "Minecraft.Client/net/minecraft/client/skins/DLCTexturePack.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.Client/Common/src/DLC/DLCPack.h"
-#include "Minecraft.World/ConsoleHelpers/compression.h"
+#include "console_helpers/compression.h"
 #include "Minecraft.Client/Common/src/Network/GameNetworkManager.h"

 int IUIScene_PauseMenu::ExitGameDialogReturned(
--- a/minecraft/Minecraft.Client/Common/src/UI/All
+++ b/minecraft/Minecraft.Client/Common/src/UI/All
@ -7,7 +7,7 @@
 #include "Minecraft.Client/net/minecraft/client/Minecraft.h"
 #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.h"
 #include "IUIScene_TradingMenu.h"

--- a/minecraft/Minecraft.Client/Common/src/UI/All
+++ b/minecraft/Minecraft.Client/Common/src/UI/All
@ -7,7 +7,7 @@

 #include "UIEnums.h"
 #include "Minecraft.Client/Common/App_Defines.h"
-#include "Minecraft.World/ConsoleHelpers/C4JThread.h"
+#include "console_helpers/C4JThread.h"
 #include "4J.Storage/4J_Storage.h"

 class Container;
--- a/minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_PressStartToPlay.cpp
+++ b/minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_PressStartToPlay.cpp
@ -2,7 +2,7 @@

 #include "Minecraft.Client/Common/src/UI/UI.h"
 #include "UIComponent_PressStartToPlay.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"

 UIComponent_PressStartToPlay::UIComponent_PressStartToPlay(int iPad,
                                                           void* initData,
--- a/minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_Tooltips.cpp
+++ b/minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_Tooltips.cpp
@ -5,7 +5,7 @@
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "Minecraft.Client/Linux/Linux_UIController.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"

 UIComponent_Tooltips::UIComponent_Tooltips(int iPad, void* initData,
                                           UILayer* parentLayer)
--- a/minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_TutorialPopup.cpp
+++ b/minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_TutorialPopup.cpp
@ -3,7 +3,7 @@
 #include "Minecraft.Client/Common/src/UI/UI.h"
 #include "UIComponent_TutorialPopup.h"
 #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "Minecraft.Client/net/minecraft/client/Minecraft.h"
 #include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h"
--- a/minecraft/Minecraft.Client/Common/src/UI/Components/UIScene_HUD.cpp
+++ b/minecraft/Minecraft.Client/Common/src/UI/Components/UIScene_HUD.cpp
@ -9,7 +9,7 @@
 #include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h"
 #include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h"
 #include "Minecraft.World/net/minecraft/world/effect/net.minecraft.world.effect.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.Client/net/minecraft/client/gui/Gui.h"

 UIScene_HUD::UIScene_HUD(int iPad, void* initData, UILayer* parentLayer)
--- a/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_Base.cpp
+++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_Base.cpp
@ -2,7 +2,7 @@
 #include <vector>

 #include "UIControl.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "Minecraft.Client/Common/src/UI/UIString.h"
--- a/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_BitmapIcon.cpp
+++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_BitmapIcon.cpp
@ -2,7 +2,7 @@
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_BitmapIcon.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"

 bool UIControl_BitmapIcon::setupControl(UIScene* scene, IggyValuePath* parent,
                                        const std::string& controlName) {
--- a/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_Button.cpp
+++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_Button.cpp
@ -3,7 +3,7 @@
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"

 UIControl_Button::UIControl_Button() {}

--- a/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_ButtonList.cpp
+++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_ButtonList.cpp
@ -4,7 +4,7 @@
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "Minecraft.Client/Linux/Iggy/include/rrCore.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"

 UIControl_ButtonList::UIControl_ButtonList() {
    m_itemCount = 0;
--- a/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.cpp
+++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.cpp
@ -4,7 +4,7 @@
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "Minecraft.Client/Linux/Iggy/include/rrCore.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"

 UIControl_CheckBox::UIControl_CheckBox() {}

--- a/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_DLCList.cpp
+++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_DLCList.cpp
@ -4,7 +4,7 @@
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_ButtonList.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "Minecraft.Client/Linux/Iggy/include/rrCore.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"

 bool UIControl_DLCList::setupControl(UIScene* scene, IggyValuePath* parent,
                                     const std::string& controlName) {
--- a/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_DynamicLabel.cpp
+++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_DynamicLabel.cpp
@ -3,7 +3,7 @@
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"

 UIControl_DynamicLabel::UIControl_DynamicLabel() {}

--- a/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentButton.cpp
+++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentButton.cpp
@ -7,7 +7,7 @@
 #include "UIControl_EnchantmentButton.h"
 #include "Minecraft.Client/net/minecraft/client/Minecraft.h"
 #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentButton.h"
 #include "4J.Render/4J_Render.h"
 #include "Minecraft.Client/Common/App_enums.h"
--- a/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_Label.cpp
+++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_Label.cpp
@ -1,5 +1,5 @@
 #include "UIControl_Label.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h"
--- a/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_LeaderboardList.cpp
+++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_LeaderboardList.cpp
@ -3,7 +3,7 @@
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"

 UIControl_LeaderboardList::UIControl_LeaderboardList() {}

--- a/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerList.cpp
+++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerList.cpp
@ -4,7 +4,7 @@
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_ButtonList.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "Minecraft.Client/Linux/Iggy/include/rrCore.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"

 bool UIControl_PlayerList::setupControl(UIScene* scene, IggyValuePath* parent,
                                        const std::string& controlName) {
--- a/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_Progress.cpp
+++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_Progress.cpp
@ -3,7 +3,7 @@
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"

 UIControl_Progress::UIControl_Progress() {
    m_min = 0;
--- a/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_SaveList.cpp
+++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_SaveList.cpp
@ -4,7 +4,7 @@
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_ButtonList.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "Minecraft.Client/Linux/Iggy/include/rrCore.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"

 bool UIControl_SaveList::setupControl(UIScene* scene, IggyValuePath* parent,
                                      const std::string& controlName) {
--- a/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.cpp
+++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.cpp
@ -4,7 +4,7 @@
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "Minecraft.Client/Linux/Linux_UIController.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.World/net/minecraft/sounds/SoundTypes.h"

 UIControl_Slider::UIControl_Slider() {
--- a/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_SpaceIndicatorBar.cpp
+++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_SpaceIndicatorBar.cpp
@ -3,7 +3,7 @@
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"

 UIControl_SpaceIndicatorBar::UIControl_SpaceIndicatorBar() {
    m_min = 0;
--- a/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_TextInput.cpp
+++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_TextInput.cpp
@ -1,5 +1,5 @@
 #include "UIControl_TextInput.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_TextInput.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h"
--- a/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_TexturePackList.cpp
+++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_TexturePackList.cpp
@ -4,7 +4,7 @@
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "Minecraft.Client/Common/src/UI/UIString.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"

 UIControl_TexturePackList::UIControl_TexturePackList() {}

--- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugCreateSchematic.cpp
+++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugCreateSchematic.cpp
@ -9,14 +9,14 @@
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "Minecraft.Client/Linux/Linux_UIController.h"
-#include "Minecraft.World/ConsoleHelpers/compression.h"
+#include "console_helpers/compression.h"
 #include "Minecraft.World/net/minecraft/world/level/Level.h"
 #include "Minecraft.World/net/minecraft/world/level/chunk/ChunkSource.h"

 class UILayer;
 #ifdef _DEBUG_MENUS_ENABLED
 #include "UIScene_DebugCreateSchematic.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"

 UIScene_DebugCreateSchematic::UIScene_DebugCreateSchematic(int iPad,
                                                           void* initData,
--- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugOverlay.cpp
+++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugOverlay.cpp
@ -30,7 +30,7 @@ class UILayer;
 #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.h"
 #include "Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.h"
 #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"

 UIScene_DebugOverlay::UIScene_DebugOverlay(int iPad, void* initData,
                                           UILayer* parentLayer)
--- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugSetCamera.cpp
+++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugSetCamera.cpp
@ -16,7 +16,7 @@ class UILayer;
 #include "UIScene_DebugSetCamera.h"
 #include "Minecraft.Client/net/minecraft/client/Minecraft.h"
 #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"

 UIScene_DebugSetCamera::UIScene_DebugSetCamera(int iPad, void* initData,
                                               UILayer* parentLayer)
--- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend
+++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend
@ -7,7 +7,7 @@
 #include "Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h"
 #include "Minecraft.Client/net/minecraft/client/skins/TexturePack.h"
 #include "Minecraft.World/net/minecraft/world/level/LevelSettings.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.World/net/minecraft/world/level/biome/BiomeSource.h"
 #include "Minecraft.World/net/minecraft/world/level/LevelType.h"
 #include "Minecraft.Client/net/minecraft/client/skins/DLCTexturePack.h"
--- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend
+++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend
@ -1,7 +1,7 @@

 #include "Minecraft.Client/Common/src/UI/UI.h"
 #include "UIScene_DLCOffersMenu.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"

 #define PLAYER_ONLINE_TIMER_ID 0
 #define PLAYER_ONLINE_TIMER_TIME 100
--- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend
+++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend
@ -1,7 +1,7 @@

 #include "Minecraft.Client/Common/src/UI/UI.h"
 #include "UIScene_EULA.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"

 UIScene_EULA::UIScene_EULA(int iPad, void* initData, UILayer* parentLayer)
    : UIScene(iPad, parentLayer) {
--- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend
+++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend
@ -1,7 +1,7 @@
 #include "Minecraft.Client/include/stdafx.h"

 #include "Minecraft.Client/Common/src/UI/UI.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "UIScene_LaunchMoreOptionsMenu.h"
 #include "4J_Input.h"

--- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend
+++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend
@ -6,7 +6,7 @@
 #include "Minecraft.Client/net/minecraft/client/Options.h"
 #include "Minecraft.Client/net/minecraft/server/MinecraftServer.h"
 #include "Minecraft.World/net/minecraft/world/level/LevelSettings.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.Client/net/minecraft/client/skins/DLCTexturePack.h"
 #include "Minecraft.Client/Common/src/DLC/DLCPack.h"

--- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend
+++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend
@ -5,14 +5,14 @@
 #include "Minecraft.Client/Common/src/UI/UI.h"
 #include "UIScene_LoadOrJoinMenu.h"

-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h"
 #include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h"
 #include "Minecraft.World/net/minecraft/world/level/chunk/storage/net.minecraft.world.level.chunk.storage.h"
-#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFile.h"
-#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileOriginal.h"
-#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileSplit.h"
-#include "Minecraft.World/ConsoleHelpers/PortableFileIO.h"
+#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h"
+#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.h"
+#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.h"
+#include "console_helpers/PortableFileIO.h"
 #include "Minecraft.Client/net/minecraft/client/ProgressRenderer.h"
 #include "Minecraft.Client/net/minecraft/server/MinecraftServer.h"
 #include "Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h"
--- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend
+++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend
@ -1,6 +1,6 @@

 #include "Minecraft.World/net/minecraft/util/Mth.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "java/Random.h"
 #include "Minecraft.Client/net/minecraft/client/User.h"
 #include "Minecraft.Client/net/minecraft/server/MinecraftServer.h"
--- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend
+++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend
@ -1,7 +1,7 @@

 #include "Minecraft.Client/Common/src/UI/UI.h"
 #include "UIScene_NewUpdateMessage.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"

 UIScene_NewUpdateMessage::UIScene_NewUpdateMessage(int iPad, void* initData,
                                                   UILayer* parentLayer)
--- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help
+++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help
@ -1,6 +1,6 @@

 #include "Minecraft.Client/Common/src/UI/UI.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "UIScene_Credits.h"

 #define CREDIT_ICON -2
--- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help
+++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help
@ -1,7 +1,7 @@

 #include "Minecraft.Client/Common/src/UI/UI.h"
 #include "UIScene_HowToPlay.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"

 static UIScene_HowToPlay::SHowToPlayPageDef gs_aPageDefs[eHowToPlay_NumPages] =
    {
--- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help
+++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help
@ -1,7 +1,7 @@

 #include "Minecraft.Client/Common/src/UI/UI.h"
 #include "UIScene_SkinSelectMenu.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.Client/Common/src/DLC/DLCPack.h"
 #include "Minecraft.Client/Common/src/DLC/DLCSkinFile.h"
 #include "Minecraft.Client/Common/Minecraft_Macros.h"
--- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help
+++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help
@ -1,7 +1,7 @@
 #pragma once
 #include <cstdint>

-#include "Minecraft.World/ConsoleHelpers/Definitions.h"
+#include "console_helpers/Definitions.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerSkinPreview.h"

--- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game
+++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game
@ -4,7 +4,7 @@
 #include "Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h"
 #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "Minecraft.Client/net/minecraft/client/Minecraft.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "UIScene_AnvilMenu.h"

 UIScene_AnvilMenu::UIScene_AnvilMenu(int iPad, void* _initData,
--- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game
+++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game
@ -15,7 +15,7 @@
 #include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h"
 #include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h"

-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"

 #define INVENTORY_UPDATE_EFFECTS_TIMER_ID (10)
 #define INVENTORY_UPDATE_EFFECTS_TIMER_TIME (1000)  // 1 second
--- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game
+++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game
@ -5,7 +5,7 @@
 #include "Minecraft.World/net/minecraft/world/item/trading/net.minecraft.world.item.trading.h"
 #include "Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h"
 #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.Client/net/minecraft/client/Minecraft.h"
 #include "UIScene_TradingMenu.h"

--- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game
+++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game
@ -4,7 +4,7 @@
 #include "Minecraft.Client/Common/src/UI/UIBitmapFont.h"
 #include "Minecraft.Client/net/minecraft/client/Minecraft.h"
 #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.Client/net/minecraft/client/gui/Font.h"

 UIScene_EndPoem::UIScene_EndPoem(int iPad, void* initData, UILayer* parentLayer)
--- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game
+++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game
@ -6,7 +6,7 @@
 #include "Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h"
 #include "Minecraft.Client/net/minecraft/client/skins/TexturePack.h"
 #include "Minecraft.Client/net/minecraft/client/skins/DLCTexturePack.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h"
 #include "Minecraft.Client/Common/src/DLC/DLCPack.h"

--- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game
+++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game
@ -1,6 +1,6 @@

 #include "Minecraft.Client/Common/src/UI/UI.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "UIScene_SignEntryMenu.h"
 #include "Minecraft.Client/net/minecraft/client/Minecraft.h"
 #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
--- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/UIScene_Keyboard.cpp
+++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/UIScene_Keyboard.cpp
@ -3,7 +3,7 @@
 #include "Minecraft.Client/Common/src/UI/UI.h"
 #include "UIScene_Keyboard.h"

-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"


 #define KEYBOARD_DONE_TIMER_ID 0
--- a/minecraft/Minecraft.Client/Common/src/UI/UIController.cpp
+++ b/minecraft/Minecraft.Client/Common/src/UI/UIController.cpp
@ -1,9 +1,9 @@
 #include "Minecraft.World/stdafx.h"
-#include "Minecraft.World/ConsoleHelpers/PlatformTime.h"
+#include "console_helpers/PlatformTime.h"
 #include "UIController.h"
 #include "UI.h"
 #include "UIScene.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.Client/include/BufferedImage.h"
 #include "Minecraft.Client/net/minecraft/client/player/LocalPlayer.h"
 #include "Minecraft.Client/net/minecraft/client/skins/DLCTexturePack.h"
@ -13,7 +13,7 @@
 #include "Minecraft.Client/net/minecraft/client/renderer/entity/EnderDragonRenderer.h"
 #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "Minecraft.Client/net/minecraft/client/title/TitleScreen.h"
-#include "Minecraft.World/ConsoleHelpers/PerformanceTimer.h"
+#include "console_helpers/PerformanceTimer.h"
 #include "UIFontData.h"
 #include "4J_Input.h"

--- a/minecraft/Minecraft.Client/Common/src/UI/UIScene.cpp
+++ b/minecraft/Minecraft.Client/Common/src/UI/UIScene.cpp
@ -17,7 +17,7 @@
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "Minecraft.Client/Linux/Linux_UIController.h"
 #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.World/net/minecraft/sounds/SoundTypes.h"
 #include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h"
 #include "Minecraft.World/net/minecraft/world/item/ItemInstance.h"
--- a/minecraft/Minecraft.Client/Common/src/UI/UIString.cpp
+++ b/minecraft/Minecraft.Client/Common/src/UI/UIString.cpp
@ -1,4 +1,4 @@
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "UIString.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "Minecraft.Client/include/NetTypes.h"
--- a/minecraft/Minecraft.Client/Common/src/UI/UITTFFont.cpp
+++ b/minecraft/Minecraft.Client/Common/src/UI/UITTFFont.cpp
@ -1,11 +1,11 @@
 #include <assert.h>
 #include <cstdio>

-#include "Minecraft.World/ConsoleHelpers/PortableFileIO.h"
+#include "console_helpers/PortableFileIO.h"
 #include "UITTFFont.h"
 #include "Minecraft.Client/Linux/Iggy/include/iggy.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"

 UITTFFont::UITTFFont(const std::string& name, const std::string& path,
                     S32 fallbackCharacter)
--- a/minecraft/Minecraft.Client/Linux/Linux_App.cpp
+++ b/minecraft/Minecraft.Client/Linux/Linux_App.cpp
@ -13,7 +13,7 @@
 #include "4J_Storage.h"
 #include "Minecraft.Client/Common/src/Network/GameNetworkManager.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h"
-#include "Minecraft.World/ConsoleHelpers/C4JThread.h"
+#include "console_helpers/C4JThread.h"

 CConsoleMinecraftApp app;

--- a/minecraft/Minecraft.Client/Linux/Linux_Minecraft.cpp
+++ b/minecraft/Minecraft.Client/Linux/Linux_Minecraft.cpp
@ -43,7 +43,7 @@ static void sigsegv_handler(int sig) {
 #include "Minecraft.World/net/minecraft/world/item/crafting/Recipes.h"
 #include "Minecraft.World/net/minecraft/world/item/crafting/Recipy.h"
 #include "Minecraft.World/net/minecraft/locale/Language.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.World/net/minecraft/world/phys/AABB.h"
 #include "Minecraft.World/net/minecraft/world/phys/Vec3.h"
 #include "Minecraft.World/net/minecraft/world/level/Level.h"
@ -52,7 +52,7 @@ static void sigsegv_handler(int sig) {
 #include "Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.h"
 #include "Minecraft.Client/net/minecraft/client/User.h"
 #include "Minecraft.Client/Common/src/Network/Socket.h"
-#include "Minecraft.World/ConsoleHelpers/ThreadName.h"
+#include "console_helpers/ThreadName.h"
 #include "Minecraft.Client/net/minecraft/stats/StatsCounter.h"
 #include "Minecraft.Client/net/minecraft/client/multiplayer/ConnectScreen.h"
 // #include "Minecraft.Client/Common/src/Leaderboards/LeaderboardManager.h"
@ -61,7 +61,7 @@ static void sigsegv_handler(int sig) {
 #include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h"
 #include "Minecraft.Client/net/minecraft/client/Options.h"
 #include "Minecraft.Client/net/minecraft/client/renderer/Textures.h"
-#include "Minecraft.World/ConsoleHelpers/compression.h"
+#include "console_helpers/compression.h"
 #include "Minecraft.World/net/minecraft/world/level/chunk/storage/OldChunkStorage.h"
 #include "Minecraft.Client/net/minecraft/client/Minecraft.h"
 #include "Minecraft.Client/Common/App_Defines.h"
--- a/minecraft/Minecraft.Client/Linux/Linux_ShutdownManager.cpp
+++ b/minecraft/Minecraft.Client/Linux/Linux_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 "Minecraft.Client/Common/ShutdownManager.h"
-#include "Minecraft.World/ConsoleHelpers/C4JThread.h"
+#include "console_helpers/C4JThread.h"

 void ShutdownManager::Initialise() {}
 void ShutdownManager::StartShutdown() {}
--- a/minecraft/Minecraft.Client/Windows64/Source
+++ b/minecraft/Minecraft.Client/Windows64/Source
@ -12,7 +12,7 @@
 #include "Minecraft.World/net/minecraft/world/item/crafting/Recipes.h"
 #include "Minecraft.World/net/minecraft/world/item/crafting/Recipy.h"
 #include "Minecraft.World/net/minecraft/locale/Language.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.World/net/minecraft/world/phys/AABB.h"
 #include "Minecraft.World/net/minecraft/world/phys/Vec3.h"
 #include "Minecraft.World/net/minecraft/world/level/Level.h"
@ -21,7 +21,7 @@
 #include "Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.h"
 #include "Minecraft.Client/net/minecraft/client/User.h"
 #include "Minecraft.Client/Common/src/Network/Socket.h"
-#include "Minecraft.World/ConsoleHelpers/ThreadName.h"
+#include "console_helpers/ThreadName.h"
 #include "Minecraft.Client/net/minecraft/stats/StatsCounter.h"
 #include "Minecraft.Client/net/minecraft/client/multiplayer/ConnectScreen.h"
 // #include "Social/SocialManager.h"
@ -33,7 +33,7 @@
 #include "Sentient/SentientManager.h"
 #include "Minecraft.Client/net/minecraft/client/renderer/Textures.h"
 #include "../Resource.h"
-#include "Minecraft.World/ConsoleHelpers/compression.h"
+#include "console_helpers/compression.h"
 #include "Minecraft.World/net/minecraft/world/level/chunk/storage/OldChunkStorage.h"

 HINSTANCE hMyInst;
--- a/minecraft/Minecraft.Client/meson.build
+++ b/minecraft/Minecraft.Client/meson.build
@ -61,6 +61,7 @@ client_dependencies = [
  dependency('zlib'),
  miniaudio_dep,
  stb_dep,
+  console_helpers_dep,
 ]

 if get_option('enable_vsync')
--- a/minecraft/Minecraft.Client/net/minecraft/client/Minecraft.cpp
+++ b/minecraft/Minecraft.Client/net/minecraft/client/Minecraft.cpp
@ -84,7 +84,7 @@
 #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.h"
 #include "Minecraft.Client/Common/src/DLC/DLCPack.h"
 #include "Minecraft.Client/Common/src/ConsoleGameMode.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.World/net/minecraft/world/item/alchemy/PotionMacros.h"
 #include "Minecraft.Client/Common/Minecraft_Macros.h"
 #include "Minecraft.Client/Common/src/Colours/ColourTable.h"
--- a/minecraft/Minecraft.Client/net/minecraft/client/Minecraft.h
+++ b/minecraft/Minecraft.Client/net/minecraft/client/Minecraft.h
@ -42,7 +42,7 @@ class LivingEntity;

 #include "java/File.h"
 #include "Minecraft.World/net/minecraft/network/packet/DisconnectPacket.h"
-#include "Minecraft.World/ConsoleHelpers/C4JThread.h"
+#include "console_helpers/C4JThread.h"
 #include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h"
 #include "4J.Common/4J_Compat.h"

--- a/minecraft/Minecraft.Client/net/minecraft/client/Options.cpp
+++ b/minecraft/Minecraft.Client/net/minecraft/client/Options.cpp
@ -9,7 +9,7 @@
 #include "java/InputOutputStream/FileInputStream.h"
 #include "java/InputOutputStream/FileOutputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.Client/Common/src/Audio/SoundEngine.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "Minecraft.World/net/minecraft/locale/I18n.h"
--- a/minecraft/Minecraft.Client/net/minecraft/client/gui/ChatScreen.cpp
+++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/ChatScreen.cpp
@ -3,7 +3,7 @@
 #include "ChatScreen.h"
 #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "Minecraft.World/net/minecraft/SharedConstants.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.Client/net/minecraft/client/Minecraft.h"
 #include "Minecraft.Client/net/minecraft/client/gui/Gui.h"
 #include "Minecraft.Client/net/minecraft/client/gui/Screen.h"
--- a/minecraft/Minecraft.Client/net/minecraft/client/gui/CreateWorldScreen.cpp
+++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/CreateWorldScreen.cpp
@ -6,7 +6,7 @@
 #include "CreateWorldScreen.h"
 #include "EditBox.h"
 #include "Button.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.World/net/minecraft/SharedConstants.h"
 #include "Minecraft.Client/net/minecraft/server/MinecraftServer.h"
 #include "Minecraft.Client/net/minecraft/client/Options.h"
--- a/minecraft/Minecraft.Client/net/minecraft/client/gui/DeathScreen.cpp
+++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/DeathScreen.cpp
@ -2,7 +2,7 @@
 #include <string>
 #include <vector>

-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "DeathScreen.h"
 #include "Button.h"
 #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
--- a/minecraft/Minecraft.Client/net/minecraft/client/gui/Font.cpp
+++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/Font.cpp
@ -7,7 +7,7 @@
 #include "Minecraft.Client/net/minecraft/client/Options.h"
 #include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h"
 #include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "java/Random.h"
 #include "Minecraft.Client/net/minecraft/client/gui/Font.h"
 #include "4J.Render/4J_Render.h"
--- a/minecraft/Minecraft.Client/net/minecraft/client/gui/Gui.cpp
+++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/Gui.cpp
@ -37,7 +37,7 @@
 #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.h"
 #include "Minecraft.Client/net/minecraft/client/gui/Font.h"
 #include "Minecraft.World/net/minecraft/util/Mth.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "4J.Common/4J_Compat.h"

 ResourceLocation Gui::PUMPKIN_BLUR_LOCATION =
--- a/Show more
+++ b/Show more