move Minecraft.World to minecraft

.github/workflows/build-doxygen.yml

@@ -6,7 +6,7 @@ on:
     paths:
       - "Minecraft.Assets/**"
       - "Minecraft.Client/**"
-      - "Minecraft.World/**"
+      - "minecraft/**"
       - "docs/**"
 
 jobs:

meson.build

@@ -73,6 +73,6 @@ subdir('minecraft/4J.Input')
 subdir('minecraft/4J.Profile')
 subdir('minecraft/4J.Storage')
 subdir('minecraft/Minecraft.Assets')
-subdir('minecraft/Minecraft.World')
+subdir('minecraft/minecraft')
 subdir('minecraft/Minecraft.Client')
 

minecraft/Minecraft.Client/Common/Consoles_App.cpp

@@ -1,7 +1,7 @@
-#include "Minecraft.World/net/minecraft/world/item/crafting/Recipy.h"
+#include "minecraft/world/item/crafting/Recipy.h"
 #include "Minecraft.Client/net/minecraft/client/Options.h"
-#include "Minecraft.World/net/minecraft/world/phys/AABB.h"
+#include "minecraft/world/phys/AABB.h"
-#include "Minecraft.World/net/minecraft/world/phys/Vec3.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"
@@ -12,14 +12,14 @@
 #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.World/net/minecraft/world/entity/player/Player.h"
+#include "minecraft/world/entity/player/Player.h"
-#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h"
+#include "minecraft/world/entity/player/Inventory.h"
-#include "Minecraft.World/net/minecraft/world/level/Level.h"
+#include "minecraft/world/level/Level.h"
-#include "Minecraft.World/net/minecraft/world/level/tile/entity/FurnaceTileEntity.h"
+#include "minecraft/world/level/tile/entity/FurnaceTileEntity.h"
-#include "Minecraft.World/net/minecraft/world/Container.h"
+#include "minecraft/world/Container.h"
-#include "Minecraft.World/net/minecraft/world/level/tile/entity/DispenserTileEntity.h"
+#include "minecraft/world/level/tile/entity/DispenserTileEntity.h"
-#include "Minecraft.World/net/minecraft/world/level/tile/entity/SignTileEntity.h"
+#include "minecraft/world/level/tile/entity/SignTileEntity.h"
-#include "Minecraft.World/net/minecraft/world/level/tile/entity/HopperTileEntity.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"
@@ -35,11 +35,11 @@
 #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/net/minecraft/world/level/LevelSettings.h"
+#include "minecraft/world/level/LevelSettings.h"
 #include "Minecraft.Client/net/minecraft/client/User.h"
 #include <cstring>
-#include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h"
+#include "minecraft/world/level/storage/LevelData.h"
-#include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h"
+#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h"
 #include "Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderDispatcher.h"
 #include "console_helpers/compression.h"
 #include "Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h"

minecraft/Minecraft.Client/Common/Consoles_App.h

@@ -13,7 +13,7 @@
 
 #include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h"
 
-#include "Minecraft.World/net/minecraft/network/packet/DisconnectPacket.h"
+#include "minecraft/network/packet/DisconnectPacket.h"
 
 #include "Minecraft.Client/Common/src/Localisation/StringTable.h"
 #include "Minecraft.Client/Common/src/DLC/DLCManager.h"
@@ -21,7 +21,7 @@
 #include "Minecraft.Client/Common/src/GameRules/GameRuleManager.h"
 #include "Minecraft.Client/include/SkinBox.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/ArchiveFile.h"
-#include "Minecraft.World/net/minecraft/world/entity/item/MinecartHopper.h"
+#include "minecraft/world/entity/item/MinecartHopper.h"
 #include "Minecraft.Client/Common/App_structs.h"
 #include "Minecraft.Client/include/NetTypes.h"
 #include "Minecraft.Client/include/XboxStubs.h"

minecraft/Minecraft.Client/Common/src/Audio/Consoles_SoundEngine.h

@@ -4,7 +4,7 @@
 #include <string>
 #include <vector>
 
-#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h"
+#include "minecraft/sounds/SoundTypes.h"
 
 class File;
 

minecraft/Minecraft.Client/Common/src/Audio/SoundEngine.cpp

@@ -13,17 +13,17 @@
 #include <filesystem>
 #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/level/storage/LevelData.h"
-#include "Minecraft.World/net/minecraft/util/Mth.h"
+#include "minecraft/util/Mth.h"
 #include "Minecraft.Client/net/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/net/minecraft/world/entity/Mob.h"
+#include "minecraft/world/entity/Mob.h"
 #include "java/Random.h"
 #include "Minecraft.Client/net/minecraft/client/Minecraft.h"
-#include "Minecraft.World/net/minecraft/util/Mth.h"
+#include "minecraft/util/Mth.h"
 
 #if defined(__linux__)
 #define STB_VORBIS_HEADER_ONLY

minecraft/Minecraft.Client/Common/src/Audio/SoundEngine.h

@@ -7,7 +7,7 @@ class Random;
 using namespace std;
 #include <string>
 
-#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h"
+#include "minecraft/sounds/SoundTypes.h"
 #include "miniaudio.h"
 #include "Minecraft.Client/Common/App_Defines.h"
 #include "Minecraft.Client/Common/src/Audio/Consoles_SoundEngine.h"

minecraft/Minecraft.Client/Common/src/Audio/SoundNames.cpp

@@ -1,5 +1,5 @@
 #include "Consoles_SoundEngine.h"
