refactor: updated to the new file cataloging system

.gitignore

@@ -44,7 +44,6 @@ cmake_install.cmake
 install_manifest.txt
 compile_commands.json
 CTestTestfile.cmake
-_deps
 
 
 ## https://github.com/github/gitignore/blob/main/VisualStudio.gitignore
@@ -67,10 +66,10 @@ _deps
 mono_crash.*
 
 # Build results
-[Dd]ebug/
-[Dd]ebugPublic/
-[Rr]elease/
-[Rr]eleases/
+/[Dd]ebug/
+/[Dd]ebugPublic/
+/[Rr]elease/
+/[Rr]eleases/
 
 # Visual Studio 2015/2017 cache/options directory
 .vs/
@@ -204,20 +203,20 @@ AutoTest.Net/
 .sass-cache/
 
 # Installshield output folder
-[Ee]xpress/
+/[Ee]xpress/
 
 # DocProject is a documentation generator add-in
-DocProject/buildhelp/
-DocProject/Help/*.HxT
-DocProject/Help/*.HxC
-DocProject/Help/*.hhc
-DocProject/Help/*.hhk
-DocProject/Help/*.hhp
-DocProject/Help/Html2
-DocProject/Help/html
+/DocProject/buildhelp/
+/DocProject/Help/*.HxT
+/DocProject/Help/*.HxC
+/DocProject/Help/*.hhc
+/DocProject/Help/*.hhk
+/DocProject/Help/*.hhp
+/DocProject/Help/Html2
+/DocProject/Help/html
 
 # Click-Once directory
-publish/
+/publish/
 
 # Publish Web Output
 *.[Pp]ublish.xml
@@ -539,15 +538,14 @@ fabric.properties
 /CMakeLists.txt
 /vsxmake2022
 
+# MkDocs
+/site/
 
 ## Project specific
 # IDE
 /.idea/
 /.vscode/
 
-# MkDocs
-/site/
-
 # Test
 src-test/**/include_all.cpp
 

src-client/ll/api/service/TargetedBedrock.cpp

@@ -4,21 +4,21 @@
 
 #include "ll/api/memory/Hook.h"
 
+#include "mc/deps/ecs/systems/EntitySystemsCollection.h"
 #include "mc/deps/raknet/RakPeer.h"
 #include "mc/deps/raknet/RakPeerInterface.h"
-#include "mc/entity/systems/common/EntitySystemsCollection.h"
 #include "mc/network/NetworkSystem.h"
 #include "mc/network/RakNetConnector.h"
 #include "mc/network/ServerNetworkHandler.h"
 #include "mc/resources/ResourcePackRepository.h"
+#include "mc/server/DedicatedServer.h"
+#include "mc/server/PropertiesSettings.h"
 #include "mc/server/ServerInstance.h"
 #include "mc/server/ServerLevel.h"
+#include "mc/server/commands/AllowListCommand.h"
 #include "mc/server/commands/CommandRegistry.h"
 #include "mc/server/commands/MinecraftCommands.h"
 #include "mc/server/commands/standard/TeleportCommand.h"
-#include "mc/server/common/DedicatedServer.h"
-#include "mc/server/common/PropertiesSettings.h"
-#include "mc/server/common/commands/AllowListCommand.h"
 #include "mc/world/GameSession.h"
 #include "mc/world/Minecraft.h"
 #include "mc/world/events/ServerInstanceEventCoordinator.h"

src-client/ll/api/service/TargetedBedrock.h

@@ -2,6 +2,6 @@
 
 #include "ll/api/base/Macro.h"
 
-#include "mc/common/wrapper/optional_ref.h"
+#include "mc/deps/core/utility/optional_ref.h"
 
 namespace ll::service::inline bedrock {}

src-client/ll/core/gui/styles/Custom.h

@@ -1,8 +1,8 @@
 #pragma once
 
 #include "ll/api/Expected.h"
