refactor: merge Minecraft.Client/net into minecraft

2026-07-02 03:37:08 +00:00 · 2026-04-01 13:26:14 -05:00 · 2026-04-01 13:26:14 -05:00 · 5c1fed0613
parent cef656847d
commit 5c1fed0613
710 changed files with 1382 additions and 1377 deletions
--- a/minecraft/Minecraft.Client/Common/Consoles_App.cpp
+++ b/minecraft/Minecraft.Client/Common/Consoles_App.cpp
@ -1,17 +1,17 @@
 #include "minecraft/world/item/crafting/Recipy.h"
-#include "Minecraft.Client/net/minecraft/client/Options.h"
+#include "minecraft/client/Options.h"
 #include "minecraft/world/phys/AABB.h"
 #include "minecraft/world/phys/Vec3.h"
-#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h"
-#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.h"
-#include "Minecraft.Client/net/minecraft/client/renderer/GameRenderer.h"
-#include "Minecraft.Client/net/minecraft/client/ProgressRenderer.h"
-#include "Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.h"
+#include "minecraft/server/MinecraftServer.h"
+#include "minecraft/client/multiplayer/MultiPlayerLevel.h"
+#include "minecraft/client/renderer/GameRenderer.h"
+#include "minecraft/client/ProgressRenderer.h"
+#include "minecraft/client/renderer/LevelRenderer.h"
 #include "Minecraft.Client/include/MobSkinMemTextureProcessor.h"
-#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
-#include "Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.h"
-#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
-#include "Minecraft.Client/net/minecraft/client/player/LocalPlayer.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/multiplayer/ClientConnection.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
+#include "minecraft/client/player/LocalPlayer.h"
 #include "minecraft/world/entity/player/Player.h"
 #include "minecraft/world/entity/player/Inventory.h"
 #include "minecraft/world/level/Level.h"
@ -21,8 +21,8 @@
 #include "minecraft/world/level/tile/entity/SignTileEntity.h"
 #include "minecraft/world/level/tile/entity/HopperTileEntity.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/stats/StatsCounter.h"
+#include "minecraft/server/level/GameMode.h"
 #include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h"
 #if defined(_WINDOWS64)
 #include "Minecraft.Client/Windows64/XML/ATGXmlParser.h"
@ -30,30 +30,30 @@
 #endif
 #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"
+#include "minecraft/server/PlayerList.h"
+#include "minecraft/server/level/ServerPlayer.h"
 #include "Minecraft.Client/Common/src/GameRules/ConsoleGameRules.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.h"
 #include "java/InputOutputStream/InputOutputStream.h"
 #include "minecraft/world/level/LevelSettings.h"
-#include "Minecraft.Client/net/minecraft/client/User.h"
+#include "minecraft/client/User.h"
 #include <cstring>
 #include "minecraft/world/level/storage/LevelData.h"
 #include "minecraft/world/entity/player/net.minecraft.world.entity.player.h"
-#include "Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderDispatcher.h"
+#include "minecraft/client/renderer/entity/EntityRenderDispatcher.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/skins/TexturePackRepository.h"
+#include "minecraft/client/skins/DLCTexturePack.h"
 #include "Minecraft.Client/Common/src/DLC/DLCPack.h"
 #include "Minecraft.Client/Common/src/Localisation/StringTable.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/ArchiveFile.h"
-#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
+#include "minecraft/client/Minecraft.h"
 #include "Minecraft.Client/Common/src/Leaderboards/LeaderboardManager.h"
 #include "Minecraft.Client/Common/src/Colours/ColourTable.h"
 #include "console_helpers/StringHelpers.h"

 #include "4J_Input.h"
-#include "Minecraft.Client/net/minecraft/client/gui/Gui.h"
+#include "minecraft/client/gui/Gui.h"
 #include "Minecraft.Client/Common/src/Audio/SoundEngine.h"

 #if defined(__linux__)
--- a/minecraft/Minecraft.Client/Common/src/Audio/SoundEngine.cpp
+++ b/minecraft/Minecraft.Client/Common/src/Audio/SoundEngine.cpp
@ -12,17 +12,17 @@
 #include "SoundEngine.h"
 #include <filesystem>
 #include "console_helpers/PathHelper.h"
-#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "minecraft/world/level/storage/LevelData.h"
 #include "minecraft/util/Mth.h"
-#include "Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h"
+#include "minecraft/client/skins/TexturePackRepository.h"
 #include "Minecraft.Client/Common/src/Audio/SoundEngine.h"
 #include "4J.Common/4J_Compat.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "console_helpers/C4JThread.h"
 #include "minecraft/world/entity/Mob.h"
 #include "java/Random.h"
-#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
+#include "minecraft/client/Minecraft.h"
 #include "minecraft/util/Mth.h"

 #if defined(__linux__)
--- a/minecraft/Minecraft.Client/Common/src/DLC/DLCColourTableFile.cpp
+++ b/minecraft/Minecraft.Client/Common/src/DLC/DLCColourTableFile.cpp
@ -1,8 +1,8 @@
 #include "DLCManager.h"
 #include "DLCColourTableFile.h"
-#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
-#include "Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h"
-#include "Minecraft.Client/net/minecraft/client/skins/TexturePack.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/skins/TexturePackRepository.h"
+#include "minecraft/client/skins/TexturePack.h"
 #include "Minecraft.Client/Common/src/Colours/ColourTable.h"
 #include "Minecraft.Client/Common/src/DLC/DLCFile.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
--- a/minecraft/Minecraft.Client/Common/src/DLC/DLCManager.cpp
+++ b/minecraft/Minecraft.Client/Common/src/DLC/DLCManager.cpp
@ -8,8 +8,8 @@
 #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"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/skins/TexturePackRepository.h"
 #include <cstring>
 #include <limits>
 #include <cstddef>
--- a/minecraft/Minecraft.Client/Common/src/DLC/DLCSkinFile.h
+++ b/minecraft/Minecraft.Client/Common/src/DLC/DLCSkinFile.h
@ -5,7 +5,7 @@
 #include <vector>

 #include "DLCFile.h"
-#include "Minecraft.Client/net/minecraft/client/model/HumanoidModel.h"
+#include "minecraft/client/model/HumanoidModel.h"
 #include "Minecraft.Client/Common/src/DLC/DLCManager.h"
 #include "Minecraft.Client/include/SkinBox.h"

--- a/minecraft/Minecraft.Client/Common/src/Network/GameNetworkManager.cpp
+++ b/minecraft/Minecraft.Client/Common/src/Network/GameNetworkManager.cpp
@ -13,24 +13,24 @@
 #include "minecraft/world/entity/Entity.h"
 #include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"
 #include "minecraft/world/item/crafting/FireworksRecipe.h"
-#include "Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.h"
-#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
-#include "Minecraft.Client/net/minecraft/client/User.h"
-#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h"
-#include "Minecraft.Client/net/minecraft/server/PlayerList.h"
-#include "Minecraft.Client/net/minecraft/server/level/ServerPlayer.h"
-#include "Minecraft.Client/net/minecraft/server/network/PlayerConnection.h"
-#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.h"
-#include "Minecraft.Client/net/minecraft/client/ProgressRenderer.h"
-#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
+#include "minecraft/client/multiplayer/ClientConnection.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/User.h"
+#include "minecraft/server/MinecraftServer.h"
+#include "minecraft/server/PlayerList.h"
+#include "minecraft/server/level/ServerPlayer.h"
+#include "minecraft/server/network/PlayerConnection.h"
+#include "minecraft/client/multiplayer/MultiPlayerLevel.h"
+#include "minecraft/client/ProgressRenderer.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "minecraft/network/packet/DisconnectPacket.h"
 #include "console_helpers/compression.h"
 #include "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"