-#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h"
+#include "minecraft/sounds/SoundTypes.h"
 
 const wchar_t* ConsoleSoundEngine::wchSoundNames[eSoundType_MAX] = {
     L"mob/chicken/chicken",        //	eSoundType_MOB_CHICKEN_AMBIENT

minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.cpp

@@ -5,13 +5,13 @@
 #include "ApplySchematicRuleDefinition.h"
 #include "LevelGenerationOptions.h"
 #include "ConsoleSchematicFile.h"
-#include "Minecraft.World/net/minecraft/world/phys/AABB.h"
+#include "minecraft/world/phys/AABB.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
-#include "Minecraft.World/net/minecraft/world/level/Level.h"
+#include "minecraft/world/level/Level.h"
-#include "Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h"
+#include "minecraft/world/level/chunk/LevelChunk.h"
-#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h"
+#include "minecraft/world/level/dimension/Dimension.h"
 #include "Minecraft.Client/include/NetTypes.h"
 #include "Minecraft.Client/include/XboxStubs.h"
 #include "Minecraft.Client/include/SkinBox.h"

minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h

@@ -5,9 +5,9 @@
 
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
 #include "ConsoleSchematicFile.h"
-#include "Minecraft.World/net/minecraft/world/phys/AABB.h"
+#include "minecraft/world/phys/AABB.h"
 #include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"
-#include "Minecraft.World/net/minecraft/world/phys/Vec3.h"
+#include "minecraft/world/phys/Vec3.h"
 
 class AABB;
 class Vec3;

minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructure.cpp

@@ -11,10 +11,10 @@
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
-#include "Minecraft.World/net/minecraft/Direction.h"
+#include "minecraft/Direction.h"
-#include "Minecraft.World/net/minecraft/world/level/Level.h"
+#include "minecraft/world/level/Level.h"
-#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h"
+#include "minecraft/world/level/dimension/Dimension.h"
-#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/BoundingBox.h"
+#include "minecraft/world/level/levelgen/structure/BoundingBox.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 
 ConsoleGenerateStructure::ConsoleGenerateStructure() : StructurePiece(0) {

minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructure.h

@@ -3,9 +3,9 @@
 #include <vector>
 
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
-#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructurePiece.h"
+#include "minecraft/world/level/levelgen/structure/StructurePiece.h"
 #include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"
-#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeatureIO.h"
+#include "minecraft/world/level/levelgen/structure/StructureFeatureIO.h"
 
 class Level;
 class Random;

minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.cpp

@@ -8,17 +8,17 @@
 #include "ConsoleSchematicFile.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/entity/Entity.h"
-#include "Minecraft.World/net/minecraft/world/entity/EntityIO.h"
+#include "minecraft/world/entity/EntityIO.h"
-#include "Minecraft.World/net/minecraft/world/entity/ItemFrame.h"
+#include "minecraft/world/entity/ItemFrame.h"
-#include "Minecraft.World/net/minecraft/world/entity/Painting.h"
+#include "minecraft/world/entity/Painting.h"
-#include "Minecraft.World/net/minecraft/world/level/Level.h"
+#include "minecraft/world/level/Level.h"
-#include "Minecraft.World/net/minecraft/world/level/LightLayer.h"
+#include "minecraft/world/level/LightLayer.h"
-#include "Minecraft.World/net/minecraft/world/level/TilePos.h"
+#include "minecraft/world/level/TilePos.h"
-#include "Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h"
+#include "minecraft/world/level/chunk/LevelChunk.h"
-#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h"
+#include "minecraft/world/level/tile/Tile.h"
-#include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h"
+#include "minecraft/world/level/tile/entity/TileEntity.h"
-#include "Minecraft.World/net/minecraft/world/phys/AABB.h"
+#include "minecraft/world/phys/AABB.h"
 #include "Minecraft.Client/include/NetTypes.h"
 #include "Minecraft.Client/include/XboxStubs.h"
 #include "Minecraft.Client/include/SkinBox.h"

minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.h

@@ -13,7 +13,7 @@
 
 #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
 #include "console_helpers/compression.h"
-#include "Minecraft.World/net/minecraft/world/phys/Vec3.h"
+#include "minecraft/world/phys/Vec3.h"
 
 class Level;
 class DataOutputStream;

minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.cpp

@@ -5,10 +5,10 @@
 #include "Minecraft.Client/include/stdafx.h"
 
 #include "console_helpers/StringHelpers.h"
-#include "Minecraft.World/net/minecraft/Pos.h"
+#include "minecraft/Pos.h"
-#include "Minecraft.World/net/minecraft/world/phys/net.minecraft.world.phys.h"
+#include "minecraft/world/phys/net.minecraft.world.phys.h"
-#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h"
+#include "minecraft/world/level/net.minecraft.world.level.h"
-#include "Minecraft.World/net/minecraft/world/level/chunk/net.minecraft.world.level.chunk.h"
+#include "minecraft/world/level/chunk/net.minecraft.world.level.chunk.h"
 #include "Minecraft.Client/Common/src/Localisation/StringTable.h"
 #include "LevelGenerationOptions.h"
 #include "Minecraft.Client/Common/src/GameRules/ConsoleGameRules.h"

minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h

@@ -5,7 +5,7 @@
 
 #include <cstdint>
 
-#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeature.h"
+#include "minecraft/world/level/levelgen/structure/StructureFeature.h"
 
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
 #include "Minecraft.Client/Common/src/Localisation/StringTable.h"

minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/StartFeature.h

@@ -4,7 +4,7 @@
 #include <string>
 
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
-#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeature.h"
+#include "minecraft/world/level/levelgen/structure/StructureFeature.h"
 #include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"
 
 class StartFeature : public GameRuleDefinition {

minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.cpp

@@ -4,7 +4,7 @@
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
-#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructurePiece.h"
+#include "minecraft/world/level/levelgen/structure/StructurePiece.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 
 XboxStructureActionGenerateBox::XboxStructureActionGenerateBox() {

minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.cpp

@@ -4,7 +4,7 @@
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
-#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructurePiece.h"
+#include "minecraft/world/level/levelgen/structure/StructurePiece.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 
 XboxStructureActionPlaceBlock::XboxStructureActionPlaceBlock() {

minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.cpp

@@ -7,12 +7,12 @@
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
-#include "Minecraft.World/net/minecraft/world/Container.h"
+#include "minecraft/world/Container.h"
-#include "Minecraft.World/net/minecraft/world/level/Level.h"
+#include "minecraft/world/level/Level.h"
-#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/BoundingBox.h"
+#include "minecraft/world/level/levelgen/structure/BoundingBox.h"
-#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructurePiece.h"
+#include "minecraft/world/level/levelgen/structure/StructurePiece.h"
-#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h"
+#include "minecraft/world/level/tile/Tile.h"
-#include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h"
+#include "minecraft/world/level/tile/entity/TileEntity.h"
 
 XboxStructureActionPlaceContainer::XboxStructureActionPlaceContainer() {
     m_tile = Tile::chest_Id;

minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.cpp

@@ -4,11 +4,11 @@
 #include "XboxStructureActionPlaceSpawner.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h"
-#include "Minecraft.World/net/minecraft/world/level/Level.h"
+#include "minecraft/world/level/Level.h"
-#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/BoundingBox.h"
+#include "minecraft/world/level/levelgen/structure/BoundingBox.h"
-#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructurePiece.h"
+#include "minecraft/world/level/levelgen/structure/StructurePiece.h"
-#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h"
+#include "minecraft/world/level/tile/Tile.h"
-#include "Minecraft.World/net/minecraft/world/level/tile/entity/MobSpawnerTileEntity.h"
+#include "minecraft/world/level/tile/entity/MobSpawnerTileEntity.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 
 XboxStructureActionPlaceSpawner::XboxStructureActionPlaceSpawner() {

minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.cpp

@@ -6,12 +6,12 @@
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
-#include "Minecraft.World/net/minecraft/world/item/EnchantedBookItem.h"
+#include "minecraft/world/item/EnchantedBookItem.h"
-#include "Minecraft.World/net/minecraft/world/item/Item.h"
+#include "minecraft/world/item/Item.h"
-#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h"
+#include "minecraft/world/item/ItemInstance.h"
-#include "Minecraft.World/net/minecraft/world/item/enchantment/Enchantment.h"
+#include "minecraft/world/item/enchantment/Enchantment.h"
-#include "Minecraft.World/net/minecraft/world/item/enchantment/EnchantmentCategory.h"
+#include "minecraft/world/item/enchantment/EnchantmentCategory.h"
-#include "Minecraft.World/net/minecraft/world/item/enchantment/EnchantmentInstance.h"
+#include "minecraft/world/item/enchantment/EnchantmentInstance.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 
 AddEnchantmentRuleDefinition::AddEnchantmentRuleDefinition() {

minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.cpp

@@ -5,10 +5,10 @@
 #include "AddEnchantmentRuleDefinition.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
-#include "Minecraft.World/net/minecraft/world/Container.h"
+#include "minecraft/world/Container.h"
-#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h"
+#include "minecraft/world/entity/player/Inventory.h"
-#include "Minecraft.World/net/minecraft/world/item/Item.h"
+#include "minecraft/world/item/Item.h"
-#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h"
+#include "minecraft/world/item/ItemInstance.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 
 AddItemRuleDefinition::AddItemRuleDefinition() {

minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.cpp

@@ -1,12 +1,12 @@
 #include "console_helpers/StringHelpers.h"
 #include "CollectItemRuleDefinition.h"
-#include "Minecraft.World/net/minecraft/network/Connection.h"
+#include "minecraft/network/Connection.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRule.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
-#include "Minecraft.World/net/minecraft/network/packet/UpdateGameRuleProgressPacket.h"
+#include "minecraft/network/packet/UpdateGameRuleProgressPacket.h"
-#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h"
+#include "minecraft/world/item/ItemInstance.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 
 CollectItemRuleDefinition::CollectItemRuleDefinition() {

minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.cpp

@@ -4,13 +4,13 @@
 
 #include "CompleteAllRuleDefinition.h"
 #include "console_helpers/StringHelpers.h"
-#include "Minecraft.World/net/minecraft/network/Connection.h"
+#include "minecraft/network/Connection.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRule.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
-#include "Minecraft.World/net/minecraft/network/packet/UpdateGameRuleProgressPacket.h"
+#include "minecraft/network/packet/UpdateGameRuleProgressPacket.h"
 
 void CompleteAllRuleDefinition::getChildren(
     std::vector<GameRuleDefinition*>* children) {

minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h

@@ -5,7 +5,7 @@
 #include <format>
 #include <memory>
 
-#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h"
+#include "minecraft/world/item/ItemInstance.h"
 #include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRulesInstance.h"
 

minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h

@@ -3,7 +3,7 @@
 #include <string>
 
 #include "GameRuleDefinition.h"
-#include "Minecraft.World/net/minecraft/world/phys/AABB.h"
+#include "minecraft/world/phys/AABB.h"
 #include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"
 
 class NamedAreaRuleDefinition : public GameRuleDefinition {

minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.cpp

@@ -2,15 +2,15 @@
 #include <memory>
 
 #include "UpdatePlayerRuleDefinition.h"
-#include "Minecraft.World/net/minecraft/Pos.h"
+#include "minecraft/Pos.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"
 #include "Minecraft.Client/Linux/Linux_App.h"
-#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h"
+#include "minecraft/world/entity/player/Inventory.h"
-#include "Minecraft.World/net/minecraft/world/entity/player/Player.h"
+#include "minecraft/world/entity/player/Player.h"
-#include "Minecraft.World/net/minecraft/world/food/FoodData.h"
+#include "minecraft/world/food/FoodData.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 
 UpdatePlayerRuleDefinition::UpdatePlayerRuleDefinition() {

minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h

@@ -4,7 +4,7 @@
 #include <string>
 
 #include "GameRuleDefinition.h"
-#include "Minecraft.World/net/minecraft/Pos.h"
+#include "minecraft/Pos.h"
 #include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"
 
 class UseTileRuleDefinition : public GameRuleDefinition {

minecraft/Minecraft.Client/Common/src/Network/GameNetworkManager.cpp

@@ -6,13 +6,13 @@
 #include <filesystem>
 
 #include "console_helpers/StringHelpers.h"
-#include "Minecraft.World/net/minecraft/world/phys/AABB.h"
+#include "minecraft/world/phys/AABB.h"
-#include "Minecraft.World/net/minecraft/world/phys/Vec3.h"
+#include "minecraft/world/phys/Vec3.h"
 #include "Socket.h"
 #include "console_helpers/ThreadName.h"
-#include "Minecraft.World/net/minecraft/world/entity/Entity.h"
+#include "minecraft/world/entity/Entity.h"
-#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h"
+#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"
-#include "Minecraft.World/net/minecraft/world/item/crafting/FireworksRecipe.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"
@@ -23,9 +23,9 @@
 #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.World/net/minecraft/network/packet/DisconnectPacket.h"
+#include "minecraft/network/packet/DisconnectPacket.h"
 #include "console_helpers/compression.h"
-#include "Minecraft.World/net/minecraft/world/level/chunk/storage/OldChunkStorage.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"
 

minecraft/Minecraft.Client/Common/src/Tutorial/Constraints/AreaConstraint.cpp

@@ -3,9 +3,9 @@
 #include "Minecraft.Client/net/minecraft/client/Minecraft.h"
 #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "AreaConstraint.h"
-#include "Minecraft.World/net/minecraft/world/phys/AABB.h"
+#include "minecraft/world/phys/AABB.h"
 #include "Minecraft.Client/Common/src/Tutorial/Constraints/TutorialConstraint.h"
-#include "Minecraft.World/net/minecraft/world/phys/Vec3.h"
+#include "minecraft/world/phys/Vec3.h"
 
 AreaConstraint::AreaConstraint(int descriptionId, double x0, double y0,
                                double z0, double x1, double y1, double z1,

minecraft/Minecraft.Client/Common/src/Tutorial/Constraints/AreaConstraint.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "TutorialConstraint.h"
-#include "Minecraft.World/net/minecraft/world/phys/AABB.h"
+#include "minecraft/world/phys/AABB.h"
 
 class AABB;
 

minecraft/Minecraft.Client/Common/src/Tutorial/Constraints/ChangeStateConstraint.cpp

@@ -4,16 +4,16 @@
 #include "Minecraft.Client/net/minecraft/client/Minecraft.h"
 #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "ChangeStateConstraint.h"
-#include "Minecraft.World/net/minecraft/world/phys/AABB.h"
+#include "minecraft/world/phys/AABB.h"
 #include "Minecraft.Client/net/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"
-#include "Minecraft.World/net/minecraft/network/packet/PlayerInfoPacket.h"
+#include "minecraft/network/packet/PlayerInfoPacket.h"
-#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h"
+#include "minecraft/world/entity/player/Abilities.h"
-#include "Minecraft.World/net/minecraft/world/entity/player/Player.h"
+#include "minecraft/world/entity/player/Player.h"
-#include "Minecraft.World/net/minecraft/world/level/LevelSettings.h"
+#include "minecraft/world/level/LevelSettings.h"
-#include "Minecraft.World/net/minecraft/world/phys/Vec3.h"
+#include "minecraft/world/phys/Vec3.h"
 
 ChangeStateConstraint::ChangeStateConstraint(
     Tutorial* tutorial, eTutorial_State targetState,

minecraft/Minecraft.Client/Common/src/Tutorial/Constraints/ChangeStateConstraint.h

@@ -4,7 +4,7 @@
 
 #include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h"
 #include "TutorialConstraint.h"
-#include "Minecraft.World/net/minecraft/world/phys/AABB.h"
+#include "minecraft/world/phys/AABB.h"
 
 class AABB;
 class Tutorial;

minecraft/Minecraft.Client/Common/src/Tutorial/FullTutorial.cpp

@@ -2,18 +2,18 @@
 
 #include "4J.Common/4J_InputActions.h"
 
-#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h"
+#include "minecraft/world/item/net.minecraft.world.item.h"
-#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h"
+#include "minecraft/world/level/net.minecraft.world.level.h"
-#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h"
+#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"
-#include "Minecraft.World/net/minecraft/world/phys/net.minecraft.world.phys.h"
+#include "minecraft/world/phys/net.minecraft.world.phys.h"
-#include "Minecraft.World/net/minecraft/world/effect/net.minecraft.world.effect.h"
+#include "minecraft/world/effect/net.minecraft.world.effect.h"
 #include "Minecraft.Client/Common/src/GameRules/ConsoleGameRules.h"
 #include "Minecraft.Client/Common/src/Tutorial/Hints/DiggerItemHint.h"
 #include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTasks.h"
 #include "Minecraft.Client/Common/src/Tutorial/Hints/AreaHint.h"
 #include "FullTutorial.h"
 #include "Minecraft.Client/Common/src/Tutorial/Constraints/TutorialConstraints.h"
-#include "Minecraft.World/net/minecraft/world/item/alchemy/PotionMacros.h"
+#include "minecraft/world/item/alchemy/PotionMacros.h"
 
 FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/)
     : Tutorial(iPad, true) {

minecraft/Minecraft.Client/Common/src/Tutorial/Hints/AreaHint.cpp

@@ -3,10 +3,10 @@
 #include "Minecraft.Client/net/minecraft/client/Minecraft.h"
 #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "AreaHint.h"
-#include "Minecraft.World/net/minecraft/world/phys/AABB.h"
+#include "minecraft/world/phys/AABB.h"
 #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
 #include "Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.h"
-#include "Minecraft.World/net/minecraft/world/phys/Vec3.h"
+#include "minecraft/world/phys/Vec3.h"
 
 AreaHint::AreaHint(eTutorial_Hint id, Tutorial* tutorial,
                    eTutorial_State displayState, eTutorial_State completeState,

minecraft/Minecraft.Client/Common/src/Tutorial/Hints/AreaHint.h

@@ -2,7 +2,7 @@
 
 #include "TutorialHint.h"
 #include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h"
-#include "Minecraft.World/net/minecraft/world/phys/AABB.h"
+#include "minecraft/world/phys/AABB.h"
 
 class AABB;
 class Tutorial;

minecraft/Minecraft.Client/Common/src/Tutorial/Hints/DiggerItemHint.cpp

@@ -1,8 +1,8 @@
 
-#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h"
+#include "minecraft/world/level/net.minecraft.world.level.h"
-#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h"
+#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"
-#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h"
+#include "minecraft/world/item/net.minecraft.world.item.h"
-#include "Minecraft.World/net/minecraft/world/entity/net.minecraft.world.entity.h"
+#include "minecraft/world/entity/net.minecraft.world.entity.h"
 #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
 #include "DiggerItemHint.h"
 

minecraft/Minecraft.Client/Common/src/Tutorial/Hints/LookAtTileHint.cpp

@@ -3,7 +3,7 @@
 #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
 #include "LookAtTileHint.h"
 #include "Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.h"
-#include "Minecraft.World/net/minecraft/world/item/Item.h"
+#include "minecraft/world/item/Item.h"
 
 LookAtTileHint::LookAtTileHint(eTutorial_Hint id, Tutorial* tutorial,
                                int tiles[], unsigned int tilesLength,

minecraft/Minecraft.Client/Common/src/Tutorial/Hints/TakeItemHint.cpp

@@ -3,7 +3,7 @@
 #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
 #include "TakeItemHint.h"
 #include "Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.h"
-#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h"
+#include "minecraft/world/item/ItemInstance.h"
 
 TakeItemHint::TakeItemHint(eTutorial_Hint id, Tutorial* tutorial, int items[],
                            unsigned int itemsLength)

minecraft/Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.cpp

@@ -4,7 +4,7 @@
 #include "Minecraft.Client/net/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/net/minecraft/world/level/material/Material.h"
+#include "minecraft/world/level/material/Material.h"
 
 class Entity;
 class ItemInstance;

minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/ChoiceTask.cpp

@@ -5,7 +5,7 @@
 #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
 #include "ChoiceTask.h"
-#include "Minecraft.World/net/minecraft/world/level/material/Material.h"
+#include "minecraft/world/level/material/Material.h"
 #include "4J_Input.h"
 #include "Minecraft.Client/Common/src/Tutorial/Constraints/InputConstraint.h"
 #include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h"

minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/CompleteUsingItemTask.cpp

@@ -1,6 +1,6 @@
 #include <memory>
 
-#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h"
+#include "minecraft/world/item/ItemInstance.h"
 #include "CompleteUsingItemTask.h"
 #include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h"
 

minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/CraftTask.cpp

@@ -4,7 +4,7 @@
 
 #include "CraftTask.h"
 #include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h"
-#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h"
+#include "minecraft/world/item/ItemInstance.h"
 
 class Tutorial;
 class TutorialConstraint;

minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/HorseChoiceTask.cpp

@@ -1,9 +1,9 @@
 #include <memory>
 
-#include "Minecraft.World/net/minecraft/world/entity/animal/EntityHorse.h"
+#include "minecraft/world/entity/animal/EntityHorse.h"
 #include "HorseChoiceTask.h"
 #include "Minecraft.Client/Common/src/Tutorial/Tasks/ChoiceTask.h"
-#include "Minecraft.World/net/minecraft/world/entity/Entity.h"
+#include "minecraft/world/entity/Entity.h"
 #include "java/Class.h"
 
 class Tutorial;

minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/InfoTask.cpp

@@ -7,7 +7,7 @@
 #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
 #include "InfoTask.h"
-#include "Minecraft.World/net/minecraft/world/level/material/Material.h"
+#include "minecraft/world/level/material/Material.h"
 #include "4J_Input.h"
 #include "Minecraft.Client/Common/src/Tutorial/Constraints/InputConstraint.h"
 #include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h"

minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/PickupTask.cpp

@@ -1,7 +1,7 @@
 #include <memory>
 
 #include "PickupTask.h"
-#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h"
+#include "minecraft/world/item/ItemInstance.h"
 
 void PickupTask::onTake(std::shared_ptr<ItemInstance> item,
                         unsigned int invItemCountAnyAux,

minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/RideEntityTask.cpp

@@ -2,7 +2,7 @@
 
 #include "RideEntityTask.h"
 #include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h"
-#include "Minecraft.World/net/minecraft/world/entity/Entity.h"
+#include "minecraft/world/entity/Entity.h"
 #include "java/Class.h"
 
 class Tutorial;

minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/UseItemTask.cpp

@@ -1,6 +1,6 @@
 #include <memory>
 
-#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h"
+#include "minecraft/world/item/ItemInstance.h"
 #include "UseItemTask.h"
 #include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h"
 

minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/UseTileTask.cpp

@@ -1,6 +1,6 @@
 #include <memory>
 
-#include "Minecraft.World/net/minecraft/world/level/Level.h"
+#include "minecraft/world/level/Level.h"
 #include "UseTileTask.h"
 #include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h"
 

minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/XuiCraftingTask.h

@@ -2,7 +2,7 @@
 #include <format>
 
 #include "TutorialTask.h"
-#include "Minecraft.World/net/minecraft/world/item/crafting/Recipy.h"
+#include "minecraft/world/item/crafting/Recipy.h"
 
 class Tutorial;
 class TutorialConstraint;

minecraft/Minecraft.Client/Common/src/Tutorial/Tutorial.cpp

@@ -1,14 +1,14 @@
 #include "Minecraft.Client/include/stdafx.h"
 
 #include "console_helpers/PlatformTime.h"
-#include "Minecraft.World/net/minecraft/stats/net.minecraft.stats.h"
+#include "minecraft/stats/net.minecraft.stats.h"
 #include "Minecraft.Client/net/minecraft/client/player/LocalPlayer.h"
-#include "Minecraft.World/net/minecraft/world/entity/Entity.h"
+#include "minecraft/world/entity/Entity.h"
-#include "Minecraft.World/net/minecraft/world/level/Level.h"
+#include "minecraft/world/level/Level.h"
-#include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h"
+#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h"
-#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h"
+#include "minecraft/world/item/net.minecraft.world.item.h"
-#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h"
+#include "minecraft/world/level/net.minecraft.world.level.h"
-#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.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"

minecraft/Minecraft.Client/Common/src/Tutorial/TutorialMode.cpp

@@ -1,16 +1,16 @@
-#include "Minecraft.World/stdafx.h"
+#include "minecraft/stdafx.h"
 #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.World/net/minecraft/world/entity/player/Inventory.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/net/minecraft/world/item/ItemInstance.h"
+#include "minecraft/world/item/ItemInstance.h"
-#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h"
+#include "minecraft/world/level/tile/Tile.h"
 #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.h"
 
 class ClientConnection;

minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIController.h

@@ -3,7 +3,7 @@
 #include "UIEnums.h"
 #include "UIStructs.h"
 #include "4J_Storage.h"
-#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h"
+#include "minecraft/sounds/SoundTypes.h"
 
 // 4J Stu - An interface class that defines all the public functions that we use
 // within the game code. This allows us to build the Xbox 360 version without

minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.cpp

@@ -4,11 +4,11 @@
 
 #include "IUIScene_AbstractContainerMenu.h"
 
-#include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h"
+#include "minecraft/world/inventory/net.minecraft.world.inventory.h"
-#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h"
+#include "minecraft/world/item/net.minecraft.world.item.h"
-#include "Minecraft.World/net/minecraft/world/item/crafting/net.minecraft.world.item.crafting.h"
+#include "minecraft/world/item/crafting/net.minecraft.world.item.crafting.h"
-#include "Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h"
+#include "minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h"
-#include "Minecraft.World/net/minecraft/world/phys/Vec3.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"

minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AnvilMenu.cpp

@@ -1,9 +1,9 @@
 #include "Minecraft.Client/include/stdafx.h"
 
 #include "IUIScene_AnvilMenu.h"
-#include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h"
+#include "minecraft/world/inventory/net.minecraft.world.inventory.h"
 #include "java/InputOutputStream/InputOutputStream.h"
-#include "Minecraft.World/net/minecraft/network/packet/net.minecraft.network.packet.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"

minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AnvilMenu.h

@@ -1,6 +1,6 @@
 #pragma once
 #include "IUIScene_AbstractContainerMenu.h"
-#include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.ContainerListener.h"
+#include "minecraft/world/inventory/net.minecraft.world.inventory.ContainerListener.h"
 
 // The 0-indexed slot in the inventory list that lines up with the result slot
 #define ANVIL_SCENE_RESULT_SLOT_UP_OFFSET 5

minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_BeaconMenu.cpp

@@ -2,8 +2,8 @@
 #include <string>
 #include <vector>
 
-#include "Minecraft.World/net/minecraft/network/packet/CustomPayloadPacket.h"
+#include "minecraft/network/packet/CustomPayloadPacket.h"
-#include "Minecraft.World/net/minecraft/util/HtmlString.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"
@@ -11,9 +11,9 @@
 #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"
-#include "Minecraft.World/net/minecraft/world/effect/MobEffect.h"
+#include "minecraft/world/effect/MobEffect.h"
-#include "Minecraft.World/net/minecraft/world/inventory/BeaconMenu.h"
+#include "minecraft/world/inventory/BeaconMenu.h"
-#include "Minecraft.World/net/minecraft/world/level/tile/entity/BeaconTileEntity.h"
+#include "minecraft/world/level/tile/entity/BeaconTileEntity.h"
 #include "java/InputOutputStream/ByteArrayOutputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 

minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_BrewingMenu.cpp

@@ -2,7 +2,7 @@
 
 #include "IUIScene_BrewingMenu.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h"
-#include "Minecraft.World/net/minecraft/world/inventory/BrewingStandMenu.h"
+#include "minecraft/world/inventory/BrewingStandMenu.h"
 
 IUIScene_AbstractContainerMenu::ESceneSection
 IUIScene_BrewingMenu::GetSectionAndSlotInDirection(ESceneSection eSection,

minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CommandBlockMenu.cpp

@@ -1,10 +1,10 @@
 #include <memory>
 
-#include "Minecraft.World/net/minecraft/network/packet/CustomPayloadPacket.h"
+#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 "IUIScene_CommandBlockMenu.h"
-#include "Minecraft.World/net/minecraft/world/level/tile/entity/CommandBlockEntity.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"

minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CommandBlockMenu.h

@@ -1,7 +1,7 @@
 #pragma once
 #include <string>
 
-#include "Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h"
+#include "minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h"
 
 class CommandBlockEntity;
 

minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_ContainerMenu.cpp

@@ -2,7 +2,7 @@
 
 #include "IUIScene_ContainerMenu.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h"
-#include "Minecraft.World/net/minecraft/world/inventory/AbstractContainerMenu.h"
+#include "minecraft/world/inventory/AbstractContainerMenu.h"
 
 IUIScene_AbstractContainerMenu::ESceneSection
 IUIScene_ContainerMenu::GetSectionAndSlotInDirection(ESceneSection eSection,

minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CraftingMenu.cpp

@@ -1,9 +1,9 @@
 #include "Minecraft.Client/include/stdafx.h"
 #include "4J.Common/4J_InputActions.h"
 
-#include "Minecraft.World/net/minecraft/world/item/crafting/net.minecraft.world.item.crafting.h"
+#include "minecraft/world/item/crafting/net.minecraft.world.item.crafting.h"
-#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h"
+#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"
-#include "Minecraft.World/net/minecraft/stats/net.minecraft.stats.h"
+#include "minecraft/stats/net.minecraft.stats.h"
 #include "Minecraft.Client/net/minecraft/client/player/LocalPlayer.h"
 #include "IUIScene_CraftingMenu.h"
 #include "Minecraft.Client/Common/src/Console_Debug_enum.h"

minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CraftingMenu.h

@@ -1,6 +1,6 @@
 #pragma once
-#include "Minecraft.World/net/minecraft/world/item/crafting/Recipy.h"
+#include "minecraft/world/item/crafting/Recipy.h"
-#include "Minecraft.World/net/minecraft/world/item/Item.h"
+#include "minecraft/world/item/Item.h"
 #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
 #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.h"
 

minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CreativeMenu.cpp

@@ -6,15 +6,15 @@
 
 #include "Minecraft.Client/net/minecraft/client/Minecraft.h"
 #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
-#include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h"
+#include "minecraft/world/inventory/net.minecraft.world.inventory.h"
-#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h"
+#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"
-#include "Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h"
+#include "minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h"
-#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h"
+#include "minecraft/world/item/net.minecraft.world.item.h"
-#include "Minecraft.World/net/minecraft/world/item/enchantment/net.minecraft.world.item.enchantment.h"
+#include "minecraft/world/item/enchantment/net.minecraft.world.item.enchantment.h"
-#include "Minecraft.World/net/minecraft/world/entity/net.minecraft.world.entity.h"
+#include "minecraft/world/entity/net.minecraft.world.entity.h"
-#include "Minecraft.World/net/minecraft/world/entity/animal/net.minecraft.world.entity.animal.h"
+#include "minecraft/world/entity/animal/net.minecraft.world.entity.animal.h"
 #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.h"
-#include "Minecraft.World/net/minecraft/world/item/alchemy/PotionMacros.h"
+#include "minecraft/world/item/alchemy/PotionMacros.h"
 #include "java/JavaMath.h"
 #include "4J.Common/4J_InputActions.h"
 

minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CreativeMenu.h

@@ -1,6 +1,6 @@
 #pragma once
 #include "IUIScene_AbstractContainerMenu.h"
-#include "Minecraft.World/net/minecraft/world/inventory/AbstractContainerMenu.h"
+#include "minecraft/world/inventory/AbstractContainerMenu.h"
 // 4J Stu - This class is for code that is common between XUI and Iggy
 
 class SimpleContainer;

minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_EnchantingMenu.cpp

@@ -5,8 +5,8 @@
 #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "IUIScene_EnchantingMenu.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h"
-#include "Minecraft.World/net/minecraft/world/inventory/AbstractContainerMenu.h"
+#include "minecraft/world/inventory/AbstractContainerMenu.h"
-#include "Minecraft.World/net/minecraft/world/inventory/EnchantmentMenu.h"
+#include "minecraft/world/inventory/EnchantmentMenu.h"
 #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.h"
 
 class Player;

minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_FireworksMenu.cpp

@@ -2,7 +2,7 @@
 
 #include "IUIScene_FireworksMenu.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h"
-#include "Minecraft.World/net/minecraft/world/inventory/FireworksMenu.h"
+#include "minecraft/world/inventory/FireworksMenu.h"
 
 IUIScene_AbstractContainerMenu::ESceneSection
 IUIScene_FireworksMenu::GetSectionAndSlotInDirection(ESceneSection eSection,

minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_FurnaceMenu.cpp

@@ -2,7 +2,7 @@
 
 #include "IUIScene_FurnaceMenu.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h"
-#include "Minecraft.World/net/minecraft/world/inventory/FurnaceMenu.h"
+#include "minecraft/world/inventory/FurnaceMenu.h"
 
 IUIScene_AbstractContainerMenu::ESceneSection
 IUIScene_FurnaceMenu::GetSectionAndSlotInDirection(ESceneSection eSection,

minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_HUD.cpp

@@ -9,16 +9,16 @@
 #include "Minecraft.Client/Common/App_enums.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "Minecraft.Client/Linux/Linux_UIController.h"
-#include "Minecraft.World/net/minecraft/SharedConstants.h"
+#include "minecraft/SharedConstants.h"
-#include "Minecraft.World/net/minecraft/world/effect/MobEffect.h"
+#include "minecraft/world/effect/MobEffect.h"
-#include "Minecraft.World/net/minecraft/world/entity/Entity.h"
+#include "minecraft/world/entity/Entity.h"
-#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h"
+#include "minecraft/world/entity/LivingEntity.h"
-#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeInstance.h"
+#include "minecraft/world/entity/ai/attributes/AttributeInstance.h"
-#include "Minecraft.World/net/minecraft/world/entity/monster/SharedMonsterAttributes.h"
+#include "minecraft/world/entity/monster/SharedMonsterAttributes.h"
-#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h"
+#include "minecraft/world/entity/player/Inventory.h"
-#include "Minecraft.World/net/minecraft/world/entity/player/Player.h"
+#include "minecraft/world/entity/player/Player.h"
-#include "Minecraft.World/net/minecraft/world/food/FoodData.h"
+#include "minecraft/world/food/FoodData.h"
-#include "Minecraft.World/net/minecraft/world/level/material/Material.h"
+#include "minecraft/world/level/material/Material.h"
 #include "java/Class.h"
 #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.h"
 

minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_HopperMenu.cpp

@@ -2,7 +2,7 @@
 
 #include "IUIScene_HopperMenu.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h"
-#include "Minecraft.World/net/minecraft/world/inventory/HopperMenu.h"
+#include "minecraft/world/inventory/HopperMenu.h"
 
 IUIScene_AbstractContainerMenu::ESceneSection
 IUIScene_HopperMenu::GetSectionAndSlotInDirection(ESceneSection eSection,

minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_HopperMenu.h

@@ -1,8 +1,8 @@
 #pragma once
 
 #include "IUIScene_AbstractContainerMenu.h"
-#include "Minecraft.World/net/minecraft/world/Container.h"
+#include "minecraft/world/Container.h"
-#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h"
+#include "minecraft/world/entity/player/Inventory.h"
 
 class IUIScene_HopperMenu : public virtual IUIScene_AbstractContainerMenu {
 public:

minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_HorseInventoryMenu.cpp

@@ -2,7 +2,7 @@
 
 #include "IUIScene_HorseInventoryMenu.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h"
-#include "Minecraft.World/net/minecraft/world/entity/animal/EntityHorse.h"
+#include "minecraft/world/entity/animal/EntityHorse.h"
 
 IUIScene_AbstractContainerMenu::ESceneSection
 IUIScene_HorseInventoryMenu::GetSectionAndSlotInDirection(

minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_HorseInventoryMenu.h

@@ -3,9 +3,9 @@
 #include <memory>
 
 #include "IUIScene_AbstractContainerMenu.h"
-#include "Minecraft.World/net/minecraft/world/Container.h"
+#include "minecraft/world/Container.h"
-#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h"
+#include "minecraft/world/entity/player/Inventory.h"
-#include "Minecraft.World/net/minecraft/world/entity/animal/EntityHorse.h"
+#include "minecraft/world/entity/animal/EntityHorse.h"
 
 class Container;
 class EntityHorse;

minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_InventoryMenu.cpp

@@ -2,7 +2,7 @@
 
 #include "IUIScene_InventoryMenu.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h"
-#include "Minecraft.World/net/minecraft/world/inventory/InventoryMenu.h"
+#include "minecraft/world/inventory/InventoryMenu.h"
 
 IUIScene_AbstractContainerMenu::ESceneSection
 IUIScene_InventoryMenu::GetSectionAndSlotInDirection(ESceneSection eSection,

minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_PauseMenu.cpp

@@ -8,8 +8,8 @@
 #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.World/net/minecraft/world/level/net.minecraft.world.level.h"
+#include "minecraft/world/level/net.minecraft.world.level.h"
-#include "Minecraft.World/net/minecraft/world/phys/net.minecraft.world.phys.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"

minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_TradingMenu.cpp

@@ -1,9 +1,9 @@
 #include "Minecraft.Client/include/stdafx.h"
 
 #include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h"
-#include "Minecraft.World/net/minecraft/world/item/trading/net.minecraft.world.item.trading.h"
+#include "minecraft/world/item/trading/net.minecraft.world.item.trading.h"
-#include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h"
+#include "minecraft/world/inventory/net.minecraft.world.inventory.h"
-#include "Minecraft.World/net/minecraft/network/packet/net.minecraft.network.packet.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"

minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_TradingMenu.h

@@ -1,7 +1,7 @@
 #pragma once
-#include "Minecraft.World/net/minecraft/world/inventory/MerchantMenu.h"
+#include "minecraft/world/inventory/MerchantMenu.h"
-#include "Minecraft.World/net/minecraft/util/HtmlString.h"
+#include "minecraft/util/HtmlString.h"
-#include "Minecraft.World/net/minecraft/world/item/Rarity.h"
+#include "minecraft/world/item/Rarity.h"
 #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
 
 class MerchantRecipe;

minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_Panorama.cpp

@@ -8,8 +8,8 @@
 #include "Minecraft.Client/Common/src/UI/UILayer.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "Minecraft.Client/Linux/Linux_UIController.h"
-#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h"
+#include "minecraft/world/level/dimension/Dimension.h"
-#include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h"
+#include "minecraft/world/level/storage/LevelData.h"
 
 UIComponent_Panorama::UIComponent_Panorama(int iPad, void* initData,
                                            UILayer* parentLayer)

minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_TutorialPopup.cpp

@@ -6,7 +6,7 @@
 #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"
+#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"
 
 UIComponent_TutorialPopup::UIComponent_TutorialPopup(int iPad, void* initData,
                                                      UILayer* parentLayer)

minecraft/Minecraft.Client/Common/src/UI/Components/UIScene_HUD.cpp

@@ -4,11 +4,11 @@
 #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.World/net/minecraft/world/entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.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.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h"
+#include "minecraft/world/inventory/net.minecraft.world.inventory.h"
-#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h"
+#include "minecraft/world/item/net.minecraft.world.item.h"
-#include "Minecraft.World/net/minecraft/world/effect/net.minecraft.world.effect.h"
+#include "minecraft/world/effect/net.minecraft.world.effect.h"
 #include "console_helpers/StringHelpers.h"
 #include "Minecraft.Client/net/minecraft/client/gui/Gui.h"
 

minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentBook.cpp

@@ -11,9 +11,9 @@
 #include "4J.Render/4J_Render.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h"
 #include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.h"
-#include "Minecraft.World/net/minecraft/world/inventory/EnchantmentMenu.h"
+#include "minecraft/world/inventory/EnchantmentMenu.h"
-#include "Minecraft.World/net/minecraft/world/inventory/Slot.h"
+#include "minecraft/world/inventory/Slot.h"
-#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h"
+#include "minecraft/world/item/ItemInstance.h"
 #include "java/Class.h"
 #include "Minecraft.Client/net/minecraft/client/renderer/Textures.h"
 

minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentButton.cpp

@@ -16,8 +16,8 @@
 #include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
-#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h"
+#include "minecraft/world/entity/player/Abilities.h"
-#include "Minecraft.World/net/minecraft/world/inventory/EnchantmentMenu.h"
+#include "minecraft/world/inventory/EnchantmentMenu.h"
 #include "Minecraft.Client/net/minecraft/client/gui/Font.h"
 
 UIControl_EnchantmentButton::UIControl_EnchantmentButton() {

minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftHorse.cpp

@@ -11,10 +11,10 @@
 #include "4J.Render/4J_Render.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h"
 #include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.h"
-#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h"
+#include "minecraft/world/entity/LivingEntity.h"
-#include "Minecraft.World/net/minecraft/world/entity/animal/EntityHorse.h"
+#include "minecraft/world/entity/animal/EntityHorse.h"
 // #include
-// "../../../Minecraft.World/net.minecraft.world.entity.animal.EntityHorse.h"
+// "../../../minecraft/net.minecraft.world.entity.animal.EntityHorse.h"
 
 #include "UIControl_MinecraftHorse.h"
 

minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerSkinPreview.cpp

@@ -16,7 +16,7 @@
 #include "Minecraft.Client/Common/App_enums.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
-#include "Minecraft.World/net/minecraft/world/entity/player/Player.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"

minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.cpp

@@ -5,7 +5,7 @@
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "Minecraft.Client/Linux/Linux_UIController.h"
 #include "console_helpers/StringHelpers.h"
-#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h"
+#include "minecraft/sounds/SoundTypes.h"
 
 UIControl_Slider::UIControl_Slider() {
     m_id = 0;

minecraft/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugCreateSchematic.cpp

@@ -10,8 +10,8 @@
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "Minecraft.Client/Linux/Linux_UIController.h"
 #include "console_helpers/compression.h"
-#include "Minecraft.World/net/minecraft/world/level/Level.h"
+#include "minecraft/world/level/Level.h"
-#include "Minecraft.World/net/minecraft/world/level/chunk/ChunkSource.h"
+#include "minecraft/world/level/chunk/ChunkSource.h"
 
 class UILayer;
 #ifdef _DEBUG_MENUS_ENABLED

minecraft/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugOverlay.cpp

@@ -10,15 +10,15 @@
 #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/net/minecraft/commands/common/EnchantItemCommand.h"
+#include "minecraft/commands/common/EnchantItemCommand.h"
-#include "Minecraft.World/net/minecraft/commands/common/GiveItemCommand.h"
+#include "minecraft/commands/common/GiveItemCommand.h"
-#include "Minecraft.World/net/minecraft/commands/common/TimeCommand.h"
+#include "minecraft/commands/common/TimeCommand.h"
-#include "Minecraft.World/net/minecraft/commands/common/ToggleDownfallCommand.h"
+#include "minecraft/commands/common/ToggleDownfallCommand.h"
-#include "Minecraft.World/net/minecraft/network/packet/GameCommandPacket.h"
+#include "minecraft/network/packet/GameCommandPacket.h"
-#include "Minecraft.World/net/minecraft/world/item/Item.h"
+#include "minecraft/world/item/Item.h"
-#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h"
+#include "minecraft/world/item/ItemInstance.h"
-#include "Minecraft.World/net/minecraft/world/item/enchantment/Enchantment.h"
+#include "minecraft/world/item/enchantment/Enchantment.h"
-#include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h"
+#include "minecraft/world/level/storage/LevelData.h"
 
 class Player;
 class UILayer;

minecraft/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugSetCamera.cpp

@@ -9,7 +9,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/net/minecraft/world/phys/Vec3.h"
+#include "minecraft/world/phys/Vec3.h"
 
 class UILayer;
 #ifdef _DEBUG_MENUS_ENABLED

minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp

@@ -6,10 +6,10 @@
 #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.World/net/minecraft/world/level/LevelSettings.h"
+#include "minecraft/world/level/LevelSettings.h"
 #include "console_helpers/StringHelpers.h"
-#include "Minecraft.World/net/minecraft/world/level/biome/BiomeSource.h"
+#include "minecraft/world/level/biome/BiomeSource.h"
-#include "Minecraft.World/net/minecraft/world/level/LevelType.h"
+#include "minecraft/world/level/LevelType.h"
 #include "Minecraft.Client/net/minecraft/client/skins/DLCTexturePack.h"
 #include "Minecraft.Client/Common/src/DLC/DLCPack.h"
 

minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.cpp

@@ -5,8 +5,8 @@
 #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.World/net/minecraft/world/level/net.minecraft.world.level.h"
+#include "minecraft/world/level/net.minecraft.world.level.h"
-#include "Minecraft.World/net/minecraft/world/net.minecraft.world.h"
+#include "minecraft/world/net.minecraft.world.h"
 
 #define UPDATE_PLAYERS_TIMER_ID 0
 #define UPDATE_PLAYERS_TIMER_TIME 30000

minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.cpp

@@ -2,8 +2,8 @@
 #include "Minecraft.Client/Common/src/UI/UI.h"
 #include "UIScene_LeaderboardsMenu.h"
 #include "Minecraft.Client/Common/src/Leaderboards/LeaderboardManager.h"
-#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h"
+#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"
-#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h"
+#include "minecraft/world/item/net.minecraft.world.item.h"
 
 #define PLAYER_ONLINE_TIMER_ID 0
 #define PLAYER_ONLINE_TIMER_TIME 100

minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp

@@ -5,7 +5,7 @@
 #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.World/net/minecraft/world/level/LevelSettings.h"
+#include "minecraft/world/level/LevelSettings.h"
 #include "console_helpers/StringHelpers.h"
 #include "Minecraft.Client/net/minecraft/client/skins/DLCTexturePack.h"
 #include "Minecraft.Client/Common/src/DLC/DLCPack.h"

minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp

@@ -6,12 +6,12 @@
 #include "UIScene_LoadOrJoinMenu.h"
 
 #include "console_helpers/StringHelpers.h"
-#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h"
+#include "minecraft/world/item/net.minecraft.world.item.h"
-#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h"
+#include "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/level/chunk/storage/net.minecraft.world.level.chunk.storage.h"
-#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h"
+#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h"
-#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.h"
+#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.h"
-#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.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"

minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp

@@ -1,5 +1,5 @@
 
-#include "Minecraft.World/net/minecraft/util/Mth.h"
+#include "minecraft/util/Mth.h"
 #include "console_helpers/StringHelpers.h"
 #include "java/Random.h"
 #include "Minecraft.Client/net/minecraft/client/User.h"

minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.cpp

@@ -2,8 +2,8 @@
 #include "Minecraft.Client/Common/src/UI/UI.h"
 #include "UIScene_AbstractContainerMenu.h"
 
-#include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h"
+#include "minecraft/world/inventory/net.minecraft.world.inventory.h"
-#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h"
+#include "minecraft/world/item/net.minecraft.world.item.h"
 #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h"
 

minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.cpp

@@ -1,7 +1,7 @@
 
 #include "Minecraft.Client/Common/src/UI/UI.h"
-#include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h"
+#include "minecraft/world/inventory/net.minecraft.world.inventory.h"
-#include "Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.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 "console_helpers/StringHelpers.h"

minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.h

@@ -2,7 +2,7 @@
 
 #include "UIScene_AbstractContainerMenu.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AnvilMenu.h"
-#include "Minecraft.World/net/minecraft/world/inventory/MerchantMenu.h"
+#include "minecraft/world/inventory/MerchantMenu.h"
 #include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h"
 #include "4J_Input.h"
 

minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.cpp

@@ -1,8 +1,8 @@
 #include "Minecraft.Client/include/stdafx.h"
 
 #include "Minecraft.Client/Common/src/UI/UI.h"
-#include "Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h"
+#include "minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h"
-#include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h"
+#include "minecraft/world/inventory/net.minecraft.world.inventory.h"
 #include "Minecraft.Client/net/minecraft/client/Minecraft.h"
 #include "UIScene_BeaconMenu.h"
 #include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h"

minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.cpp

@@ -9,10 +9,10 @@
 #include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h"
 #include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
-#include "Minecraft.World/net/minecraft/SharedConstants.h"
+#include "minecraft/SharedConstants.h"
-#include "Minecraft.World/net/minecraft/world/inventory/BrewingStandMenu.h"
+#include "minecraft/world/inventory/BrewingStandMenu.h"
-#include "Minecraft.World/net/minecraft/world/item/alchemy/PotionBrewing.h"
+#include "minecraft/world/item/alchemy/PotionBrewing.h"
-#include "Minecraft.World/net/minecraft/world/level/tile/entity/BrewingStandTileEntity.h"
+#include "minecraft/world/level/tile/entity/BrewingStandTileEntity.h"
 
 class UILayer;