-#include "mc/deps/core/mce/Color.h"
-#include "mc/math/Vec2.h"
+#include "mc/deps/core/math/Color.h"
+#include "mc/deps/core/math/Vec2.h"
 #include "nlohmann/json.hpp"
 
 namespace ll::gui {

src-client/mc/gui/screens/ScreenController.h

@@ -3,14 +3,6 @@
 #include "mc/_HeaderOutputPredefine.h"
 #include "mc/gui/controls/UIPropertyBag.h"
 
-// auto generated inclusion list
-#include "mc/entity/flags/DirtyFlag.h"
-#include "mc/enums/ButtonState.h"
-#include "mc/enums/ui/SceneType.h"
-#include "mc/enums/ui/ViewRequest.h"
-#include "mc/external/glm/tvec2.h"
-#include "mc/world/events/GameEventNotification.h"
-
 // auto generated forward declare list
 // clang-format off
 namespace Json { class Value; }

src-client/mc/gui/screens/controllers/StartMenuScreenController.h

@@ -2,11 +2,6 @@
 
 #include "mc/_HeaderOutputPredefine.h"
 #include "mc/gui/screens/controllers/MainMenuScreenController.h"
-
-// auto generated inclusion list
-#include "mc/entity/flags/DirtyFlag.h"
-#include "mc/enums/ui/SceneType.h"
-#include "mc/enums/ui/ViewRequest.h"
 #include "mc/world/events/GameEventNotification.h"
 
 // auto generated forward declare list
@@ -15,7 +10,7 @@ namespace Json { class Value; }
 namespace Social { class User; }
 // clang-format on
 
-class StartMenuScreenController : public MainMenuScreenController {
+class StartMenuScreenController : public ::MainMenuScreenController {
 public:
     // StartMenuScreenController inner types declare
     // clang-format off

src-client/mc/world/actor/Actor.cpp

@@ -8,15 +8,13 @@
 
 #include "mc/_HeaderOutputPredefine.h"
 #include "mc/common/HitDetection.h"
-#include "mc/common/wrapper/optional_ref.h"
-#include "mc/entity/EntityContext.h"
+#include "mc/deps/core/math/Vec2.h"
+#include "mc/deps/core/math/Vec3.h"
+#include "mc/deps/core/utility/optional_ref.h"
+#include "mc/deps/ecs/gamerefs_entity/EntityContext.h"
 #include "mc/entity/systems/OnFireSystem.h"
 #include "mc/entity/utilities/ActorCollision.h"
-#include "mc/entity/utilities/ActorDamageCause.h"
 #include "mc/entity/utilities/ActorLocation.h"
-#include "mc/enums/ShapeType.h"
-#include "mc/math/Vec2.h"
-#include "mc/math/Vec3.h"
 #include "mc/server/ServerLevel.h"
 #include "mc/server/commands/CommandUtils.h"
 #include "mc/server/commands/RotationData.h"
@@ -25,11 +23,13 @@
 #include "mc/util/ExpressionNode.h"
 #include "mc/world//actor/player/Player.h"
 #include "mc/world/actor/ActorDamageByActorSource.h"
+#include "mc/world/actor/ActorDamageCause.h"
 #include "mc/world/actor/ActorDefinitionIdentifier.h"
-#include "mc/world/actor/common/ClipDefaults.h"
 #include "mc/world/components/FlagComponent.h"
 #include "mc/world/level/BlockPos.h"
 #include "mc/world/level/BlockSource.h"
+#include "mc/world/level/ClipDefaults.h"
+#include "mc/world/level/ShapeType.h"
 #include "mc/world/level/dimension/Dimension.h"
 #include "mc/world/phys/HitResult.h"
 

src-server/ll/api/form/FormBase.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "mc/enums/ModalFormCancelReason.h"
+#include "mc/network/packet/ModalFormCancelReason.h"
 
 namespace ll::form {
 

src-server/ll/api/service/PlayerInfo.h

@@ -4,7 +4,7 @@
 
 #include "ll/api/base/Macro.h"
 
-#include "mc/deps/core/mce/UUID.h"
+#include "mc/platform/UUID.h"
 
 namespace ll::service {
 class PlayerInfo {

src-server/ll/api/service/TargetedBedrock.cpp

@@ -2,20 +2,20 @@
 
 #include "ll/api/memory/Hook.h"
 
+#include "mc/deps/ecs/systems/EntitySystemsCollection.h"
 #include "mc/deps/raknet/RakPeer.h"
 #include "mc/deps/raknet/RakPeerInterface.h"
-#include "mc/entity/systems/common/EntitySystemsCollection.h"
 #include "mc/network/NetworkSystem.h"
 #include "mc/network/RakNetConnector.h"
 #include "mc/network/ServerNetworkHandler.h"
 #include "mc/resources/ResourcePackRepository.h"
+#include "mc/server/DedicatedServer.h"
+#include "mc/server/PropertiesSettings.h"
 #include "mc/server/ServerInstance.h"
 #include "mc/server/ServerLevel.h"
+#include "mc/server/commands/AllowListCommand.h"
 #include "mc/server/commands/CommandRegistry.h"
 #include "mc/server/commands/MinecraftCommands.h"
-#include "mc/server/common/DedicatedServer.h"
-#include "mc/server/common/PropertiesSettings.h"
-#include "mc/server/common/commands/AllowListCommand.h"
 #include "mc/world/Minecraft.h"
 #include "mc/world/events/ServerInstanceEventCoordinator.h"
 

src-server/ll/api/service/TargetedBedrock.h

@@ -2,7 +2,7 @@
 
 #include "ll/api/base/Macro.h"
 
-#include "mc/common/wrapper/optional_ref.h"
+#include "mc/deps/core/utility/optional_ref.h"
 
 class PropertiesSettings;
 class ResourcePackRepository;

src-server/ll/core/Statistics.cpp

@@ -24,8 +24,8 @@
 
 #include "mc/common/BuildInfo.h"
 #include "mc/common/Common.h"
-#include "mc/deps/core/mce/UUID.h"
-#include "mc/server/common/PropertiesSettings.h"
+#include "mc/platform/UUID.h"
+#include "mc/server/PropertiesSettings.h"
 #include "mc/world/actor/player/Player.h"
 #include "mc/world/level/Level.h"
 

src-server/ll/core/form/FormHandler.h

@@ -6,7 +6,7 @@
 #include "ll/api/form/SimpleForm.h"
 #include "ll/core/form/CustomFormElement.h"
 #include "mc/deps/json/Value.h"
-#include "mc/enums/ModalFormCancelReason.h"
+#include "mc/network/packet/ModalFormCancelReason.h"
 #include "mc/world/actor/player/Player.h"
 #include <optional>
 

src-server/ll/core/main_win.cpp

@@ -25,9 +25,9 @@
 #include "ll/api/utils/HashUtils.h"
 #include "ll/api/utils/SystemUtils.h"
 
+#include "mc/server/DedicatedServer.h"
 #include "mc/server/ServerInstance.h"
-#include "mc/server/common/DedicatedServer.h"
-#include "mc/server/common/commands/StopCommand.h"
+#include "mc/server/commands/StopCommand.h"
 #include "mc/world/events/ServerInstanceEventCoordinator.h"
 
 #include "ll/core/Config.h"

src-server/ll/core/plugin-abi/Memory.cpp

@@ -13,7 +13,7 @@
 #include "ll/api/utils/SystemUtils.h"
 #include "ll/core/LeviLamina.h"
 
-#include "mc/deps/core/common/bedrock/IMemoryAllocator.h"
+#include "mc/deps/core/memory/IMemoryAllocator.h"
 
 #include "demangler/Demangle.h"
 

src-server/ll/core/tweak/ForceEnableCheatCommands.cpp

@@ -1,11 +1,11 @@
 #include "ll/core/tweak/ForceEnableCheatCommands.h"
 
-#include "mc/enums/SemanticConstraint.h"
 #include "mc/server/commands/CommandFlag.h"
 #include "mc/server/commands/CommandOrigin.h"
 #include "mc/server/commands/CommandPermissionLevel.h"
 #include "mc/server/commands/CommandRegistry.h"
 #include "mc/server/commands/CommandSelectorBase.h"
+#include "mc/server/commands/SemanticConstraint.h"
 
 #include "ll/api/memory/Hook.h"
 #include <memory>

src-test/server/ConfigTest.cpp

@@ -22,11 +22,11 @@
 #include "mc/server/ServerLevel.h"
 #include "mc/server/commands/standard/FillCommand.h"
 
-#include "mc/deps/core/mce/Color.h"
-#include "mc/deps/core/mce/UUID.h"
+#include "mc/deps/core/math/Color.h"
+#include "mc/platform/UUID.h"
 
-#include "mc/math/Vec2.h"
-#include "mc/math/Vec3.h"
+#include "mc/deps/core/math/Vec2.h"
+#include "mc/deps/core/math/Vec3.h"
 #include "mc/world/level/BlockPos.h"
 #include "mc/world/level/levelgen/structure/BoundingBox.h"
 
@@ -35,6 +35,8 @@
 #include "ll/api/base/Containers.h"
 #include "ll/api/data/IndirectValue.h"
 
+#include "mc/util/MultidimensionalArray.h"
+
 // [0, 8, 16, 96, 97, 98, 104, 136, 144, 160, 176, 184, 196, 208, 232, 248, 304, 328, 360, 392, 408]
 
 // ["structure", "version", "ver", "someFlag", "eeeeFlag", "ssbbFlag", "str", "plain", "amap", "bmap", "vec2", "vec3",
@@ -191,4 +193,9 @@ LL_AUTO_TYPE_INSTANCE_HOOK(ConfigTest, HookPriority::Normal, ServerInstance, &Se
 
     auto indirect2 = indirect;
     auto indirect3 = indirect;
+
+    auto arr = Util::MultidimensionalArray<int, 2, 3, 4>{};
+
+    static_assert(arr.dim() == 3);
+    static_assert(arr.size() == 2 * 3 * 4);
 }

src-test/server/EventTest.cpp

@@ -30,10 +30,10 @@
 #include "ll/api/event/world/BlockChangedEvent.h"
 #include "ll/api/event/world/SpawnMobEvent.h"
 #include "ll/api/io/FileUtils.h"
-#include "mc/codebuilder/MCRESULT.h"
+#include "mc/deps/core/utility/MCRESULT.h"
 #include "mc/nbt/CompoundTag.h"
 #include "mc/world/actor/ActorDamageSource.h"
-#include "mc/world/item/registry/ItemStack.h"
+#include "mc/world/item/ItemStack.h"
 #include "mc/world/level/dimension/Dimension.h"
 
 

src-test/server/PtrTest.cpp

@@ -1,5 +1,5 @@
 // #include "ll/api/memory/Hook.h"
-// #include "mc/entity/gamerefs_entity/EntityRegistry.h"
+// #include "mc/deps/ecs/gamerefs_entity/EntityRegistry.h"
 // #include "mc/server/ServerInstance.h"
 // #include "mc/world/events/ServerInstanceEventCoordinator.h"
 // #include "mc/world/level/block/Block.h"

src-test/server/TestMolang.cpp

@@ -1,5 +1,5 @@
-#include "mc/util/molang/MolangScriptArg.h"
-#include "mc/world/level/levelgen/feature/helpers/RenderParams.h"
+#include "mc/util/MolangScriptArg.h"
+#include "mc/world/actor/RenderParams.h"
 
 #include "mc/util/ExpressionNode.h"
 
@@ -9,8 +9,8 @@
 #include "mc/world/events/ServerInstanceEventCoordinator.h"
 
 #include "ll/api/io/Logger.h"
+#include "mc/deps/core/utility/AutomaticID.h"
 #include "mc/server/commands/CommandBlockName.h"
-#include "mc/world/AutomaticID.h"
 
 
 namespace {

src-test/server/TestNbt.cpp

@@ -3,10 +3,10 @@
 #include "ll/api/utils/StringUtils.h"
 #include "ll/core/LeviLamina.h"
 
-#include "mc/common/ColorFormat.h"
-#include "mc/deps/core/mce/Color.h"
+#include "mc/deps/core/math/Color.h"
 #include "mc/nbt/CompoundTag.h"
 #include "mc/server/ServerInstance.h"
+#include "mc/util/ColorFormat.h"
 
 #include "nlohmann/json.hpp"