Merge remote-tracking branch 'origin/header' into develop

# Conflicts: # src/mc/events/BlockSlot.h # src/mc/events/BlockUpdateFlag.h # src/mc/events/CraftingDataEntryType.h # src/mc/events/FacingID.h # src/mc/events/ui/AnchorPoint.h # src/mc/events/ui/AnimationStatus.h # src/mc/events/ui/AnimationType.h # src/mc/events/ui/CardinalDirection.h # src/mc/events/ui/ChildInsertPosition.h # src/mc/events/ui/ClipDirection.h # src/mc/events/ui/Draggable.h # src/mc/events/ui/FontSize.h # src/mc/events/ui/LayoutAxisType.h # src/mc/events/ui/NameResolutionScope.h # src/mc/events/ui/OrientationType.h # src/mc/events/ui/SceneType.h # src/mc/events/ui/TextAlignment.h # src/mc/events/ui/TileDirection.h # src/mc/events/ui/ViewRequest.h # test/include_all.h
LiteLDev · Oct 9, 2024 · bdbc6a4 · bdbc6a4
2 parents 95da210 + 17d47f1
commit bdbc6a4
Show file tree

Hide file tree

Showing 86 changed files with 42 additions and 42 deletions.
diff --git a/src/mc/codebuilder/ClientBlockPipeline.h → ...ssellation_pipeline/ClientBlockPipeline.h b/src/mc/codebuilder/ClientBlockPipeline.h → ...ssellation_pipeline/ClientBlockPipeline.h
diff --git a/src/mc/enums/ApiId.h → src/mc/deps/core/threading/ApiId.h b/src/mc/enums/ApiId.h → src/mc/deps/core/threading/ApiId.h
diff --git a/src/mc/deps/core/threading/TaskQueueImpl.h b/src/mc/deps/core/threading/TaskQueueImpl.h
@@ -3,9 +3,9 @@
 #include "mc/_HeaderOutputPredefine.h"
 
 // auto generated inclusion list
+#include "mc/deps/core/threading/ApiId.h"
 #include "mc/deps/core/threading/XTaskQueueDispatchMode.h"
 #include "mc/deps/core/threading/XTaskQueuePort.h"
