diff --git a/manifest.json b/manifest.json
index e872628..6827888 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,5 +1,10 @@
 {
-    "name": "Cleaner",
-    "entry": "Cleaner.dll",
-    "type": "native"
+    "name": "${pluginName}",
+    "entry": "${pluginFile}",
+    "type": "native",
+    "dependencies": [
+        {
+            "name": "GMLIB"
+        }
+    ]
 }
\ No newline at end of file
diff --git a/src/Cleaner.cpp b/src/Cleaner.cpp
index a34730a..ec4fdcd 100644
--- a/src/Cleaner.cpp
+++ b/src/Cleaner.cpp
@@ -1,39 +1,42 @@
 #include "Global.h"
+#include <GMLIB/Event/Entity/ItemActorSpawnEvent.h>
+#include <GMLIB/Event/Entity/MobPickupItemEvent.h>
+#include <GMLIB/Server/PlayerAPI.h>
 
 using namespace ll::schedule;
 using namespace ll::chrono_literals;
+int item_despawn_time = 3000;
 
-GameTimeAsyncScheduler scheduler;
-bool                   auto_clean_triggerred = false;
+ServerTimeAsyncScheduler scheduler;
+bool                     auto_clean_triggerred = false;
 
 namespace Cleaner {
 
-bool isDeathDrop(ItemActor* itac) {
-    //
-    return false;
-}
-
-bool shouldIgnoreMob(Actor* ac) {
-    if (ac->isTame() || ac->isTrusting() || ac->getNameTag() != "") {
-        return true;
+bool shouldIgnore(GMLIB_Actor* ac) {
+    if (ac->isMob() || ac->isItemActor()) {
+        if (ac->isTame() || ac->isTrusting() || ac->getNameTag() != "") {
+            return true;
+        }
+        auto nbt = ac->getNbt();
+        if (nbt->getByte("ShowBottom") == 1) { // End Crystal Used Only, if has this tag 1b, it is modified by cleaner.
+            return true;
+        }
     }
-
     return false;
 }
 
-bool ShouldClean(Actor* en) {
+bool ShouldClean(Actor* actor) {
     // Players
-    if (en->isType(ActorType::Player)) {
+    auto en = (GMLIB_Actor*)actor;
+    if (en->isPlayer() || shouldIgnore(en)) {
         return false;
     }
     auto type = en->getTypeName();
     // Items
-    if (en->hasCategory(ActorCategory::Item)) {
+    if (en->isItemActor()) {
+        return true;
         if (true) { // Todo Config Toggle
-            auto itac = (ItemActor*)en;
-            if (isDeathDrop(itac)) {
-                return false;
-            }
+            auto itac     = (ItemActor*)en;
             auto itemType = itac->item().getTypeName();
             if (true) { // Todo Config WhiteList
                 return false;
@@ -43,12 +46,8 @@ bool ShouldClean(Actor* en) {
         return false;
     }
     // Mobs
-    else if (en->hasCategory(ActorCategory::Mob)) {
+    else if (en->isMob()) {
         if (true) { // Todo Config Toggle
-            if (shouldIgnoreMob(en)) {
-                return false;
-            }
-            // Test
             return true;
             if (true) { // Todo WhiteList
                 return false;
@@ -71,7 +70,7 @@ bool ShouldClean(Actor* en) {
 
 int ExecuteClean() {
     int  clean_count  = 0;
-    auto all_entities = ll::service::bedrock::getLevel()->getRuntimeActorList();
+    auto all_entities = GMLIB_Level::getLevel()->getAllEntities();
     for (auto entity : all_entities) {
         if (ShouldClean(entity)) {
             entity->despawn();
@@ -83,7 +82,7 @@ int ExecuteClean() {
 
 int CountEntities() {
     int  clean_count  = 0;
-    auto all_entities = ll::service::bedrock::getLevel()->getRuntimeActorList();
+    auto all_entities = GMLIB_Level::getLevel()->getAllEntities();
     for (auto entity : all_entities) {
         if (ShouldClean(entity)) {
             clean_count++;
@@ -105,19 +104,19 @@ void CleanTask(int time, int announce_time) {
 }
 
 void AutoCleanTask(int seconds) {
-    auto time       = std::chrono::seconds::duration(seconds);
-    auto_clean_task = scheduler.add<RepeatTask>(time, [] { CleanTask(20, 5); });
+    auto time      = std::chrono::seconds::duration(seconds);
+    mAutoCleanTask = scheduler.add<RepeatTask>(time, [] { CleanTask(20, 5); });
 }
 
 void CheckCleanTask(int max_entities, float min_tps) {
-    check_clean_task = scheduler.add<RepeatTask>(10s, [max_entities, min_tps] {
+    mCheckCleanTask = scheduler.add<RepeatTask>(10s, [max_entities, min_tps] {
         auto count = CountEntities();
         if (auto_clean_triggerred == false) {
             if (count >= max_entities) {
                 auto_clean_triggerred = true;
                 logger.warn("Too many entities! Auto started clean task!");
                 CleanTask(20, 5);
-            } else if (TPS::getAverageTps() <= min_tps) {
+            } else if (GMLIB_Level::getLevel()->getServerAverageTps() <= min_tps) {
                 auto_clean_triggerred = true;
                 logger.warn("TPS too low! Auto started clean task!");
                 CleanTask(20, 5);
@@ -126,5 +125,46 @@ void CheckCleanTask(int max_entities, float min_tps) {
     });
 }
 
+void setShouldIgnore(GMLIB_Actor* ac) {
+    auto nbt = ac->getNbt();
+    nbt->put("ShowBottom", ByteTag(1));
+    ac->setNbt(*nbt);
+}
+
+void ListenEvents() {
+    auto eventBus = &ll::event::EventBus::getInstance();
+    // ItemSpawnEvent
+    eventBus->emplaceListener<GMLIB::Event::EntityEvent::ItemActorSpawnAfterEvent>(
+        [](GMLIB::Event::EntityEvent::ItemActorSpawnAfterEvent& event) {
+            auto& item = event.getItemActor();
+            auto  pl   = (GMLIB_Player*)event.getSpawner();
+            if (pl) {
+                if (pl->isPlayer() && !pl->isAlive()) { // Death Drop
+                    auto ac = (GMLIB_Actor*)&item;
+                    setShouldIgnore(ac);
+                    return;
+                }
+            }
+            item.lifeTime() = item_despawn_time;
+        }
+    );
+    // MobTakeItemEvent
+    eventBus->emplaceListener<GMLIB::Event::EntityEvent::MobPickupItemAfterEvent>(
+        [](GMLIB::Event::EntityEvent::MobPickupItemAfterEvent& event) {
+            // auto item = event.getItemActor().item().getTypeName();
+            auto mob = (GMLIB_Actor*)&event.self();
+            setShouldIgnore(mob);
+        }
+    );
+}
+
+void ReloadCleaner() {
+    mAutoCleanTask->cancel();
+    mCheckCleanTask->cancel();
+    // UnregisterCommands();
+    // RegisterCommands();
+    Cleaner::AutoCleanTask(600);
+    Cleaner::CheckCleanTask(15, 8);
+}
 
 } // namespace Cleaner
\ No newline at end of file
diff --git a/src/Global.h b/src/Global.h
index c610d84..5aa66bb 100644
--- a/src/Global.h
+++ b/src/Global.h
@@ -1,23 +1,23 @@
 #pragma once
 #include "Plugin.h"
 #include "include_all.h"
+#include <GMLIB/Server/ActorAPI.h>
+#include <GMLIB/Server/LevelAPI.h>
 
 extern ll::Logger logger;
-extern void RegisterCommands();
-extern void UnregisterCommands();
-static std::shared_ptr<ll::schedule::task::Task<ll::chrono::GameTimeClock>> auto_clean_task;
-static std::shared_ptr<ll::schedule::task::Task<ll::chrono::GameTimeClock>> check_clean_task;
+extern void       RegisterCommands();
+extern void       UnregisterCommands();
+
 extern int item_despawn_time;
 
 namespace Cleaner {
-    extern void CleanTask(int time, int announce_time);
-    extern void AutoCleanTask(int seconds);
-    extern void CheckCleanTask(int max_entities, float min_tps);
-}
 
-namespace TPS {
-    extern void CaculateTPS();
-    extern float getCurrentTps();
-    extern float getAverageTps();
-    extern float getMspt();
-}
\ No newline at end of file
+static std::shared_ptr<ll::schedule::task::Task<ll::chrono::ServerClock>> mAutoCleanTask;
+static std::shared_ptr<ll::schedule::task::Task<ll::chrono::ServerClock>> mCheckCleanTask;
+extern void                                                               CleanTask(int time, int announce_time);
+extern void                                                               AutoCleanTask(int seconds);
+extern void CheckCleanTask(int max_entities, float min_tps);
+extern void ReloadCleaner();
+extern void ListenEvents();
+
+} // namespace Cleaner
\ No newline at end of file
diff --git a/src/ItemDespawn.cpp b/src/ItemDespawn.cpp
deleted file mode 100644
index a779777..0000000
--- a/src/ItemDespawn.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-#include "Global.h"
-
-int item_despawn_time = 3000;
-
-LL_AUTO_TYPED_INSTANCE_HOOK(
-    ItemSpawnEventHook,
-    ll::memory::HookPriority::Normal,
-    Spawner,
-    "?spawnItem@Spawner@@QEAAPEAVItemActor@@AEAVBlockSource@@AEBVItemStack@@PEAVActor@@AEBVVec3@@H@Z",
-    ItemActor*,
-    class BlockSource&     region,
-    class ItemStack const& item,
-    class Actor*           spawner,
-    class Vec3 const&      pos,
-    int                    throwTime
-) {
-    auto itac = origin(region, item, spawner, pos, throwTime);
-    if (itac) {
-        if (spawner) {
-            if (spawner->isType(ActorType::Player)) {
-                if (!spawner->isAlive()) {
-                    // Death Drop
-                    return itac;
-                }
-            }
-        }
-        itac->mLifeTime = item_despawn_time;
-    }
-    return itac;
-}
-
-LL_AUTO_TYPED_INSTANCE_HOOK(
-    ItemTakeEventHook,
-    ll::memory::HookPriority::Normal,
-    Actor,
-    "?pickUpItem@Actor@@QEAAXAEAVItemActor@@H@Z",
-    void,
-    class ItemActor& itemActor, int count
-) {
-    logger.warn("pickup item {}", this->getTypeName());
-    return origin(itemActor,count);
-}
\ No newline at end of file
diff --git a/src/Mspt.cpp b/src/Mspt.cpp
deleted file mode 100644
index 09b83dd..0000000
--- a/src/Mspt.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-#include "Global.h"
-
-typedef std::chrono::high_resolution_clock timer_clock;
-#define TIMER_START auto start = timer_clock::now();
-#define TIMER_END                                                                                                      \
-    auto      elapsed    = timer_clock::now() - start;                                                                 \
-    long long timeReslut = std::chrono::duration_cast<std::chrono::microseconds>(elapsed).count();
-
-uint              ticks          = 0;
-float             average_tps    = 0;
-double            mspt           = 0;
-bool              culculate_mspt = false;
-std::list<ushort> avrtps         = {};
-
-LL_AUTO_TYPED_INSTANCE_HOOK(LevelTickHook, ll::memory::HookPriority::Normal, Level, "?tick@Level@@UEAAXXZ", void) {
-    ticks++;
-    TIMER_START
-    origin();
-    TIMER_END
-    culculate_mspt = true;
-    if (culculate_mspt) {
-        mspt           = (double)timeReslut / 1000;
-        culculate_mspt = false;
-    }
-}
-
-namespace TPS {
-
-void CaculateTPS() {
-    std::thread([] {
-        while (true) {
-            std::this_thread::sleep_for(std::chrono::seconds(1));
-            culculate_mspt = true;
-            avrtps.push_back(ticks);
-            ticks = 0;
-            if (avrtps.size() >= 60) {
-                avrtps.clear();
-                continue;
-            }
-            uint ticks_minute = 0;
-            for (auto i : avrtps) {
-                ticks_minute = ticks_minute + i;
-            }
-            float res   = (float)ticks_minute / ((float)avrtps.size());
-            average_tps = res >= 20 ? 20 : res;
-        }
-    }).detach();
-}
-
-float getCurrentTps() { return mspt <= 50 ? 20 : (float)(1000.0 / mspt); }
-
-float getAverageTps() { return average_tps; }
-
-float getMspt() { return mspt; }
-
-} // namespace TPS
diff --git a/src/Plugin.cpp b/src/Plugin.cpp
index dfb1ed4..2bd7b33 100644
--- a/src/Plugin.cpp
+++ b/src/Plugin.cpp
@@ -9,10 +9,9 @@ Plugin::Plugin(ll::plugin::NativePlugin& self) : mSelf(self) {
 }
 
 bool Plugin::enable() {
-    TPS::CaculateTPS();
+    Cleaner::ListenEvents();
     RegisterCommands();
-    item_despawn_time = 300;
-    Cleaner::AutoCleanTask(60);
+    Cleaner::AutoCleanTask(300);
     Cleaner::CheckCleanTask(20, 15);
     logger.info("Cleaner Loaded!");
     logger.info("Author: Tsubasa6848");
@@ -23,6 +22,8 @@ bool Plugin::enable() {
 bool Plugin::disable() {
     logger.info("Disabling Cleaner...");
     // Code for disabling the plugin goes here.
+    Cleaner::mAutoCleanTask->cancel();
+    Cleaner::mCheckCleanTask->cancel();
     UnregisterCommands();
     logger.info("Cleaner Disabled!");
     return true;
diff --git a/src/RegCommand.cpp b/src/RegisterCommand.cpp
similarity index 92%
rename from src/RegCommand.cpp
rename to src/RegisterCommand.cpp
index f1d8bf0..554e5c9 100644
--- a/src/RegCommand.cpp
+++ b/src/RegisterCommand.cpp
@@ -1,95 +1,100 @@
-#include "Global.h"
-
-using ParamType = DynamicCommand::ParameterType;
-
-void RegVoteCommand(CommandRegistry& registry) {
-    auto command = DynamicCommand::createCommand(registry, "voteclean", "Clean entities", CommandPermissionLevel::Any);
-    command->addOverload();
-    command->setCallback([](DynamicCommand const&                                    cmd,
-                            CommandOrigin const&                                     origin,
-                            CommandOutput&                                           output,
-                            std::unordered_map<std::string, DynamicCommand::Result>& result) {
-        // vote clean command
-    });
-    DynamicCommand::setup(registry, std::move(command));
-}
-
-void RegCleanerCommand(CommandRegistry& registry) {
-    auto command = DynamicCommand::createCommand(
-        registry,
-        "cleaner",
-        "Cleaner plugin settings",
-        CommandPermissionLevel::GameDirectors
-    );
-    command->setEnum("Despawn", {"despawn"});
-    command->setEnum("Action", {"tps", "clean", "reload", "mspt"});
-    command->setEnum("Despawntime", {"despawntime"});
-    command->mandatory("action", ParamType::Enum, "Action", CommandParameterOption::EnumAutocompleteExpansion);
-    command
-        ->mandatory("despawntime", ParamType::Enum, "Despawntime", CommandParameterOption::EnumAutocompleteExpansion);
-    command->mandatory("despawn", ParamType::Enum, "Despawn", CommandParameterOption::EnumAutocompleteExpansion);
-    command->mandatory("ticks", ParamType::Int);
-    command->mandatory("target", ParamType::Actor);
-    command->addOverload({"action"});
-    command->addOverload({"despawntime", "ticks"});
-    command->addOverload({"despawn", "target"});
-    command->setCallback([](DynamicCommand const&                                    cmd,
-                            CommandOrigin const&                                     origin,
-                            CommandOutput&                                           output,
-                            std::unordered_map<std::string, DynamicCommand::Result>& result) {
-        if (result["despawn"].isSet && result["target"].isSet) {
-            auto ens = result["target"].get<std::vector<Actor*>>();
-            if (ens.size() == 0) {
-                return output.error("No matched targets found!");
-            }
-            for (auto en : ens) {
-                en->despawn();
-            }
-            return output.success("Successfully despawned {} entities", ens.size());
-        } else if (result["action"].isSet) {
-            auto act = result["action"].get<std::string>();
-            if (act == "tps") {
-                return output.success("current tps {}, average tps {}", TPS::getCurrentTps(), TPS::getAverageTps());
-            } else if (act == "mspt") {
-                return output.success("mspt {}", TPS::getMspt());
-            } else if (act == "clean") {
-                output.success("Clean task started!");
-                Cleaner::CleanTask(20, 5); // Config
-                return;
-            } else if (act == "reload") {
-                output.success("Reloading Cleaner ...");
-                return output.success("Cleaner Reloaded!");
-            }
-        } else if (result["despawntime"].isSet && result["ticks"].isSet) {
-            item_despawn_time = result["ticks"].get<int>();
-            return output.success("Successfully set deapawn time to {}", item_despawn_time);
-        }
-    });
-    DynamicCommand::setup(registry, std::move(command));
-}
-
-void RegDespawnCommand(CommandRegistry& registry) {
-    auto command = DynamicCommand::createCommand(registry, "despawn", "despawn entities", CommandPermissionLevel::Any);
-    command->mandatory("target", ParamType::Actor);
-    command->addOverload({"target"});
-    command->addOverload();
-    command->setCallback([](DynamicCommand const&                                    cmd,
-                            CommandOrigin const&                                     origin,
-                            CommandOutput&                                           output,
-                            std::unordered_map<std::string, DynamicCommand::Result>& result) {
-
-    });
-    DynamicCommand::setup(registry, std::move(command));
-}
-
-void RegisterCommands() {
-    auto registry = ll::service::bedrock::getCommandRegistry();
-    RegCleanerCommand(registry);
-    RegVoteCommand(registry);
-}
-
-void UnregisterCommands() {
-    auto registry = ll::service::bedrock::getCommandRegistry();
-    registry->unregisterCommand("cleaner");
-    registry->unregisterCommand("voteclean");
+#include "Global.h"
+
+using ParamType = DynamicCommand::ParameterType;
+
+void RegVoteCommand(CommandRegistry& registry) {
+    auto command = DynamicCommand::createCommand(registry, "voteclean", "Clean entities", CommandPermissionLevel::Any);
+    command->addOverload();
+    command->setCallback([](DynamicCommand const&                                    cmd,
+                            CommandOrigin const&                                     origin,
+                            CommandOutput&                                           output,
+                            std::unordered_map<std::string, DynamicCommand::Result>& result) {
+        // vote clean command
+    });
+    DynamicCommand::setup(registry, std::move(command));
+}
+
+void RegCleanerCommand(CommandRegistry& registry) {
+    auto command = DynamicCommand::createCommand(
+        registry,
+        "cleaner",
+        "Cleaner plugin settings",
+        CommandPermissionLevel::GameDirectors
+    );
+    command->setEnum("Despawn", {"despawn"});
+    command->setEnum("Action", {"tps", "clean", "reload", "mspt"});
+    command->setEnum("Despawntime", {"despawntime"});
+    command->mandatory("action", ParamType::Enum, "Action", CommandParameterOption::EnumAutocompleteExpansion);
+    command
+        ->mandatory("despawntime", ParamType::Enum, "Despawntime", CommandParameterOption::EnumAutocompleteExpansion);
+    command->mandatory("despawn", ParamType::Enum, "Despawn", CommandParameterOption::EnumAutocompleteExpansion);
+    command->mandatory("ticks", ParamType::Int);
+    command->mandatory("target", ParamType::Actor);
+    command->addOverload({"action"});
+    command->addOverload({"despawntime", "ticks"});
+    command->addOverload({"despawn", "target"});
+    command->setCallback([](DynamicCommand const&                                    cmd,
+                            CommandOrigin const&                                     origin,
+                            CommandOutput&                                           output,
+                            std::unordered_map<std::string, DynamicCommand::Result>& result) {
+        if (result["despawn"].isSet && result["target"].isSet) {
+            auto ens = result["target"].get<std::vector<Actor*>>();
+            if (ens.size() == 0) {
+                return output.error("No matched targets found!");
+            }
+            for (auto en : ens) {
+                en->despawn();
+            }
+            return output.success("Successfully despawned {} entities", ens.size());
+        } else if (result["action"].isSet) {
+            auto act = result["action"].get<std::string>();
+            if (act == "tps") {
+                return output.success(
+                    "current tps {}, average tps {}",
+                    GMLIB_Level::getLevel()->getServerCurrentTps(),
+                    GMLIB_Level::getLevel()->getServerAverageTps()
+                );
+            } else if (act == "mspt") {
+                return output.success("mspt {}", GMLIB_Level::getLevel()->getServerMspt());
+            } else if (act == "clean") {
+                output.success("Clean task started!");
+                Cleaner::CleanTask(20, 5); // Config
+                return;
+            } else if (act == "reload") {
+                output.success("Reloading Cleaner ...");
+                Cleaner::ReloadCleaner();
+                return output.success("Cleaner Reloaded!");
+            }
+        } else if (result["despawntime"].isSet && result["ticks"].isSet) {
+            item_despawn_time = result["ticks"].get<int>();
+            return output.success("Successfully set deapawn time to {}", item_despawn_time);
+        }
+    });
+    DynamicCommand::setup(registry, std::move(command));
+}
+
+void RegDespawnCommand(CommandRegistry& registry) {
+    auto command = DynamicCommand::createCommand(registry, "despawn", "despawn entities", CommandPermissionLevel::Any);
+    command->mandatory("target", ParamType::Actor);
+    command->addOverload({"target"});
+    command->addOverload();
+    command->setCallback([](DynamicCommand const&                                    cmd,
+                            CommandOrigin const&                                     origin,
+                            CommandOutput&                                           output,
+                            std::unordered_map<std::string, DynamicCommand::Result>& result) {
+
+    });
+    DynamicCommand::setup(registry, std::move(command));
+}
+
+void RegisterCommands() {
+    auto registry = ll::service::bedrock::getCommandRegistry();
+    RegCleanerCommand(registry);
+    RegVoteCommand(registry);
+}
+
+void UnregisterCommands() {
+    auto registry = ll::service::bedrock::getCommandRegistry();
+    registry->unregisterCommand("cleaner");
+    registry->unregisterCommand("voteclean");
 }
\ No newline at end of file
diff --git a/src/include_all.h b/src/include_all.h
index 7385eee..906e4cf 100644
--- a/src/include_all.h
+++ b/src/include_all.h
@@ -1,11 +1,11 @@
-// This file included all levilamina api and mcapi. 
-// This file is automatically generated by GroupMountain Tool Chain. 
-// Do not edit by hand. 
+// This file included all levilamina api and mcapi.
+// This file is automatically generated by GroupMountain Tool Chain.
+// Do not edit by hand.
 
 #pragma once
-#include <ll/api/Config.h>
+// #include <ll/api/Config.h>
 #include <ll/api/Logger.h>
-#include <ll/api/ServerInfo.h>
+// #include <ll/api/ServerInfo.h>
 #include <ll/api/base/Base64.h>
 #include <ll/api/base/Concepts.h>
 #include <ll/api/base/DependencyGraph.h>
@@ -21,10 +21,11 @@
 #include <ll/api/base/StdInt.h>
 #include <ll/api/base/ToString.h>
 #include <ll/api/base/UnorderedStringMap.h>
-#include <ll/api/base/Version.h>
+// #include <ll/api/base/Version.h>
 #include <ll/api/chrono/GameChrono.h>
 #include <ll/api/command/CommandRegistrar.h>
 #include <ll/api/command/DynamicCommand.h>
+#include <ll/api/dimension/CustomDimensionManager.h>
 #include <ll/api/event/Cancellable.h>
 #include <ll/api/event/DynamicListener.h>
 #include <ll/api/event/Emitter.h>
@@ -40,7 +41,7 @@
 #include <ll/api/event/entity/ActorHurtEvent.h>
 #include <ll/api/event/entity/MobDieEvent.h>
 #include <ll/api/event/entity/MobEvent.h>
-#include <ll/api/event/filesystem/FileActionEvent.h>
+// #include <ll/api/event/filesystem/FileActionEvent.h>
 #include <ll/api/event/player/PlayerAddExperienceEvent.h>
 #include <ll/api/event/player/PlayerAttackEvent.h>
 #include <ll/api/event/player/PlayerChangePermEvent.h>
@@ -62,28 +63,29 @@
 #include <ll/api/event/player/PlayerSwingEvent.h>
 #include <ll/api/event/player/PlayerUseItemEvent.h>
 #include <ll/api/event/player/PlayerUseItemOnEvent.h>
+#include <ll/api/event/server/ServerStartedEvent.h>
+#include <ll/api/event/server/ServerStoppingEvent.h>
+#include <ll/api/event/server/ServiceEvents.h>
 #include <ll/api/event/world/BlockChangedEvent.h>
 #include <ll/api/event/world/FireSpreadEvent.h>
 #include <ll/api/event/world/LevelEvent.h>
-#include <ll/api/event/world/ServerStartedEvent.h>
-#include <ll/api/event/world/ServerStoppingEvent.h>
 #include <ll/api/event/world/SpawnMobEvent.h>
 #include <ll/api/event/world/WorldEvent.h>
 #include <ll/api/form/CustomForm.h>
 #include <ll/api/form/FormBase.h>
 #include <ll/api/form/ModalForm.h>
 #include <ll/api/form/SimpleForm.h>
-#include <ll/api/i18n/I18nAPI.h>
-#include <ll/api/io/FileUtils.h>
+// #include <ll/api/i18n/I18nAPI.h>
+// #include <ll/api/io/FileUtils.h>
 #include <ll/api/io/FunctionStream.h>
 #include <ll/api/io/StreamRedirector.h>
 #include <ll/api/memory/Closure.h>
 #include <ll/api/memory/Hook.h>
 #include <ll/api/memory/Memory.h>
 #include <ll/api/memory/PatchHelper.h>
-#include <ll/api/plugin/Manifest.h>
+// #include <ll/api/plugin/Manifest.h>
 #include <ll/api/plugin/NativePlugin.h>
-#include <ll/api/plugin/Plugin.h>
+// #include <ll/api/plugin/Plugin.h>
 #include <ll/api/plugin/PluginManager.h>
 #include <ll/api/plugin/PluginManagerRegistry.h>
 #include <ll/api/reflection/Deserialization.h>
@@ -97,6 +99,9 @@
 #include <ll/api/schedule/Task.h>
 #include <ll/api/service/Bedrock.h>
 #include <ll/api/service/PlayerInfo.h>
+#include <ll/api/service/Service.h>
+#include <ll/api/service/ServiceId.h>
+#include <ll/api/service/ServiceManager.h>
 #include <ll/api/thread/GlobalThreadPauser.h>
 #include <ll/api/thread/InterruptableSleep.h>
 #include <ll/api/thread/SharedRecursiveMutex.h>
@@ -105,7 +110,7 @@
 #include <ll/api/thread/TickSyncTaskPool.h>
 #include <ll/api/utils/CryptoUtils.h>
 #include <ll/api/utils/StacktraceUtils.h>
-#include <ll/api/utils/StringUtils.h>
+// #include <ll/api/utils/StringUtils.h>
 #include <ll/api/utils/WinUtils.h>
 #include <mc/_HeaderOutputPredefine.h>
 #include <mc/certificates/Certificate.h>
@@ -121,33 +126,33 @@
 #include <mc/client/game/ContentLogFileEndPoint.h>
 #include <mc/client/game/IClientInstance.h>
 #include <mc/client/multiplayer/MultiPlayerLevel.h>
-#include <mc/client/network/detail.h>
 #include <mc/client/network/GameRelightingTestData.h>
 #include <mc/client/network/HeaderCompare.h>
-#include <mc/client/network/httpclient.h>
-#include <mc/client/network/http_memory.h>
-#include <mc/client/network/http_memory_buffer.h>
-#include <mc/client/network/http_retry_after_api_state.h>
-#include <mc/client/network/http_singleton.h>
-#include <mc/client/network/proxy_protocol.h>
-#include <mc/client/network/proxy_type.h>
-#include <mc/client/network/shared_ptr_cache.h>
 #include <mc/client/network/Uri.h>
 #include <mc/client/network/WebSocket.h>
-#include <mc/client/network/win32_cs.h>
-#include <mc/client/network/win32_cs_autolock.h>
 #include <mc/client/network/WinHttpCallbackContext.h>
 #include <mc/client/network/WinHttpConnection.h>
 #include <mc/client/network/WinHttpProvider.h>
 #include <mc/client/network/WinHttpWebSocketExports.h>
-#include <mc/client/network/xbox.h>
 #include <mc/client/network/XPlatSecurityInformation.h>
 #include <mc/client/network/blob_cache/ClientBlobCacheTrackingData.h>
+#include <mc/client/network/detail.h>
+#include <mc/client/network/http_memory.h>
+#include <mc/client/network/http_memory_buffer.h>
+#include <mc/client/network/http_retry_after_api_state.h>
+#include <mc/client/network/http_singleton.h>
+#include <mc/client/network/httpclient.h>
+#include <mc/client/network/proxy_protocol.h>
+#include <mc/client/network/proxy_type.h>
 #include <mc/client/network/realms/RealmId.h>
 #include <mc/client/network/realms/Realms.h>
 #include <mc/client/network/realms/RealmsPurchaseFailureReason.h>
 #include <mc/client/network/realms/RealmsPurchaseIntent.h>
 #include <mc/client/network/realms/RealmsStoriesData.h>
+#include <mc/client/network/shared_ptr_cache.h>
+#include <mc/client/network/win32_cs.h>
+#include <mc/client/network/win32_cs_autolock.h>
+#include <mc/client/network/xbox.h>
 #include <mc/client/options/Options.h>
 #include <mc/client/particle/Particle.h>
 #include <mc/client/player/InventoryOptions.h>
@@ -158,20 +163,19 @@
 #include <mc/client/services/persona/AnimatedTextureType.h>
 #include <mc/client/services/persona/AnimationExpression.h>
 #include <mc/client/services/persona/ArmSize.h>
-#include <mc/client/services/persona/packId.h>
-#include <mc/client/services/persona/persona.h>
 #include <mc/client/services/persona/PersonaCharacterHandle.h>
 #include <mc/client/services/persona/PersonaColors.h>
-#include <mc/client/services/persona/personaDefault.h>
-#include <mc/client/services/persona/pieceId.h>
 #include <mc/client/services/persona/PieceType.h>
 #include <mc/client/services/persona/SizeInfo.h>
+#include <mc/client/services/persona/packId.h>
+#include <mc/client/services/persona/persona.h>
+#include <mc/client/services/persona/personaDefault.h>
+#include <mc/client/services/persona/pieceId.h>
 #include <mc/client/services/persona/skinRepository.h>
 #include <mc/client/social/AchievementEventing.h>
 #include <mc/client/social/AggregationEventListener.h>
 #include <mc/client/social/Connection.h>
 #include <mc/client/social/ConnectionType.h>
-#include <mc/client/social/eventData.h>
 #include <mc/client/social/EventManager.h>
 #include <mc/client/social/Events.h>
 #include <mc/client/social/GameConnectionInfo.h>
@@ -196,12 +200,13 @@
 #include <mc/client/social/TelemetryHeartbeat.h>
 #include <mc/client/social/UserManager.h>
 #include <mc/client/social/XboxLiveUserObserver.h>
+#include <mc/client/social/eventData.h>
 #include <mc/client/sound/NullSoundPlayer.h>
-#include <mc/client/store/storeSearch.h>
 #include <mc/client/store/TelemetryData.h>
 #include <mc/client/store/iap/Offer.h>
 #include <mc/client/store/iap/PlatformOfferPurchaseDetails.h>
 #include <mc/client/store/iap/ProductSku.h>
+#include <mc/client/store/storeSearch.h>
 #include <mc/codebuilder/AgentMessage.h>
 #include <mc/codebuilder/Block.h>
 #include <mc/codebuilder/Category.h>
@@ -246,12 +251,11 @@
 #include <mc/common/CommonDirection.h>
 #include <mc/common/ComplexAliasDescriptor.h>
 #include <mc/common/ComponentComparer.h>
+#include <mc/common/DBHelpers.h>
 #include <mc/common/DashJump.h>
 #include <mc/common/DateManager.h>
-#include <mc/common/DBHelpers.h>
 #include <mc/common/DisplayLoggedErrorManager.h>
 #include <mc/common/EditorBootstrapper.h>
-#include <mc/common/edu.h>
 #include <mc/common/ExpressionNodeCerealConstraint.h>
 #include <mc/common/FrameUpdateContextBase.h>
 #include <mc/common/GameTypeConv.h>
@@ -259,22 +263,20 @@
 #include <mc/common/GetAttachPositionViews.h>
 #include <mc/common/GlobalRead.h>
 #include <mc/common/GlobalWrite.h>
-#include <mc/common/glTFExportData.h>
 #include <mc/common/HIDController.h>
 #include <mc/common/HitDetection.h>
 #include <mc/common/IAdvancedGraphicsOptions.h>
 #include <mc/common/IGameModuleDocumentation.h>
 #include <mc/common/IMapDataManagerOptions.h>
 #include <mc/common/IMinecraftApp.h>
-#include <mc/common/InheritanceTree.h>
-#include <mc/common/InvertableFilter.h>
 #include <mc/common/IScriptStatPublisher.h>
-#include <mc/common/IsPregnantDefinition.h>
 #include <mc/common/ITaskQueue.h>
 #include <mc/common/ITaskQueuePort.h>
 #include <mc/common/ITaskQueuePortContext.h>
+#include <mc/common/InheritanceTree.h>
+#include <mc/common/InvertableFilter.h>
+#include <mc/common/IsPregnantDefinition.h>
 #include <mc/common/KnockbackRules.h>
-#include <mc/common/librarySearch.h>
 #include <mc/common/LocalSpatialEntityFetcher.h>
 #include <mc/common/LowMemoryWatcher.h>
 #include <mc/common/MapDataManagerOptions.h>
@@ -301,6 +303,9 @@
 #include <mc/common/TrustedKeys.h>
 #include <mc/common/UserStorageChecker.h>
 #include <mc/common/WeightedChoices.h>
+#include <mc/common/edu.h>
+#include <mc/common/glTFExportData.h>
+#include <mc/common/librarySearch.h>
 #include <mc/common/wrapper/AddRemove.h>
 #include <mc/common/wrapper/AdvanceFrameResult.h>
 #include <mc/common/wrapper/BedSleepingResult.h>
@@ -322,21 +327,19 @@
 #include <mc/common/wrapper/Optional.h>
 #include <mc/common/wrapper/OptionalComponentWrapper.h>
 #include <mc/common/wrapper/OptionalGlobal.h>
-#include <mc/common/wrapper/optional_ref.h>
 #include <mc/common/wrapper/OwnerPtrFactory.h>
 #include <mc/common/wrapper/OwnerPtrT.h>
 #include <mc/common/wrapper/PackAccessAssetGenerationResult.h>
 #include <mc/common/wrapper/QueueRequestResult.h>
 #include <mc/common/wrapper/Ref.h>
-#include <mc/common/wrapper/referenced_ptr.h>
 #include <mc/common/wrapper/RepairItemResult.h>
 #include <mc/common/wrapper/ReplayCorrectionResult.h>
 #include <mc/common/wrapper/Result.h>
 #include <mc/common/wrapper/ResultCode.h>
 #include <mc/common/wrapper/ScalarOptional.h>
 #include <mc/common/wrapper/ServerConnectivityTestResult.h>
-#include <mc/common/wrapper/SharedPtr.h>
 #include <mc/common/wrapper/SharePtrRefTraits.h>
+#include <mc/common/wrapper/SharedPtr.h>
 #include <mc/common/wrapper/StackRefResultT.h>
 #include <mc/common/wrapper/StructureBlockPaletteLoadResult.h>
 #include <mc/common/wrapper/StructureDeleteResult.h>
@@ -345,11 +348,13 @@
 #include <mc/common/wrapper/TempEPtrBase.h>
 #include <mc/common/wrapper/ValueOrRef.h>
 #include <mc/common/wrapper/ViewT.h>
+#include <mc/common/wrapper/WSConnectionResult.h>
 #include <mc/common/wrapper/WeakPtr.h>
 #include <mc/common/wrapper/WeakRefT.h>
 #include <mc/common/wrapper/WitherBossPreAIStepResult.h>
 #include <mc/common/wrapper/WorldTransferResultType.h>
-#include <mc/common/wrapper/WSConnectionResult.h>
+#include <mc/common/wrapper/optional_ref.h>
+#include <mc/common/wrapper/referenced_ptr.h>
 #include <mc/config/DefaultScreenCapabilities.h>
 #include <mc/config/IPlayerData.h>
 #include <mc/config/IScreenCapabilities.h>
@@ -378,7 +383,6 @@
 #include <mc/deps/application/RandomThreadCheckManager.h>
 #include <mc/deps/cereal/BasicLoader.h>
 #include <mc/deps/cereal/BasicSaver.h>
-#include <mc/deps/cereal/cereal.h>
 #include <mc/deps/cereal/CerealComponentItemDataLoader.h>
 #include <mc/deps/cereal/Constraint.h>
 #include <mc/deps/cereal/CoreCerealBindings.h>
@@ -402,6 +406,7 @@
 #include <mc/deps/cereal/SerializerEnumMapping.h>
 #include <mc/deps/cereal/SerializerTraits.h>
 #include <mc/deps/cereal/StringConstraint.h>
+#include <mc/deps/cereal/cereal.h>
 #include <mc/deps/cereal/internal/AliasSchema.h>
 #include <mc/deps/cereal/internal/BasicCompositeSchema.h>
 #include <mc/deps/cereal/internal/BasicGenericTypeSchema.h>
@@ -411,7 +416,6 @@
 #include <mc/deps/cereal/internal/DefaultCompositeSchema.h>
 #include <mc/deps/cereal/internal/DeprecatedSchema.h>
 #include <mc/deps/cereal/internal/ExtendedSchemaInfo.h>
-#include <mc/deps/cereal/internal/internal.h>
 #include <mc/deps/cereal/internal/Member.h>
 #include <mc/deps/cereal/internal/ReflectedType.h>
 #include <mc/deps/cereal/internal/ReflectionContext.h>
@@ -421,6 +425,7 @@
 #include <mc/deps/cereal/internal/SchemaInfo.h>
 #include <mc/deps/cereal/internal/StringConstraint.h>
 #include <mc/deps/cereal/internal/UndefinedSchema.h>
+#include <mc/deps/cereal/internal/internal.h>
 #include <mc/deps/core/BufferedFileOperations.h>
 #include <mc/deps/core/Core.h>
 #include <mc/deps/core/CounterFlags.h>
@@ -474,8 +479,8 @@
 #include <mc/deps/core/StorageAreaFactory.h>
 #include <mc/deps/core/StorageAreaState.h>
 #include <mc/deps/core/StorageAreaStateListener.h>
-#include <mc/deps/core/StorageAreasTree.h>
 #include <mc/deps/core/StorageArea_windows.h>
+#include <mc/deps/core/StorageAreasTree.h>
 #include <mc/deps/core/StringConversions.h>
 #include <mc/deps/core/Subject.h>
 #include <mc/deps/core/TransactionFlags.h>
@@ -512,10 +517,10 @@
 #include <mc/deps/core/common/bedrock/CrashManager.h>
 #include <mc/deps/core/common/bedrock/CrashTelemetryProcessor.h>
 #include <mc/deps/core/common/bedrock/CrashUploadStatus.h>
+#include <mc/deps/core/common/bedrock/DEL.h>
 #include <mc/deps/core/common/bedrock/DataStore.h>
 #include <mc/deps/core/common/bedrock/DataStoreDetail.h>
 #include <mc/deps/core/common/bedrock/DataStoreInfo.h>
-#include <mc/deps/core/common/bedrock/DEL.h>
 #include <mc/deps/core/common/bedrock/Detail.h>
 #include <mc/deps/core/common/bedrock/Details.h>
 #include <mc/deps/core/common/bedrock/DeviceIdContext.h>
@@ -525,9 +530,9 @@
 #include <mc/deps/core/common/bedrock/DimensionManager.h>
 #include <mc/deps/core/common/bedrock/DirectoryEntry.h>
 #include <mc/deps/core/common/bedrock/DirectoryPickerConfig.h>
+#include <mc/deps/core/common/bedrock/DispatchQueue.h>
 #include <mc/deps/core/common/bedrock/DispatcherInterface.h>
 #include <mc/deps/core/common/bedrock/DispatcherProcess.h>
-#include <mc/deps/core/common/bedrock/DispatchQueue.h>
 #include <mc/deps/core/common/bedrock/Document.h>
 #include <mc/deps/core/common/bedrock/DocumentOptions.h>
 #include <mc/deps/core/common/bedrock/EnableNonOwnerReferences.h>
@@ -558,26 +563,25 @@
 #include <mc/deps/core/common/bedrock/ILevelListCache.h>
 #include <mc/deps/core/common/bedrock/IManager.h>
 #include <mc/deps/core/common/bedrock/IMemoryAllocator.h>
+#include <mc/deps/core/common/bedrock/IRequestBody.h>
+#include <mc/deps/core/common/bedrock/IResponseBody.h>
+#include <mc/deps/core/common/bedrock/IVillageManager.h>
 #include <mc/deps/core/common/bedrock/ImplFactory.h>
 #include <mc/deps/core/common/bedrock/ImportStructureMetaData.h>
 #include <mc/deps/core/common/bedrock/Interface.h>
 #include <mc/deps/core/common/bedrock/Internal.h>
 #include <mc/deps/core/common/bedrock/InternalHeapAllocator.h>
 #include <mc/deps/core/common/bedrock/Intrusive.h>
-#include <mc/deps/core/common/bedrock/IRequestBody.h>
-#include <mc/deps/core/common/bedrock/IResponseBody.h>
-#include <mc/deps/core/common/bedrock/IVillageManager.h>
 #include <mc/deps/core/common/bedrock/JSONObject.h>
 #include <mc/deps/core/common/bedrock/LevelSoundManager.h>
 #include <mc/deps/core/common/bedrock/LibHttpClientErrorCatergory.h>
 #include <mc/deps/core/common/bedrock/LibHttpClientImpl.h>
 #include <mc/deps/core/common/bedrock/LibHttpClientInstance.h>
-#include <mc/deps/core/common/bedrock/list.h>
 #include <mc/deps/core/common/bedrock/LoadTimeProfiler.h>
 #include <mc/deps/core/common/bedrock/LockGuard.h>
+#include <mc/deps/core/common/bedrock/LogLevel.h>
 #include <mc/deps/core/common/bedrock/LoggingInterface.h>
 #include <mc/deps/core/common/bedrock/LoggingInterfaceGeneric.h>
-#include <mc/deps/core/common/bedrock/LogLevel.h>
 #include <mc/deps/core/common/bedrock/MainProcScope.h>
 #include <mc/deps/core/common/bedrock/Manager.h>
 #include <mc/deps/core/common/bedrock/Memory.h>
@@ -591,8 +595,10 @@
 #include <mc/deps/core/common/bedrock/Node.h>
 #include <mc/deps/core/common/bedrock/NodeBase.h>
 #include <mc/deps/core/common/bedrock/NonOwnerPointer.h>
-#include <mc/deps/core/common/bedrock/ObjectNode.h>
 #include <mc/deps/core/common/bedrock/OSThreadPriority.h>
+#include <mc/deps/core/common/bedrock/ObjectNode.h>
+#include <mc/deps/core/common/bedrock/POST.h>
+#include <mc/deps/core/common/bedrock/PUT.h>
 #include <mc/deps/core/common/bedrock/ParseHandler.h>
 #include <mc/deps/core/common/bedrock/ParseResult.h>
 #include <mc/deps/core/common/bedrock/PlatformBootstrap.h>
@@ -601,11 +607,9 @@
 #include <mc/deps/core/common/bedrock/PlatformData.h>
 #include <mc/deps/core/common/bedrock/PlatformRuntimeInfo.h>
 #include <mc/deps/core/common/bedrock/PlatformUtils.h>
-#include <mc/deps/core/common/bedrock/POST.h>
 #include <mc/deps/core/common/bedrock/PrioritizeSharedOwnership.h>
 #include <mc/deps/core/common/bedrock/PrioritySharedMutex.h>
 #include <mc/deps/core/common/bedrock/PubSub.h>
-#include <mc/deps/core/common/bedrock/PUT.h>
 #include <mc/deps/core/common/bedrock/Request.h>
 #include <mc/deps/core/common/bedrock/RequestBuilder.h>
 #include <mc/deps/core/common/bedrock/RequestPriority.h>
@@ -627,12 +631,11 @@
 #include <mc/deps/core/common/bedrock/StringAppendBuffer.h>
 #include <mc/deps/core/common/bedrock/StringNode.h>
 #include <mc/deps/core/common/bedrock/StringRequestBody.h>
-#include <mc/deps/core/common/bedrock/Threading.h>
 #include <mc/deps/core/common/bedrock/ThreadLocalObject.h>
 #include <mc/deps/core/common/bedrock/ThreadOwner.h>
 #include <mc/deps/core/common/bedrock/ThreadUtil.h>
+#include <mc/deps/core/common/bedrock/Threading.h>
 #include <mc/deps/core/common/bedrock/ToXAsyncBlock.h>
-#include <mc/deps/core/common/bedrock/typeid_t.h>
 #include <mc/deps/core/common/bedrock/UniqueLock.h>
 #include <mc/deps/core/common/bedrock/UnwrapResult.h>
 #include <mc/deps/core/common/bedrock/ValueWrapper.h>
@@ -645,8 +648,9 @@
 #include <mc/deps/core/common/bedrock/WorkerTaskStats.h>
 #include <mc/deps/core/common/bedrock/WorldRecoveryTelemetryEvent.h>
 #include <mc/deps/core/common/bedrock/WorldRecoveryTelemetryHandler.h>
-#include <mc/deps/core/common/bedrock/pubsub/Connector.h>
+#include <mc/deps/core/common/bedrock/list.h>
 #include <mc/deps/core/common/bedrock/pubsub/ConnectPosition.h>
+#include <mc/deps/core/common/bedrock/pubsub/Connector.h>
 #include <mc/deps/core/common/bedrock/pubsub/DeferredSubscription.h>
 #include <mc/deps/core/common/bedrock/pubsub/DeferredSubscriptionHub.h>
 #include <mc/deps/core/common/bedrock/pubsub/DeferredSubscriptionHubBase.h>
@@ -661,6 +665,7 @@
 #include <mc/deps/core/common/bedrock/pubsub/SubscriptionBase.h>
 #include <mc/deps/core/common/bedrock/pubsub/SubscriptionBodyBase.h>
 #include <mc/deps/core/common/bedrock/pubsub/SubscriptionContext.h>
+#include <mc/deps/core/common/bedrock/typeid_t.h>
 #include <mc/deps/core/common/debug/BedrockLog.h>
 #include <mc/deps/core/common/debug/CategoryLogFile.h>
 #include <mc/deps/core/common/debug/ComposedAssertMessage.h>
@@ -709,10 +714,10 @@
 #include <mc/deps/core/mce/ImageUsage.h>
 #include <mc/deps/core/mce/Math.h>
 #include <mc/deps/core/mce/MathUtility.h>
-#include <mc/deps/core/mce/mce.h>
 #include <mc/deps/core/mce/Radian.h>
 #include <mc/deps/core/mce/RenderState.h>
 #include <mc/deps/core/mce/UUID.h>
+#include <mc/deps/core/mce/mce.h>
 #include <mc/deps/core/platform/ActivationUri.h>
 #include <mc/deps/core/platform/AppLifecycleContext.h>
 #include <mc/deps/core/resource/BackwardsCompatTextureGroup.h>
@@ -772,8 +777,6 @@
 #include <mc/deps/core/utility/BedrockLoadContext.h>
 #include <mc/deps/core/utility/BinaryStream.h>
 #include <mc/deps/core/utility/BoatFrictionUtility.h>
-#include <mc/deps/core/utility/buffer_span.h>
-#include <mc/deps/core/utility/buffer_span_mut.h>
 #include <mc/deps/core/utility/CDScopedEvent.h>
 #include <mc/deps/core/utility/Components.h>
 #include <mc/deps/core/utility/ComponentsView.h>
@@ -821,12 +824,14 @@
 #include <mc/deps/core/utility/ValidationStatus.h>
 #include <mc/deps/core/utility/VanillaGoalUtility.h>
 #include <mc/deps/core/utility/XXHash.h>
-#include <mc/deps/core_graphics/common/cg.h>
+#include <mc/deps/core/utility/buffer_span.h>
+#include <mc/deps/core/utility/buffer_span_mut.h>
 #include <mc/deps/core_graphics/common/ImageBuffer.h>
+#include <mc/deps/core_graphics/common/cg.h>
 #include <mc/deps/core_graphics/helpers/TintMapColor.h>
 #include <mc/deps/crypto/Asymmetric.h>
 #include <mc/deps/crypto/Crypto.h>
-#include <mc/deps/crypto/Hash.h>
+// #include <mc/deps/crypto/Hash.h>
 #include <mc/deps/crypto/Random.h>
 #include <mc/deps/crypto/Symmetric.h>
 #include <mc/deps/crypto/asymmetric/Asymmetric.h>
@@ -834,12 +839,12 @@
 #include <mc/deps/crypto/asymmetric/Padding.h>
 #include <mc/deps/crypto/asymmetric/PubKeyFormat.h>
 #include <mc/deps/crypto/asymmetric/System.h>
+#include <mc/deps/crypto/hash/HMAC.h>
 #include <mc/deps/crypto/hash/Hash.h>
 #include <mc/deps/crypto/hash/HashType.h>
-#include <mc/deps/crypto/hash/HMAC.h>
 #include <mc/deps/crypto/hash/IHash.h>
-#include <mc/deps/crypto/hash/md5.h>
 #include <mc/deps/crypto/hash/OpenSSLHashInterface.h>
+#include <mc/deps/crypto/hash/md5.h>
 #include <mc/deps/crypto/random/Random.h>
 #include <mc/deps/crypto/symmetric/OpenSSLSymmetricInterface.h>
 #include <mc/deps/crypto/symmetric/OperationMode.h>
@@ -880,12 +885,11 @@
 #include <mc/deps/puv/CerealUpgraderBase.h>
 #include <mc/deps/puv/EquipmentSlot.h>
 #include <mc/deps/puv/FilterSubject.h>
-#include <mc/deps/puv/internal.h>
 #include <mc/deps/puv/IntRange.h>
 #include <mc/deps/puv/Legacy.h>
-#include <mc/deps/puv/LoaderBase.h>
 #include <mc/deps/puv/LoadResult.h>
 #include <mc/deps/puv/LoadResultAny.h>
+#include <mc/deps/puv/LoaderBase.h>
 #include <mc/deps/puv/Logger.h>
 #include <mc/deps/puv/ParserBase.h>
 #include <mc/deps/puv/PathElement.h>
@@ -896,6 +900,7 @@
 #include <mc/deps/puv/Upgrader.h>
 #include <mc/deps/puv/UseAnimation.h>
 #include <mc/deps/puv/VersionParser.h>
+#include <mc/deps/puv/internal.h>
 #include <mc/deps/puv/v1_20_50/AllowOffHandItemComponent.h>
 #include <mc/deps/puv/v1_20_50/BlockDescriptor.h>
 #include <mc/deps/puv/v1_20_50/BlockDescriptorProxy.h>
@@ -909,8 +914,8 @@
 #include <mc/deps/puv/v1_20_50/DiggerItemComponent.h>
 #include <mc/deps/puv/v1_20_50/DisplayNameItemComponent.h>
 #include <mc/deps/puv/v1_20_50/DurabilityItemComponent.h>
-#include <mc/deps/puv/v1_20_50/EnchantableItemComponent.h>
 #include <mc/deps/puv/v1_20_50/EnchantSlotConstraint.h>
+#include <mc/deps/puv/v1_20_50/EnchantableItemComponent.h>
 #include <mc/deps/puv/v1_20_50/EntityPlacerItemComponent.h>
 #include <mc/deps/puv/v1_20_50/FoodItemComponent.h>
 #include <mc/deps/puv/v1_20_50/FuelItemComponent.h>
@@ -933,27 +938,36 @@
 #include <mc/deps/puv/v1_20_50/ThrowableItemComponent.h>
 #include <mc/deps/puv/v1_20_50/UseAnimationItemComponent.h>
 #include <mc/deps/puv/v1_20_50/UseModifiersItemComponent.h>
-#include <mc/deps/puv/v1_20_50/v1_20_50.h>
 #include <mc/deps/puv/v1_20_50/WearableItemComponent.h>
+#include <mc/deps/puv/v1_20_50/v1_20_50.h>
 #include <mc/deps/raknet/AddressOrGUID.h>
-#include <mc/deps/raknet/BitStream.h>
 #include <mc/deps/raknet/BPSTracker.h>
+#include <mc/deps/raknet/BitStream.h>
 #include <mc/deps/raknet/CCRakNetSlidingWindow.h>
+#include <mc/deps/raknet/CSHA1.h>
 #include <mc/deps/raknet/CommandParserInterface.h>
 #include <mc/deps/raknet/ConnectionAttemptResult.h>
 #include <mc/deps/raknet/ConnectionState.h>
-#include <mc/deps/raknet/CSHA1.h>
 #include <mc/deps/raknet/DatagramHeaderFormat.h>
 #include <mc/deps/raknet/HuffmanEncodingTree.h>
 #include <mc/deps/raknet/HuffmanEncodingTreeNode.h>
+#include <mc/deps/raknet/IRNS2_Berkley.h>
 #include <mc/deps/raknet/InternalPacket.h>
 #include <mc/deps/raknet/InternalPacketRefCountedData.h>
-#include <mc/deps/raknet/IRNS2_Berkley.h>
 #include <mc/deps/raknet/LocklessUint32_t.h>
 #include <mc/deps/raknet/NetworkAdapter.h>
 #include <mc/deps/raknet/Packet.h>
 #include <mc/deps/raknet/PluginInterface2.h>
 #include <mc/deps/raknet/PublicKey.h>
+#include <mc/deps/raknet/RNS2BindResult.h>
+#include <mc/deps/raknet/RNS2EventHandler.h>
+#include <mc/deps/raknet/RNS2RecvStruct.h>
+#include <mc/deps/raknet/RNS2Type.h>
+#include <mc/deps/raknet/RNS2_Berkley.h>
+#include <mc/deps/raknet/RNS2_BerkleyBindParameters.h>
+#include <mc/deps/raknet/RNS2_SendParameters.h>
+#include <mc/deps/raknet/RNS2_Windows.h>
+#include <mc/deps/raknet/RNS2_Windows_Linux_360.h>
 #include <mc/deps/raknet/RakNet.h>
 #include <mc/deps/raknet/RakNetGUID.h>
 #include <mc/deps/raknet/RakNetRandom.h>
@@ -968,15 +982,6 @@
 #include <mc/deps/raknet/ReliabilityLayer.h>
 #include <mc/deps/raknet/RemoteClient.h>
 #include <mc/deps/raknet/RemoteSystemIndex.h>
-#include <mc/deps/raknet/RNS2BindResult.h>
-#include <mc/deps/raknet/RNS2EventHandler.h>
-#include <mc/deps/raknet/RNS2RecvStruct.h>
-#include <mc/deps/raknet/RNS2Type.h>
-#include <mc/deps/raknet/RNS2_Berkley.h>
-#include <mc/deps/raknet/RNS2_BerkleyBindParameters.h>
-#include <mc/deps/raknet/RNS2_SendParameters.h>
-#include <mc/deps/raknet/RNS2_Windows.h>
-#include <mc/deps/raknet/RNS2_Windows_Linux_360.h>
 #include <mc/deps/raknet/SimpleMutex.h>
 #include <mc/deps/raknet/SocketDescriptor.h>
 #include <mc/deps/raknet/SocketLayer.h>
@@ -987,7 +992,6 @@
 #include <mc/deps/raknet/StringTable.h>
 #include <mc/deps/raknet/SystemAddress.h>
 #include <mc/deps/raknet/TCPInterface.h>
-#include <mc/deps/raknet/uint24_t.h>
 #include <mc/deps/raknet/WSAStartupSingleton.h>
 #include <mc/deps/raknet/data_structures/ByteQueue.h>
 #include <mc/deps/raknet/data_structures/DataStructures.h>
@@ -995,13 +999,14 @@
 #include <mc/deps/raknet/data_structures/List.h>
 #include <mc/deps/raknet/data_structures/Map.h>
 #include <mc/deps/raknet/data_structures/RangeNode.h>
+#include <mc/deps/raknet/uint24_t.h>
 #include <mc/deps/snappy/ByteArraySource.h>
-#include <mc/deps/snappy/internal.h>
 #include <mc/deps/snappy/Sink.h>
-#include <mc/deps/snappy/snappy.h>
 #include <mc/deps/snappy/SnappyDecompressor.h>
 #include <mc/deps/snappy/Source.h>
 #include <mc/deps/snappy/UncheckedByteArraySink.h>
+#include <mc/deps/snappy/internal.h>
+#include <mc/deps/snappy/snappy.h>
 #include <mc/editor/systems/ActorOwnerComponent.h>
 #include <mc/editor/systems/ActorTickNeededComponent.h>
 #include <mc/editor/systems/CurrentTickComponent.h>
@@ -1053,9 +1058,9 @@
 #include <mc/entity/components/ArrowEffectSubcomponent.h>
 #include <mc/entity/components/AttackCooldownComponent.h>
 #include <mc/entity/components/AttributesComponent.h>
+#include <mc/entity/components/BalloonDefinition.h>
 #include <mc/entity/components/BalloonableComponent.h>
 #include <mc/entity/components/BalloonableDefinition.h>
-#include <mc/entity/components/BalloonDefinition.h>
 #include <mc/entity/components/BarterComponent.h>
 #include <mc/entity/components/BarterDefinition.h>
 #include <mc/entity/components/BaseGameVersionComponent.h>
@@ -1069,9 +1074,9 @@
 #include <mc/entity/components/BlockPosTrackerComponent.h>
 #include <mc/entity/components/BlockSet.h>
 #include <mc/entity/components/BoatPaddleComponent.h>
+#include <mc/entity/components/BoostItem.h>
 #include <mc/entity/components/BoostableComponent.h>
 #include <mc/entity/components/BoostableDefinition.h>
-#include <mc/entity/components/BoostItem.h>
 #include <mc/entity/components/BossDefinition.h>
 #include <mc/entity/components/BounceComponent.h>
 #include <mc/entity/components/BreakBlocksDescription.h>
@@ -1158,9 +1163,9 @@
 #include <mc/entity/components/GameEventMovementTrackingDefinition.h>
 #include <mc/entity/components/GeneDefinition.h>
 #include <mc/entity/components/GenericMoveControlDescription.h>
+#include <mc/entity/components/GeneticVariant.h>
 #include <mc/entity/components/GeneticsComponent.h>
 #include <mc/entity/components/GeneticsDefinition.h>
-#include <mc/entity/components/GeneticVariant.h>
 #include <mc/entity/components/GiveableComponent.h>
 #include <mc/entity/components/GiveableDefinition.h>
 #include <mc/entity/components/GiveableTrigger.h>
@@ -1188,6 +1193,8 @@
 #include <mc/entity/components/HorseStandCounterComponent.h>
 #include <mc/entity/components/HurtOnConditionDefinition.h>
 #include <mc/entity/components/HurtOwnerSubcomponent.h>
+#include <mc/entity/components/IPlayerTickPolicy.h>
+#include <mc/entity/components/IReplayStatePolicy.h>
 #include <mc/entity/components/IgniteSubcomponent.h>
 #include <mc/entity/components/IllagerBeastBlockedComponent.h>
 #include <mc/entity/components/IllagerBeastBlockedDescription.h>
@@ -1203,8 +1210,6 @@
 #include <mc/entity/components/InteractComponent.h>
 #include <mc/entity/components/InteractDefinition.h>
 #include <mc/entity/components/Interaction.h>
-#include <mc/entity/components/IPlayerTickPolicy.h>
-#include <mc/entity/components/IReplayStatePolicy.h>
 #include <mc/entity/components/ItemInUseComponent.h>
 #include <mc/entity/components/JumpControlComponent.h>
 #include <mc/entity/components/JumpPendingScaleComponent.h>
@@ -1230,8 +1235,8 @@
 #include <mc/entity/components/MobBodyRotationComponent.h>
 #include <mc/entity/components/MobEffectComponent.h>
 #include <mc/entity/components/MobEffectDefinition.h>
-#include <mc/entity/components/MobEffectsComponent.h>
 #include <mc/entity/components/MobEffectSubcomponent.h>
+#include <mc/entity/components/MobEffectsComponent.h>
 #include <mc/entity/components/MobHurtTimeComponent.h>
 #include <mc/entity/components/MobJumpComponent.h>
 #include <mc/entity/components/MobOnPlayerJumpRequestComponent.h>
@@ -1248,13 +1253,13 @@
 #include <mc/entity/components/MoveControlSkipDescription.h>
 #include <mc/entity/components/MoveControlSwayDescription.h>
 #include <mc/entity/components/MoveInputComponent.h>
+#include <mc/entity/components/MoveRequestComponent.h>
 #include <mc/entity/components/MovementCorrection.h>
 #include <mc/entity/components/MovementInterpolatorComponent.h>
 #include <mc/entity/components/MovementSpeedComponent.h>
-#include <mc/entity/components/MoveRequestComponent.h>
+#include <mc/entity/components/NameAction.h>
 #include <mc/entity/components/NameableComponent.h>
 #include <mc/entity/components/NameableDefinition.h>
-#include <mc/entity/components/NameAction.h>
 #include <mc/entity/components/NavigationClimbDescription.h>
 #include <mc/entity/components/NavigationDescription.h>
 #include <mc/entity/components/NavigationFloatDescription.h>
@@ -1269,9 +1274,9 @@
 #include <mc/entity/components/NpcI18nObserver.h>
 #include <mc/entity/components/OfferFlowerTickComponent.h>
 #include <mc/entity/components/OffsetsComponent.h>
-#include <mc/entity/components/OnewayPhysicsBlocksComponent.h>
 #include <mc/entity/components/OnFireComponent.h>
 #include <mc/entity/components/OnHitSubcomponent.h>
+#include <mc/entity/components/OnewayPhysicsBlocksComponent.h>
 #include <mc/entity/components/OpenDoorAnnotationDescription.h>
 #include <mc/entity/components/OutOfControlDefinition.h>
 #include <mc/entity/components/PackedItemUseLegacyInventoryTransaction.h>
@@ -1280,8 +1285,8 @@
 #include <mc/entity/components/ParticleEventRequestQueueComponent.h>
 #include <mc/entity/components/ParticleOnHitSubcomponent.h>
 #include <mc/entity/components/PassengerComponent.h>
-#include <mc/entity/components/PassengersToPositionComponent.h>
 #include <mc/entity/components/PassengerYRotLimitComponent.h>
+#include <mc/entity/components/PassengersToPositionComponent.h>
 #include <mc/entity/components/PeekComponent.h>
 #include <mc/entity/components/PeekDefinition.h>
 #include <mc/entity/components/PendingRemovePassengersComponent.h>
@@ -1392,6 +1397,7 @@
 #include <mc/entity/components/TrustingComponent.h>
 #include <mc/entity/components/TrustingDefinition.h>
 #include <mc/entity/components/UpdateWaterStateRequestComponent.h>
+#include <mc/entity/components/VRMoveAdjustAngleComponent.h>
 #include <mc/entity/components/VanillaClientGameplayComponent.h>
 #include <mc/entity/components/VariableMaxAutoStepDefinition.h>
 #include <mc/entity/components/VehicleComponent.h>
@@ -1400,7 +1406,6 @@
 #include <mc/entity/components/VibrationDataComponent.h>
 #include <mc/entity/components/VibrationListenerComponent.h>
 #include <mc/entity/components/VibrationListenerDefinition.h>
-#include <mc/entity/components/VRMoveAdjustAngleComponent.h>
 #include <mc/entity/components/WalkDistComponent.h>
 #include <mc/entity/components/WardenSpawnTrackerComponent.h>
 #include <mc/entity/components/WaterMovementDescription.h>
@@ -1471,11 +1476,11 @@
 #include <mc/entity/flags/CollidableMobNearFlag.h>
 #include <mc/entity/flags/CollisionFlag.h>
 #include <mc/entity/flags/ControlledByLocalInstanceFlag.h>
-#include <mc/entity/flags/EditorActorPausedFlag.h>
 #include <mc/entity/flags/EditorActorPauseTickNeededFlag.h>
+#include <mc/entity/flags/EditorActorPausedFlag.h>
 #include <mc/entity/flags/EjectedByActivatorRailFlag.h>
-#include <mc/entity/flags/EnderDragonFlag.h>
 #include <mc/entity/flags/EndPortalBlockFlag.h>
+#include <mc/entity/flags/EnderDragonFlag.h>
 #include <mc/entity/flags/ExecutingFlag.h>
 #include <mc/entity/flags/ExitFromPassengerFlag.h>
 #include <mc/entity/flags/ExperienceOrbFlag.h>
@@ -1555,8 +1560,8 @@
 #include <mc/entity/flags/WasOnGroundFlag.h>
 #include <mc/entity/flags/WasOnGroundPreTravelFlag.h>
 #include <mc/entity/flags/WasPenetratingLastFrameFlag.h>
-#include <mc/entity/flags/WaterlilyBlockFlag.h>
 #include <mc/entity/flags/WaterTravelFlag.h>
+#include <mc/entity/flags/WaterlilyBlockFlag.h>
 #include <mc/entity/flags/WitherBossFlag.h>
 #include <mc/entity/flags/WitherSkullFlag.h>
 #include <mc/entity/flags/WolfFlag.h>
@@ -1572,8 +1577,8 @@
 #include <mc/entity/systems/ActorLegacyTickSystem.h>
 #include <mc/entity/systems/ActorLimitedLifetimeTickSystem.h>
 #include <mc/entity/systems/ActorMotionSyncSystem.h>
-#include <mc/entity/systems/ActorMovementTickFilterSystem.h>
 #include <mc/entity/systems/ActorMoveSystem.h>
+#include <mc/entity/systems/ActorMovementTickFilterSystem.h>
 #include <mc/entity/systems/ActorSetPositionRequestComponent.h>
 #include <mc/entity/systems/ActorStopRidingEventSystem.h>
 #include <mc/entity/systems/ActorUpdatePostTickPositionDeltaSystem.h>
@@ -1673,9 +1678,12 @@
 #include <mc/entity/systems/HurtOnConditionSystem.h>
 #include <mc/entity/systems/IEntitySystems.h>
 #include <mc/entity/systems/IEntitySystemsCollection.h>
+#include <mc/entity/systems/ISystem.h>
+#include <mc/entity/systems/ITickingSystem.h>
 #include <mc/entity/systems/IllagerBeastPostAIStepSystem.h>
-#include <mc/entity/systems/InitialTickFilterSystem.h>
 #include <mc/entity/systems/InLavaSensingSystem.h>
+#include <mc/entity/systems/InWaterSensingSystem.h>
+#include <mc/entity/systems/InitialTickFilterSystem.h>
 #include <mc/entity/systems/InsideBlockNotifierSystem.h>
 #include <mc/entity/systems/InsideBubbleColumnSystem.h>
 #include <mc/entity/systems/InsideGenericBlockSystem.h>
@@ -1689,10 +1697,7 @@
 #include <mc/entity/systems/InstantDespawnSystem.h>
 #include <mc/entity/systems/InteractSystem.h>
 #include <mc/entity/systems/InternalSystemInfo.h>
-#include <mc/entity/systems/InWaterSensingSystem.h>
-#include <mc/entity/systems/ISystem.h>
 #include <mc/entity/systems/ItemUseSlowdownSystem.h>
-#include <mc/entity/systems/ITickingSystem.h>
 #include <mc/entity/systems/JumpControlSystem.h>
 #include <mc/entity/systems/JumpInputSystem.h>
 #include <mc/entity/systems/LavaResetFallDistanceSystem.h>
@@ -1719,10 +1724,10 @@
 #include <mc/entity/systems/MountTamingSystem.h>
 #include <mc/entity/systems/MoveCollisionSystem.h>
 #include <mc/entity/systems/MoveControlSystem.h>
+#include <mc/entity/systems/MoveSpeedCapSystem.h>
 #include <mc/entity/systems/MovementDataExtractionUtility.h>
 #include <mc/entity/systems/MovementInterpolatorSystem.h>
 #include <mc/entity/systems/MovementInterpolatorSystemImpl.h>
-#include <mc/entity/systems/MoveSpeedCapSystem.h>
 #include <mc/entity/systems/NavigationSystem.h>
 #include <mc/entity/systems/NoClipOrNoBlockMoveFilterSystem.h>
 #include <mc/entity/systems/NormalTickFilterSystem.h>
@@ -1740,8 +1745,8 @@
 #include <mc/entity/systems/PersonaEmoteInputSystem.h>
 #include <mc/entity/systems/PlayerActionComponent.h>
 #include <mc/entity/systems/PlayerInteractionSystem.h>
-#include <mc/entity/systems/PlayerMovementRateSystem.h>
 #include <mc/entity/systems/PlayerMoveSystems.h>
+#include <mc/entity/systems/PlayerMovementRateSystem.h>
 #include <mc/entity/systems/PlayerRotationSystem.h>
 #include <mc/entity/systems/PlayerTickComponent.h>
 #include <mc/entity/systems/PlayerTickSystem.h>
@@ -1781,13 +1786,13 @@
 #include <mc/entity/systems/ServerStandInCauldronSystem.h>
 #include <mc/entity/systems/SetActorLinkPacketSystem.h>
 #include <mc/entity/systems/SetActorLinkPacketSystemImpl.h>
-#include <mc/entity/systems/SetPreviousPositionSystem.h>
 #include <mc/entity/systems/SetPreviousPosRotSystem.h>
+#include <mc/entity/systems/SetPreviousPositionSystem.h>
 #include <mc/entity/systems/SimulatedPlayerPostAIStepSystem.h>
 #include <mc/entity/systems/SkeletonPassengerRotationSystem.h>
 #include <mc/entity/systems/SlimePreNormalTickSystem.h>
-#include <mc/entity/systems/SneakingSystem.h>
 #include <mc/entity/systems/SneakMovementSystem.h>
+#include <mc/entity/systems/SneakingSystem.h>
 #include <mc/entity/systems/SoundEventSystem.h>
 #include <mc/entity/systems/SpawnActorSystem.h>
 #include <mc/entity/systems/SpinAttackSystem.h>
@@ -1850,8 +1855,8 @@
 #include <mc/entity/systems/common/BoatMoveFrictionSystem.h>
 #include <mc/entity/systems/common/BoatMoveRequestSystem.h>
 #include <mc/entity/systems/common/BoatRowTimeSyncSystem.h>
-#include <mc/entity/systems/common/CanJoinRaidQueueSystem.h>
 #include <mc/entity/systems/common/CBLISystem.h>
+#include <mc/entity/systems/common/CanJoinRaidQueueSystem.h>
 #include <mc/entity/systems/common/CelebrateHuntSystemInternal.h>
 #include <mc/entity/systems/common/CheckFallDamageInMoveSystemImpl.h>
 #include <mc/entity/systems/common/CheckFallDamageSystemImpl.h>
@@ -1873,8 +1878,8 @@
 #include <mc/entity/systems/common/EntityInside.h>
 #include <mc/entity/systems/common/EntityInsideSystem.h>
 #include <mc/entity/systems/common/EntityInsideSystemImpl.h>
-#include <mc/entity/systems/common/EntitySystemsCollection.h>
 #include <mc/entity/systems/common/EntitySystemTickingMode.h>
+#include <mc/entity/systems/common/EntitySystemsCollection.h>
 #include <mc/entity/systems/common/FileSystemMode.h>
 #include <mc/entity/systems/common/FinalizeMoveSystemImpl.h>
 #include <mc/entity/systems/common/FireworksMovementSystems.h>
@@ -1921,24 +1926,24 @@
 #include <mc/entity/systems/common/MobTravelTeleportedFilterSystem.h>
 #include <mc/entity/systems/common/MobTravelUpdateSpeedsSystem.h>
 #include <mc/entity/systems/common/MonsterAiStepSystem.h>
-#include <mc/entity/systems/common/MovementTickResetTemporaryComponentsSystem.h>
 #include <mc/entity/systems/common/MoveSpeedCapSystemImpl.h>
 #include <mc/entity/systems/common/MoveTowardsClosestSpaceSystem.h>
 #include <mc/entity/systems/common/MoveTowardsClosestSpaceSystemImpl.h>
+#include <mc/entity/systems/common/MovementTickResetTemporaryComponentsSystem.h>
 #include <mc/entity/systems/common/NavigationTravelSystem.h>
+#include <mc/entity/systems/common/PlayJumpSoundSystem.h>
+#include <mc/entity/systems/common/PlayJumpSoundSystemImpl.h>
 #include <mc/entity/systems/common/PlayerBoundingBoxStateUpdateSystem.h>
 #include <mc/entity/systems/common/PlayerDataSystem.h>
 #include <mc/entity/systems/common/PlayerInputFilterSystem.h>
-#include <mc/entity/systems/common/PlayerMovementStatsEventSystem.h>
 #include <mc/entity/systems/common/PlayerMoveSystemsImpl.h>
+#include <mc/entity/systems/common/PlayerMovementStatsEventSystem.h>
 #include <mc/entity/systems/common/PlayerPostTravelSystem.h>
 #include <mc/entity/systems/common/PlayerPreMobTravelSystem.h>
 #include <mc/entity/systems/common/PlayerResetMovementSpeedSystem.h>
 #include <mc/entity/systems/common/PlayerRotationSystemImpl.h>
 #include <mc/entity/systems/common/PlayerSetWalkOrSprintFlySpeedSystem.h>
 #include <mc/entity/systems/common/PlayerStatusTransitions.h>
-#include <mc/entity/systems/common/PlayJumpSoundSystem.h>
-#include <mc/entity/systems/common/PlayJumpSoundSystemImpl.h>
 #include <mc/entity/systems/common/PostAIUpdateSystem.h>
 #include <mc/entity/systems/common/PostEntityDismountGameEventSystem.h>
 #include <mc/entity/systems/common/PredictedMovementSystem.h>
@@ -2005,6 +2010,9 @@
 #include <mc/entity/systems/common/UpdateMovingFlagSystemImpl.h>
 #include <mc/entity/systems/common/UpdateServerPlayerInputSystem.h>
 #include <mc/entity/systems/common/UpdateServerPlayerInputSystemImpl.h>
+#include <mc/entity/systems/common/VRBobControlSystem.h>
+#include <mc/entity/systems/common/VRBobControlSystemInternal.h>
+#include <mc/entity/systems/common/VRFlyTravelSystem.h>
 #include <mc/entity/systems/common/ValidateClientPlayerActionSystem.h>
 #include <mc/entity/systems/common/ValidateClientPlayerActionSystemImpl.h>
 #include <mc/entity/systems/common/ValidationSystem.h>
@@ -2016,9 +2024,6 @@
 #include <mc/entity/systems/common/VehicleManagement.h>
 #include <mc/entity/systems/common/VibrationListenerSystemInternal.h>
 #include <mc/entity/systems/common/VillagerV2PreTravelSystem.h>
-#include <mc/entity/systems/common/VRBobControlSystem.h>
-#include <mc/entity/systems/common/VRBobControlSystemInternal.h>
-#include <mc/entity/systems/common/VRFlyTravelSystem.h>
 #include <mc/entity/systems/common/WalkDistanceSystem.h>
 #include <mc/entity/systems/common/WardenSpawnTrackerSystemInternal.h>
 #include <mc/entity/systems/common/WaterAnimalPreAIStepSystem.h>
@@ -2089,6 +2094,7 @@
 #include <mc/entity/utilities/SeatDescriptionUtility.h>
 #include <mc/entity/utilities/SpatialQueryUtility.h>
 #include <mc/entity/utilities/UpdateEntityAfterFallOnEntityProxyBase.h>
+#include <mc/enums/ARVRPlatform.h>
 #include <mc/enums/AbilitiesIndex.h>
 #include <mc/enums/AbilitiesLayer.h>
 #include <mc/enums/ActiveDirectoryAction.h>
@@ -2107,7 +2113,6 @@
 #include <mc/enums/ArmorMaterialType.h>
 #include <mc/enums/ArmorSlot.h>
 #include <mc/enums/ArmorTextureType.h>
-#include <mc/enums/ARVRPlatform.h>
 #include <mc/enums/AssertDialogResponse.h>
 #include <mc/enums/AttachableSlotIndex.h>
 #include <mc/enums/AttachmentType.h>
@@ -2118,7 +2123,9 @@
 #include <mc/enums/BehaviorStatus.h>
 #include <mc/enums/BigDripleafTilt.h>
 #include <mc/enums/BlendVersion.h>
+#include <mc/enums/BlockLayer.h>
 #include <mc/enums/BlockSlot.h>
+#include <mc/enums/BlockUpdateFlag.h>
 #include <mc/enums/BoneAnimationRelativeMode.h>
 #include <mc/enums/BoneTransformType.h>
 #include <mc/enums/BookEditAction.h>
@@ -2165,10 +2172,10 @@
 #include <mc/enums/DwellerRole.h>
 #include <mc/enums/DynamicPropertyDefinePropertyError.h>
 #include <mc/enums/EasingType.h>
-#include <mc/enums/EducationEditionOffer.h>
 #include <mc/enums/EduControlPanelUpdateType.h>
 #include <mc/enums/EduShareMethodType.h>
 #include <mc/enums/EduShareUriType.h>
+#include <mc/enums/EducationEditionOffer.h>
 #include <mc/enums/EggCount.h>
 #include <mc/enums/ElementType.h>
 #include <mc/enums/EncryptedProxyReadMode.h>
@@ -2244,6 +2251,7 @@
 #include <mc/enums/OptionOwnerType.h>
 #include <mc/enums/OptionResetFlags.h>
 #include <mc/enums/OsVersion.h>
+#include <mc/enums/POIType.h>
 #include <mc/enums/PaletteColor.h>
 #include <mc/enums/ParticleType.h>
 #include <mc/enums/PathCompletionType.h>
@@ -2254,7 +2262,6 @@
 #include <mc/enums/PistonState.h>
 #include <mc/enums/PlatformType.h>
 #include <mc/enums/PlayStatus.h>
-#include <mc/enums/POIType.h>
 #include <mc/enums/PortalAxis.h>
 #include <mc/enums/PostProcessSettings.h>
 #include <mc/enums/ProfanityFilterContext.h>
@@ -2266,11 +2273,11 @@
 #include <mc/enums/ReplayStateMode.h>
 #include <mc/enums/RespawnAnimation.h>
 #include <mc/enums/Rotation.h>
-#include <mc/enums/SandstoneType.h>
 #include <mc/enums/SandType.h>
+#include <mc/enums/SandstoneType.h>
 #include <mc/enums/SaplingType.h>
-#include <mc/enums/ScoreboardIdentityPacketType.h>
 #include <mc/enums/ScorePacketType.h>
+#include <mc/enums/ScoreboardIdentityPacketType.h>
 #include <mc/enums/SeagrassType.h>
 #include <mc/enums/SemanticConstraint.h>
 #include <mc/enums/ServerAuthMovementMode.h>
@@ -2311,8 +2318,8 @@
 #include <mc/enums/UIScalingRules.h>
 #include <mc/enums/UploadError.h>
 #include <mc/enums/UserGeneratedUriSource.h>
-#include <mc/enums/VerticalHalfEnum.h>
 #include <mc/enums/VRControllerType.h>
+#include <mc/enums/VerticalHalfEnum.h>
 #include <mc/enums/WallConnectionType.h>
 #include <mc/enums/WatchdogTerminateReason.h>
 #include <mc/enums/WeirdoDirection.h>
@@ -2340,14 +2347,14 @@
 #include <mc/events/IMinecraftEventing.h>
 #include <mc/events/IPackTelemetry.h>
 #include <mc/events/IScreenChangedEventing.h>
+#include <mc/events/IUIEventTelemetry.h>
+#include <mc/events/IWebviewTelemetry.h>
 #include <mc/events/ItemCompleteUseEvent.h>
 #include <mc/events/ItemGameplayEvent.h>
 #include <mc/events/ItemReleaseUseEvent.h>
 #include <mc/events/ItemStartUseEvent.h>
 #include <mc/events/ItemStopUseEvent.h>
 #include <mc/events/ItemUsedOnEvent.h>
-#include <mc/events/IUIEventTelemetry.h>
-#include <mc/events/IWebviewTelemetry.h>
 #include <mc/events/LevelEvent.h>
 #include <mc/events/LevelGameplayEvent.h>
 #include <mc/events/LevelSoundEvent.h>
@@ -2382,6 +2389,7 @@
 #include <mc/external/concurrentqueue/ConcurrentQueue.h>
 #include <mc/external/concurrentqueue/ConcurrentQueueDefaultTraits.h>
 #include <mc/external/concurrentqueue/moodycamel.h>
+#include <mc/external/expected_lite/expected.h>
 #include <mc/external/glm/glm.h>
 #include <mc/external/glm/mat.h>
 #include <mc/external/glm/qua.h>
@@ -2394,11 +2402,6 @@
 #include <mc/external/lib_http_client/ThreadPoolImpl.h>
 #include <mc/external/lib_http_client/WaitTimer.h>
 #include <mc/external/lib_http_client/WaitTimerImpl.h>
-#include <mc/external/nonstd/detail.h>
-#include <mc/external/nonstd/expected.h>
-#include <mc/external/nonstd/expected_lite.h>
-#include <mc/external/nonstd/nonstd.h>
-#include <mc/external/nonstd/storage_t.h>
 #include <mc/external/openssl/evp_md_st.h>
 #include <mc/external/openssl/ssl_ctx_st.h>
 #include <mc/external/openssl/ssl_session_st.h>
@@ -2406,8 +2409,8 @@
 #include <mc/external/openssl/x509_st.h>
 #include <mc/external/openssl/x509_store_ctx_st.h>
 #include <mc/external/qrcodegen/QrCode.h>
-#include <mc/external/qrcodegen/qrcodegen.h>
 #include <mc/external/qrcodegen/QrSegment.h>
+#include <mc/external/qrcodegen/qrcodegen.h>
 #include <mc/external/scripting/AnyAndJSValue.h>
 #include <mc/external/scripting/ArgumentBinding.h>
 #include <mc/external/scripting/ArgumentBindingBuilder.h>
@@ -2419,12 +2422,12 @@
 #include <mc/external/scripting/Closure.h>
 #include <mc/external/scripting/ClosureAny.h>
 #include <mc/external/scripting/ClosureType.h>
+#include <mc/external/scripting/CoRoutineResult.h>
 #include <mc/external/scripting/CommonModuleFactory.h>
 #include <mc/external/scripting/ConstantFactory.h>
 #include <mc/external/scripting/ContextConfig.h>
 #include <mc/external/scripting/ContextId.h>
 #include <mc/external/scripting/ContextScopeListener.h>
-#include <mc/external/scripting/CoRoutineResult.h>
 #include <mc/external/scripting/Debugger.h>
 #include <mc/external/scripting/DependencyLocator.h>
 #include <mc/external/scripting/DependencyResolutionBehavior.h>
@@ -2452,10 +2455,6 @@
 #include <mc/external/scripting/IFunction.h>
 #include <mc/external/scripting/ILifetimeScopeListener.h>
 #include <mc/external/scripting/IModuleBindingFactory.h>
-#include <mc/external/scripting/InterfaceBinding.h>
-#include <mc/external/scripting/InterfaceBindingBuilder.h>
-#include <mc/external/scripting/internal.h>
-#include <mc/external/scripting/InvalidArgumentError.h>
 #include <mc/external/scripting/IObjectInspector.h>
 #include <mc/external/scripting/IPayload.h>
 #include <mc/external/scripting/IPrinter.h>
@@ -2463,8 +2462,11 @@
 #include <mc/external/scripting/IPropertySetter.h>
 #include <mc/external/scripting/IRuntime.h>
 #include <mc/external/scripting/IScriptEngine.h>
-#include <mc/external/scripting/IteratorBinding.h>
 #include <mc/external/scripting/IWatchdog.h>
+#include <mc/external/scripting/InterfaceBinding.h>
+#include <mc/external/scripting/InterfaceBindingBuilder.h>
+#include <mc/external/scripting/InvalidArgumentError.h>
+#include <mc/external/scripting/IteratorBinding.h>
 #include <mc/external/scripting/JSContext.h>
 #include <mc/external/scripting/JSModuleDef.h>
 #include <mc/external/scripting/JSON.h>
@@ -2516,8 +2518,6 @@
 #include <mc/external/scripting/ScriptDiagnosticsCollectors.h>
 #include <mc/external/scripting/ScriptEngine.h>
 #include <mc/external/scripting/ScriptIdentityModuleFactory.h>
-#include <mc/external/scripting/Scripting.h>
-#include <mc/external/scripting/ScriptingGameplayEvent.h>
 #include <mc/external/scripting/ScriptMinecraftServerUIModuleFactory.h>
 #include <mc/external/scripting/ScriptModuleCommon.h>
 #include <mc/external/scripting/ScriptModuleFilters.h>
@@ -2533,21 +2533,23 @@
 #include <mc/external/scripting/ScriptSystemLevelEventListener.h>
 #include <mc/external/scripting/ScriptUtils.h>
 #include <mc/external/scripting/ScriptValue.h>
+#include <mc/external/scripting/Scripting.h>
+#include <mc/external/scripting/ScriptingGameplayEvent.h>
 #include <mc/external/scripting/StringBasedRuntime.h>
 #include <mc/external/scripting/StringPayload.h>
 #include <mc/external/scripting/StrongObjectHandle.h>
 #include <mc/external/scripting/StrongTypedObjectHandle.h>
 #include <mc/external/scripting/SupportedBindingModule.h>
 #include <mc/external/scripting/TaggedBinding.h>
+#include <mc/external/scripting/TypeNameInfo.h>
 #include <mc/external/scripting/TypedIteratorBinding.h>
 #include <mc/external/scripting/TypedObjectHandle.h>
-#include <mc/external/scripting/TypeNameInfo.h>
 #include <mc/external/scripting/UUID.h>
 #include <mc/external/scripting/VariantHelper.h>
 #include <mc/external/scripting/Version.h>
 #include <mc/external/scripting/VersionConflict.h>
-#include <mc/external/scripting/VersionRequestedBy.h>
 #include <mc/external/scripting/VersionRequestKey.h>
+#include <mc/external/scripting/VersionRequestedBy.h>
 #include <mc/external/scripting/Watchdog.h>
 #include <mc/external/scripting/WatchdogEvent.h>
 #include <mc/external/scripting/WatchdogEventType.h>
@@ -2563,6 +2565,7 @@
 #include <mc/external/scripting/gametest/ScriptGameTestRegistrationBuilder.h>
 #include <mc/external/scripting/gametest/ScriptGameTestSequence.h>
 #include <mc/external/scripting/gametest/ScriptSculkSpreader.h>
+#include <mc/external/scripting/internal.h>
 #include <mc/external/scripting/quickjs/ArrayProxy.h>
 #include <mc/external/scripting/quickjs/ClassRegistry.h>
 #include <mc/external/scripting/quickjs/ContextObject.h>
@@ -2611,7 +2614,6 @@
 #include <mc/gametest/framework/BaseGameTestFunction.h>
 #include <mc/gametest/framework/BaseGameTestInstance.h>
 #include <mc/gametest/framework/BaseScriptGameTestFunction.h>
-#include <mc/gametest/framework/gametest.h>
 #include <mc/gametest/framework/GameTestBatch.h>
 #include <mc/gametest/framework/GameTestBatchRunnerGameTestListener.h>
 #include <mc/gametest/framework/GameTestClearTask.h>
@@ -2636,8 +2638,9 @@
 #include <mc/gametest/framework/StructureUtils.h>
 #include <mc/gametest/framework/SyncGameTestFunctionRunResult.h>
 #include <mc/gametest/framework/SyncScriptGameTestFunction.h>
-#include <mc/gametest/framework/tags.h>
 #include <mc/gametest/framework/TestParameters.h>
+#include <mc/gametest/framework/gametest.h>
+#include <mc/gametest/framework/tags.h>
 #include <mc/input/IReplayableActorInput.h>
 #include <mc/leveldb/LevelDbEnv.h>
 #include <mc/leveldb/LevelDbFileLock.h>
@@ -2660,19 +2663,19 @@
 #include <mc/math/Vec2.h>
 #include <mc/math/Vec3.h>
 #include <mc/math/Vec4.h>
-#include <mc/math/vector/boolN.h>
-#include <mc/math/vector/doubleN.h>
-#include <mc/math/vector/floatN.h>
-#include <mc/math/vector/intN.h>
-#include <mc/math/vector/longlongN.h>
 #include <mc/math/vector/Vecs.h>
+#include <mc/math/vector/boolN.h>
 #include <mc/math/vector/component/BoolN.h>
 #include <mc/math/vector/component/FloatN.h>
 #include <mc/math/vector/component/IntN.h>
 #include <mc/math/vector/component/base/CommutativeGroup.h>
 #include <mc/math/vector/component/base/Field.h>
-#include <mc/math/vector/component/base/vecN.h>
 #include <mc/math/vector/component/base/VectorBase.h>
+#include <mc/math/vector/component/base/vecN.h>
+#include <mc/math/vector/doubleN.h>
+#include <mc/math/vector/floatN.h>
+#include <mc/math/vector/intN.h>
+#include <mc/math/vector/longlongN.h>
 #include <mc/nbt/ByteArrayTag.h>
 #include <mc/nbt/ByteTag.h>
 #include <mc/nbt/CompoundTag.h>
@@ -2724,8 +2727,6 @@
 #include <mc/network/HC_WEBSOCKET.h>
 #include <mc/network/HC_WEBSOCKET_OBSERVER.h>
 #include <mc/network/HttpPerformInfo.h>
-#include <mc/network/http_alloc_deleter.h>
-#include <mc/network/http_stl_allocator.h>
 #include <mc/network/IPacketHandlerDispatcher.h>
 #include <mc/network/IPacketObserver.h>
 #include <mc/network/LocalConnectivitySystem.h>
@@ -2774,8 +2775,8 @@
 #include <mc/network/ThirdPartyInfo.h>
 #include <mc/network/TypedClientNetId.h>
 #include <mc/network/TypedServerNetId.h>
-#include <mc/network/UnverifiedCertificate.h>
 #include <mc/network/UPNPInterface.h>
+#include <mc/network/UnverifiedCertificate.h>
 #include <mc/network/VanillaServerNetworkHandler.h>
 #include <mc/network/WebBlockTag.h>
 #include <mc/network/WebRTCNetworkPeer.h>
@@ -2787,6 +2788,8 @@
 #include <mc/network/_TP_TIMER.h>
 #include <mc/network/_TP_WAIT.h>
 #include <mc/network/_TP_WORK.h>
+#include <mc/network/http_alloc_deleter.h>
+#include <mc/network/http_stl_allocator.h>
 #include <mc/network/packet/ActorEventPacket.h>
 #include <mc/network/packet/ActorFallPacket.h>
 #include <mc/network/packet/ActorLink.h>
@@ -2826,12 +2829,12 @@
 #include <mc/network/packet/ChangeDimensionPacket.h>
 #include <mc/network/packet/ChangeMobPropertyPacket.h>
 #include <mc/network/packet/ChunkRadiusUpdatedPacket.h>
-#include <mc/network/packet/ClientboundDebugRendererPacket.h>
-#include <mc/network/packet/ClientboundMapItemDataPacket.h>
 #include <mc/network/packet/ClientCacheBlobStatusPacket.h>
 #include <mc/network/packet/ClientCacheMissResponsePacket.h>
 #include <mc/network/packet/ClientCacheStatusPacket.h>
 #include <mc/network/packet/ClientToServerHandshakePacket.h>
+#include <mc/network/packet/ClientboundDebugRendererPacket.h>
+#include <mc/network/packet/ClientboundMapItemDataPacket.h>
 #include <mc/network/packet/CodeBuilderPacket.h>
 #include <mc/network/packet/CodeBuilderSourcePacket.h>
 #include <mc/network/packet/CommandBlockUpdatePacket.h>
@@ -2853,8 +2856,8 @@
 #include <mc/network/packet/DimensionDataPacket.h>
 #include <mc/network/packet/DisconnectPacket.h>
 #include <mc/network/packet/EditorNetworkPacket.h>
-#include <mc/network/packet/EducationSettingsPacket.h>
 #include <mc/network/packet/EduUriResourcePacket.h>
+#include <mc/network/packet/EducationSettingsPacket.h>
 #include <mc/network/packet/EmoteListPacket.h>
 #include <mc/network/packet/EmotePacket.h>
 #include <mc/network/packet/EntityServerPacket.h>
@@ -2912,13 +2915,15 @@
 #include <mc/network/packet/NpcRequestPacket.h>
 #include <mc/network/packet/OnScreenTextureAnimationPacket.h>
 #include <mc/network/packet/OpenSignPacket.h>
+#include <mc/network/packet/PackInfoData.h>
 #include <mc/network/packet/Packet.h>
 #include <mc/network/packet/PacketUtil.h>
 #include <mc/network/packet/PacketViolationWarningPacket.h>
-#include <mc/network/packet/PackInfoData.h>
 #include <mc/network/packet/PacksInfoData.h>
 #include <mc/network/packet/PassengerJumpPacket.h>
 #include <mc/network/packet/PhotoTransferPacket.h>
+#include <mc/network/packet/PlaySoundPacket.h>
+#include <mc/network/packet/PlayStatusPacket.h>
 #include <mc/network/packet/PlayerActionPacket.h>
 #include <mc/network/packet/PlayerArmorDamagePacket.h>
 #include <mc/network/packet/PlayerAuthInputPacket.h>
@@ -2931,8 +2936,6 @@
 #include <mc/network/packet/PlayerSkinPacket.h>
 #include <mc/network/packet/PlayerStartItemCooldownPacket.h>
 #include <mc/network/packet/PlayerToggleCrafterSlotRequestPacket.h>
-#include <mc/network/packet/PlaySoundPacket.h>
-#include <mc/network/packet/PlayStatusPacket.h>
 #include <mc/network/packet/PositionTrackingDBClientRequestPacket.h>
 #include <mc/network/packet/PositionTrackingDBServerBroadcastPacket.h>
 #include <mc/network/packet/PotionMixDataEntry.h>
@@ -2950,11 +2953,11 @@
 #include <mc/network/packet/ResourcePackChunkRequestPacket.h>
 #include <mc/network/packet/ResourcePackClientResponsePacket.h>
 #include <mc/network/packet/ResourcePackDataInfoPacket.h>
-#include <mc/network/packet/ResourcePacksInfoPacket.h>
 #include <mc/network/packet/ResourcePackStackPacket.h>
+#include <mc/network/packet/ResourcePacksInfoPacket.h>
 #include <mc/network/packet/RespawnPacket.h>
-#include <mc/network/packet/ScoreboardIdentityPacketInfo.h>
 #include <mc/network/packet/ScorePacketInfo.h>
+#include <mc/network/packet/ScoreboardIdentityPacketInfo.h>
 #include <mc/network/packet/ScriptMessagePacket.h>
 #include <mc/network/packet/SerializedAbilitiesData.h>
 #include <mc/network/packet/ServerPlayerPostMovePositionPacket.h>
@@ -2974,12 +2977,12 @@
 #include <mc/network/packet/SetLocalPlayerAsInitializedPacket.h>
 #include <mc/network/packet/SetPlayerGameTypePacket.h>
 #include <mc/network/packet/SetPlayerInventoryOptionsPacket.h>
-#include <mc/network/packet/SetScoreboardIdentityPacket.h>
 #include <mc/network/packet/SetScorePacket.h>
+#include <mc/network/packet/SetScoreboardIdentityPacket.h>
 #include <mc/network/packet/SetSpawnPositionPacket.h>
 #include <mc/network/packet/SetTimePacket.h>
-#include <mc/network/packet/SettingsCommandPacket.h>
 #include <mc/network/packet/SetTitlePacket.h>
+#include <mc/network/packet/SettingsCommandPacket.h>
 #include <mc/network/packet/ShowCreditsPacket.h>
 #include <mc/network/packet/ShowProfilePacket.h>
 #include <mc/network/packet/ShowStoreOfferPacket.h>
@@ -2999,8 +3002,8 @@
 #include <mc/network/packet/SyncedAttribute.h>
 #include <mc/network/packet/TakeItemActorPacket.h>
 #include <mc/network/packet/TextPacket.h>
-#include <mc/network/packet/TickingAreasLoadStatusPacket.h>
 #include <mc/network/packet/TickSyncPacket.h>
+#include <mc/network/packet/TickingAreasLoadStatusPacket.h>
 #include <mc/network/packet/ToastRequestPacket.h>
 #include <mc/network/packet/TransferPacket.h>
 #include <mc/network/packet/TrimDataPacket.h>
@@ -3021,8 +3024,8 @@
 #include <mc/options/AppConfigs.h>
 #include <mc/options/AppConfigsFactory.h>
 #include <mc/options/EduAppConfigs.h>
-#include <mc/options/EducationEditionOfferValue.h>
 #include <mc/options/EduSharedUriResource.h>
+#include <mc/options/EducationEditionOfferValue.h>
 #include <mc/options/FeatureToggles.h>
 #include <mc/options/IAppConfigData.h>
 #include <mc/options/IMinecraftGame.h>
@@ -3064,9 +3067,9 @@
 #include <mc/resources/IDynamicPackagePacks.h>
 #include <mc/resources/IEntitlementManager.h>
 #include <mc/resources/IInPackagePacks.h>
+#include <mc/resources/IResourcePackRepository.h>
 #include <mc/resources/InPackagePackSource.h>
 #include <mc/resources/InvalidPacksFilterGroup.h>
-#include <mc/resources/IResourcePackRepository.h>
 #include <mc/resources/Pack.h>
 #include <mc/resources/PackAccessStrategy.h>
 #include <mc/resources/PackAccessStrategyFactory.h>
@@ -3079,12 +3082,6 @@
 #include <mc/resources/PackDiscoveryError.h>
 #include <mc/resources/PackError.h>
 #include <mc/resources/PackErrorType.h>
-#include <mc/resources/PacketCompressionAlgorithm.h>
-#include <mc/resources/PacketPriority.h>
-#include <mc/resources/PacketReliability.h>
-#include <mc/resources/PacketViolationResponse.h>
-#include <mc/resources/PacketViolationSeverity.h>
-#include <mc/resources/PacketViolationType.h>
 #include <mc/resources/PackLoadError.h>
 #include <mc/resources/PackManifest.h>
 #include <mc/resources/PackManifestFactory.h>
@@ -3104,11 +3101,17 @@
 #include <mc/resources/PackSourceReport.h>
 #include <mc/resources/PackStats.h>
 #include <mc/resources/PackType.h>
+#include <mc/resources/PacketCompressionAlgorithm.h>
+#include <mc/resources/PacketPriority.h>
+#include <mc/resources/PacketReliability.h>
+#include <mc/resources/PacketViolationResponse.h>
+#include <mc/resources/PacketViolationSeverity.h>
+#include <mc/resources/PacketViolationType.h>
 #include <mc/resources/ResourceDefinition.h>
 #include <mc/resources/ResourceHelper.h>
-#include <mc/resources/ResourceLoaders.h>
 #include <mc/resources/ResourceLoadManager.h>
 #include <mc/resources/ResourceLoadType.h>
+#include <mc/resources/ResourceLoaders.h>
 #include <mc/resources/ResourcePack.h>
 #include <mc/resources/ResourcePackListener.h>
 #include <mc/resources/ResourcePackManager.h>
@@ -3183,7 +3186,6 @@
 #include <mc/scripting/modules/minecraft/BlockHitInfo.h>
 #include <mc/scripting/modules/minecraft/EntityHitInfo.h>
 #include <mc/scripting/modules/minecraft/IComponentFactory.h>
-#include <mc/scripting/modules/minecraft/Internals.h>
 #include <mc/scripting/modules/minecraft/IScriptActorDataDrivenTriggerEventSignal.h>
 #include <mc/scripting/modules/minecraft/IScriptActorEventSignal.h>
 #include <mc/scripting/modules/minecraft/IScriptBlockEventSignal.h>
@@ -3195,6 +3197,7 @@
 #include <mc/scripting/modules/minecraft/IScriptMessageReceiveEventSignal.h>
 #include <mc/scripting/modules/minecraft/IScriptWorldAfterEvents.h>
 #include <mc/scripting/modules/minecraft/IScriptWorldBeforeEvents.h>
+#include <mc/scripting/modules/minecraft/Internals.h>
 #include <mc/scripting/modules/minecraft/MovementScriptActorComponent.h>
 #include <mc/scripting/modules/minecraft/NavigationScriptActorComponent.h>
 #include <mc/scripting/modules/minecraft/PropertyComponentRegistration.h>
@@ -3260,8 +3263,8 @@
 #include <mc/scripting/modules/minecraft/ScriptBlockRecordPlayerComponentV010.h>
 #include <mc/scripting/modules/minecraft/ScriptBlockSignComponent.h>
 #include <mc/scripting/modules/minecraft/ScriptBlockSnowContainerComponent.h>
-#include <mc/scripting/modules/minecraft/ScriptBlockStates.h>
 #include <mc/scripting/modules/minecraft/ScriptBlockStateType.h>
+#include <mc/scripting/modules/minecraft/ScriptBlockStates.h>
 #include <mc/scripting/modules/minecraft/ScriptBlockType.h>
 #include <mc/scripting/modules/minecraft/ScriptBlockTypes.h>
 #include <mc/scripting/modules/minecraft/ScriptBlockValidator.h>
@@ -3309,8 +3312,8 @@
 #include <mc/scripting/modules/minecraft/ScriptDisplayObjectiveSlotId.h>
 #include <mc/scripting/modules/minecraft/ScriptDyeColor.h>
 #include <mc/scripting/modules/minecraft/ScriptDynamicPropertiesDefinition.h>
-#include <mc/scripting/modules/minecraft/ScriptEffects.h>
 #include <mc/scripting/modules/minecraft/ScriptEffectType.h>
+#include <mc/scripting/modules/minecraft/ScriptEffects.h>
 #include <mc/scripting/modules/minecraft/ScriptEntityEffectOptions.h>
 #include <mc/scripting/modules/minecraft/ScriptEntityHitInformation.h>
 #include <mc/scripting/modules/minecraft/ScriptEntityRaycastHit.h>
@@ -3370,14 +3373,13 @@
 #include <mc/scripting/modules/minecraft/ScriptItemDurabilityComponent.h>
 #include <mc/scripting/modules/minecraft/ScriptItemEnchantmentComponent.h>
 #include <mc/scripting/modules/minecraft/ScriptItemEnchantmentInstance.h>
-#include <mc/scripting/modules/minecraft/ScriptItemEnchantments.h>
 #include <mc/scripting/modules/minecraft/ScriptItemEnchantmentSlot.h>
 #include <mc/scripting/modules/minecraft/ScriptItemEnchantmentType.h>
 #include <mc/scripting/modules/minecraft/ScriptItemEnchantmentTypes.h>
+#include <mc/scripting/modules/minecraft/ScriptItemEnchantments.h>
 #include <mc/scripting/modules/minecraft/ScriptItemEvent.h>
 #include <mc/scripting/modules/minecraft/ScriptItemEventListener.h>
 #include <mc/scripting/modules/minecraft/ScriptItemReleaseUseAfterEvent.h>
-#include <mc/scripting/modules/minecraft/ScriptItems.h>
 #include <mc/scripting/modules/minecraft/ScriptItemStack.h>
 #include <mc/scripting/modules/minecraft/ScriptItemStartUseAfterEvent.h>
 #include <mc/scripting/modules/minecraft/ScriptItemStartUseOnAfterEvent.h>
@@ -3388,6 +3390,7 @@
 #include <mc/scripting/modules/minecraft/ScriptItemUseBeforeEvent.h>
 #include <mc/scripting/modules/minecraft/ScriptItemUseOnAfterEvent.h>
 #include <mc/scripting/modules/minecraft/ScriptItemUseOnBeforeEvent.h>
+#include <mc/scripting/modules/minecraft/ScriptItems.h>
 #include <mc/scripting/modules/minecraft/ScriptLavaMovementComponent.h>
 #include <mc/scripting/modules/minecraft/ScriptLavaMovementComponentFactory.h>
 #include <mc/scripting/modules/minecraft/ScriptLeashableComponent.h>
@@ -3475,16 +3478,17 @@
 #include <mc/scripting/modules/minecraft/ScriptPropertyComponents.h>
 #include <mc/scripting/modules/minecraft/ScriptPropertyRegistry.h>
 #include <mc/scripting/modules/minecraft/ScriptPushThroughComponent.h>
+#include <mc/scripting/modules/minecraft/ScriptRGB.h>
+#include <mc/scripting/modules/minecraft/ScriptRGBA.h>
 #include <mc/scripting/modules/minecraft/ScriptRawMessageInterface.h>
 #include <mc/scripting/modules/minecraft/ScriptRawMessageScoreInterface.h>
 #include <mc/scripting/modules/minecraft/ScriptRawTextInterface.h>
 #include <mc/scripting/modules/minecraft/ScriptRaycasting.h>
-#include <mc/scripting/modules/minecraft/ScriptRGB.h>
-#include <mc/scripting/modules/minecraft/ScriptRGBA.h>
 #include <mc/scripting/modules/minecraft/ScriptRideableComponent.h>
 #include <mc/scripting/modules/minecraft/ScriptRidingComponent.h>
 #include <mc/scripting/modules/minecraft/ScriptRidingComponentFactory.h>
 #include <mc/scripting/modules/minecraft/ScriptScaleComponent.h>
+#include <mc/scripting/modules/minecraft/ScriptScoreTargetSelectorOption.h>
 #include <mc/scripting/modules/minecraft/ScriptScoreboard.h>
 #include <mc/scripting/modules/minecraft/ScriptScoreboardFactory.h>
 #include <mc/scripting/modules/minecraft/ScriptScoreboardIdentity.h>
@@ -3493,14 +3497,13 @@
 #include <mc/scripting/modules/minecraft/ScriptScoreboardObjective.h>
 #include <mc/scripting/modules/minecraft/ScriptScoreboardObjectiveDisplayOptions.h>
 #include <mc/scripting/modules/minecraft/ScriptScoreboardScoreInfo.h>
-#include <mc/scripting/modules/minecraft/ScriptScoreTargetSelectorOption.h>
 #include <mc/scripting/modules/minecraft/ScriptScreenDisplay.h>
 #include <mc/scripting/modules/minecraft/ScriptScriptingEventListener.h>
 #include <mc/scripting/modules/minecraft/ScriptSeat.h>
 #include <mc/scripting/modules/minecraft/ScriptServerMessageAfterEvent.h>
 #include <mc/scripting/modules/minecraft/ScriptServerNetworkEventListener.h>
-#include <mc/scripting/modules/minecraft/ScriptSignals.h>
 #include <mc/scripting/modules/minecraft/ScriptSignTextSide.h>
+#include <mc/scripting/modules/minecraft/ScriptSignals.h>
 #include <mc/scripting/modules/minecraft/ScriptSimpleBlockVolume.h>
 #include <mc/scripting/modules/minecraft/ScriptSimpleBlockVolumeUtils.h>
 #include <mc/scripting/modules/minecraft/ScriptSimulatedPlayer.h>
@@ -3782,8 +3785,8 @@
 #include <mc/server/commands/standard/TitleRawCommand.h>
 #include <mc/server/commands/standard/ToggleDownfallCommand.h>
 #include <mc/server/commands/standard/VolumeAreaCommand.h>
-#include <mc/server/commands/standard/WeatherCommand.h>
 #include <mc/server/commands/standard/WSServerCommand.h>
+#include <mc/server/commands/standard/WeatherCommand.h>
 #include <mc/server/commands/standard/XPCommand.h>
 #include <mc/server/commands/test/TransferServerCommand.h>
 #include <mc/server/common/AllowListFile.h>
@@ -3872,8 +3875,8 @@
 #include <mc/util/BytesDataOutput.h>
 #include <mc/util/CallbackToken.h>
 #include <mc/util/CallbackTokenCancelState.h>
-#include <mc/util/CerealDocumentUpgrader.h>
 #include <mc/util/CerealDocumentUpgradeStep.h>
+#include <mc/util/CerealDocumentUpgrader.h>
 #include <mc/util/CerealHelpers.h>
 #include <mc/util/CerealSchemaUpgrade.h>
 #include <mc/util/ChanceInformation.h>
@@ -3924,8 +3927,8 @@
 #include <mc/util/MineshaftUtil.h>
 #include <mc/util/MobEffectPacketUtils.h>
 #include <mc/util/MobSpawnUtils.h>
-#include <mc/util/NamedMolangScript.h>
 #include <mc/util/NamePair.h>
+#include <mc/util/NamedMolangScript.h>
 #include <mc/util/PackSettingsJsonValidator.h>
 #include <mc/util/Palette.h>
 #include <mc/util/PauseManager.h>
@@ -3961,9 +3964,9 @@
 #include <mc/util/UniformInt.h>
 #include <mc/util/UseAnimationUtils.h>
 #include <mc/util/ValueProviders.h>
-#include <mc/util/VariantParameterList.h>
 #include <mc/util/VarIntDataInput.h>
 #include <mc/util/VarIntDataOutput.h>
+#include <mc/util/VariantParameterList.h>
 #include <mc/util/VibrationListenerUtils.h>
 #include <mc/util/VillageManagerComponentUtils.h>
 #include <mc/util/WitherBossSpawnUtilities.h>
@@ -3996,8 +3999,8 @@
 #include <mc/util/molang/MolangStruct_RGBA.h>
 #include <mc/util/molang/MolangStruct_RotYAndPosY.h>
 #include <mc/util/molang/MolangStruct_SpeedAndDirection.h>
-#include <mc/util/molang/MolangStruct_TentacleAngleAndSwimRotation.h>
 #include <mc/util/molang/MolangStruct_TRS.h>
+#include <mc/util/molang/MolangStruct_TentacleAngleAndSwimRotation.h>
 #include <mc/util/molang/MolangStruct_UV.h>
 #include <mc/util/molang/MolangStruct_XY.h>
 #include <mc/util/molang/MolangStruct_XYZ.h>
@@ -4033,7 +4036,6 @@
 #include <mc/volume/systems/EntityEnterVolumeSystem.h>
 #include <mc/volume/systems/EntityExitVolumeSystem.h>
 #include <mc/websockets/Automation.h>
-#include <mc/websockets/hc_websocket_impl.h>
 #include <mc/websockets/HttpHeaders.h>
 #include <mc/websockets/RakTcpProxy.h>
 #include <mc/websockets/RakWebSocket.h>
@@ -4041,6 +4043,7 @@
 #include <mc/websockets/RakWebSocketDataFrame.h>
 #include <mc/websockets/RakWebSocketDataFrameParser.h>
 #include <mc/websockets/TcpProxy.h>
+#include <mc/websockets/hc_websocket_impl.h>
 #include <mc/websockets/websocket_message_buffer.h>
 #include <mc/websockets/websocket_outgoing_message.h>
 #include <mc/webview/Webview.h>
@@ -4054,6 +4057,7 @@
 #include <mc/world/BlockID.h>
 #include <mc/world/Container.h>
 #include <mc/world/ContainerContentChangeListener.h>
+#include <mc/world/ContainerIterator.h>
 #include <mc/world/ContainerSizeChangeListener.h>
 #include <mc/world/Direction.h>
 #include <mc/world/Facing.h>
@@ -4140,8 +4144,8 @@
 #include <mc/world/actor/GetCollisionShapeActorProxy.h>
 #include <mc/world/actor/HangingActor.h>
 #include <mc/world/actor/Hopper.h>
-#include <mc/world/actor/IdentifierDescription.h>
 #include <mc/world/actor/IEntityInitializer.h>
+#include <mc/world/actor/IdentifierDescription.h>
 #include <mc/world/actor/InsomniaComponent.h>
 #include <mc/world/actor/InternalComponentRegistry.h>
 #include <mc/world/actor/IsSpawnableDescription.h>
@@ -4276,11 +4280,11 @@
 #include <mc/world/actor/ai/goal/FollowOwnerGoal.h>
 #include <mc/world/actor/ai/goal/FollowParentGoal.h>
 #include <mc/world/actor/ai/goal/FollowTargetCaptainGoal.h>
-#include <mc/world/actor/ai/goal/Goal.h>
-#include <mc/world/actor/ai/goal/GoalDefinition.h>
 #include <mc/world/actor/ai/goal/GoAndGiveItemsToNoteblockGoal.h>
 #include <mc/world/actor/ai/goal/GoAndGiveItemsToOwnerGoal.h>
 #include <mc/world/actor/ai/goal/GoHomeGoal.h>
+#include <mc/world/actor/ai/goal/Goal.h>
+#include <mc/world/actor/ai/goal/GoalDefinition.h>
 #include <mc/world/actor/ai/goal/GuardianAttackDefinition.h>
 #include <mc/world/actor/ai/goal/GuardianAttackGoal.h>
 #include <mc/world/actor/ai/goal/HarvestFarmBlockDefinition.h>
@@ -4320,6 +4324,7 @@
 #include <mc/world/actor/ai/goal/MoveToPOIGoal.h>
 #include <mc/world/actor/ai/goal/MoveToRandomBlockGoal.h>
 #include <mc/world/actor/ai/goal/MoveToVillageGoal.h>
+#include <mc/world/actor/ai/goal/MoveToWaterGoal.h>
 #include <mc/world/actor/ai/goal/MoveTowardsDwellingRestrictionDefinition.h>
 #include <mc/world/actor/ai/goal/MoveTowardsDwellingRestrictionGoal.h>
 #include <mc/world/actor/ai/goal/MoveTowardsHomeRestrictionDefinition.h>
@@ -4327,7 +4332,6 @@
 #include <mc/world/actor/ai/goal/MoveTowardsRestrictionDefinition.h>
 #include <mc/world/actor/ai/goal/MoveTowardsRestrictionGoal.h>
 #include <mc/world/actor/ai/goal/MoveTowardsTargetGoal.h>
-#include <mc/world/actor/ai/goal/MoveToWaterGoal.h>
 #include <mc/world/actor/ai/goal/NapGoal.h>
 #include <mc/world/actor/ai/goal/OcelotAttackDefinition.h>
 #include <mc/world/actor/ai/goal/OcelotAttackGoal.h>
@@ -4341,11 +4345,11 @@
 #include <mc/world/actor/ai/goal/PetSleepWithOwnerState.h>
 #include <mc/world/actor/ai/goal/PickupItemsGoal.h>
 #include <mc/world/actor/ai/goal/PlayDeadGoal.h>
-#include <mc/world/actor/ai/goal/PlayerVehicleTamedGoal.h>
 #include <mc/world/actor/ai/goal/PlayGoal.h>
+#include <mc/world/actor/ai/goal/PlayerVehicleTamedGoal.h>
 #include <mc/world/actor/ai/goal/RabbitPanicGoal.h>
-#include <mc/world/actor/ai/goal/RaiderCelebrationGoal.h>
 #include <mc/world/actor/ai/goal/RaidGardenGoal.h>
+#include <mc/world/actor/ai/goal/RaiderCelebrationGoal.h>
 #include <mc/world/actor/ai/goal/RamAttackGoal.h>
 #include <mc/world/actor/ai/goal/RamAttackGoalUtils.h>
 #include <mc/world/actor/ai/goal/RamGoalItemDropperImpl.h>
@@ -4646,6 +4650,7 @@
 #include <mc/world/actor/components/IActorManagerProxy.h>
 #include <mc/world/actor/components/IAddActorEntityProxy.h>
 #include <mc/world/actor/components/IRideableActor.h>
+#include <mc/world/actor/components/ISynchedActorDataAdapter.h>
 #include <mc/world/actor/components/IsBabyDefinition.h>
 #include <mc/world/actor/components/IsChargedDefinition.h>
 #include <mc/world/actor/components/IsChestedDefinition.h>
@@ -4658,7 +4663,6 @@
 #include <mc/world/actor/components/IsStackableDefinition.h>
 #include <mc/world/actor/components/IsStunnedDefinition.h>
 #include <mc/world/actor/components/IsTamedDefinition.h>
-#include <mc/world/actor/components/ISynchedActorDataAdapter.h>
 #include <mc/world/actor/components/ItemControlDefinition.h>
 #include <mc/world/actor/components/LootTableDefinition.h>
 #include <mc/world/actor/components/MarkVariantDefinition.h>
@@ -4691,9 +4695,9 @@
 #include <mc/world/actor/components/SynchedActorDataSerializer.h>
 #include <mc/world/actor/components/VariantDefinition.h>
 #include <mc/world/actor/components/VersionedActorDamageCause.h>
+#include <mc/world/actor/components/WASDControlledDefinition.h>
 #include <mc/world/actor/components/WalkAnimationSpeedDefinition.h>
 #include <mc/world/actor/components/WantsJockeyDefinition.h>
-#include <mc/world/actor/components/WASDControlledDefinition.h>
 #include <mc/world/actor/events/ActorDieEvent.h>
 #include <mc/world/actor/global/LightningBolt.h>
 #include <mc/world/actor/item/Balloon.h>
@@ -4704,8 +4708,8 @@
 #include <mc/world/actor/item/EyeOfEnder.h>
 #include <mc/world/actor/item/FallingBlock.h>
 #include <mc/world/actor/item/FireworksRocketActor.h>
-#include <mc/world/actor/item/ItemActor.h>
 #include <mc/world/actor/item/ITickDelegate.h>
+#include <mc/world/actor/item/ItemActor.h>
 #include <mc/world/actor/item/Minecart.h>
 #include <mc/world/actor/item/MinecartChest.h>
 #include <mc/world/actor/item/MinecartCommandBlock.h>
@@ -4732,8 +4736,8 @@
 #include <mc/world/actor/monster/LavaSlime.h>
 #include <mc/world/actor/monster/Monster.h>
 #include <mc/world/actor/monster/Phantom.h>
-#include <mc/world/actor/monster/Piglin.h>
 #include <mc/world/actor/monster/PigZombie.h>
+#include <mc/world/actor/monster/Piglin.h>
 #include <mc/world/actor/monster/Pillager.h>
 #include <mc/world/actor/monster/Shulker.h>
 #include <mc/world/actor/monster/Silverfish.h>
@@ -4761,11 +4765,10 @@
 #include <mc/world/actor/npc/Button.h>
 #include <mc/world/actor/npc/CommandAction.h>
 #include <mc/world/actor/npc/LeaveMenuCountdown.h>
-#include <mc/world/actor/npc/npc.h>
+#include <mc/world/actor/npc/NPCSize.h>
 #include <mc/world/actor/npc/NpcDialogueButton.h>
 #include <mc/world/actor/npc/NpcDialogueScene.h>
 #include <mc/world/actor/npc/NpcDialogueStorage.h>
-#include <mc/world/actor/npc/NPCSize.h>
 #include <mc/world/actor/npc/NpcSystemHelper.h>
 #include <mc/world/actor/npc/UrlAction.h>
 #include <mc/world/actor/npc/Villager.h>
@@ -4773,15 +4776,16 @@
 #include <mc/world/actor/npc/VillagerV2.h>
 #include <mc/world/actor/npc/WanderingTrader.h>
 #include <mc/world/actor/npc/allay/AllayVibrationConfig.h>
+#include <mc/world/actor/npc/npc.h>
 #include <mc/world/actor/player/Ability.h>
 #include <mc/world/actor/player/AnimatedImageData.h>
 #include <mc/world/actor/player/DefaultPlayerNameValidator.h>
 #include <mc/world/actor/player/EnderChestContainer.h>
 #include <mc/world/actor/player/FullPlayerInventoryWrapper.h>
 #include <mc/world/actor/player/INpcDialogueData.h>
-#include <mc/world/actor/player/Inventory.h>
 #include <mc/world/actor/player/IPlayerDeathManagerProxy.h>
 #include <mc/world/actor/player/IPlayerTickProxy.h>
+#include <mc/world/actor/player/Inventory.h>
 #include <mc/world/actor/player/ItemGroup.h>
 #include <mc/world/actor/player/MarketplaceSkinValidator.h>
 #include <mc/world/actor/player/Player.h>
@@ -5043,8 +5047,8 @@
 #include <mc/world/events/ActorKilledEvent.h>
 #include <mc/world/events/ActorNotificationEvent.h>
 #include <mc/world/events/ActorPlacedItemEvent.h>
-#include <mc/world/events/ActorRemovedEvent.h>
 #include <mc/world/events/ActorRemoveEffectEvent.h>
+#include <mc/world/events/ActorRemovedEvent.h>
 #include <mc/world/events/ActorStandOnBlockEvent.h>
 #include <mc/world/events/ActorUseItemEvent.h>
 #include <mc/world/events/BlockEventDispatcherToken.h>
@@ -5134,11 +5138,11 @@
 #include <mc/world/events/RealmsStoriesGameplayEventListener.h>
 #include <mc/world/events/ScoreboardEventCoordinator.h>
 #include <mc/world/events/ScoreboardEventListener.h>
+#include <mc/world/events/ScriptScoreboardListener.h>
 #include <mc/world/events/ScriptingEventCoordinator.h>
 #include <mc/world/events/ScriptingEventListener.h>
 #include <mc/world/events/ScriptingInitializeEvent.h>
 #include <mc/world/events/ScriptingNotificationEvent.h>
-#include <mc/world/events/ScriptScoreboardListener.h>
 #include <mc/world/events/ServerInstanceEventCoordinator.h>
 #include <mc/world/events/ServerInstanceEventListener.h>
 #include <mc/world/events/ServerInstanceLeaveGameDoneEvent.h>
@@ -5182,7 +5186,6 @@
 #include <mc/world/filters/ActorHasTagTest.h>
 #include <mc/world/filters/ActorHasTargetTest.h>
 #include <mc/world/filters/ActorHealthTest.h>
-#include <mc/world/filters/ActorInactivityTimerTest.h>
 #include <mc/world/filters/ActorInBlockTest.h>
 #include <mc/world/filters/ActorInCaravanTest.h>
 #include <mc/world/filters/ActorInCloudsTest.h>
@@ -5190,11 +5193,12 @@
 #include <mc/world/filters/ActorInLavaTest.h>
 #include <mc/world/filters/ActorInNetherTest.h>
 #include <mc/world/filters/ActorInOverworldTest.h>
-#include <mc/world/filters/ActorIntPropertyTest.h>
 #include <mc/world/filters/ActorInVillageTest.h>
 #include <mc/world/filters/ActorInWaterOrRainTest.h>
 #include <mc/world/filters/ActorInWaterTest.h>
 #include <mc/world/filters/ActorInWeatherTest.h>
+#include <mc/world/filters/ActorInactivityTimerTest.h>
+#include <mc/world/filters/ActorIntPropertyTest.h>
 #include <mc/world/filters/ActorIsAvoidingMobsTest.h>
 #include <mc/world/filters/ActorIsBabyTest.h>
 #include <mc/world/filters/ActorIsClimbingTest.h>
@@ -5371,10 +5375,10 @@
 #include <mc/world/inventory/simulation/validation/GrindstoneAdditionalContainerValidation.h>
 #include <mc/world/inventory/simulation/validation/GrindstoneContainerScreenValidator.h>
 #include <mc/world/inventory/simulation/validation/GrindstoneInputContainerValidation.h>
+#include <mc/world/inventory/simulation/validation/HUDContainerScreenValidator.h>
 #include <mc/world/inventory/simulation/validation/HorseContainerScreenValidator.h>
 #include <mc/world/inventory/simulation/validation/HorseEquipContainerValidation.h>
 #include <mc/world/inventory/simulation/validation/HotbarContainerValidation.h>
-#include <mc/world/inventory/simulation/validation/HUDContainerScreenValidator.h>
 #include <mc/world/inventory/simulation/validation/InventoryContainerValidation.h>
 #include <mc/world/inventory/simulation/validation/LabTableContainerScreenValidator.h>
 #include <mc/world/inventory/simulation/validation/LabTableInputValidation.h>
@@ -5543,9 +5547,9 @@
 #include <mc/world/item/TridentItem.h>
 #include <mc/world/item/TropicalFishInfo.h>
 #include <mc/world/item/VanillaItemNames.h>
-#include <mc/world/item/VanillaItems.h>
 #include <mc/world/item/VanillaItemTags.h>
 #include <mc/world/item/VanillaItemTiers.h>
+#include <mc/world/item/VanillaItems.h>
 #include <mc/world/item/WarpedFungusOnAStickItem.h>
 #include <mc/world/item/WaterLilyBlockItem.h>
 #include <mc/world/item/WeaponItem.h>
@@ -5597,9 +5601,9 @@
 #include <mc/world/item/components/FoodItemVersioning.h>
 #include <mc/world/item/components/FuelItemComponent.h>
 #include <mc/world/item/components/ICameraItemComponent.h>
-#include <mc/world/item/components/IconItemComponent.h>
 #include <mc/world/item/components/IFoodItemComponent.h>
 #include <mc/world/item/components/IItemComponentLegacyFactoryData.h>
+#include <mc/world/item/components/IconItemComponent.h>
 #include <mc/world/item/components/InteractButtonItemComponent.h>
 #include <mc/world/item/components/ItemAcquisitionMethod.h>
 #include <mc/world/item/components/ItemColor.h>
@@ -5635,8 +5639,8 @@
 #include <mc/world/item/components/ProjectileItemComponent.h>
 #include <mc/world/item/components/RecordItemComponent.h>
 #include <mc/world/item/components/RenderOffsetsItemComponent.h>
-#include <mc/world/item/components/RepairableItemComponent.h>
 #include <mc/world/item/components/RepairItemEntry.h>
+#include <mc/world/item/components/RepairableItemComponent.h>
 #include <mc/world/item/components/ShooterItemComponent.h>
 #include <mc/world/item/components/StorageItemComponent.h>
 #include <mc/world/item/components/ThrowableItemComponent.h>
@@ -5674,8 +5678,8 @@
 #include <mc/world/item/crafting/MultiRecipe.h>
 #include <mc/world/item/crafting/Recipe.h>
 #include <mc/world/item/crafting/RecipeIngredient.h>
-#include <mc/world/item/crafting/Recipes.h>
 #include <mc/world/item/crafting/RecipeUnlockingRequirement.h>
+#include <mc/world/item/crafting/Recipes.h>
 #include <mc/world/item/crafting/RepairItemRecipe.h>
 #include <mc/world/item/crafting/ShapedChemistryRecipe.h>
 #include <mc/world/item/crafting/ShapedRecipe.h>
@@ -5691,10 +5695,10 @@
 #include <mc/world/item/enchanting/CurseVanishingEnchant.h>
 #include <mc/world/item/enchanting/DiggingEnchant.h>
 #include <mc/world/item/enchanting/Enchant.h>
-#include <mc/world/item/enchanting/EnchantmentInstance.h>
 #include <mc/world/item/enchanting/EnchantResult.h>
 #include <mc/world/item/enchanting/EnchantSlotEnumHasher.h>
 #include <mc/world/item/enchanting/EnchantUtils.h>
+#include <mc/world/item/enchanting/EnchantmentInstance.h>
 #include <mc/world/item/enchanting/FishingEnchant.h>
 #include <mc/world/item/enchanting/FrostWalkerEnchant.h>
 #include <mc/world/item/enchanting/ItemEnchants.h>
@@ -5782,9 +5786,9 @@
 #include <mc/world/level/IBlockWorldGenAPI.h>
 #include <mc/world/level/IConstBlockSource.h>
 #include <mc/world/level/ILevel.h>
+#include <mc/world/level/IWorldRegistriesProvider.h>
 #include <mc/world/level/InputPermissionCommand.h>
 #include <mc/world/level/ItemEventCoordinator.h>
-#include <mc/world/level/IWorldRegistriesProvider.h>
 #include <mc/world/level/LayeredAbilities.h>
 #include <mc/world/level/Level.h>
 #include <mc/world/level/LevelAnimateTickHelper.h>
@@ -5842,9 +5846,9 @@
 #include <mc/world/level/SkipNormalTick.h>
 #include <mc/world/level/SpawnConditions.h>
 #include <mc/world/level/SpawnData.h>
-#include <mc/world/level/Spawner.h>
 #include <mc/world/level/SpawnFinder.h>
 #include <mc/world/level/SpawnSettings.h>
+#include <mc/world/level/Spawner.h>
 #include <mc/world/level/SubChunkLightUpdate.h>
 #include <mc/world/level/SubChunkPos.h>
 #include <mc/world/level/Tick.h>
@@ -5873,23 +5877,22 @@
 #include <mc/world/level/biome/ClimateParameters.h>
 #include <mc/world/level/biome/ClimateUtils.h>
 #include <mc/world/level/biome/GetBiomeOptions.h>
+#include <mc/world/level/biome/MobSpawnRules.h>
 #include <mc/world/level/biome/MobSpawnerData.h>
 #include <mc/world/level/biome/MobSpawnerPermutation.h>
-#include <mc/world/level/biome/MobSpawnRules.h>
 #include <mc/world/level/biome/OceanRuinConfiguration.h>
 #include <mc/world/level/biome/Parameter.h>
 #include <mc/world/level/biome/ParameterList.h>
 #include <mc/world/level/biome/PreBiome.h>
-#include <mc/world/level/biome/RareBiomeSpot.h>
 #include <mc/world/level/biome/RTree.h>
+#include <mc/world/level/biome/RareBiomeSpot.h>
 #include <mc/world/level/biome/SpawnBiomeType.h>
 #include <mc/world/level/biome/SpawnClimateFinder.h>
 #include <mc/world/level/biome/TargetSpace.h>
 #include <mc/world/level/biome/TerrainShaper.h>
-#include <mc/world/level/biome/v1_16_compat.h>
 #include <mc/world/level/biome/VanillaBiomeNames.h>
-#include <mc/world/level/biome/VanillaBiomes.h>
 #include <mc/world/level/biome/VanillaBiomeTypes.h>
+#include <mc/world/level/biome/VanillaBiomes.h>
 #include <mc/world/level/biome/biomeproviders/BlendedMultiNoiseBiomeProvider.h>
 #include <mc/world/level/biome/components/BiomeDecorationFeature.h>
 #include <mc/world/level/biome/components/MesaSurfaceAttributes.h>
@@ -5924,6 +5927,7 @@
 #include <mc/world/level/biome/surface/TheEndSurfaceBuilder.h>
 #include <mc/world/level/biome/surface/Utils.h>
 #include <mc/world/level/biome/surface/VanillaSurfaceBuilders.h>
+#include <mc/world/level/biome/v1_16_compat.h>
 #include <mc/world/level/block/AbstractCandleBlock.h>
 #include <mc/world/level/block/ActivatorRailBlock.h>
 #include <mc/world/level/block/ActorBlock.h>
@@ -6027,12 +6031,12 @@
 #include <mc/world/level/block/ElementBlock.h>
 #include <mc/world/level/block/ElementInfo.h>
 #include <mc/world/level/block/EnchantingTableBlock.h>
-#include <mc/world/level/block/EnderChestBlock.h>
 #include <mc/world/level/block/EndGatewayBlock.h>
 #include <mc/world/level/block/EndPortalBlock.h>
 #include <mc/world/level/block/EndPortalFrameBlock.h>
 #include <mc/world/level/block/EndPortalShape.h>
 #include <mc/world/level/block/EndRodBlock.h>
+#include <mc/world/level/block/EnderChestBlock.h>
 #include <mc/world/level/block/FaceDirectionalActorBlock.h>
 #include <mc/world/level/block/FaceDirectionalBlock.h>
 #include <mc/world/level/block/FarmBlock.h>
@@ -6095,10 +6099,10 @@
 #include <mc/world/level/block/MushroomBlock.h>
 #include <mc/world/level/block/MyceliumBlock.h>
 #include <mc/world/level/block/NetherFungusBlock.h>
-#include <mc/world/level/block/NetherrackBlock.h>
 #include <mc/world/level/block/NetherReactorBlock.h>
 #include <mc/world/level/block/NetherSproutsBlock.h>
 #include <mc/world/level/block/NetherWartBlock.h>
+#include <mc/world/level/block/NetherrackBlock.h>
 #include <mc/world/level/block/NewLeavesBlock.h>
 #include <mc/world/level/block/NewLogBlock.h>
 #include <mc/world/level/block/NoteBlock.h>
@@ -6125,11 +6129,11 @@
 #include <mc/world/level/block/PumpkinBlock.h>
 #include <mc/world/level/block/QuartzBlock.h>
 #include <mc/world/level/block/RailBlock.h>
+#include <mc/world/level/block/RedStoneOreBlock.h>
+#include <mc/world/level/block/RedStoneWireBlock.h>
 #include <mc/world/level/block/RedstoneBlock.h>
 #include <mc/world/level/block/RedstoneLampBlock.h>
-#include <mc/world/level/block/RedStoneOreBlock.h>
 #include <mc/world/level/block/RedstoneTorchBlock.h>
-#include <mc/world/level/block/RedStoneWireBlock.h>
 #include <mc/world/level/block/ReinforcedDeepslateBlock.h>
 #include <mc/world/level/block/RepeaterBlock.h>
 #include <mc/world/level/block/RespawnAnchorBlock.h>
@@ -6148,9 +6152,9 @@
 #include <mc/world/level/block/SculkShriekerBlock.h>
 #include <mc/world/level/block/SculkSpreader.h>
 #include <mc/world/level/block/SculkVeinBlock.h>
-#include <mc/world/level/block/SeagrassBlock.h>
 #include <mc/world/level/block/SeaLanternBlock.h>
 #include <mc/world/level/block/SeaPickleBlock.h>
+#include <mc/world/level/block/SeagrassBlock.h>
 #include <mc/world/level/block/ShulkerBoxBlock.h>
 #include <mc/world/level/block/SignBlock.h>
 #include <mc/world/level/block/SkullBlock.h>
@@ -6176,11 +6180,11 @@
 #include <mc/world/level/block/StoneBlock.h>
 #include <mc/world/level/block/StoneBricksBlock.h>
 #include <mc/world/level/block/StoneButtonBlock.h>
-#include <mc/world/level/block/StonecutterBlock.h>
 #include <mc/world/level/block/StoneSlabBlock.h>
 #include <mc/world/level/block/StoneSlabBlock2.h>
 #include <mc/world/level/block/StoneSlabBlock3.h>
 #include <mc/world/level/block/StoneSlabBlock4.h>
+#include <mc/world/level/block/StonecutterBlock.h>
 #include <mc/world/level/block/StrippedLogBlock.h>
 #include <mc/world/level/block/StructureBlock.h>
 #include <mc/world/level/block/StructureVoidBlock.h>
@@ -6249,9 +6253,9 @@
 #include <mc/world/level/block/actor/DispenserBlockActor.h>
 #include <mc/world/level/block/actor/DropperBlockActor.h>
 #include <mc/world/level/block/actor/EnchantingTableBlockActor.h>
-#include <mc/world/level/block/actor/EnderChestBlockActor.h>
 #include <mc/world/level/block/actor/EndGatewayBlockActor.h>
 #include <mc/world/level/block/actor/EndPortalBlockActor.h>
+#include <mc/world/level/block/actor/EnderChestBlockActor.h>
 #include <mc/world/level/block/actor/FlowerPotBlockActor.h>
 #include <mc/world/level/block/actor/FurnaceBlockActor.h>
 #include <mc/world/level/block/actor/GlowItemFrameBlockActor.h>
@@ -6379,8 +6383,8 @@
 #include <mc/world/level/block/events/responses/SetBlockAtPos.h>
 #include <mc/world/level/block/registry/BlockTypeRegistry.h>
 #include <mc/world/level/block/registry/BlockTypeRegistryModificationsLock.h>
-#include <mc/world/level/block/registry/BlockTypeRegistryReadLock.h>
 #include <mc/world/level/block/registry/BlockTypeRegistryRWLock.h>
+#include <mc/world/level/block/registry/BlockTypeRegistryReadLock.h>
 #include <mc/world/level/block/registry/IUnknownBlockTypeRegistry.h>
 #include <mc/world/level/block/registry/UnknownBlockTypeRegistry.h>
 #include <mc/world/level/block/states/BlockState.h>
@@ -6389,16 +6393,16 @@
 #include <mc/world/level/block/states/BlockStateMeta.h>
 #include <mc/world/level/block/states/BlockStateRegistry.h>
 #include <mc/world/level/block/states/BlockStateVariant.h>
-#include <mc/world/level/block/states/BuiltInBlockStates.h>
 #include <mc/world/level/block/states/BuiltInBlockStateVariant.h>
+#include <mc/world/level/block/states/BuiltInBlockStates.h>
 #include <mc/world/level/block/states/CustomBlockStateVariant.h>
 #include <mc/world/level/block/utils/AirBlockCache.h>
 #include <mc/world/level/block/utils/AmethystBlockUtils.h>
 #include <mc/world/level/block/utils/BannerBlockType.h>
 #include <mc/world/level/block/utils/BaseBlockLocationIterator.h>
 #include <mc/world/level/block/utils/BedrockBlockNames.h>
-#include <mc/world/level/block/utils/BedrockBlocks.h>
 #include <mc/world/level/block/utils/BedrockBlockTypes.h>
+#include <mc/world/level/block/utils/BedrockBlocks.h>
 #include <mc/world/level/block/utils/BlendingBlockType.h>
 #include <mc/world/level/block/utils/BlockActorRendererId.h>
 #include <mc/world/level/block/utils/BlockActorType.h>
@@ -6465,10 +6469,10 @@
 #include <mc/world/level/block/utils/FacingDirectionToFacingDirection.h>
 #include <mc/world/level/block/utils/GetCollisionShapeInterface.h>
 #include <mc/world/level/block/utils/IGetPlacementBlockCallback.h>
-#include <mc/world/level/block/utils/InsideBlockData.h>
 #include <mc/world/level/block/utils/IResourceDropsStrategy.h>
-#include <mc/world/level/block/utils/ItemDropsStrategy.h>
 #include <mc/world/level/block/utils/ITrait.h>
+#include <mc/world/level/block/utils/InsideBlockData.h>
+#include <mc/world/level/block/utils/ItemDropsStrategy.h>
 #include <mc/world/level/block/utils/LecternBlockUtil.h>
 #include <mc/world/level/block/utils/LegacyBlockInfo.h>
 #include <mc/world/level/block/utils/LevelSoundEventMap.h>
@@ -6510,12 +6514,12 @@
 #include <mc/world/level/block/utils/UpdateEntityAfterFallOnInterface.h>
 #include <mc/world/level/block/utils/VanillaBlockConversion.h>
 #include <mc/world/level/block/utils/VanillaBlockDrops.h>
-#include <mc/world/level/block/utils/VanillaBlocks.h>
 #include <mc/world/level/block/utils/VanillaBlockStateTransformUtils.h>
 #include <mc/world/level/block/utils/VanillaBlockTypeGroups.h>
 #include <mc/world/level/block/utils/VanillaBlockTypeIds.h>
 #include <mc/world/level/block/utils/VanillaBlockTypes.h>
 #include <mc/world/level/block/utils/VanillaBlockUpdater.h>
+#include <mc/world/level/block/utils/VanillaBlocks.h>
 #include <mc/world/level/block/utils/VolumeOf.h>
 #include <mc/world/level/block/utils/WallBlockType.h>
 #include <mc/world/level/block/utils/updater/Carpet.h>
@@ -6550,8 +6554,6 @@
 #include <mc/world/level/chunk/ChunkRecyclerTelemetryData.h>
 #include <mc/world/level/chunk/ChunkRecyclerTelemetryOutput.h>
 #include <mc/world/level/chunk/ChunkRequestListType.h>
-#include <mc/world/level/chunk/ChunksLoadedInfo.h>
-#include <mc/world/level/chunk/ChunksLoadedStatus.h>
 #include <mc/world/level/chunk/ChunkSource.h>
 #include <mc/world/level/chunk/ChunkSourceViewGenerateMode.h>
 #include <mc/world/level/chunk/ChunkState.h>
@@ -6559,6 +6561,8 @@
 #include <mc/world/level/chunk/ChunkTickRangeManager.h>
 #include <mc/world/level/chunk/ChunkViewOwner.h>
 #include <mc/world/level/chunk/ChunkViewSource.h>
+#include <mc/world/level/chunk/ChunksLoadedInfo.h>
+#include <mc/world/level/chunk/ChunksLoadedStatus.h>
 #include <mc/world/level/chunk/ClientChunkGenerationValidationData.h>
 #include <mc/world/level/chunk/ClientSideChunkGeneration.h>
 #include <mc/world/level/chunk/DeserializationChanges.h>
@@ -6681,11 +6685,11 @@
 #include <mc/world/level/levelgen/feature/GrowingPlantFeature.h>
 #include <mc/world/level/levelgen/feature/HugeFungusFeature.h>
 #include <mc/world/level/levelgen/feature/HugeMushroomFeature.h>
-#include <mc/world/level/levelgen/feature/IcebergFeature.h>
-#include <mc/world/level/levelgen/feature/IcePatchFeature.h>
-#include <mc/world/level/levelgen/feature/IceSpikeFeature.h>
 #include <mc/world/level/levelgen/feature/IFeature.h>
 #include <mc/world/level/levelgen/feature/ITreeFeature.h>
+#include <mc/world/level/levelgen/feature/IcePatchFeature.h>
+#include <mc/world/level/levelgen/feature/IceSpikeFeature.h>
+#include <mc/world/level/levelgen/feature/IcebergFeature.h>
 #include <mc/world/level/levelgen/feature/KelpFeature.h>
 #include <mc/world/level/levelgen/feature/LakeFeature.h>
 #include <mc/world/level/levelgen/feature/LargeDripstoneFeature.h>
@@ -6721,8 +6725,8 @@
 #include <mc/world/level/levelgen/feature/ScatterFeature.h>
 #include <mc/world/level/levelgen/feature/SculkPatchFeature.h>
 #include <mc/world/level/levelgen/feature/SeaAnemoneFeature.h>
-#include <mc/world/level/levelgen/feature/SeagrassFeature.h>
 #include <mc/world/level/levelgen/feature/SeaPickleFeature.h>
+#include <mc/world/level/levelgen/feature/SeagrassFeature.h>
 #include <mc/world/level/levelgen/feature/SearchFeature.h>
 #include <mc/world/level/levelgen/feature/SingleBlockFeature.h>
 #include <mc/world/level/levelgen/feature/SnapToSurfaceFeature.h>
@@ -6874,14 +6878,9 @@
 #include <mc/world/level/levelgen/structure/RuinedPortalFeature.h>
 #include <mc/world/level/levelgen/structure/RuinedPortalPiece.h>
 #include <mc/world/level/levelgen/structure/RuinedPortalStart.h>
-#include <mc/world/level/levelgen/structure/ScatteredFeaturePiece.h>
-#include <mc/world/level/levelgen/structure/ScatteredFeatureStart.h>
 #include <mc/world/level/levelgen/structure/SHChestCorridor.h>
 #include <mc/world/level/levelgen/structure/SHFillerCorridor.h>
 #include <mc/world/level/levelgen/structure/SHFiveCrossing.h>
-#include <mc/world/level/levelgen/structure/ShipwreckFeature.h>
-#include <mc/world/level/levelgen/structure/ShipwreckPiece.h>
-#include <mc/world/level/levelgen/structure/ShipwreckStart.h>
 #include <mc/world/level/levelgen/structure/SHLeftTurn.h>
 #include <mc/world/level/levelgen/structure/SHLibrary.h>
 #include <mc/world/level/levelgen/structure/SHPortalRoom.h>
@@ -6892,6 +6891,11 @@
 #include <mc/world/level/levelgen/structure/SHStartPiece.h>
 #include <mc/world/level/levelgen/structure/SHStraight.h>
 #include <mc/world/level/levelgen/structure/SHStraightStairsDown.h>
+#include <mc/world/level/levelgen/structure/ScatteredFeaturePiece.h>
+#include <mc/world/level/levelgen/structure/ScatteredFeatureStart.h>
+#include <mc/world/level/levelgen/structure/ShipwreckFeature.h>
+#include <mc/world/level/levelgen/structure/ShipwreckPiece.h>
+#include <mc/world/level/levelgen/structure/ShipwreckStart.h>
 #include <mc/world/level/levelgen/structure/SmoothStoneSelector.h>
 #include <mc/world/level/levelgen/structure/StrongholdFeature.h>
 #include <mc/world/level/levelgen/structure/StrongholdPiece.h>
@@ -6986,8 +6990,8 @@
 #include <mc/world/level/levelgen/synth/YBlendingBugSettings.h>
 #include <mc/world/level/levelgen/v1/Aquifer.h>
 #include <mc/world/level/levelgen/v1/BeardAndShaverDescription.h>
-#include <mc/world/level/levelgen/v1/BeardingDescriptionCache.h>
 #include <mc/world/level/levelgen/v1/BeardKernel.h>
+#include <mc/world/level/levelgen/v1/BeardingDescriptionCache.h>
 #include <mc/world/level/levelgen/v1/BiomeSource.h>
 #include <mc/world/level/levelgen/v1/Cavifier.h>
 #include <mc/world/level/levelgen/v1/ChunkLocalNoiseCache.h>
@@ -7061,8 +7065,8 @@
 #include <mc/world/level/storage/DBStorageEnvironmentChain.h>
 #include <mc/world/level/storage/DBStoragePerformanceData.h>
 #include <mc/world/level/storage/EncryptedProxyEnv.h>
-#include <mc/world/level/storage/Experiments.h>
 #include <mc/world/level/storage/ExperimentStorage.h>
+#include <mc/world/level/storage/Experiments.h>
 #include <mc/world/level/storage/ExternalFileLevelStorageSource.h>
 #include <mc/world/level/storage/FlushableEnv.h>
 #include <mc/world/level/storage/FlushableStorageAreaEnv.h>
@@ -7093,8 +7097,8 @@
 #include <mc/world/level/storage/PhotoStorage.h>
 #include <mc/world/level/storage/PlayerStorageIds.h>
 #include <mc/world/level/storage/RegionFile.h>
-#include <mc/world/level/storage/SavedDataStorage.h>
 #include <mc/world/level/storage/SaveTransactionManager.h>
+#include <mc/world/level/storage/SavedDataStorage.h>
 #include <mc/world/level/storage/SnapshotEnv.h>
 #include <mc/world/level/storage/SnapshotFilenameAndLength.h>
 #include <mc/world/level/storage/SnapshotWritableFile.h>
@@ -7116,9 +7120,9 @@
 #include <mc/world/level/storage/loot/functions/ExplorationMapFunction.h>
 #include <mc/world/level/storage/loot/functions/ExplosionDecayFunction.h>
 #include <mc/world/level/storage/loot/functions/FillContainerFunction.h>
-#include <mc/world/level/storage/loot/functions/LootingEnchantFunction.h>
 #include <mc/world/level/storage/loot/functions/LootItemFunction.h>
 #include <mc/world/level/storage/loot/functions/LootItemFunctions.h>
+#include <mc/world/level/storage/loot/functions/LootingEnchantFunction.h>
 #include <mc/world/level/storage/loot/functions/RandomBlockStateFunction.h>
 #include <mc/world/level/storage/loot/functions/RandomDyeFunction.h>
 #include <mc/world/level/storage/loot/functions/SetBannerDetailsFunction.h>
@@ -7153,8 +7157,8 @@
 #include <mc/world/level/ticking/TickingAreaDescription.h>
 #include <mc/world/level/ticking/TickingAreaList.h>
 #include <mc/world/level/ticking/TickingAreaListBase.h>
-#include <mc/world/level/ticking/TickingAreasManager.h>
 #include <mc/world/level/ticking/TickingAreaView.h>
+#include <mc/world/level/ticking/TickingAreasManager.h>
 #include <mc/world/module/GameModuleServer.h>
 #include <mc/world/module/IGameModuleShared.h>
 #include <mc/world/persistence/DynamicPropertiesDefinition.h>
@@ -7216,11 +7220,11 @@
 #include <mc/world/scores/ObjectiveCriteria.h>
 #include <mc/world/scores/PlayerScore.h>
 #include <mc/world/scores/PlayerScoreboardId.h>
+#include <mc/world/scores/ScoreInfo.h>
+#include <mc/world/scores/ScoreInfoRef.h>
 #include <mc/world/scores/Scoreboard.h>
 #include <mc/world/scores/ScoreboardId.h>
 #include <mc/world/scores/ScoreboardIdentityRef.h>
-#include <mc/world/scores/ScoreInfo.h>
-#include <mc/world/scores/ScoreInfoRef.h>
 #include <mc/world/scores/ServerScoreboard.h>
 #include <mc/world/trim/ArmorTrim.h>
 #include <mc/world/trim/ArmorTrimIconGenerationInfo.h>
diff --git a/xmake.lua b/xmake.lua
index 3ef9997..23a455b 100644
--- a/xmake.lua
+++ b/xmake.lua
@@ -1,7 +1,13 @@
 add_rules("mode.debug", "mode.release", "mode.releasedbg")
 
 add_repositories("liteldev-repo https://github.com/LiteLDev/xmake-repo.git")
-add_requires("levilamina 0.3.0") -- or add_requires("levilamina x.x.x") to specify target LeviLamina version
+
+if not has_config("vs_runtime") then
+    set_runtimes("MD")
+end
+
+-- Option 1: Use the latest version of LeviLamina released on GitHub.
+add_requires("levilamina")
 
 target("Cleaner") -- Change this to your plugin name.
     add_cxflags(
@@ -11,7 +17,11 @@ target("Cleaner") -- Change this to your plugin name.
     add_files(
         "src/**.cpp"
     )
+    add_links(
+        "SDK-GMLIB/Lib/GMLIB"
+    )
     add_includedirs(
+        "SDK-GMLIB",
         "src"
     )
     add_packages(