+#include "minecraft/client/skins/TexturePackRepository.h"
+#include "minecraft/client/skins/TexturePack.h"

-#include "Minecraft.Client/net/minecraft/client/gui/Gui.h"
-#include "Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.h"
+#include "minecraft/client/gui/Gui.h"
+#include "minecraft/client/renderer/LevelRenderer.h"
 #include "Minecraft.Client/Common/src/GameRules/ConsoleGameRules.h"
 #include "GameNetworkManager.h"

--- a/minecraft/Minecraft.Client/Common/src/Network/Socket.cpp
+++ b/minecraft/Minecraft.Client/Common/src/Network/Socket.cpp
@ -6,7 +6,7 @@
 #include "Socket.h"
 // 4jcraft TODO
 #include "Minecraft.Client/Common/ShutdownManager.h"
-#include "Minecraft.Client/net/minecraft/server/network/ServerConnection.h"
+#include "minecraft/server/network/ServerConnection.h"
 #include "Minecraft.Client/Common/src/Network/GameNetworkManager.h"
 #include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h"
 #include "Minecraft.Client/include/NetTypes.h"
--- a/minecraft/Minecraft.Client/Common/src/Tutorial/Constraints/AreaConstraint.cpp
+++ b/minecraft/Minecraft.Client/Common/src/Tutorial/Constraints/AreaConstraint.cpp
@ -1,7 +1,7 @@
 #include <memory>

-#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
-#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "AreaConstraint.h"
 #include "minecraft/world/phys/AABB.h"
 #include "Minecraft.Client/Common/src/Tutorial/Constraints/TutorialConstraint.h"
--- a/minecraft/Minecraft.Client/Common/src/Tutorial/Constraints/ChangeStateConstraint.cpp
+++ b/minecraft/Minecraft.Client/Common/src/Tutorial/Constraints/ChangeStateConstraint.cpp
@ -1,11 +1,11 @@
 #include <memory>

 #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
-#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
-#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "ChangeStateConstraint.h"
 #include "minecraft/world/phys/AABB.h"
-#include "Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.h"
+#include "minecraft/client/multiplayer/ClientConnection.h"
 #include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h"
 #include "Minecraft.Client/Common/src/Tutorial/Constraints/TutorialConstraint.h"
 #include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h"
--- a/minecraft/Minecraft.Client/Common/src/Tutorial/FullTutorialMode.cpp
+++ b/minecraft/Minecraft.Client/Common/src/Tutorial/FullTutorialMode.cpp
@ -1,4 +1,4 @@
-#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
+#include "minecraft/client/Minecraft.h"
 #include "FullTutorial.h"
 #include "FullTutorialMode.h"
 #include "Minecraft.Client/Common/src/Tutorial/FullTutorialMode.h"
--- a/minecraft/Minecraft.Client/Common/src/Tutorial/Hints/AreaHint.cpp
+++ b/minecraft/Minecraft.Client/Common/src/Tutorial/Hints/AreaHint.cpp
@ -1,7 +1,7 @@
 #include <memory>

-#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
-#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "AreaHint.h"
 #include "minecraft/world/phys/AABB.h"
 #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
--- a/minecraft/Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.cpp
+++ b/minecraft/Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.cpp
@ -1,7 +1,7 @@
 #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
 #include "TutorialHint.h"
-#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
-#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.h"
 #include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h"
 #include "minecraft/world/level/material/Material.h"
--- a/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/ChoiceTask.cpp
+++ b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/ChoiceTask.cpp
@ -1,8 +1,8 @@
 #include <memory>
 #include <vector>

-#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
-#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
 #include "ChoiceTask.h"
 #include "minecraft/world/level/material/Material.h"
--- a/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/ControllerTask.cpp
+++ b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/ControllerTask.cpp
@ -4,8 +4,8 @@
 #include <utility>
 #include <vector>

-#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
-#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "ControllerTask.h"
 #include "4J_Input.h"
 #include "Minecraft.Client/Common/App_enums.h"
--- a/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/InfoTask.cpp
+++ b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/InfoTask.cpp
@ -3,8 +3,8 @@
 #include <utility>
 #include <vector>

-#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
-#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
 #include "InfoTask.h"
 #include "minecraft/world/level/material/Material.h"
--- a/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/StatTask.cpp
+++ b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/StatTask.cpp
@ -1,5 +1,5 @@
-#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
-#include "Minecraft.Client/net/minecraft/stats/StatsCounter.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/stats/StatsCounter.h"
 #include "StatTask.h"
 #include "4J_Profile.h"
 #include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h"
--- a/minecraft/Minecraft.Client/Common/src/Tutorial/Tutorial.cpp
+++ b/minecraft/Minecraft.Client/Common/src/Tutorial/Tutorial.cpp
@ -2,18 +2,18 @@

 #include "console_helpers/PlatformTime.h"
 #include "minecraft/stats/net.minecraft.stats.h"
-#include "Minecraft.Client/net/minecraft/client/player/LocalPlayer.h"
+#include "minecraft/client/player/LocalPlayer.h"
 #include "minecraft/world/entity/Entity.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/entity/player/net.minecraft.world.entity.player.h"
 #include "minecraft/world/item/net.minecraft.world.item.h"
 #include "minecraft/world/level/net.minecraft.world.level.h"
 #include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"
-#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h"
-#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
-#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
-#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.h"
-#include "Minecraft.Client/net/minecraft/server/level/SurvivalMode.h"
+#include "minecraft/server/MinecraftServer.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
+#include "minecraft/client/multiplayer/MultiPlayerLevel.h"
+#include "minecraft/server/level/SurvivalMode.h"
 #include "Tutorial.h"
 #include "TutorialMessage.h"
 #include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTasks.h"
--- a/minecraft/Minecraft.Client/Common/src/Tutorial/TutorialMode.cpp
+++ b/minecraft/Minecraft.Client/Common/src/Tutorial/TutorialMode.cpp
@ -2,16 +2,16 @@
 #include "console_helpers/PlatformTime.h"
 #include <memory>

-#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
-#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
-#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
+#include "minecraft/client/multiplayer/MultiPlayerLevel.h"
 #include "minecraft/world/entity/player/Inventory.h"
 #include "TutorialMode.h"
 #include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h"
 #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
 #include "minecraft/world/item/ItemInstance.h"
 #include "minecraft/world/level/tile/Tile.h"
-#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.h"
+#include "minecraft/client/multiplayer/MultiPlayerGameMode.h"

 class ClientConnection;

--- a/minecraft/Minecraft.Client/Common/src/Tutorial/TutorialMode.h
+++ b/minecraft/Minecraft.Client/Common/src/Tutorial/TutorialMode.h
@ -1,7 +1,7 @@
 #pragma once
 // using namespace std;