-#include "mc/enums/ApiId.h"
 
 class TaskQueueImpl {
 public:

diff --git a/src/mc/deps/core/threading/TaskQueuePortContextImpl.h b/src/mc/deps/core/threading/TaskQueuePortContextImpl.h
@@ -3,10 +3,10 @@
 #include "mc/_HeaderOutputPredefine.h"
 
 // auto generated inclusion list
+#include "mc/deps/core/threading/ApiId.h"
 #include "mc/deps/core/threading/ITaskQueuePortContext.h"
+#include "mc/deps/core/threading/TaskQueuePortStatus.h"
 #include "mc/deps/core/threading/XTaskQueuePort.h"
-#include "mc/enums/ApiId.h"
-#include "mc/enums/TaskQueuePortStatus.h"
 
 class TaskQueuePortContextImpl : public ::ITaskQueuePortContext {
 public:

diff --git a/src/mc/deps/core/threading/TaskQueuePortImpl.h b/src/mc/deps/core/threading/TaskQueuePortImpl.h
@@ -3,9 +3,9 @@
 #include "mc/_HeaderOutputPredefine.h"
 
 // auto generated inclusion list
+#include "mc/deps/core/threading/ApiId.h"
 #include "mc/deps/core/threading/LocklessQueue.h"
 #include "mc/deps/core/threading/XTaskQueueDispatchMode.h"
-#include "mc/enums/ApiId.h"
 
 // auto generated forward declare list
 // clang-format off

diff --git a/src/mc/enums/TaskQueuePortStatus.h → ...deps/core/threading/TaskQueuePortStatus.h b/src/mc/enums/TaskQueuePortStatus.h → ...deps/core/threading/TaskQueuePortStatus.h
diff --git a/src/mc/deps/core/utility/Util.h b/src/mc/deps/core/utility/Util.h
@@ -7,8 +7,8 @@
 #include "mc/deps/core/utility/AutomaticID.h"
 #include "mc/deps/core/utility/NumberConversionResult.h"
 #include "mc/deps/puv/EquipmentSlot.h"
-#include "mc/entity/components/agent_components/Direction.h"
 #include "mc/util/BidirectionalUnorderedMap.h"
+#include "mc/world/actor/agent/agent_components/Direction.h"
 #include "mc/world/actor/animation/BoneTransformType.h"
 
 // auto generated forward declare list

diff --git a/...y/components/agent_components/Animating.h → ...onents/agent/agent_components/Animating.h b/...y/components/agent_components/Animating.h → ...onents/agent/agent_components/Animating.h
diff --git a/src/mc/entity/components/agent_components/AgentComponents.h b/src/mc/entity/components/agent_components/AgentComponents.h
@@ -3,8 +3,8 @@
 #include "mc/_HeaderOutputPredefine.h"
 
 // auto generated inclusion list
-#include "mc/entity/components/agent_components/Direction.h"
 #include "mc/server/commands/CurrentCmdVersion.h"
+#include "mc/world/actor/agent/agent_components/Direction.h"
 
 // auto generated forward declare list
 // clang-format off

diff --git a/src/mc/entity/components/agent_components/DetectObstacle.h b/src/mc/entity/components/agent_components/DetectObstacle.h
@@ -3,7 +3,7 @@
 #include "mc/_HeaderOutputPredefine.h"
 
 // auto generated inclusion list
-#include "mc/entity/components/agent_components/Direction.h"
+#include "mc/world/actor/agent/agent_components/Direction.h"
 
 // auto generated forward declare list
 // clang-format off

diff --git a/src/mc/entity/components/agent_components/DetectRedstone.h b/src/mc/entity/components/agent_components/DetectRedstone.h
@@ -3,7 +3,7 @@
 #include "mc/_HeaderOutputPredefine.h"
 
 // auto generated inclusion list
-#include "mc/entity/components/agent_components/Direction.h"
+#include "mc/world/actor/agent/agent_components/Direction.h"
 
 // auto generated forward declare list
 // clang-format off

diff --git a/src/mc/entity/components/agent_components/Move.h b/src/mc/entity/components/agent_components/Move.h
@@ -3,7 +3,7 @@
 #include "mc/_HeaderOutputPredefine.h"
 
 // auto generated inclusion list
-#include "mc/entity/components/agent_components/Direction.h"
+#include "mc/world/actor/agent/agent_components/Direction.h"
 
 // auto generated forward declare list
 // clang-format off

diff --git a/src/mc/enums/BlockSlot.h → src/mc/events/BlockSlot.h b/src/mc/enums/BlockSlot.h → src/mc/events/BlockSlot.h
diff --git a/src/mc/enums/BlockUpdateFlag.h → src/mc/events/BlockUpdateFlag.h b/src/mc/enums/BlockUpdateFlag.h → src/mc/events/BlockUpdateFlag.h
diff --git a/src/mc/enums/ClassroomSetting.h → src/mc/events/ClassroomSetting.h b/src/mc/enums/ClassroomSetting.h → src/mc/events/ClassroomSetting.h
diff --git a/src/mc/enums/CraftingDataEntryType.h → src/mc/events/CraftingDataEntryType.h b/src/mc/enums/CraftingDataEntryType.h → src/mc/events/CraftingDataEntryType.h
diff --git a/src/mc/enums/DiskStatus.h → src/mc/events/DiskStatus.h b/src/mc/enums/DiskStatus.h → src/mc/events/DiskStatus.h
diff --git a/src/mc/enums/EduShareMethodType.h → src/mc/events/EduShareMethodType.h b/src/mc/enums/EduShareMethodType.h → src/mc/events/EduShareMethodType.h
diff --git a/src/mc/enums/EduShareUriType.h → src/mc/events/EduShareUriType.h b/src/mc/enums/EduShareUriType.h → src/mc/events/EduShareUriType.h
diff --git a/src/mc/enums/FacingID.h → src/mc/events/FacingID.h b/src/mc/enums/FacingID.h → src/mc/events/FacingID.h
diff --git a/src/mc/events/MinecraftEventing.h b/src/mc/events/MinecraftEventing.h
@@ -18,19 +18,19 @@
 #include "mc/deps/core/utility/ValidationStatus.h"
 #include "mc/deps/core/utility/buffer_span.h"
 #include "mc/deps/input/InputMode.h"
-#include "mc/enums/ClassroomSetting.h"
-#include "mc/enums/DiskStatus.h"
-#include "mc/enums/EduShareMethodType.h"
-#include "mc/enums/EduShareUriType.h"
-#include "mc/enums/RawInputType.h"
-#include "mc/enums/RealmsPurchaseFailureReason.h"
-#include "mc/enums/RealmsPurchaseIntent.h"
-#include "mc/enums/SettingsScreenMode.h"
+#include "mc/events/ClassroomSetting.h"
 #include "mc/events/ConnectedStorageEventType.h"
+#include "mc/events/DiskStatus.h"
 #include "mc/events/EduControlPanelUpdateType.h"
+#include "mc/events/EduShareMethodType.h"
+#include "mc/events/EduShareUriType.h"
 #include "mc/events/IConnectionEventing.h"
 #include "mc/events/IMinecraftEventing.h"
 #include "mc/events/OpenCodeMethod.h"
+#include "mc/events/RawInputType.h"
+#include "mc/events/RealmsPurchaseFailureReason.h"
+#include "mc/events/RealmsPurchaseIntent.h"
+#include "mc/events/SettingsScreenMode.h"
 #include "mc/events/TextProcessingEventOrigin.h"
 #include "mc/events/UserGeneratedUriSource.h"
 #include "mc/events/identity/EduSignInStage.h"

diff --git a/src/mc/enums/RawInputType.h → src/mc/events/RawInputType.h b/src/mc/enums/RawInputType.h → src/mc/events/RawInputType.h
diff --git a/src/mc/enums/RealmsPurchaseFailureReason.h → src/mc/events/RealmsPurchaseFailureReason.h b/src/mc/enums/RealmsPurchaseFailureReason.h → src/mc/events/RealmsPurchaseFailureReason.h
diff --git a/src/mc/enums/RealmsPurchaseIntent.h → src/mc/events/RealmsPurchaseIntent.h b/src/mc/enums/RealmsPurchaseIntent.h → src/mc/events/RealmsPurchaseIntent.h
diff --git a/src/mc/enums/SettingsScreenMode.h → src/mc/events/SettingsScreenMode.h b/src/mc/enums/SettingsScreenMode.h → src/mc/events/SettingsScreenMode.h
diff --git a/src/mc/enums/ui/AnchorPoint.h → src/mc/events/ui/AnchorPoint.h b/src/mc/enums/ui/AnchorPoint.h → src/mc/events/ui/AnchorPoint.h
diff --git a/src/mc/enums/ui/AnimationStatus.h → src/mc/events/ui/AnimationStatus.h b/src/mc/enums/ui/AnimationStatus.h → src/mc/events/ui/AnimationStatus.h
diff --git a/src/mc/enums/ui/AnimationType.h → src/mc/events/ui/AnimationType.h b/src/mc/enums/ui/AnimationType.h → src/mc/events/ui/AnimationType.h
diff --git a/src/mc/enums/ui/CardinalDirection.h → src/mc/events/ui/CardinalDirection.h b/src/mc/enums/ui/CardinalDirection.h → src/mc/events/ui/CardinalDirection.h
diff --git a/src/mc/enums/ui/ChildInsertPosition.h → src/mc/events/ui/ChildInsertPosition.h b/src/mc/enums/ui/ChildInsertPosition.h → src/mc/events/ui/ChildInsertPosition.h
diff --git a/src/mc/enums/ui/ClipDirection.h → src/mc/events/ui/ClipDirection.h b/src/mc/enums/ui/ClipDirection.h → src/mc/events/ui/ClipDirection.h
diff --git a/src/mc/enums/ui/Draggable.h → src/mc/events/ui/Draggable.h b/src/mc/enums/ui/Draggable.h → src/mc/events/ui/Draggable.h
diff --git a/src/mc/enums/ui/FontSize.h → src/mc/events/ui/FontSize.h b/src/mc/enums/ui/FontSize.h → src/mc/events/ui/FontSize.h
diff --git a/src/mc/enums/ui/LayoutAxisType.h → src/mc/events/ui/LayoutAxisType.h b/src/mc/enums/ui/LayoutAxisType.h → src/mc/events/ui/LayoutAxisType.h
diff --git a/src/mc/enums/ui/NameResolutionScope.h → src/mc/events/ui/NameResolutionScope.h b/src/mc/enums/ui/NameResolutionScope.h → src/mc/events/ui/NameResolutionScope.h
diff --git a/src/mc/enums/ui/OrientationType.h → src/mc/events/ui/OrientationType.h b/src/mc/enums/ui/OrientationType.h → src/mc/events/ui/OrientationType.h
diff --git a/src/mc/enums/ui/SceneType.h → src/mc/events/ui/SceneType.h b/src/mc/enums/ui/SceneType.h → src/mc/events/ui/SceneType.h
diff --git a/src/mc/enums/ui/TextAlignment.h → src/mc/events/ui/TextAlignment.h b/src/mc/enums/ui/TextAlignment.h → src/mc/events/ui/TextAlignment.h
diff --git a/src/mc/enums/ui/TileDirection.h → src/mc/events/ui/TileDirection.h b/src/mc/enums/ui/TileDirection.h → src/mc/events/ui/TileDirection.h
diff --git a/src/mc/enums/ui/ViewRequest.h → src/mc/events/ui/ViewRequest.h b/src/mc/enums/ui/ViewRequest.h → src/mc/events/ui/ViewRequest.h
diff --git a/src/mc/external/scripting/Scripting.h b/src/mc/external/scripting/Scripting.h
@@ -3,7 +3,6 @@
 #include "mc/_HeaderOutputPredefine.h"
 
 // auto generated inclusion list
-#include "mc/enums/scripting/DebuggerLogLevel.h"
 #include "mc/external/scripting/LogLevel.h"
 #include "mc/external/scripting/binding_type/EnumBinding.h"
 #include "mc/external/scripting/lifetime_registry/ObjectHandleValue.h"
@@ -14,6 +13,7 @@
 #include "mc/external/scripting/reflection/Privilege.h"
 #include "mc/external/scripting/runtime/FutureStatus.h"
 #include "mc/external/scripting/runtime/Result.h"
+#include "mc/scripting/debugger/DebuggerLogLevel.h"
 
 // auto generated forward declare list
 // clang-format off

diff --git a/src/mc/external/scripting/quickjs/QuickJS.h b/src/mc/external/scripting/quickjs/QuickJS.h
@@ -3,14 +3,14 @@
 #include "mc/_HeaderOutputPredefine.h"
 
 // auto generated inclusion list
-#include "mc/enums/scripting/DebuggerLogLevel.h"
 #include "mc/external/scripting/lifetime_registry/StrongTypedObjectHandle.h"
 #include "mc/external/scripting/lifetime_registry/TypedObjectHandle.h"
 #include "mc/external/scripting/quickjs/NativeObjectOwnership.h"
 #include "mc/external/scripting/quickjs/context/ParseContext.h"
 #include "mc/external/scripting/reflection/Privilege.h"
 #include "mc/external/scripting/runtime/FutureStatus.h"
 #include "mc/external/scripting/runtime/Result.h"
+#include "mc/scripting/debugger/DebuggerLogLevel.h"
 
 // auto generated forward declare list
 // clang-format off

diff --git a/src/mc/external/scripting/quickjs/debugger/Debugger.h b/src/mc/external/scripting/quickjs/debugger/Debugger.h
@@ -3,8 +3,8 @@
 #include "mc/_HeaderOutputPredefine.h"
 
 // auto generated inclusion list
-#include "mc/enums/scripting/DebuggerLogLevel.h"
 #include "mc/external/scripting/runtime/IDebuggerController.h"
+#include "mc/scripting/debugger/DebuggerLogLevel.h"
 
 // auto generated forward declare list
 // clang-format off

diff --git a/...twork/rak_net_connector/RakNetConnector.h → src/mc/network/RakNetConnector.h b/...twork/rak_net_connector/RakNetConnector.h → src/mc/network/RakNetConnector.h
diff --git a/src/mc/resources/IResourcePackRepository.h b/src/mc/resources/IResourcePackRepository.h
@@ -9,7 +9,7 @@
 #include "mc/deps/core/resource/PackType.h"
 #include "mc/deps/core/utility/EnableNonOwnerReferences.h"
 #include "mc/deps/core/utility/NonOwnerPointer.h"
-#include "mc/enums/KnownPackType.h"
+#include "mc/resources/KnownPackType.h"
 
 // auto generated forward declare list
 // clang-format off

diff --git a/src/mc/enums/KnownPackType.h → src/mc/resources/KnownPackType.h b/src/mc/enums/KnownPackType.h → src/mc/resources/KnownPackType.h
diff --git a/src/mc/resources/ResourcePackRepository.h b/src/mc/resources/ResourcePackRepository.h
@@ -9,8 +9,8 @@
 #include "mc/deps/core/resource/PackOrigin.h"
 #include "mc/deps/core/resource/PackType.h"
 #include "mc/deps/core/utility/NonOwnerPointer.h"
-#include "mc/enums/KnownPackType.h"
 #include "mc/resources/IResourcePackRepository.h"
+#include "mc/resources/KnownPackType.h"
 
 // auto generated forward declare list
 // clang-format off

diff --git a/src/mc/enums/scripting/DebuggerLogLevel.h → src/mc/scripting/debugger/DebuggerLogLevel.h b/src/mc/enums/scripting/DebuggerLogLevel.h → src/mc/scripting/debugger/DebuggerLogLevel.h
diff --git a/src/mc/scripting/debugger/ScriptDebugger.h b/src/mc/scripting/debugger/ScriptDebugger.h
@@ -3,7 +3,7 @@
 #include "mc/_HeaderOutputPredefine.h"
 
 // auto generated inclusion list
-#include "mc/enums/scripting/DebuggerLogLevel.h"
+#include "mc/scripting/debugger/DebuggerLogLevel.h"
 
 // auto generated forward declare list
 // clang-format off

diff --git a/...til/ScriptModuleMinecraftDebugUtilities.h → ...bug/ScriptModuleMinecraftDebugUtilities.h b/...til/ScriptModuleMinecraftDebugUtilities.h → ...bug/ScriptModuleMinecraftDebugUtilities.h
diff --git a/src/mc/world/actor/agent/Destroy.h → ...ver/commands/edu/agent_commands/Destroy.h b/src/mc/world/actor/agent/Destroy.h → ...ver/commands/edu/agent_commands/Destroy.h
diff --git a/src/mc/world/actor/agent/Inspect.h → ...ver/commands/edu/agent_commands/Inspect.h b/src/mc/world/actor/agent/Inspect.h → ...ver/commands/edu/agent_commands/Inspect.h
diff --git a/src/mc/world/actor/agent/Interact.h → ...er/commands/edu/agent_commands/Interact.h b/src/mc/world/actor/agent/Interact.h → ...er/commands/edu/agent_commands/Interact.h
diff --git a/...ange_transaction/WorldChangeTransaction.h → src/mc/util/WorldChangeTransaction.h b/...ange_transaction/WorldChangeTransaction.h → src/mc/util/WorldChangeTransaction.h
diff --git a/src/mc/world/actor/agent/AgentCommands.h b/src/mc/world/actor/agent/AgentCommands.h
@@ -3,7 +3,7 @@
 #include "mc/_HeaderOutputPredefine.h"
 
 // auto generated inclusion list
-#include "mc/entity/components/agent_components/Direction.h"
+#include "mc/world/actor/agent/agent_components/Direction.h"
 
 // auto generated forward declare list
 // clang-format off

diff --git a/src/mc/world/actor/agent/AttackCommand.h → ...ctor/agent/agent_commands/AttackCommand.h b/src/mc/world/actor/agent/AttackCommand.h → ...ctor/agent/agent_commands/AttackCommand.h
@@ -3,7 +3,7 @@
 #include "mc/_HeaderOutputPredefine.h"
 
 // auto generated inclusion list
-#include "mc/world/actor/agent/Command.h"
+#include "mc/world/actor/agent/agent_commands/Command.h"
 
 // auto generated forward declare list
 // clang-format off

diff --git a/src/mc/world/actor/agent/CollectCommand.h → ...tor/agent/agent_commands/CollectCommand.h b/src/mc/world/actor/agent/CollectCommand.h → ...tor/agent/agent_commands/CollectCommand.h
@@ -3,7 +3,7 @@
 #include "mc/_HeaderOutputPredefine.h"
 
 // auto generated inclusion list
-#include "mc/world/actor/agent/Command.h"
+#include "mc/world/actor/agent/agent_commands/Command.h"
 
 // auto generated forward declare list
 // clang-format off

diff --git a/src/mc/world/actor/agent/Command.h → ...orld/actor/agent/agent_commands/Command.h b/src/mc/world/actor/agent/Command.h → ...orld/actor/agent/agent_commands/Command.h
@@ -3,7 +3,7 @@
 #include "mc/_HeaderOutputPredefine.h"
 
 // auto generated inclusion list
-#include "mc/entity/components/agent_components/Direction.h"
+#include "mc/world/actor/agent/agent_components/Direction.h"
 
 // auto generated forward declare list
 // clang-format off

diff --git a/src/mc/world/actor/agent/DropAllCommand.h → ...tor/agent/agent_commands/DropAllCommand.h b/src/mc/world/actor/agent/DropAllCommand.h → ...tor/agent/agent_commands/DropAllCommand.h
@@ -3,7 +3,7 @@
 #include "mc/_HeaderOutputPredefine.h"
 
 // auto generated inclusion list
-#include "mc/world/actor/agent/Command.h"
+#include "mc/world/actor/agent/agent_commands/Command.h"
 
 // auto generated forward declare list
 // clang-format off

diff --git a/src/mc/world/actor/agent/DropCommand.h → .../actor/agent/agent_commands/DropCommand.h b/src/mc/world/actor/agent/DropCommand.h → .../actor/agent/agent_commands/DropCommand.h
@@ -3,7 +3,7 @@
 #include "mc/_HeaderOutputPredefine.h"
 
 // auto generated inclusion list
-#include "mc/world/actor/agent/Command.h"
+#include "mc/world/actor/agent/agent_commands/Command.h"
 
 // auto generated forward declare list
 // clang-format off

diff --git a/...c/world/actor/agent/GetItemCountCommand.h → ...gent/agent_commands/GetItemCountCommand.h b/...c/world/actor/agent/GetItemCountCommand.h → ...gent/agent_commands/GetItemCountCommand.h
@@ -3,7 +3,7 @@
 #include "mc/_HeaderOutputPredefine.h"
 
 // auto generated inclusion list
-#include "mc/world/actor/agent/Command.h"
+#include "mc/world/actor/agent/agent_commands/Command.h"
 
 // auto generated forward declare list
 // clang-format off

diff --git a/...world/actor/agent/GetItemDetailsCommand.h → ...nt/agent_commands/GetItemDetailsCommand.h b/...world/actor/agent/GetItemDetailsCommand.h → ...nt/agent_commands/GetItemDetailsCommand.h
@@ -3,7 +3,7 @@
 #include "mc/_HeaderOutputPredefine.h"
 
 // auto generated inclusion list
-#include "mc/world/actor/agent/Command.h"
+#include "mc/world/actor/agent/agent_commands/Command.h"
 
 // auto generated forward declare list
 // clang-format off

diff --git a/...c/world/actor/agent/GetItemSpaceCommand.h → ...gent/agent_commands/GetItemSpaceCommand.h b/...c/world/actor/agent/GetItemSpaceCommand.h → ...gent/agent_commands/GetItemSpaceCommand.h
@@ -3,7 +3,7 @@
 #include "mc/_HeaderOutputPredefine.h"
 
 // auto generated inclusion list
-#include "mc/world/actor/agent/Command.h"
+#include "mc/world/actor/agent/agent_commands/Command.h"
 
 // auto generated forward declare list
 // clang-format off

diff --git a/...mc/world/actor/agent/InspectDataCommand.h → ...agent/agent_commands/InspectDataCommand.h b/...mc/world/actor/agent/InspectDataCommand.h → ...agent/agent_commands/InspectDataCommand.h
@@ -3,7 +3,7 @@
 #include "mc/_HeaderOutputPredefine.h"
 
 // auto generated inclusion list
-#include "mc/world/actor/agent/Command.h"
+#include "mc/world/actor/agent/agent_commands/Command.h"
 
 // auto generated forward declare list
 // clang-format off

diff --git a/src/mc/world/actor/agent/PlaceCommand.h → ...actor/agent/agent_commands/PlaceCommand.h b/src/mc/world/actor/agent/PlaceCommand.h → ...actor/agent/agent_commands/PlaceCommand.h
@@ -3,7 +3,7 @@
 #include "mc/_HeaderOutputPredefine.h"
 
 // auto generated inclusion list
-#include "mc/world/actor/agent/Command.h"
+#include "mc/world/actor/agent/agent_commands/Command.h"
 
 // auto generated forward declare list
 // clang-format off

diff --git a/src/mc/world/actor/agent/TillCommand.h → .../actor/agent/agent_commands/TillCommand.h b/src/mc/world/actor/agent/TillCommand.h → .../actor/agent/agent_commands/TillCommand.h
@@ -3,7 +3,7 @@
 #include "mc/_HeaderOutputPredefine.h"
 
 // auto generated inclusion list
-#include "mc/world/actor/agent/Command.h"
+#include "mc/world/actor/agent/agent_commands/Command.h"
 
 // auto generated forward declare list
 // clang-format off

diff --git a/src/mc/world/actor/agent/TransferToCommand.h → .../agent/agent_commands/TransferToCommand.h b/src/mc/world/actor/agent/TransferToCommand.h → .../agent/agent_commands/TransferToCommand.h
@@ -3,7 +3,7 @@
 #include "mc/_HeaderOutputPredefine.h"
 
 // auto generated inclusion list
-#include "mc/world/actor/agent/Command.h"
+#include "mc/world/actor/agent/agent_commands/Command.h"
 
 // auto generated forward declare list
 // clang-format off

diff --git a/src/mc/world/actor/agent/TurnCommand.h → .../actor/agent/agent_commands/TurnCommand.h b/src/mc/world/actor/agent/TurnCommand.h → .../actor/agent/agent_commands/TurnCommand.h
@@ -3,7 +3,7 @@
 #include "mc/_HeaderOutputPredefine.h"
 
 // auto generated inclusion list
-#include "mc/world/actor/agent/Command.h"
+#include "mc/world/actor/agent/agent_commands/Command.h"
 
 // auto generated forward declare list
 // clang-format off

diff --git a/...nents/agent_components/BlockQueryResult.h → ...agent/agent_components/BlockQueryResult.h b/...nents/agent_components/BlockQueryResult.h → ...agent/agent_components/BlockQueryResult.h
diff --git a/...y/components/agent_components/Direction.h → .../actor/agent/agent_components/Direction.h b/...y/components/agent_components/Direction.h → .../actor/agent/agent_components/Direction.h
diff --git a/src/mc/world/actor/agent/utils/Agent.h b/src/mc/world/actor/agent/utils/Agent.h
@@ -3,7 +3,7 @@
 #include "mc/_HeaderOutputPredefine.h"
 
 // auto generated inclusion list
-#include "mc/entity/components/agent_components/Direction.h"
+#include "mc/world/actor/agent/agent_components/Direction.h"
 
 // auto generated forward declare list
 // clang-format off

diff --git a/src/mc/world/actor/ai/goal/MoveToBlockGoal.h b/src/mc/world/actor/ai/goal/MoveToBlockGoal.h
@@ -4,8 +4,8 @@
 
 // auto generated inclusion list
 #include "mc/deps/core/utility/AutomaticID.h"
-#include "mc/enums/TargetSelectionMethod.h"
 #include "mc/world/actor/ai/goal/Goal.h"
+#include "mc/world/actor/ai/goal/TargetSelectionMethod.h"
 
 class MoveToBlockGoal : public ::Goal {
 public:

diff --git a/src/mc/enums/TargetSelectionMethod.h → ...rld/actor/ai/goal/TargetSelectionMethod.h b/src/mc/enums/TargetSelectionMethod.h → ...rld/actor/ai/goal/TargetSelectionMethod.h
diff --git a/...afting/crafting_context/CraftingContext.h → src/mc/world/item/crafting/CraftingContext.h b/...afting/crafting_context/CraftingContext.h → src/mc/world/item/crafting/CraftingContext.h
diff --git a/...a_surface_builders/CappedSurfaceBuilder.h → ...a_surface_builders/CappedSurfaceBuilder.h b/...a_surface_builders/CappedSurfaceBuilder.h → ...a_surface_builders/CappedSurfaceBuilder.h
diff --git a/...builders/OverworldDefaultSurfaceBuilder.h → ...builders/OverworldDefaultSurfaceBuilder.h b/...builders/OverworldDefaultSurfaceBuilder.h → ...builders/OverworldDefaultSurfaceBuilder.h
diff --git a/...k/vanilla_block_drops/VanillaBlockDrops.h → src/mc/world/level/block/VanillaBlockDrops.h b/...k/vanilla_block_drops/VanillaBlockDrops.h → src/mc/world/level/block/VanillaBlockDrops.h
diff --git a/src/mc/codebuilder/BlockSchematic.h → ...ck/client_block_pipeline/BlockSchematic.h b/src/mc/codebuilder/BlockSchematic.h → ...ck/client_block_pipeline/BlockSchematic.h
diff --git a/src/mc/codebuilder/VolumeOf.h → ...el/block/client_block_pipeline/VolumeOf.h b/src/mc/codebuilder/VolumeOf.h → ...el/block/client_block_pipeline/VolumeOf.h
diff --git a/src/mc/world/level/block/traits/block_trait/BlockTrait.h b/src/mc/world/level/block/traits/block_trait/BlockTrait.h
@@ -3,8 +3,8 @@
 #include "mc/_HeaderOutputPredefine.h"
 
 // auto generated inclusion list
-#include "mc/world/level/block/traits/block_trait/placement_direction/PlacementDirection.h"
-#include "mc/world/level/block/traits/block_trait/placement_position/PlacementPosition.h"
+#include "mc/world/level/block/traits/block_trait/PlacementDirection.h"
+#include "mc/world/level/block/traits/block_trait/PlacementPosition.h"
 
 // auto generated forward declare list
 // clang-format off

diff --git a/.../placement_direction/PlacementDirection.h → ...k/traits/block_trait/PlacementDirection.h b/.../placement_direction/PlacementDirection.h → ...k/traits/block_trait/PlacementDirection.h
diff --git a/...it/placement_position/PlacementPosition.h → ...ck/traits/block_trait/PlacementPosition.h b/...it/placement_position/PlacementPosition.h → ...ck/traits/block_trait/PlacementPosition.h
diff --git a/src/mc/world/level/chunk/LevelChunk.h b/src/mc/world/level/chunk/LevelChunk.h
@@ -4,12 +4,12 @@
 #include "mc/world/level/levelgen/structure/BoundingBox.h"
 
 // auto generated inclusion list
-#include "mc/codebuilder/VolumeOf.h"
 #include "mc/deps/core/utility/buffer_span.h"
 #include "mc/deps/core/utility/buffer_span_mut.h"
 #include "mc/network/packet/SubChunkPacket.h"
 #include "mc/platform/threading/UniqueLock.h"
 #include "mc/world/actor/ActorType.h"
+#include "mc/world/level/block/client_block_pipeline/VolumeOf.h"
 #include "mc/world/level/chunk/ChunkState.h"
 #include "mc/world/level/chunk/ChunkTerrainDataState.h"
 #include "mc/world/level/chunk/LevelChunkFormat.h"

diff --git a/...g_data/LevelChunkAndSubChunkLoggingData.h → .../chunk/LevelChunkAndSubChunkLoggingData.h b/...g_data/LevelChunkAndSubChunkLoggingData.h → .../chunk/LevelChunkAndSubChunkLoggingData.h
diff --git a/...orld/level/storage/db_storage/DBStorage.h → src/mc/world/level/storage/DBStorage.h b/...orld/level/storage/db_storage/DBStorage.h → src/mc/world/level/storage/DBStorage.h
diff --git a/...rformance_data/DBStoragePerformanceData.h → .../level/storage/DBStoragePerformanceData.h b/...rformance_data/DBStoragePerformanceData.h → .../level/storage/DBStoragePerformanceData.h