-#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.h"
+#include "minecraft/client/multiplayer/MultiPlayerGameMode.h"
 #include "Tutorial.h"

 class ClientConnection;
--- a/Platforms/IUIScene_AbstractContainerMenu.cpp
+++ b/Platforms/IUIScene_AbstractContainerMenu.cpp
@ -9,9 +9,9 @@
 #include "minecraft/world/item/crafting/net.minecraft.world.item.crafting.h"
 #include "minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h"
 #include "minecraft/world/phys/Vec3.h"
-#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
-#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
-#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/multiplayer/MultiPlayerGameMode.h"
 #include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h"
 #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"

--- a/minecraft/Minecraft.Client/Common/src/UI/All
+++ b/minecraft/Minecraft.Client/Common/src/UI/All
@ -4,9 +4,9 @@
 #include "minecraft/world/inventory/net.minecraft.world.inventory.h"
 #include "java/InputOutputStream/InputOutputStream.h"
 #include "minecraft/network/packet/net.minecraft.network.packet.h"
-#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
-#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
-#include "Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
+#include "minecraft/client/multiplayer/ClientConnection.h"

 IUIScene_AnvilMenu::IUIScene_AnvilMenu() {
    m_inventory = nullptr;
--- a/minecraft/Minecraft.Client/Common/src/UI/All
+++ b/minecraft/Minecraft.Client/Common/src/UI/All
@ -5,9 +5,9 @@
 #include "minecraft/network/packet/CustomPayloadPacket.h"
 #include "minecraft/util/HtmlString.h"
 #include "IUIScene_BeaconMenu.h"
-#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
-#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
-#include "Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
+#include "minecraft/client/multiplayer/ClientConnection.h"
 #include "Minecraft.Client/Common/App_enums.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
--- a/minecraft/Minecraft.Client/Common/src/UI/All
+++ b/minecraft/Minecraft.Client/Common/src/UI/All
@ -1,13 +1,13 @@
 #include <memory>

 #include "minecraft/network/packet/CustomPayloadPacket.h"
-#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
-#include "Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
+#include "minecraft/client/multiplayer/ClientConnection.h"
 #include "IUIScene_CommandBlockMenu.h"
 #include "minecraft/world/level/tile/entity/CommandBlockEntity.h"
 #include "java/InputOutputStream/ByteArrayOutputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
-#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
+#include "minecraft/client/Minecraft.h"

 void IUIScene_CommandBlockMenu::Initialise(CommandBlockEntity* commandBlock) {
    m_commandBlock = commandBlock;
--- a/minecraft/Minecraft.Client/Common/src/UI/All
+++ b/minecraft/Minecraft.Client/Common/src/UI/All
@ -4,10 +4,10 @@
 #include "minecraft/world/item/crafting/net.minecraft.world.item.crafting.h"
 #include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"
 #include "minecraft/stats/net.minecraft.stats.h"
-#include "Minecraft.Client/net/minecraft/client/player/LocalPlayer.h"
+#include "minecraft/client/player/LocalPlayer.h"
 #include "IUIScene_CraftingMenu.h"
 #include "Minecraft.Client/Common/src/Console_Debug_enum.h"
-#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
+#include "minecraft/client/Minecraft.h"

 Recipy::_eGroupType IUIScene_CraftingMenu::m_GroupTypeMapping4GridA
    [IUIScene_CraftingMenu::m_iMaxGroup2x2] = {
--- a/minecraft/Minecraft.Client/Common/src/UI/All
+++ b/minecraft/Minecraft.Client/Common/src/UI/All
@ -2,7 +2,7 @@
 #include "minecraft/world/item/crafting/Recipy.h"
 #include "minecraft/world/item/Item.h"
 #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
-#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.h"
+#include "minecraft/client/multiplayer/MultiPlayerGameMode.h"

 class LocalPlayer;

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

 #include "IUIScene_CreativeMenu.h"

-#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
-#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "minecraft/world/inventory/net.minecraft.world.inventory.h"
 #include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"
 #include "minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h"
@ -13,7 +13,7 @@
 #include "minecraft/world/item/enchantment/net.minecraft.world.item.enchantment.h"
 #include "minecraft/world/entity/net.minecraft.world.entity.h"
 #include "minecraft/world/entity/animal/net.minecraft.world.entity.animal.h"
-#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.h"
+#include "minecraft/client/multiplayer/MultiPlayerGameMode.h"
 #include "minecraft/world/item/alchemy/PotionMacros.h"
 #include "java/JavaMath.h"
 #include "4J.Common/4J_InputActions.h"
--- a/minecraft/Minecraft.Client/Common/src/UI/All
+++ b/minecraft/Minecraft.Client/Common/src/UI/All
@ -1,13 +1,13 @@
 #include <assert.h>
 #include <memory>

-#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
-#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "IUIScene_EnchantingMenu.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h"
 #include "minecraft/world/inventory/AbstractContainerMenu.h"
 #include "minecraft/world/inventory/EnchantmentMenu.h"
-#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.h"
+#include "minecraft/client/multiplayer/MultiPlayerGameMode.h"

 class Player;

--- a/minecraft/Minecraft.Client/Common/src/UI/All
+++ b/minecraft/Minecraft.Client/Common/src/UI/All
@ -1,8 +1,8 @@
 #include <cmath>
 #include <memory>

-#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
-#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "IUIScene_HUD.h"
 #include "4J_Profile.h"
 #include "4J.Render/4J_Render.h"
@ -20,7 +20,7 @@
 #include "minecraft/world/food/FoodData.h"
 #include "minecraft/world/level/material/Material.h"
 #include "java/Class.h"
-#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.h"
+#include "minecraft/client/multiplayer/MultiPlayerGameMode.h"

 IUIScene_HUD::IUIScene_HUD() {
    m_lastActiveSlot = -1;
--- a/minecraft/Minecraft.Client/Common/src/UI/All
+++ b/minecraft/Minecraft.Client/Common/src/UI/All
@ -4,15 +4,15 @@

 #include "IUIScene_PauseMenu.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
-#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
-#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h"
-#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.h"
-#include "Minecraft.Client/net/minecraft/client/ProgressRenderer.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/server/MinecraftServer.h"
+#include "minecraft/client/multiplayer/MultiPlayerLevel.h"
+#include "minecraft/client/ProgressRenderer.h"
 #include "minecraft/world/level/net.minecraft.world.level.h"
 #include "minecraft/world/phys/net.minecraft.world.phys.h"
-#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/client/skins/TexturePackRepository.h"
+#include "minecraft/client/skins/TexturePack.h"
+#include "minecraft/client/skins/DLCTexturePack.h"
 #include "console_helpers/StringHelpers.h"
 #include "Minecraft.Client/Common/src/DLC/DLCPack.h"
 #include "console_helpers/compression.h"
--- a/minecraft/Minecraft.Client/Common/src/UI/All
+++ b/minecraft/Minecraft.Client/Common/src/UI/All
@ -4,11 +4,11 @@
 #include "minecraft/world/item/trading/net.minecraft.world.item.trading.h"
 #include "minecraft/world/inventory/net.minecraft.world.inventory.h"
 #include "minecraft/network/packet/net.minecraft.network.packet.h"
-#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/client/Minecraft.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
+#include "minecraft/client/multiplayer/MultiPlayerGameMode.h"
 #include "console_helpers/StringHelpers.h"
-#include "Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.h"
+#include "minecraft/client/multiplayer/ClientConnection.h"
 #include "IUIScene_TradingMenu.h"

 #include "4J.Common/4J_InputActions.h"
--- a/minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_Chat.cpp
+++ b/minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_Chat.cpp
@ -1,8 +1,8 @@
 #include <memory>

 #include "UIComponent_Chat.h"
-#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
-#include "Minecraft.Client/net/minecraft/client/gui/Gui.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/gui/Gui.h"
 #include "Minecraft.Client/Common/src/UI/Components/UIComponent_Chat.h"
 #include "Minecraft.Client/Common/src/UI/UILayer.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
--- a/minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_Panorama.cpp
+++ b/minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_Panorama.cpp
@ -2,8 +2,8 @@
 #include <mutex>

 #include "UIComponent_Panorama.h"
-#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
-#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/multiplayer/MultiPlayerLevel.h"
 #include "Minecraft.Client/Common/src/UI/Components/UIComponent_Panorama.h"
 #include "Minecraft.Client/Common/src/UI/UILayer.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
--- a/minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_TutorialPopup.cpp
+++ b/minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_TutorialPopup.cpp
@ -4,8 +4,8 @@
 #include "UIComponent_TutorialPopup.h"
 #include "Minecraft.Client/Common/src/Tutorial/Tutorial.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/client/multiplayer/MultiPlayerLocalPlayer.h"
+#include "minecraft/client/Minecraft.h"
 #include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"

 UIComponent_TutorialPopup::UIComponent_TutorialPopup(int iPad, void* initData,
--- a/minecraft/Minecraft.Client/Common/src/UI/Components/UIScene_HUD.cpp
+++ b/minecraft/Minecraft.Client/Common/src/UI/Components/UIScene_HUD.cpp
@ -1,16 +1,16 @@

 #include "Minecraft.Client/Common/src/UI/UI.h"
 #include "UIScene_HUD.h"
-#include "Minecraft.Client/net/minecraft/client/renderer/BossMobGuiInfo.h"
-#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
-#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
+#include "minecraft/client/renderer/BossMobGuiInfo.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "minecraft/world/entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.h"
-#include "Minecraft.Client/net/minecraft/client/renderer/entity/EnderDragonRenderer.h"
+#include "minecraft/client/renderer/entity/EnderDragonRenderer.h"
 #include "minecraft/world/inventory/net.minecraft.world.inventory.h"
 #include "minecraft/world/item/net.minecraft.world.item.h"
 #include "minecraft/world/effect/net.minecraft.world.effect.h"
 #include "console_helpers/StringHelpers.h"
-#include "Minecraft.Client/net/minecraft/client/gui/Gui.h"
+#include "minecraft/client/gui/Gui.h"

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

 #include "UIControl_EnchantmentBook.h"
-#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
-#include "Minecraft.Client/net/minecraft/client/renderer/tileentity/TileEntityRenderDispatcher.h"
-#include "Minecraft.Client/net/minecraft/client/renderer/tileentity/EnchantTableRenderer.h"
-#include "Minecraft.Client/net/minecraft/client/Lighting.h"
-#include "Minecraft.Client/net/minecraft/client/model/BookModel.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/renderer/tileentity/TileEntityRenderDispatcher.h"
+#include "minecraft/client/renderer/tileentity/EnchantTableRenderer.h"
+#include "minecraft/client/Lighting.h"
+#include "minecraft/client/model/BookModel.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentBook.h"
 #include "4J.Render/4J_Render.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h"
@ -15,7 +15,7 @@
 #include "minecraft/world/inventory/Slot.h"
 #include "minecraft/world/item/ItemInstance.h"
 #include "java/Class.h"
-#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h"
+#include "minecraft/client/renderer/Textures.h"

 UIControl_EnchantmentBook::UIControl_EnchantmentBook() {
    UIControl::setControlType(UIControl::eEnchantmentBook);
--- a/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentButton.cpp
+++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentButton.cpp
@ -5,8 +5,8 @@
 #include <memory>

 #include "UIControl_EnchantmentButton.h"
-#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
-#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "console_helpers/StringHelpers.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentButton.h"
 #include "4J.Render/4J_Render.h"
@ -18,7 +18,7 @@
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "minecraft/world/entity/player/Abilities.h"
 #include "minecraft/world/inventory/EnchantmentMenu.h"
-#include "Minecraft.Client/net/minecraft/client/gui/Font.h"
+#include "minecraft/client/gui/Font.h"

 UIControl_EnchantmentButton::UIControl_EnchantmentButton() {
    m_index = 0;
--- a/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftHorse.cpp
+++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftHorse.cpp
@ -2,11 +2,11 @@
 #include <cmath>
 #include <memory>

-#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
-#include "Minecraft.Client/net/minecraft/client/gui/ScreenSizeCalculator.h"
-#include "Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderDispatcher.h"
-#include "Minecraft.Client/net/minecraft/client/Lighting.h"
-#include "Minecraft.Client/net/minecraft/client/Options.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/gui/ScreenSizeCalculator.h"
+#include "minecraft/client/renderer/entity/EntityRenderDispatcher.h"
+#include "minecraft/client/Lighting.h"
+#include "minecraft/client/Options.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftHorse.h"
 #include "4J.Render/4J_Render.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h"
--- a/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftPlayer.cpp
+++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftPlayer.cpp
@ -2,12 +2,12 @@
 #include <cmath>
 #include <memory>

-#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
-#include "Minecraft.Client/net/minecraft/client/gui/ScreenSizeCalculator.h"
-#include "Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderDispatcher.h"
-#include "Minecraft.Client/net/minecraft/client/Lighting.h"
-#include "Minecraft.Client/net/minecraft/client/Options.h"
-#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/gui/ScreenSizeCalculator.h"
+#include "minecraft/client/renderer/entity/EntityRenderDispatcher.h"
+#include "minecraft/client/Lighting.h"
+#include "minecraft/client/Options.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "UIControl_MinecraftPlayer.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftPlayer.h"
 #include "4J.Render/4J_Render.h"
--- a/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerSkinPreview.cpp
+++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerSkinPreview.cpp
@ -4,13 +4,13 @@
 #include <numbers>
 #include <vector>

-#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
-#include "Minecraft.Client/net/minecraft/client/gui/ScreenSizeCalculator.h"
-#include "Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderDispatcher.h"
-#include "Minecraft.Client/net/minecraft/client/model/HumanoidModel.h"
-#include "Minecraft.Client/net/minecraft/client/Lighting.h"
-#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h"
-#include "Minecraft.Client/net/minecraft/client/Options.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/gui/ScreenSizeCalculator.h"
+#include "minecraft/client/renderer/entity/EntityRenderDispatcher.h"
+#include "minecraft/client/model/HumanoidModel.h"
+#include "minecraft/client/Lighting.h"
+#include "minecraft/client/model/geom/ModelPart.h"
+#include "minecraft/client/Options.h"
 #include "UIControl_PlayerSkinPreview.h"
 #include "4J.Render/4J_Render.h"
 #include "Minecraft.Client/Common/App_enums.h"
@ -18,8 +18,8 @@
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "minecraft/world/entity/player/Player.h"
 #include "java/Class.h"
-#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h"
-#include "Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderer.h"
+#include "minecraft/client/renderer/Textures.h"
+#include "minecraft/client/renderer/entity/EntityRenderer.h"

 // #define SKIN_PREVIEW_BOB_ANIM
 #define SKIN_PREVIEW_WALKING_ANIM
--- a/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerSkinPreview.h
+++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerSkinPreview.h
@ -5,7 +5,7 @@
 #include <string>

 #include "UIControl.h"
-#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h"
+#include "minecraft/client/renderer/Textures.h"
 #include "Minecraft.Client/Linux/Iggy/include/iggy.h"

 class ModelPart;
--- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugOverlay.cpp
+++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugOverlay.cpp
@ -24,12 +24,12 @@ class Player;
 class UILayer;
 #ifdef _DEBUG_MENUS_ENABLED
 #include "UIScene_DebugOverlay.h"
-#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
-#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h"
-#include "Minecraft.Client/net/minecraft/client/renderer/GameRenderer.h"
-#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/client/Minecraft.h"
+#include "minecraft/server/MinecraftServer.h"
+#include "minecraft/client/renderer/GameRenderer.h"
+#include "minecraft/client/multiplayer/MultiPlayerLevel.h"
+#include "minecraft/client/multiplayer/ClientConnection.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "console_helpers/StringHelpers.h"

 UIScene_DebugOverlay::UIScene_DebugOverlay(int iPad, void* initData,
--- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugSetCamera.cpp
+++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugSetCamera.cpp
@ -14,8 +14,8 @@
 class UILayer;
 #ifdef _DEBUG_MENUS_ENABLED
 #include "UIScene_DebugSetCamera.h"
-#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
-#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "console_helpers/StringHelpers.h"

 UIScene_DebugSetCamera::UIScene_DebugSetCamera(int iPad, void* initData,
--- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend
+++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend
@ -1,9 +1,9 @@
 #include <wchar.h>
 #include <cstdint>

-#include "Minecraft.Client/net/minecraft/client/skins/TexturePack.h"
-#include "Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h"
-#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
+#include "minecraft/client/skins/TexturePack.h"
+#include "minecraft/client/skins/TexturePackRepository.h"
+#include "minecraft/client/Minecraft.h"
 #include "IUIScene_StartGame.h"
 #include "4J_Profile.h"
 #include "Minecraft.Client/Common/App_structs.h"
--- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend
+++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend
@ -1,16 +1,16 @@

 #include "Minecraft.Client/Common/src/UI/UI.h"
 #include "UIScene_CreateWorldMenu.h"
-#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h"
-#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
-#include "Minecraft.Client/net/minecraft/client/Options.h"
-#include "Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h"
-#include "Minecraft.Client/net/minecraft/client/skins/TexturePack.h"
+#include "minecraft/server/MinecraftServer.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/Options.h"
+#include "minecraft/client/skins/TexturePackRepository.h"
+#include "minecraft/client/skins/TexturePack.h"
 #include "minecraft/world/level/LevelSettings.h"
 #include "console_helpers/StringHelpers.h"
 #include "minecraft/world/level/biome/BiomeSource.h"
 #include "minecraft/world/level/LevelType.h"
-#include "Minecraft.Client/net/minecraft/client/skins/DLCTexturePack.h"
+#include "minecraft/client/skins/DLCTexturePack.h"
 #include "Minecraft.Client/Common/src/DLC/DLCPack.h"

 #if defined(_WINDOWS64)
--- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend
+++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend
@ -1,10 +1,10 @@

 #include "Minecraft.Client/Common/src/UI/UI.h"
 #include "UIScene_JoinMenu.h"
-#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
-#include "Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h"
-#include "Minecraft.Client/net/minecraft/client/Options.h"
-#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/skins/TexturePackRepository.h"
+#include "minecraft/client/Options.h"
+#include "minecraft/server/MinecraftServer.h"
 #include "minecraft/world/level/net.minecraft.world.level.h"
 #include "minecraft/world/net.minecraft.world.h"

--- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend
+++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend
@ -1,13 +1,13 @@

 #include "Minecraft.Client/Common/src/UI/UI.h"
 #include "UIScene_LoadMenu.h"
-#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
-#include "Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h"
-#include "Minecraft.Client/net/minecraft/client/Options.h"
-#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/skins/TexturePackRepository.h"
+#include "minecraft/client/Options.h"
+#include "minecraft/server/MinecraftServer.h"
 #include "minecraft/world/level/LevelSettings.h"
 #include "console_helpers/StringHelpers.h"
-#include "Minecraft.Client/net/minecraft/client/skins/DLCTexturePack.h"
+#include "minecraft/client/skins/DLCTexturePack.h"
 #include "Minecraft.Client/Common/src/DLC/DLCPack.h"

 #define GAME_CREATE_ONLINE_TIMER_ID 0
--- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend
+++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend
@ -13,10 +13,10 @@
 #include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.h"
 #include "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"
-#include "Minecraft.Client/net/minecraft/client/skins/TexturePack.h"
+#include "minecraft/client/ProgressRenderer.h"
+#include "minecraft/server/MinecraftServer.h"
+#include "minecraft/client/skins/TexturePackRepository.h"
+#include "minecraft/client/skins/TexturePack.h"
 #include "Minecraft.Client/Common/src/Network/SessionInfo.h"

 #if defined(SONY_REMOTE_STORAGE_DOWNLOAD)
--- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend
+++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend
@ -5,7 +5,7 @@

 #include "java/File.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
-#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
+#include "minecraft/client/Minecraft.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_SaveList.h"

 #include "4J_Storage.h"
--- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend
+++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend
@ -2,12 +2,12 @@
 #include "minecraft/util/Mth.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"
+#include "minecraft/client/User.h"
+#include "minecraft/server/MinecraftServer.h"
 #include "Minecraft.Client/Common/src/UI/UI.h"
-#include "Minecraft.Client/net/minecraft/client/gui/Font.h"
-#include "Minecraft.Client/net/minecraft/client/gui/ScreenSizeCalculator.h"
-#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
+#include "minecraft/client/gui/Font.h"
+#include "minecraft/client/gui/ScreenSizeCalculator.h"
+#include "minecraft/client/Minecraft.h"
 #include "UIScene_MainMenu.h"


--- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help
+++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help
@ -2,8 +2,8 @@

 #include "Minecraft.Client/Common/src/UI/UI.h"
 #include "UIScene_ControlsMenu.h"
-#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
-#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "Minecraft.Client/Common/src/BuildVer/BuildVer.h"
 #include "4J_Input.h"

--- 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_HelpAndOptionsMenu.h"
-#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
+#include "minecraft/client/Minecraft.h"

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

 #include "Minecraft.Client/Common/src/UI/UI.h"
 #include "UIScene_SettingsControlMenu.h"
-#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
+#include "minecraft/client/Minecraft.h"

 UIScene_SettingsControlMenu::UIScene_SettingsControlMenu(int iPad,
                                                         void* initData,
--- 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_SettingsMenu.h"
-#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
+#include "minecraft/client/Minecraft.h"

 UIScene_SettingsMenu::UIScene_SettingsMenu(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
@ -4,7 +4,7 @@

 #include "minecraft/world/inventory/net.minecraft.world.inventory.h"
 #include "minecraft/world/item/net.minecraft.world.item.h"
-#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h"

 UIScene_AbstractContainerMenu::UIScene_AbstractContainerMenu(
--- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game
+++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game
@ -2,8 +2,8 @@
 #include "Minecraft.Client/Common/src/UI/UI.h"
 #include "minecraft/world/inventory/net.minecraft.world.inventory.h"
 #include "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/client/multiplayer/MultiPlayerLocalPlayer.h"
+#include "minecraft/client/Minecraft.h"
 #include "console_helpers/StringHelpers.h"
 #include "UIScene_AnvilMenu.h"

--- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game
+++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game
@ -3,7 +3,7 @@
 #include "Minecraft.Client/Common/src/UI/UI.h"
 #include "minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h"
 #include "minecraft/world/inventory/net.minecraft.world.inventory.h"
-#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
+#include "minecraft/client/Minecraft.h"
 #include "UIScene_BeaconMenu.h"
 #include "Minecraft.Client/Common/src/Tutorial/TutorialMode.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 <assert.h>

-#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
+#include "minecraft/client/Minecraft.h"
 #include "UIScene_BrewingStandMenu.h"
 #include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.h"
 #include "4J_Profile.h"
--- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game
+++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game
@ -2,7 +2,7 @@
 #include <memory>

 #include "UIScene_ContainerMenu.h"
-#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
+#include "minecraft/client/Minecraft.h"
 #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
 #include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h"
 #include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h"
--- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game
+++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game
@ -2,7 +2,7 @@
 #include <memory>

 #include "UIScene_CreativeMenu.h"
-#include "Minecraft.Client/net/minecraft/client/player/LocalPlayer.h"
+#include "minecraft/client/player/LocalPlayer.h"
 #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
 #include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h"
 #include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.h"
@ -17,7 +17,7 @@
 #include "Minecraft.Client/include/NetTypes.h"
 #include "Minecraft.Client/include/XboxStubs.h"
 #include "Minecraft.Client/include/SkinBox.h"
-#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
+#include "minecraft/client/Minecraft.h"

 class UILayer;

--- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game
+++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game
@ -1,7 +1,7 @@
 #include <assert.h>
 #include <memory>

-#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
+#include "minecraft/client/Minecraft.h"
 #include "UIScene_DispenserMenu.h"
 #include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.h"
 #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
--- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game
+++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game
@ -2,7 +2,7 @@
 #include "Minecraft.Client/Common/src/UI/UI.h"
 #include "minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h"
 #include "minecraft/world/inventory/net.minecraft.world.inventory.h"
-#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
+#include "minecraft/client/Minecraft.h"
 #include "UIScene_EnchantingMenu.h"

 UIScene_EnchantingMenu::UIScene_EnchantingMenu(int iPad, void* _initData,
--- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game
+++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game
@ -3,8 +3,8 @@
 #include "Minecraft.Client/Common/src/UI/UI.h"
 #include "minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h"
 #include "minecraft/world/inventory/net.minecraft.world.inventory.h"
-#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
-#include "Minecraft.Client/net/minecraft/client/player/LocalPlayer.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/player/LocalPlayer.h"
 #include "UIScene_FireworksMenu.h"

 UIScene_FireworksMenu::UIScene_FireworksMenu(int iPad, void* _initData,
--- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game
+++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game
@ -2,7 +2,7 @@
 #include "Minecraft.Client/Common/src/UI/UI.h"
 #include "minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h"
 #include "minecraft/world/inventory/net.minecraft.world.inventory.h"
-#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
+#include "minecraft/client/Minecraft.h"
 #include "UIScene_FurnaceMenu.h"

 #include "4J_Profile.h"
--- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game
+++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game
@ -1,7 +1,7 @@
 #include <assert.h>
 #include <memory>

-#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
+#include "minecraft/client/Minecraft.h"
 #include "UIScene_HopperMenu.h"
 #include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.h"
 #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
--- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game
+++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game
@ -1,7 +1,7 @@
 #include <assert.h>
 #include <memory>

-#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
+#include "minecraft/client/Minecraft.h"
 #include "UIScene_HorseInventoryMenu.h"
 #include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.h"
 #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
--- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game
+++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game
@ -6,11 +6,11 @@
 #include "minecraft/world/item/net.minecraft.world.item.h"
 #include "minecraft/stats/net.minecraft.stats.h"
 #include "minecraft/world/effect/net.minecraft.world.effect.h"
-#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
-#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
-#include "Minecraft.Client/net/minecraft/client/Options.h"
-#include "Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderDispatcher.h"
-#include "Minecraft.Client/net/minecraft/client/Lighting.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/Options.h"
+#include "minecraft/client/renderer/entity/EntityRenderDispatcher.h"
+#include "minecraft/client/Lighting.h"
 #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
 #include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h"
 #include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h"
--- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game
+++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game
@ -4,9 +4,9 @@
 #include "minecraft/world/inventory/net.minecraft.world.inventory.h"
 #include "minecraft/world/item/trading/net.minecraft.world.item.trading.h"
 #include "minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h"
-#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "console_helpers/StringHelpers.h"
-#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
+#include "minecraft/client/Minecraft.h"
 #include "UIScene_TradingMenu.h"

 UIScene_TradingMenu::UIScene_TradingMenu(int iPad, void* _initData,
--- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game
+++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game
@ -1,7 +1,7 @@

 #include "Minecraft.Client/Common/src/UI/UI.h"
-#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
-#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "minecraft/world/inventory/net.minecraft.world.inventory.h"
 #include "UIScene_CraftingMenu.h"

--- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game
+++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game
@ -2,8 +2,8 @@
 #include "Minecraft.Client/Common/src/UI/UI.h"
 #include "UIScene_DeathMenu.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_PauseMenu.h"
-#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
-#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"

 UIScene_DeathMenu::UIScene_DeathMenu(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
@ -2,10 +2,10 @@
 #include "Minecraft.Client/Common/src/UI/UI.h"
 #include "UIScene_EndPoem.h"
 #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/client/Minecraft.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "console_helpers/StringHelpers.h"
-#include "Minecraft.Client/net/minecraft/client/gui/Font.h"
+#include "minecraft/client/gui/Font.h"

 UIScene_EndPoem::UIScene_EndPoem(int iPad, void* initData, UILayer* parentLayer)
    : UIScene(iPad, parentLayer) {
--- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game
+++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game
@ -1,9 +1,9 @@

 #include "Minecraft.Client/Common/src/UI/UI.h"
 #include "UIScene_InGameHostOptionsMenu.h"
-#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
-#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
-#include "Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
+#include "minecraft/client/multiplayer/ClientConnection.h"
 #include "minecraft/network/net.minecraft.network.h"
 #include "minecraft/network/packet/net.minecraft.network.packet.h"

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

 #include "Minecraft.Client/Common/src/UI/UI.h"
 #include "UIScene_InGameInfoMenu.h"
-#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "minecraft/network/packet/net.minecraft.network.packet.h"
-#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
-#include "Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.h"
-#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
+#include "minecraft/client/multiplayer/ClientConnection.h"
+#include "minecraft/client/Minecraft.h"

 UIScene_InGameInfoMenu::UIScene_InGameInfoMenu(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
@ -1,9 +1,9 @@

 #include "Minecraft.Client/Common/src/UI/UI.h"
 #include "UIScene_InGamePlayerOptionsMenu.h"
-#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
-#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
-#include "Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
+#include "minecraft/client/multiplayer/ClientConnection.h"
 #include "minecraft/network/packet/net.minecraft.network.packet.h"

 #define CHECKBOXES_TIMER_ID 0
--- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game
+++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game
@ -1,11 +1,11 @@

 #include "Minecraft.Client/Common/src/UI/UI.h"
 #include "UIScene_PauseMenu.h"
-#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h"
-#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
-#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/server/MinecraftServer.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
+#include "minecraft/client/skins/TexturePackRepository.h"
+#include "minecraft/client/skins/TexturePack.h"
+#include "minecraft/client/skins/DLCTexturePack.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
@ -2,10 +2,10 @@
 #include "Minecraft.Client/Common/src/UI/UI.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"
-#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.h"
-#include "Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
+#include "minecraft/client/multiplayer/MultiPlayerLevel.h"
+#include "minecraft/client/multiplayer/ClientConnection.h"
 #include "minecraft/world/level/net.minecraft.world.level.h"
 #include "minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h"
 #include "4J_Input.h"
--- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game
+++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game
@ -1,11 +1,11 @@

 #include "Minecraft.Client/Common/src/UI/UI.h"
 #include "UIScene_TeleportMenu.h"
-#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "minecraft/network/packet/net.minecraft.network.packet.h"
-#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
-#include "Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.h"
-#include "Minecraft.Client/net/minecraft/server/commands/TeleportCommand.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
+#include "minecraft/client/multiplayer/ClientConnection.h"
+#include "minecraft/server/commands/TeleportCommand.h"

 UIScene_TeleportMenu::UIScene_TeleportMenu(int iPad, void* initData,
                                           UILayer* parentLayer)
--- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/UIScene_ConnectingProgress.cpp
+++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/UIScene_ConnectingProgress.cpp
@ -1,7 +1,7 @@

 #include "Minecraft.Client/Common/src/UI/UI.h"
 #include "UIScene_ConnectingProgress.h"
-#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
+#include "minecraft/client/Minecraft.h"

 UIScene_ConnectingProgress::UIScene_ConnectingProgress(int iPad,
                                                       void* _initData,
--- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/UIScene_FullscreenProgress.cpp
+++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/UIScene_FullscreenProgress.cpp
@ -1,8 +1,8 @@

 #include "Minecraft.Client/Common/src/UI/UI.h"
 #include "UIScene_FullscreenProgress.h"
-#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
-#include "Minecraft.Client/net/minecraft/client/ProgressRenderer.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/ProgressRenderer.h"

 UIScene_FullscreenProgress::UIScene_FullscreenProgress(int iPad, void* initData,
                                                       UILayer* parentLayer)
--- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/UIScene_QuadrantSignin.cpp
+++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/UIScene_QuadrantSignin.cpp
@ -1,7 +1,7 @@

 #include "Minecraft.Client/Common/src/UI/UI.h"
 #include "UIScene_QuadrantSignin.h"
-#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
+#include "minecraft/client/Minecraft.h"
 #include "4J_Input.h"

 UIScene_QuadrantSignin::UIScene_QuadrantSignin(int iPad, void* _initData,
--- a/minecraft/Minecraft.Client/Common/src/UI/UIController.cpp
+++ b/minecraft/Minecraft.Client/Common/src/UI/UIController.cpp
@ -5,14 +5,14 @@
 #include "UIScene.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"
-#include "Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h"
-#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
+#include "minecraft/client/player/LocalPlayer.h"
+#include "minecraft/client/skins/DLCTexturePack.h"
+#include "minecraft/client/skins/TexturePackRepository.h"
+#include "minecraft/client/Minecraft.h"
 #include "minecraft/world/entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.h"
-#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/client/renderer/entity/EnderDragonRenderer.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
+#include "minecraft/client/title/TitleScreen.h"
 #include "console_helpers/PerformanceTimer.h"
 #include "UIFontData.h"
 #include "4J_Input.h"
--- a/minecraft/Minecraft.Client/Common/src/UI/UIGroup.cpp
+++ b/minecraft/Minecraft.Client/Common/src/UI/UIGroup.cpp
@ -6,8 +6,8 @@
 #include "Minecraft.Client/Common/src/UI/UILayer.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "Minecraft.Client/Linux/Linux_UIController.h"
-#include "Minecraft.Client/net/minecraft/client/MemoryTracker.h"
-#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
+#include "minecraft/client/MemoryTracker.h"
+#include "minecraft/client/Minecraft.h"

 class UIScene;

--- a/minecraft/Minecraft.Client/Common/src/UI/UIScene.cpp
+++ b/minecraft/Minecraft.Client/Common/src/UI/UIScene.cpp
@ -4,8 +4,8 @@
 #include <utility>

 #include "UIScene.h"
-#include "Minecraft.Client/net/minecraft/client/Lighting.h"
-#include "Minecraft.Client/net/minecraft/client/renderer/entity/ItemRenderer.h"
+#include "minecraft/client/Lighting.h"
+#include "minecraft/client/renderer/entity/ItemRenderer.h"
 #include "4J.Common/4J_Compat.h"
 #include "Minecraft.Client/Common/App_enums.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h"
@ -25,7 +25,7 @@
 #include "Minecraft.Client/include/XboxStubs.h"
 #include "Minecraft.Client/include/SkinBox.h"
 #include "java/System.h"
-#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
+#include "minecraft/client/Minecraft.h"

 class MultiplayerLocalPlayer;

--- a/minecraft/Minecraft.Client/Linux/Linux_App.cpp
+++ b/minecraft/Minecraft.Client/Linux/Linux_App.cpp
@ -2,9 +2,9 @@
 #include <string>

 #include "Minecraft.Client/Common/Consoles_App.h"
-#include "Minecraft.Client/net/minecraft/client/User.h"
-#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
-#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h"
+#include "minecraft/client/User.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/server/MinecraftServer.h"
 #include "minecraft/world/level/LevelSettings.h"
 #include "Linux_App.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
--- a/minecraft/Minecraft.Client/Linux/Linux_Minecraft.cpp
+++ b/minecraft/Minecraft.Client/Linux/Linux_Minecraft.cpp
@ -36,8 +36,8 @@ static void sigsegv_handler(int sig) {
    _exit(139);
 }
 #endif
-#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h"
-#include "Minecraft.Client/net/minecraft/client/player/LocalPlayer.h"
+#include "minecraft/server/MinecraftServer.h"
+#include "minecraft/client/player/LocalPlayer.h"
 #include "minecraft/world/item/ItemInstance.h"
 #include "minecraft/world/item/MapItem.h"
 #include "minecraft/world/item/crafting/Recipes.h"
@ -49,21 +49,21 @@ static void sigsegv_handler(int sig) {
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"

-#include "Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.h"
-#include "Minecraft.Client/net/minecraft/client/User.h"
+#include "minecraft/client/multiplayer/ClientConnection.h"
+#include "minecraft/client/User.h"
 #include "Minecraft.Client/Common/src/Network/Socket.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/stats/StatsCounter.h"
+#include "minecraft/client/multiplayer/ConnectScreen.h"
 // #include "Minecraft.Client/Common/src/Leaderboards/LeaderboardManager.h"
 // #include "../Common/XUI/XUI_Scene_Container.h"
 // #include "NetworkManager.h"
-#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/client/renderer/Tesselator.h"
+#include "minecraft/client/Options.h"
+#include "minecraft/client/renderer/Textures.h"
 #include "console_helpers/compression.h"
 #include "minecraft/world/level/chunk/storage/OldChunkStorage.h"
-#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
+#include "minecraft/client/Minecraft.h"
 #include "Minecraft.Client/Common/App_Defines.h"

 #include "4J_Input.h"
--- a/minecraft/Minecraft.Client/Windows64/Source
+++ b/minecraft/Minecraft.Client/Windows64/Source
@ -5,8 +5,8 @@

 #include <assert.h>
 #include <mutex>
-#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h"
-#include "Minecraft.Client/net/minecraft/client/player/LocalPlayer.h"
+#include "minecraft/server/MinecraftServer.h"
+#include "minecraft/client/player/LocalPlayer.h"
 #include "minecraft/world/item/ItemInstance.h"
 #include "minecraft/world/item/MapItem.h"
 #include "minecraft/world/item/crafting/Recipes.h"
@ -18,20 +18,20 @@
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"

-#include "Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.h"
-#include "Minecraft.Client/net/minecraft/client/User.h"
+#include "minecraft/client/multiplayer/ClientConnection.h"
+#include "minecraft/client/User.h"
 #include "Minecraft.Client/Common/src/Network/Socket.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/stats/StatsCounter.h"
+#include "minecraft/client/multiplayer/ConnectScreen.h"
 // #include "Social/SocialManager.h"
 // #include "Minecraft.Client/Common/src/Leaderboards/LeaderboardManager.h"
 // #include "../Common/XUI/XUI_Scene_Container.h"
 // #include "NetworkManager.h"
-#include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h"
-#include "Minecraft.Client/net/minecraft/client/Options.h"
+#include "minecraft/client/renderer/Tesselator.h"
+#include "minecraft/client/Options.h"
 #include "Sentient/SentientManager.h"
-#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h"
+#include "minecraft/client/renderer/Textures.h"
 #include "../Resource.h"
 #include "console_helpers/compression.h"
 #include "minecraft/world/level/chunk/storage/OldChunkStorage.h"
--- a/minecraft/Minecraft.Client/Windows64/Windows64_App.cpp
+++ b/minecraft/Minecraft.Client/Windows64/Windows64_App.cpp
@ -1,10 +1,10 @@

 #include "Minecraft.Client/Common/Consoles_App.h"
-#include "Minecraft.Client/net/minecraft/client/User.h"
-#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
-#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h"
-#include "Minecraft.Client/net/minecraft/server/PlayerList.h"
-#include "Minecraft.Client/net/minecraft/server/level/ServerPlayer.h"
+#include "minecraft/client/User.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/server/MinecraftServer.h"
+#include "minecraft/server/PlayerList.h"
+#include "minecraft/server/level/ServerPlayer.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/LevelSettings.h"
 #include "minecraft/world/level/biome/BiomeSource.h"
--- a/minecraft/Minecraft.Client/Windows64/Windows64_UIController.cpp
+++ b/minecraft/Minecraft.Client/Windows64/Windows64_UIController.cpp
@ -2,8 +2,8 @@
 #include "Windows64_UIController.h"

 // Temp
-#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
-#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/renderer/Textures.h"

 #define _ENABLEIGGY

--- a/minecraft/minecraft/StaticConstructors.cpp
+++ b/minecraft/minecraft/StaticConstructors.cpp
@ -1,5 +1,5 @@
 #include "minecraft/StaticConstructors.h"
-#include "Minecraft.Client/net/minecraft/server/level/ServerLevel.h"
+#include "minecraft/server/level/ServerLevel.h"
 #include "minecraft/stats/CommonStats.h"
 #include "minecraft/SharedConstants.h"
 #include "minecraft/network/packet/Packet.h"
--- a/minecraft/Minecraft.Client/net/minecraft/client/Camera.cpp
+++ b/minecraft/Minecraft.Client/net/minecraft/client/Camera.cpp
--- a/minecraft/Minecraft.Client/net/minecraft/client/Camera.h
+++ b/minecraft/Minecraft.Client/net/minecraft/client/Camera.h
--- a/minecraft/Minecraft.Client/net/minecraft/client/ClientConstants.cpp
+++ b/minecraft/Minecraft.Client/net/minecraft/client/ClientConstants.cpp
@ -1,5 +1,5 @@
 #include "ClientConstants.h"
-#include "Minecraft.Client/net/minecraft/client/ClientConstants.h"
+#include "minecraft/client/ClientConstants.h"
 #include "Minecraft.Client/Common/src/BuildVer/BuildVer.h"

 const std::wstring ClientConstants::VERSION_STRING =
--- a/minecraft/Minecraft.Client/net/minecraft/client/ClientConstants.h
+++ b/minecraft/Minecraft.Client/net/minecraft/client/ClientConstants.h
--- a/minecraft/Minecraft.Client/net/minecraft/client/DemoUser.cpp
+++ b/minecraft/Minecraft.Client/net/minecraft/client/DemoUser.cpp
@ -1,6 +1,6 @@
 #include <string>

 #include "DemoUser.h"
-#include "Minecraft.Client/net/minecraft/client/User.h"
+#include "minecraft/client/User.h"

 DemoUser::DemoUser() : User(L"DemoUser", L"n/a") {}
--- a/minecraft/Minecraft.Client/net/minecraft/client/DemoUser.h
+++ b/minecraft/Minecraft.Client/net/minecraft/client/DemoUser.h
--- a/minecraft/Minecraft.Client/net/minecraft/client/GuiMessage.cpp
+++ b/minecraft/Minecraft.Client/net/minecraft/client/GuiMessage.cpp
@ -1,5 +1,5 @@
 #include "GuiMessage.h"
-#include "Minecraft.Client/net/minecraft/client/GuiMessage.h"
+#include "minecraft/client/GuiMessage.h"

 GuiMessage::GuiMessage(const std::wstring& string) {
    this->string = string;
--- a/minecraft/Minecraft.Client/net/minecraft/client/GuiMessage.h
+++ b/minecraft/Minecraft.Client/net/minecraft/client/GuiMessage.h
--- a/minecraft/Minecraft.Client/net/minecraft/client/KeyMapping.cpp
+++ b/minecraft/Minecraft.Client/net/minecraft/client/KeyMapping.cpp
--- a/minecraft/Minecraft.Client/net/minecraft/client/KeyMapping.h
+++ b/minecraft/Minecraft.Client/net/minecraft/client/KeyMapping.h
--- a/minecraft/Minecraft.Client/net/minecraft/client/Lighting.cpp
+++ b/minecraft/Minecraft.Client/net/minecraft/client/Lighting.cpp
--- a/minecraft/Minecraft.Client/net/minecraft/client/Lighting.h
+++ b/minecraft/Minecraft.Client/net/minecraft/client/Lighting.h
--- a/Show more
+++ b/Show more