diff --git a/SDK-GMLIB b/SDK-GMLIB
index 9fac639..41b3a0c 160000
--- a/SDK-GMLIB
+++ b/SDK-GMLIB
@@ -1 +1 @@
-Subproject commit 9fac6399eb735975fc0a119f1adbb98ce6910dd5
+Subproject commit 41b3a0cf5ff473fdb6a37597c73fd47f992b6736
diff --git a/src/Cleaner.cpp b/src/Cleaner.cpp
index ec4fdcd..00cc3d2 100644
--- a/src/Cleaner.cpp
+++ b/src/Cleaner.cpp
@@ -1,7 +1,12 @@
+#include "Config.h"
 #include "Global.h"
 #include <GMLIB/Event/Entity/ItemActorSpawnEvent.h>
 #include <GMLIB/Event/Entity/MobPickupItemEvent.h>
 #include <GMLIB/Server/PlayerAPI.h>
+#include <regex>
+
+GMLIB_JsonConfig*   Config   = nullptr;
+GMLIB_JsonLanguage* Language = nullptr;
 
 using namespace ll::schedule;
 using namespace ll::chrono_literals;
@@ -12,6 +17,19 @@ bool                     auto_clean_triggerred = false;
 
 namespace Cleaner {
 
+bool isMatch(std::string& A, std::string& B) {
+    // 如果B是正则表达式
+    if (B.find_first_of(".*+?()[]{}|^$") != std::string::npos) {
+        try {
+            std::regex regex(B);
+            return std::regex_match(A, regex);
+        } catch (...) {
+            return false;
+        }
+    }
+    return (A == B);
+}
+
 bool shouldIgnore(GMLIB_Actor* ac) {
     if (ac->isMob() || ac->isItemActor()) {
         if (ac->isTame() || ac->isTrusting() || ac->getNameTag() != "") {
@@ -34,35 +52,56 @@ bool ShouldClean(Actor* actor) {
     auto type = en->getTypeName();
     // Items
     if (en->isItemActor()) {
-        return true;
-        if (true) { // Todo Config Toggle
-            auto itac     = (ItemActor*)en;
-            auto itemType = itac->item().getTypeName();
-            if (true) { // Todo Config WhiteList
+        if (Config->getValue<bool>({"CleanItem", "Enabled"}, false)) {
+            auto itac = (ItemActor*)en;
+            if (itac->age() <= Config->getValue<int>({"CleanItem", "ExistTicks"}, 0)) {
                 return false;
             }
+            auto itemType  = itac->item().getTypeName();
+            auto whitelist = Config->getValue<std::vector<std::string>>({"CleanItem", "Whitelist"}, {});
+            for (auto& key : whitelist) {
+                if (isMatch(itemType, key)) {
+                    return false;
+                }
+            }
             return true;
         }
         return false;
     }
     // Mobs
     else if (en->isMob()) {
-        if (true) { // Todo Config Toggle
-            return true;
-            if (true) { // Todo WhiteList
-                return false;
+        if (Config->getValue<bool>({"CleanMobs", "Enabled"}, false)) {
+            auto blacklist = Config->getValue<std::vector<std::string>>({"CleanMobs", "Blacklist"}, {});
+            for (auto& key : blacklist) {
+                if (isMatch(type, key)) {
+                    return true;
+                }
+            }
+            auto whitelist = Config->getValue<std::vector<std::string>>({"CleanMobs", "Whitelist"}, {});
+            for (auto& key : whitelist) {
+                if (isMatch(type, key)) {
+                    return false;
+                }
+            }
+            if (Config->getValue<bool>({"CleanMobs", "CleanMonstors"}, false)
+                && en->hasCategory(ActorCategory::Monster)) {
+                return true;
+            }
+            if (Config->getValue<bool>({"CleanMobs", "CleanPeacefulMobs"}, false)) {
+                return true;
             }
-            return true;
         }
         return false;
     }
     // Others
     else {
-        if (true) {     // Todo Config Toggle
-            if (true) { // BlackList
-                return true;
+        if (Config->getValue<bool>({"CleanInanimate", "Enabled"}, false)) {
+            auto blacklist = Config->getValue<std::vector<std::string>>({"CleanInanimate", "Blacklist"}, {});
+            for (auto& key : blacklist) {
+                if (isMatch(type, key)) {
+                    return true;
+                }
             }
-            return false;
         }
         return false;
     }
@@ -94,18 +133,22 @@ int CountEntities() {
 void CleanTask(int time, int announce_time) {
     auto time_1 = std::chrono::seconds::duration(time);
     auto time_2 = std::chrono::seconds::duration(time - announce_time);
-    logger.info("clean will in {}", time_1);
-    scheduler.add<DelayTask>(time_2, [announce_time] { logger.info("clean will in {}", announce_time); });
+    logger.info(Language->translate("cleaner.output.count1", {S(time_1.count())}));
+    scheduler.add<DelayTask>(time_2, [announce_time] {
+        logger.info(Language->translate("cleaner.output.count2", {S(announce_time)}));
+    });
     scheduler.add<DelayTask>(time_1, [] {
         auto count = ExecuteClean();
-        logger.info("Successfully cleaned {} entities", count);
+        logger.info(Language->translate("cleaner.output.finish", {S(count)}));
         auto_clean_triggerred = false;
     });
 }
 
 void AutoCleanTask(int seconds) {
     auto time      = std::chrono::seconds::duration(seconds);
-    mAutoCleanTask = scheduler.add<RepeatTask>(time, [] { CleanTask(20, 5); });
+    mAutoCleanTask = scheduler.add<RepeatTask>(time, [] {
+        CleanTask(Config->getValue<int>({"Basic", "Notice1"}, 20), Config->getValue<int>({"Basic", "Notice2"}, 15));
+    });
 }
 
 void CheckCleanTask(int max_entities, float min_tps) {
@@ -114,12 +157,21 @@ void CheckCleanTask(int max_entities, float min_tps) {
         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);
+                logger.warn(Language->translate("cleaner.output.triggerAutoCleanCount", {S(count)}));
+                CleanTask(
+                    Config->getValue<int>({"Basic", "Notice1"}, 20),
+                    Config->getValue<int>({"Basic", "Notice2"}, 15)
+                );
             } else if (GMLIB_Level::getLevel()->getServerAverageTps() <= min_tps) {
                 auto_clean_triggerred = true;
-                logger.warn("TPS too low! Auto started clean task!");
-                CleanTask(20, 5);
+                logger.warn(Language->translate(
+                    "cleaner.output.triggerAutoCleanCount",
+                    {S(GMLIB_Level::getLevel()->getServerAverageTps())}
+                ));
+                CleanTask(
+                    Config->getValue<int>({"Basic", "Notice1"}, 20),
+                    Config->getValue<int>({"Basic", "Notice2"}, 15)
+                );
             }
         }
     });
@@ -158,13 +210,39 @@ void ListenEvents() {
     );
 }
 
-void ReloadCleaner() {
+void reloadCleaner() {
+    unloadCleaner();
+    loadCleaner();
+}
+
+void loadConfig() {
+    Config = new GMLIB_JsonConfig("./plugins/Cleaner/config/config.json", defaultConfig);
+    Config->initConfig();
+    Language = new GMLIB_JsonLanguage("./plugins/Cleaner/config/language.json", defaultLanguage);
+    Language->initConfig();
+}
+
+void loadCleaner() {
+    ListenEvents();
+    RegisterCommands();
+    if (Config->getValue<bool>({"ScheduleClean", "Enabled"}, false)) {
+        Cleaner::AutoCleanTask(Config->getValue<int>({"ScheduleClean", "CleanInterval"}, 3000));
+    }
+    if (Config->getValue<bool>({"AutoCleanCount", "Enabled"}, false)
+        || Config->getValue<bool>({"AutoCleanTPS", "Enabled"}, false)) {
+        Cleaner::CheckCleanTask(
+            Config->getValue<int>({"AutoCleanCount", "TriggerCount"}, 900),
+            Config->getValue<int>({"AutoCleanTPS", "TriggerTPS"}, 15)
+        );
+    }
+}
+
+void unloadCleaner() {
     mAutoCleanTask->cancel();
     mCheckCleanTask->cancel();
     // UnregisterCommands();
-    // RegisterCommands();
-    Cleaner::AutoCleanTask(600);
-    Cleaner::CheckCleanTask(15, 8);
+    delete Config;
+    delete Language;
 }
 
 } // namespace Cleaner
\ No newline at end of file
diff --git a/src/Config.h b/src/Config.h
new file mode 100644
index 0000000..d641a21
--- /dev/null
+++ b/src/Config.h
@@ -0,0 +1,134 @@
+#pragma once
+#include <GMLIB/Files/JsonConfig.h>
+#include <GMLIB/Files/JsonLanguage.h>
+
+inline std::string defaultConfig = R"({
+    "AutoCleanCount": {
+        "Enabled": true,
+        "TriggerCount": 900
+    },
+    "AutoCleanTPS": {
+        "Enabled": false,
+        "TriggerTPS": 15
+    },
+    "Basic": {
+        "Command": "cleaner",
+        "ConsoleLog": true,
+        "Notice1": 20,
+        "Notice2": 5,
+        "SendBroadcast": true,
+        "SendToast": false
+    },
+    "ItemDespawn": {
+        "Enabled": true,
+        "DespawnTime": 6000,
+        "WhiteList": [
+            "minecraft:elytra"
+        ]
+    },
+    "CleanInanimate": {
+        "Blacklist": [
+            "minecraft:xp_orb",
+            "minecraft:arrow",
+            "minecraft:fireball",
+            "minecraft:small_fireball",
+            "minecraft:wither_skull",
+            "minecraft:wither_skull_dangerous",
+            "minecraft:dragon_fireball"
+        ],
+        "Enabled": true
+    },
+    "CleanItem": {
+        "Enabled": true,
+        "ExistTicks": 0,
+        "Whitelist": [
+            "minecraft:netherite_helmet",
+            "minecraft:netherite_sword",
+            "minecraft:netherite_chestplate",
+            "minecraft:diamond_helmet",
+            "minecraft:netherite_leggings",
+            "minecraft:undyed_shulker_box",
+            "minecraft:netherite_boots",
+            "minecraft:shulker_box",
+            "minecraft:elytra",
+            "minecraft:dragon_egg",
+            "minecraft:nether_star",
+            "minecraft:diamond_sword",
+            "minecraft:diamond_chestplate",
+            "minecraft:diamond_boots",
+            "minecraft:diamond_leggings",
+            "minecraft:diamond_hoe",
+            "minecraft:netherite_hoe",
+            "minecraft:diamond_axe",
+            "minecraft:netherite_axe",
+            "minecraft:netherite_pickaxe",
+            "minecraft:diamond_pickaxe"
+        ]
+    },
+    "CleanMobs": {
+        "BlackList": [
+            "minecraft:guardian",
+            "minecraft:zombie_pigman"
+        ],
+        "CleanMonstors": true,
+        "CleanPeacefulMobs": false,
+        "EnableAutoExclude": true,
+        "Enabled": true,
+        "IgnoreTags": [
+            "ignore",
+            "不清理"
+        ],
+        "Whitelist": [
+            "minecraft:ender_dragon",
+            "minecraft:shulker",
+            "minecraft:wither",
+            "minecraft:elder_guardian",
+            "minecraft:piglin_brute",
+            "minecraft:ender_pearl",
+            "minecraft:phantom"
+        ]
+    },
+    "ScheduleClean": {
+        "CleanInterval": 3600,
+        "Enabled": true
+        },    
+    "VoteClean": {
+        "CD": 120,
+        "Delay": 30,
+        "Enabled": true,
+        "Percentage": 50,
+        "VoteCleanCommand": "voteclean"
+    }
+})";
+
+inline std::string defaultLanguage = R"({
+    "cleaner.command.cleaner": "Cleaner管理员命令。",
+    "cleaner.command.despawnSuccess": "已成功清除了 %1$s 个实体",
+    "cleaner.command.error.noTarget": "没有与选择器匹配的目标",
+    "cleaner.command.error.playerOnly": "该命令只能由玩家执行！",
+    "cleaner.command.tps.output": "当前服务器实时TPS %1$s §r，平均TPS %2$s",
+    "cleaner.command.mspt.output": "当前服务器实MSPT %1$s",
+    "cleaner.command.voteclean": "发起实体清理投票。",
+    "cleaner.command.despawntime" : "已成功将物品消失时间设置为 %1$s 游戏刻",
+    "cleaner.output.count1": "系统将在 %1$s 秒后自动清理服务器实体！",
+    "cleaner.output.count2": "请注意！系统将在 %1$s 秒后自动清理服务器实体！",
+    "cleaner.output.finish": "清理完成！本次总共清理了 %1$s 个实体。",
+    "cleaner.output.opClean": "管理员启用了服务器实体清理。",
+    "cleaner.output.reload": "已重载Cleaner插件，部分配置可能需要重启服务器才能生效。",
+    "cleaner.output.triggerAutoCleanCount": "检测到服务器实体过多！！当前服务器存在 %1$s 个可清理实体，已启动自动清理程序。",
+    "cleaner.output.triggerAutoCleanTps": "当前服务器TPS过低！！服务器平均TPS %1$s\n系统已启动清理程序。",
+    "cleaner.vote.cooldown": "投票清理冷却...",
+    "cleaner.vote.cancel": "投票已取消！",
+    "cleaner.vote.confirmNo": "我再想想",
+    "cleaner.vote.confirmOk": "发起投票",
+    "cleaner.vote.confirmTubtitle": "你是否要发起投票清理？",
+    "cleaner.vote.accept": "你已同意实体清理。",
+    "cleaner.vote.deny": "你已拒绝实体清理。",
+    "cleaner.vote.no": "拒绝",
+    "cleaner.vote.ok": "同意",
+    "cleaner.vote.Subtitle": "你是否同意现在清理服务器实体？",
+    "cleaner.vote.Timeout": "投票已过期！",
+    "cleaner.vote.succeed": "投票清理成功！",
+    "cleaner.vote.title": "投票清理",
+    "cleaner.vote.toastNotice": "通知"
+})";
\ No newline at end of file
diff --git a/src/Global.h b/src/Global.h
index 5aa66bb..2b581ce 100644
--- a/src/Global.h
+++ b/src/Global.h
@@ -1,23 +1,30 @@
 #pragma once
+#include "Config.h"
 #include "Plugin.h"
 #include "include_all.h"
 #include <GMLIB/Server/ActorAPI.h>
 #include <GMLIB/Server/LevelAPI.h>
+#include <GMLIB/Files/JsonConfig.h>
+#include <GMLIB/Files/JsonLanguage.h>
+#define S(x) std::to_string(x)
 
 extern ll::Logger logger;
 extern void       RegisterCommands();
 extern void       UnregisterCommands();
 
+extern GMLIB_JsonConfig* Config;
+extern GMLIB_JsonLanguage* Language; 
+
 extern int item_despawn_time;
 
 namespace Cleaner {
 
 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();
+extern void loadConfig();
+extern void loadCleaner();
+extern void unloadCleaner();
+extern void reloadCleaner();
+extern void CleanTask(int time, int announce_time);
 
 } // namespace Cleaner
\ No newline at end of file
diff --git a/src/Plugin.cpp b/src/Plugin.cpp
index 2bd7b33..97ef89f 100644
--- a/src/Plugin.cpp
+++ b/src/Plugin.cpp
@@ -6,13 +6,11 @@ namespace plugin {
 
 Plugin::Plugin(ll::plugin::NativePlugin& self) : mSelf(self) {
     // Code for loading the plugin goes here.
+    Cleaner::loadConfig();
 }
 
 bool Plugin::enable() {
-    Cleaner::ListenEvents();
-    RegisterCommands();
-    Cleaner::AutoCleanTask(300);
-    Cleaner::CheckCleanTask(20, 15);
+    Cleaner::loadCleaner();
     logger.info("Cleaner Loaded!");
     logger.info("Author: Tsubasa6848");
     logger.info("Repository: https://github.com/GroupMountain/Cleaner");
@@ -20,11 +18,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();
+    Cleaner::unloadCleaner();
     logger.info("Cleaner Disabled!");
     return true;
 }
diff --git a/src/RegisterCommand.cpp b/src/RegisterCommand.cpp
index 554e5c9..aa97427 100644
--- a/src/RegisterCommand.cpp
+++ b/src/RegisterCommand.cpp
@@ -17,8 +17,8 @@ void RegVoteCommand(CommandRegistry& registry) {
 void RegCleanerCommand(CommandRegistry& registry) {
     auto command = DynamicCommand::createCommand(
         registry,
-        "cleaner",
-        "Cleaner plugin settings",
+        Config->getValue<std::string>({"Basic", "Command"}, "cleaner"),
+        Language->translate("cleaner.command.cleaner"),
         CommandPermissionLevel::GameDirectors
     );
     command->setEnum("Despawn", {"despawn"});
@@ -40,53 +40,43 @@ void RegCleanerCommand(CommandRegistry& registry) {
         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!");
+                return output.error(Language->translate("cleaner.command.error.noTarget"));
             }
             for (auto en : ens) {
                 en->despawn();
             }
-            return output.success("Successfully despawned {} entities", ens.size());
+            return output.success(Language->translate("cleaner.command.despawnSuccess", {S(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()
-                );
+                return output.success(Language->translate(
+                    "cleaner.command.tps.output",
+                    {S(GMLIB_Level::getLevel()->getServerCurrentTps()),
+                     S(GMLIB_Level::getLevel()->getServerAverageTps())}
+                ));
             } else if (act == "mspt") {
-                return output.success("mspt {}", GMLIB_Level::getLevel()->getServerMspt());
+                return output.success(
+                    Language->translate("cleaner.command.mspt.output", {S(GMLIB_Level::getLevel()->getServerMspt())})
+                );
             } else if (act == "clean") {
-                output.success("Clean task started!");
-                Cleaner::CleanTask(20, 5); // Config
+                output.success(Language->translate("cleaner.output.opClean"));
+                Cleaner::CleanTask(
+                    Config->getValue<int>({"Basic", "Notice1"}, 20),
+                    Config->getValue<int>({"Basic", "Notice2"}, 15)
+                ); // Config
                 return;
             } else if (act == "reload") {
-                output.success("Reloading Cleaner ...");
-                Cleaner::ReloadCleaner();
-                return output.success("Cleaner Reloaded!");
+                Cleaner::reloadCleaner();
+                return output.success(Language->translate("cleaner.output.reload"));
             }
         } 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);
+            return output.success(Language->translate("cleaner.command.despawntime", {S(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);
@@ -95,6 +85,6 @@ void RegisterCommands() {
 
 void UnregisterCommands() {
     auto registry = ll::service::bedrock::getCommandRegistry();
-    registry->unregisterCommand("cleaner");
-    registry->unregisterCommand("voteclean");
+    registry->unregisterCommand(Config->getValue<std::string>({"Basic", "Command"}, "cleaner"));
+    // registry->unregisterCommand("voteclean");
 }
\ No newline at end of file
diff --git a/src/include_all.h b/src/include_all.h
index 906e4cf..fe45bfe 100644
--- a/src/include_all.h
+++ b/src/include_all.h
@@ -1,31 +1,28 @@
-// 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/Global.h>
 #include <ll/api/Logger.h>
-// #include <ll/api/ServerInfo.h>
-#include <ll/api/base/Base64.h>
 #include <ll/api/base/Concepts.h>
-#include <ll/api/base/DependencyGraph.h>
-#include <ll/api/base/ErrorInfo.h>
+#include <ll/api/base/Containers.h>
 #include <ll/api/base/FixedString.h>
-#include <ll/api/base/Hash.h>
-#include <ll/api/base/KeyValueDB.h>
 #include <ll/api/base/Macro.h>
 #include <ll/api/base/Meta.h>
 #include <ll/api/base/MsvcPredefine.h>
-#include <ll/api/base/Random.h>
 #include <ll/api/base/SourceLocation.h>
 #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/chrono/GameChrono.h>
 #include <ll/api/command/CommandRegistrar.h>
 #include <ll/api/command/DynamicCommand.h>
+#include <ll/api/data/DependencyGraph.h>
+#include <ll/api/data/KeyValueDB.h>
+#include <ll/api/data/Version.h>
 #include <ll/api/dimension/CustomDimensionManager.h>
+#include <ll/api/dimension/SimpleCustomDimension.h>
 #include <ll/api/event/Cancellable.h>
 #include <ll/api/event/DynamicListener.h>
 #include <ll/api/event/Emitter.h>
@@ -41,7 +38,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>
@@ -75,17 +72,17 @@
 #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>
@@ -99,6 +96,7 @@
 #include <ll/api/schedule/Task.h>
 #include <ll/api/service/Bedrock.h>
 #include <ll/api/service/PlayerInfo.h>
+#include <ll/api/service/ServerInfo.h>
 #include <ll/api/service/Service.h>
 #include <ll/api/service/ServiceId.h>
 #include <ll/api/service/ServiceManager.h>
@@ -108,9 +106,13 @@
 #include <ll/api/thread/ThreadPool.h>
 #include <ll/api/thread/TickSyncSleep.h>
 #include <ll/api/thread/TickSyncTaskPool.h>
+#include <ll/api/utils/Base64Utils.h>
 #include <ll/api/utils/CryptoUtils.h>
+#include <ll/api/utils/ErrorUtils.h>
+#include <ll/api/utils/HashUtils.h>
+#include <ll/api/utils/RandomUtils.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>
@@ -126,33 +128,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/Uri.h>
-#include <mc/client/network/WebSocket.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/XPlatSecurityInformation.h>
-#include <mc/client/network/blob_cache/ClientBlobCacheTrackingData.h>
-#include <mc/client/network/detail.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/httpclient.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/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>
@@ -163,19 +165,20 @@
 #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/PersonaCharacterHandle.h>
-#include <mc/client/services/persona/PersonaColors.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/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/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>
@@ -200,13 +203,12 @@
 #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>
@@ -251,11 +253,12 @@
 #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>
@@ -263,20 +266,22 @@
 #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>
@@ -303,9 +308,6 @@
 #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>
@@ -327,19 +329,21 @@
 #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/SharePtrRefTraits.h>
 #include <mc/common/wrapper/SharedPtr.h>
+#include <mc/common/wrapper/SharePtrRefTraits.h>
 #include <mc/common/wrapper/StackRefResultT.h>
 #include <mc/common/wrapper/StructureBlockPaletteLoadResult.h>
 #include <mc/common/wrapper/StructureDeleteResult.h>
@@ -348,13 +352,11 @@
 #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/optional_ref.h>
-#include <mc/common/wrapper/referenced_ptr.h>
+#include <mc/common/wrapper/WSConnectionResult.h>
 #include <mc/config/DefaultScreenCapabilities.h>
 #include <mc/config/IPlayerData.h>
 #include <mc/config/IScreenCapabilities.h>
@@ -383,6 +385,7 @@
 #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>
@@ -406,7 +409,6 @@
 #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>
@@ -416,6 +418,7 @@
 #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>
@@ -425,7 +428,6 @@
 #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>
@@ -479,8 +481,8 @@
 #include <mc/deps/core/StorageAreaFactory.h>
 #include <mc/deps/core/StorageAreaState.h>
 #include <mc/deps/core/StorageAreaStateListener.h>
-#include <mc/deps/core/StorageArea_windows.h>
 #include <mc/deps/core/StorageAreasTree.h>
+#include <mc/deps/core/StorageArea_windows.h>
 #include <mc/deps/core/StringConversions.h>
 #include <mc/deps/core/Subject.h>
 #include <mc/deps/core/TransactionFlags.h>
@@ -517,10 +519,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>
@@ -530,9 +532,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>
@@ -563,25 +565,26 @@
 #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>
@@ -595,10 +598,8 @@
 #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/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/OSThreadPriority.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>
@@ -607,9 +608,11 @@
 #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>
@@ -631,11 +634,12 @@
 #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>
@@ -648,9 +652,8 @@
 #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/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/ConnectPosition.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>
@@ -665,7 +668,6 @@
 #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>
@@ -714,10 +716,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>
@@ -777,6 +779,8 @@
 #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>
@@ -824,14 +828,12 @@
 #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/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/common/ImageBuffer.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>
@@ -839,12 +841,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/OpenSSLHashInterface.h>
 #include <mc/deps/crypto/hash/md5.h>
+#include <mc/deps/crypto/hash/OpenSSLHashInterface.h>
 #include <mc/deps/crypto/random/Random.h>
 #include <mc/deps/crypto/symmetric/OpenSSLSymmetricInterface.h>
 #include <mc/deps/crypto/symmetric/OperationMode.h>
@@ -885,11 +887,12 @@
 #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>
@@ -900,7 +903,6 @@
 #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>
@@ -914,8 +916,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/EnchantSlotConstraint.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/EntityPlacerItemComponent.h>
 #include <mc/deps/puv/v1_20_50/FoodItemComponent.h>
 #include <mc/deps/puv/v1_20_50/FuelItemComponent.h>
@@ -938,36 +940,27 @@
 #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/WearableItemComponent.h>
 #include <mc/deps/puv/v1_20_50/v1_20_50.h>
+#include <mc/deps/puv/v1_20_50/WearableItemComponent.h>
 #include <mc/deps/raknet/AddressOrGUID.h>
-#include <mc/deps/raknet/BPSTracker.h>
 #include <mc/deps/raknet/BitStream.h>
+#include <mc/deps/raknet/BPSTracker.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>
@@ -982,6 +975,15 @@
 #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>
@@ -992,6 +994,7 @@
 #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>
@@ -999,14 +1002,13 @@
 #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>
@@ -1058,9 +1060,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>
@@ -1074,9 +1076,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>
@@ -1163,9 +1165,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>
@@ -1193,8 +1195,6 @@
 #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>
@@ -1210,6 +1210,8 @@
 #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>
@@ -1235,8 +1237,8 @@
 #include <mc/entity/components/MobBodyRotationComponent.h>
 #include <mc/entity/components/MobEffectComponent.h>
 #include <mc/entity/components/MobEffectDefinition.h>
-#include <mc/entity/components/MobEffectSubcomponent.h>
 #include <mc/entity/components/MobEffectsComponent.h>
+#include <mc/entity/components/MobEffectSubcomponent.h>
 #include <mc/entity/components/MobHurtTimeComponent.h>
 #include <mc/entity/components/MobJumpComponent.h>
 #include <mc/entity/components/MobOnPlayerJumpRequestComponent.h>
@@ -1253,13 +1255,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/NameAction.h>
+#include <mc/entity/components/MoveRequestComponent.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>
@@ -1274,9 +1276,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>
@@ -1285,8 +1287,8 @@
 #include <mc/entity/components/ParticleEventRequestQueueComponent.h>
 #include <mc/entity/components/ParticleOnHitSubcomponent.h>
 #include <mc/entity/components/PassengerComponent.h>
-#include <mc/entity/components/PassengerYRotLimitComponent.h>
 #include <mc/entity/components/PassengersToPositionComponent.h>
+#include <mc/entity/components/PassengerYRotLimitComponent.h>
 #include <mc/entity/components/PeekComponent.h>
 #include <mc/entity/components/PeekDefinition.h>
 #include <mc/entity/components/PendingRemovePassengersComponent.h>
@@ -1397,7 +1399,6 @@
 #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>
@@ -1406,6 +1407,7 @@
 #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>
@@ -1476,11 +1478,11 @@
 #include <mc/entity/flags/CollidableMobNearFlag.h>
 #include <mc/entity/flags/CollisionFlag.h>
 #include <mc/entity/flags/ControlledByLocalInstanceFlag.h>
-#include <mc/entity/flags/EditorActorPauseTickNeededFlag.h>
 #include <mc/entity/flags/EditorActorPausedFlag.h>
+#include <mc/entity/flags/EditorActorPauseTickNeededFlag.h>
 #include <mc/entity/flags/EjectedByActivatorRailFlag.h>
-#include <mc/entity/flags/EndPortalBlockFlag.h>
 #include <mc/entity/flags/EnderDragonFlag.h>
+#include <mc/entity/flags/EndPortalBlockFlag.h>
 #include <mc/entity/flags/ExecutingFlag.h>
 #include <mc/entity/flags/ExitFromPassengerFlag.h>
 #include <mc/entity/flags/ExperienceOrbFlag.h>
@@ -1560,8 +1562,8 @@
 #include <mc/entity/flags/WasOnGroundFlag.h>
 #include <mc/entity/flags/WasOnGroundPreTravelFlag.h>
 #include <mc/entity/flags/WasPenetratingLastFrameFlag.h>
-#include <mc/entity/flags/WaterTravelFlag.h>
 #include <mc/entity/flags/WaterlilyBlockFlag.h>
+#include <mc/entity/flags/WaterTravelFlag.h>
 #include <mc/entity/flags/WitherBossFlag.h>
 #include <mc/entity/flags/WitherSkullFlag.h>
 #include <mc/entity/flags/WolfFlag.h>
@@ -1577,8 +1579,8 @@
 #include <mc/entity/systems/ActorLegacyTickSystem.h>
 #include <mc/entity/systems/ActorLimitedLifetimeTickSystem.h>
 #include <mc/entity/systems/ActorMotionSyncSystem.h>
-#include <mc/entity/systems/ActorMoveSystem.h>
 #include <mc/entity/systems/ActorMovementTickFilterSystem.h>
+#include <mc/entity/systems/ActorMoveSystem.h>
 #include <mc/entity/systems/ActorSetPositionRequestComponent.h>
 #include <mc/entity/systems/ActorStopRidingEventSystem.h>
 #include <mc/entity/systems/ActorUpdatePostTickPositionDeltaSystem.h>
@@ -1678,12 +1680,9 @@
 #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/InLavaSensingSystem.h>
-#include <mc/entity/systems/InWaterSensingSystem.h>
 #include <mc/entity/systems/InitialTickFilterSystem.h>
+#include <mc/entity/systems/InLavaSensingSystem.h>
 #include <mc/entity/systems/InsideBlockNotifierSystem.h>
 #include <mc/entity/systems/InsideBubbleColumnSystem.h>
 #include <mc/entity/systems/InsideGenericBlockSystem.h>
@@ -1697,7 +1696,10 @@
 #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>
@@ -1724,10 +1726,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>
@@ -1745,8 +1747,8 @@
 #include <mc/entity/systems/PersonaEmoteInputSystem.h>
 #include <mc/entity/systems/PlayerActionComponent.h>
 #include <mc/entity/systems/PlayerInteractionSystem.h>
-#include <mc/entity/systems/PlayerMoveSystems.h>
 #include <mc/entity/systems/PlayerMovementRateSystem.h>
+#include <mc/entity/systems/PlayerMoveSystems.h>
 #include <mc/entity/systems/PlayerRotationSystem.h>
 #include <mc/entity/systems/PlayerTickComponent.h>
 #include <mc/entity/systems/PlayerTickSystem.h>
@@ -1786,13 +1788,13 @@
 #include <mc/entity/systems/ServerStandInCauldronSystem.h>
 #include <mc/entity/systems/SetActorLinkPacketSystem.h>
 #include <mc/entity/systems/SetActorLinkPacketSystemImpl.h>
-#include <mc/entity/systems/SetPreviousPosRotSystem.h>
 #include <mc/entity/systems/SetPreviousPositionSystem.h>
+#include <mc/entity/systems/SetPreviousPosRotSystem.h>
 #include <mc/entity/systems/SimulatedPlayerPostAIStepSystem.h>
 #include <mc/entity/systems/SkeletonPassengerRotationSystem.h>
 #include <mc/entity/systems/SlimePreNormalTickSystem.h>
-#include <mc/entity/systems/SneakMovementSystem.h>
 #include <mc/entity/systems/SneakingSystem.h>
+#include <mc/entity/systems/SneakMovementSystem.h>
 #include <mc/entity/systems/SoundEventSystem.h>
 #include <mc/entity/systems/SpawnActorSystem.h>
 #include <mc/entity/systems/SpinAttackSystem.h>
@@ -1855,8 +1857,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/CBLISystem.h>
 #include <mc/entity/systems/common/CanJoinRaidQueueSystem.h>
+#include <mc/entity/systems/common/CBLISystem.h>
 #include <mc/entity/systems/common/CelebrateHuntSystemInternal.h>
 #include <mc/entity/systems/common/CheckFallDamageInMoveSystemImpl.h>
 #include <mc/entity/systems/common/CheckFallDamageSystemImpl.h>
@@ -1878,8 +1880,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/EntitySystemTickingMode.h>
 #include <mc/entity/systems/common/EntitySystemsCollection.h>
+#include <mc/entity/systems/common/EntitySystemTickingMode.h>
 #include <mc/entity/systems/common/FileSystemMode.h>
 #include <mc/entity/systems/common/FinalizeMoveSystemImpl.h>
 #include <mc/entity/systems/common/FireworksMovementSystems.h>
@@ -1926,24 +1928,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/PlayerMoveSystemsImpl.h>
 #include <mc/entity/systems/common/PlayerMovementStatsEventSystem.h>
+#include <mc/entity/systems/common/PlayerMoveSystemsImpl.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>
@@ -2010,9 +2012,6 @@
 #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>
@@ -2024,6 +2023,9 @@
 #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>
@@ -2094,7 +2096,6 @@
 #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>
@@ -2113,6 +2114,7 @@
 #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>
@@ -2123,7 +2125,6 @@
 #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>
@@ -2172,10 +2173,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>
@@ -2251,7 +2252,6 @@
 #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>
@@ -2262,6 +2262,7 @@
 #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>
@@ -2273,11 +2274,11 @@
 #include <mc/enums/ReplayStateMode.h>
 #include <mc/enums/RespawnAnimation.h>
 #include <mc/enums/Rotation.h>
-#include <mc/enums/SandType.h>
 #include <mc/enums/SandstoneType.h>
+#include <mc/enums/SandType.h>
 #include <mc/enums/SaplingType.h>
-#include <mc/enums/ScorePacketType.h>
 #include <mc/enums/ScoreboardIdentityPacketType.h>
+#include <mc/enums/ScorePacketType.h>
 #include <mc/enums/SeagrassType.h>
 #include <mc/enums/SemanticConstraint.h>
 #include <mc/enums/ServerAuthMovementMode.h>
@@ -2318,8 +2319,8 @@
 #include <mc/enums/UIScalingRules.h>
 #include <mc/enums/UploadError.h>
 #include <mc/enums/UserGeneratedUriSource.h>
-#include <mc/enums/VRControllerType.h>
 #include <mc/enums/VerticalHalfEnum.h>
+#include <mc/enums/VRControllerType.h>
 #include <mc/enums/WallConnectionType.h>
 #include <mc/enums/WatchdogTerminateReason.h>
 #include <mc/enums/WeirdoDirection.h>
@@ -2347,14 +2348,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>
@@ -2409,8 +2410,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/QrSegment.h>
 #include <mc/external/qrcodegen/qrcodegen.h>
+#include <mc/external/qrcodegen/QrSegment.h>
 #include <mc/external/scripting/AnyAndJSValue.h>
 #include <mc/external/scripting/ArgumentBinding.h>
 #include <mc/external/scripting/ArgumentBindingBuilder.h>
@@ -2422,12 +2423,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>
@@ -2455,6 +2456,10 @@
 #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>
@@ -2462,11 +2467,8 @@
 #include <mc/external/scripting/IPropertySetter.h>
 #include <mc/external/scripting/IRuntime.h>
 #include <mc/external/scripting/IScriptEngine.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/IWatchdog.h>
 #include <mc/external/scripting/JSContext.h>
 #include <mc/external/scripting/JSModuleDef.h>
 #include <mc/external/scripting/JSON.h>
@@ -2518,6 +2520,8 @@
 #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,23 +2537,21 @@
 #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/VersionRequestKey.h>
 #include <mc/external/scripting/VersionRequestedBy.h>
+#include <mc/external/scripting/VersionRequestKey.h>
 #include <mc/external/scripting/Watchdog.h>
 #include <mc/external/scripting/WatchdogEvent.h>
 #include <mc/external/scripting/WatchdogEventType.h>
@@ -2565,7 +2567,6 @@
 #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>
@@ -2614,6 +2615,7 @@
 #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>
@@ -2638,9 +2640,8 @@
 #include <mc/gametest/framework/StructureUtils.h>
 #include <mc/gametest/framework/SyncGameTestFunctionRunResult.h>
 #include <mc/gametest/framework/SyncScriptGameTestFunction.h>
-#include <mc/gametest/framework/TestParameters.h>
-#include <mc/gametest/framework/gametest.h>
 #include <mc/gametest/framework/tags.h>
+#include <mc/gametest/framework/TestParameters.h>
 #include <mc/input/IReplayableActorInput.h>
 #include <mc/leveldb/LevelDbEnv.h>
 #include <mc/leveldb/LevelDbFileLock.h>
@@ -2663,19 +2664,19 @@
 #include <mc/math/Vec2.h>
 #include <mc/math/Vec3.h>
 #include <mc/math/Vec4.h>
-#include <mc/math/vector/Vecs.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/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/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/math/vector/component/base/VectorBase.h>
 #include <mc/nbt/ByteArrayTag.h>
 #include <mc/nbt/ByteTag.h>
 #include <mc/nbt/CompoundTag.h>
@@ -2727,6 +2728,8 @@
 #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>
@@ -2775,8 +2778,8 @@
 #include <mc/network/ThirdPartyInfo.h>
 #include <mc/network/TypedClientNetId.h>
 #include <mc/network/TypedServerNetId.h>
-#include <mc/network/UPNPInterface.h>
 #include <mc/network/UnverifiedCertificate.h>
+#include <mc/network/UPNPInterface.h>
 #include <mc/network/VanillaServerNetworkHandler.h>
 #include <mc/network/WebBlockTag.h>
 #include <mc/network/WebRTCNetworkPeer.h>
@@ -2788,8 +2791,6 @@
 #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>
@@ -2829,12 +2830,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>
@@ -2856,8 +2857,8 @@
 #include <mc/network/packet/DimensionDataPacket.h>
 #include <mc/network/packet/DisconnectPacket.h>
 #include <mc/network/packet/EditorNetworkPacket.h>
-#include <mc/network/packet/EduUriResourcePacket.h>
 #include <mc/network/packet/EducationSettingsPacket.h>
+#include <mc/network/packet/EduUriResourcePacket.h>
 #include <mc/network/packet/EmoteListPacket.h>
 #include <mc/network/packet/EmotePacket.h>
 #include <mc/network/packet/EntityServerPacket.h>
@@ -2915,15 +2916,13 @@
 #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>
@@ -2936,6 +2935,8 @@
 #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>
@@ -2953,11 +2954,11 @@
 #include <mc/network/packet/ResourcePackChunkRequestPacket.h>
 #include <mc/network/packet/ResourcePackClientResponsePacket.h>
 #include <mc/network/packet/ResourcePackDataInfoPacket.h>
-#include <mc/network/packet/ResourcePackStackPacket.h>
 #include <mc/network/packet/ResourcePacksInfoPacket.h>
+#include <mc/network/packet/ResourcePackStackPacket.h>
 #include <mc/network/packet/RespawnPacket.h>
-#include <mc/network/packet/ScorePacketInfo.h>
 #include <mc/network/packet/ScoreboardIdentityPacketInfo.h>
+#include <mc/network/packet/ScorePacketInfo.h>
 #include <mc/network/packet/ScriptMessagePacket.h>
 #include <mc/network/packet/SerializedAbilitiesData.h>
 #include <mc/network/packet/ServerPlayerPostMovePositionPacket.h>
@@ -2977,12 +2978,12 @@
 #include <mc/network/packet/SetLocalPlayerAsInitializedPacket.h>
 #include <mc/network/packet/SetPlayerGameTypePacket.h>
 #include <mc/network/packet/SetPlayerInventoryOptionsPacket.h>
-#include <mc/network/packet/SetScorePacket.h>
 #include <mc/network/packet/SetScoreboardIdentityPacket.h>
+#include <mc/network/packet/SetScorePacket.h>
 #include <mc/network/packet/SetSpawnPositionPacket.h>
 #include <mc/network/packet/SetTimePacket.h>
-#include <mc/network/packet/SetTitlePacket.h>
 #include <mc/network/packet/SettingsCommandPacket.h>
+#include <mc/network/packet/SetTitlePacket.h>
 #include <mc/network/packet/ShowCreditsPacket.h>
 #include <mc/network/packet/ShowProfilePacket.h>
 #include <mc/network/packet/ShowStoreOfferPacket.h>
@@ -3002,8 +3003,8 @@
 #include <mc/network/packet/SyncedAttribute.h>
 #include <mc/network/packet/TakeItemActorPacket.h>
 #include <mc/network/packet/TextPacket.h>
-#include <mc/network/packet/TickSyncPacket.h>
 #include <mc/network/packet/TickingAreasLoadStatusPacket.h>
+#include <mc/network/packet/TickSyncPacket.h>
 #include <mc/network/packet/ToastRequestPacket.h>
 #include <mc/network/packet/TransferPacket.h>
 #include <mc/network/packet/TrimDataPacket.h>
@@ -3024,8 +3025,8 @@
 #include <mc/options/AppConfigs.h>
 #include <mc/options/AppConfigsFactory.h>
 #include <mc/options/EduAppConfigs.h>
-#include <mc/options/EduSharedUriResource.h>
 #include <mc/options/EducationEditionOfferValue.h>
+#include <mc/options/EduSharedUriResource.h>
 #include <mc/options/FeatureToggles.h>
 #include <mc/options/IAppConfigData.h>
 #include <mc/options/IMinecraftGame.h>
@@ -3067,9 +3068,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>
@@ -3082,6 +3083,12 @@
 #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>
@@ -3101,17 +3108,11 @@
 #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>
@@ -3186,6 +3187,7 @@
 #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>
@@ -3197,7 +3199,6 @@
 #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>
@@ -3263,8 +3264,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/ScriptBlockStateType.h>
 #include <mc/scripting/modules/minecraft/ScriptBlockStates.h>
+#include <mc/scripting/modules/minecraft/ScriptBlockStateType.h>
 #include <mc/scripting/modules/minecraft/ScriptBlockType.h>
 #include <mc/scripting/modules/minecraft/ScriptBlockTypes.h>
 #include <mc/scripting/modules/minecraft/ScriptBlockValidator.h>
@@ -3312,8 +3313,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/ScriptEffectType.h>
 #include <mc/scripting/modules/minecraft/ScriptEffects.h>
+#include <mc/scripting/modules/minecraft/ScriptEffectType.h>
 #include <mc/scripting/modules/minecraft/ScriptEntityEffectOptions.h>
 #include <mc/scripting/modules/minecraft/ScriptEntityHitInformation.h>
 #include <mc/scripting/modules/minecraft/ScriptEntityRaycastHit.h>
@@ -3373,13 +3374,14 @@
 #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>
@@ -3390,7 +3392,6 @@
 #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>
@@ -3478,17 +3479,16 @@
 #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>
@@ -3497,13 +3497,14 @@
 #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/ScriptSignTextSide.h>
 #include <mc/scripting/modules/minecraft/ScriptSignals.h>
+#include <mc/scripting/modules/minecraft/ScriptSignTextSide.h>
 #include <mc/scripting/modules/minecraft/ScriptSimpleBlockVolume.h>
 #include <mc/scripting/modules/minecraft/ScriptSimpleBlockVolumeUtils.h>
 #include <mc/scripting/modules/minecraft/ScriptSimulatedPlayer.h>
@@ -3785,8 +3786,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/WSServerCommand.h>
 #include <mc/server/commands/standard/WeatherCommand.h>
+#include <mc/server/commands/standard/WSServerCommand.h>
 #include <mc/server/commands/standard/XPCommand.h>
 #include <mc/server/commands/test/TransferServerCommand.h>
 #include <mc/server/common/AllowListFile.h>
@@ -3875,8 +3876,8 @@
 #include <mc/util/BytesDataOutput.h>
 #include <mc/util/CallbackToken.h>
 #include <mc/util/CallbackTokenCancelState.h>
-#include <mc/util/CerealDocumentUpgradeStep.h>
 #include <mc/util/CerealDocumentUpgrader.h>
+#include <mc/util/CerealDocumentUpgradeStep.h>
 #include <mc/util/CerealHelpers.h>
 #include <mc/util/CerealSchemaUpgrade.h>
 #include <mc/util/ChanceInformation.h>
@@ -3927,8 +3928,8 @@
 #include <mc/util/MineshaftUtil.h>
 #include <mc/util/MobEffectPacketUtils.h>
 #include <mc/util/MobSpawnUtils.h>
-#include <mc/util/NamePair.h>
 #include <mc/util/NamedMolangScript.h>
+#include <mc/util/NamePair.h>
 #include <mc/util/PackSettingsJsonValidator.h>
 #include <mc/util/Palette.h>
 #include <mc/util/PauseManager.h>
@@ -3964,9 +3965,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>
@@ -3999,8 +4000,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_TRS.h>
 #include <mc/util/molang/MolangStruct_TentacleAngleAndSwimRotation.h>
+#include <mc/util/molang/MolangStruct_TRS.h>
 #include <mc/util/molang/MolangStruct_UV.h>
 #include <mc/util/molang/MolangStruct_XY.h>
 #include <mc/util/molang/MolangStruct_XYZ.h>
@@ -4036,6 +4037,7 @@
 #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>
@@ -4043,7 +4045,6 @@
 #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>
@@ -4144,8 +4145,8 @@
 #include <mc/world/actor/GetCollisionShapeActorProxy.h>
 #include <mc/world/actor/HangingActor.h>
 #include <mc/world/actor/Hopper.h>
-#include <mc/world/actor/IEntityInitializer.h>
 #include <mc/world/actor/IdentifierDescription.h>
+#include <mc/world/actor/IEntityInitializer.h>
 #include <mc/world/actor/InsomniaComponent.h>
 #include <mc/world/actor/InternalComponentRegistry.h>
 #include <mc/world/actor/IsSpawnableDescription.h>
@@ -4280,11 +4281,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>
@@ -4324,7 +4325,6 @@
 #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>
@@ -4332,6 +4332,7 @@
 #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>
@@ -4345,11 +4346,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/PlayGoal.h>
 #include <mc/world/actor/ai/goal/PlayerVehicleTamedGoal.h>
+#include <mc/world/actor/ai/goal/PlayGoal.h>
 #include <mc/world/actor/ai/goal/RabbitPanicGoal.h>
-#include <mc/world/actor/ai/goal/RaidGardenGoal.h>
 #include <mc/world/actor/ai/goal/RaiderCelebrationGoal.h>
+#include <mc/world/actor/ai/goal/RaidGardenGoal.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>
@@ -4650,7 +4651,6 @@
 #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>
@@ -4663,6 +4663,7 @@
 #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>
@@ -4695,9 +4696,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>
@@ -4708,8 +4709,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/ITickDelegate.h>
 #include <mc/world/actor/item/ItemActor.h>
+#include <mc/world/actor/item/ITickDelegate.h>
 #include <mc/world/actor/item/Minecart.h>
 #include <mc/world/actor/item/MinecartChest.h>
 #include <mc/world/actor/item/MinecartCommandBlock.h>
@@ -4736,8 +4737,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/PigZombie.h>
 #include <mc/world/actor/monster/Piglin.h>
+#include <mc/world/actor/monster/PigZombie.h>
 #include <mc/world/actor/monster/Pillager.h>
 #include <mc/world/actor/monster/Shulker.h>
 #include <mc/world/actor/monster/Silverfish.h>
@@ -4765,10 +4766,11 @@
 #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/NPCSize.h>
+#include <mc/world/actor/npc/npc.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>
@@ -4776,16 +4778,15 @@
 #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>
@@ -5047,8 +5048,8 @@
 #include <mc/world/events/ActorKilledEvent.h>
 #include <mc/world/events/ActorNotificationEvent.h>
 #include <mc/world/events/ActorPlacedItemEvent.h>
-#include <mc/world/events/ActorRemoveEffectEvent.h>
 #include <mc/world/events/ActorRemovedEvent.h>
+#include <mc/world/events/ActorRemoveEffectEvent.h>
 #include <mc/world/events/ActorStandOnBlockEvent.h>
 #include <mc/world/events/ActorUseItemEvent.h>
 #include <mc/world/events/BlockEventDispatcherToken.h>
@@ -5138,11 +5139,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>
@@ -5186,6 +5187,7 @@
 #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>
@@ -5193,12 +5195,11 @@
 #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>
@@ -5375,10 +5376,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>
@@ -5547,9 +5548,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>
@@ -5601,9 +5602,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>
@@ -5639,8 +5640,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/RepairItemEntry.h>
 #include <mc/world/item/components/RepairableItemComponent.h>
+#include <mc/world/item/components/RepairItemEntry.h>
 #include <mc/world/item/components/ShooterItemComponent.h>
 #include <mc/world/item/components/StorageItemComponent.h>
 #include <mc/world/item/components/ThrowableItemComponent.h>
@@ -5678,8 +5679,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/RecipeUnlockingRequirement.h>
 #include <mc/world/item/crafting/Recipes.h>
+#include <mc/world/item/crafting/RecipeUnlockingRequirement.h>
 #include <mc/world/item/crafting/RepairItemRecipe.h>
 #include <mc/world/item/crafting/ShapedChemistryRecipe.h>
 #include <mc/world/item/crafting/ShapedRecipe.h>
@@ -5695,10 +5696,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>
@@ -5786,9 +5787,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>
@@ -5846,9 +5847,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>
@@ -5877,22 +5878,23 @@
 #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/RTree.h>
 #include <mc/world/level/biome/RareBiomeSpot.h>
+#include <mc/world/level/biome/RTree.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/VanillaBiomeTypes.h>
 #include <mc/world/level/biome/VanillaBiomes.h>
+#include <mc/world/level/biome/VanillaBiomeTypes.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>
@@ -5927,7 +5929,6 @@
 #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>
@@ -6031,12 +6032,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>
@@ -6099,10 +6100,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>
@@ -6129,11 +6130,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>
@@ -6152,9 +6153,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>
@@ -6180,11 +6181,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>
@@ -6253,9 +6254,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>
@@ -6383,8 +6384,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/BlockTypeRegistryRWLock.h>
 #include <mc/world/level/block/registry/BlockTypeRegistryReadLock.h>
+#include <mc/world/level/block/registry/BlockTypeRegistryRWLock.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>
@@ -6393,16 +6394,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/BuiltInBlockStateVariant.h>
 #include <mc/world/level/block/states/BuiltInBlockStates.h>
+#include <mc/world/level/block/states/BuiltInBlockStateVariant.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/BedrockBlockTypes.h>
 #include <mc/world/level/block/utils/BedrockBlocks.h>
+#include <mc/world/level/block/utils/BedrockBlockTypes.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>
@@ -6469,10 +6470,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/IResourceDropsStrategy.h>
-#include <mc/world/level/block/utils/ITrait.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/LecternBlockUtil.h>
 #include <mc/world/level/block/utils/LegacyBlockInfo.h>
 #include <mc/world/level/block/utils/LevelSoundEventMap.h>
@@ -6514,12 +6515,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>
@@ -6554,6 +6555,8 @@
 #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>
@@ -6561,8 +6564,6 @@
 #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>
@@ -6685,11 +6686,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/IFeature.h>
-#include <mc/world/level/levelgen/feature/ITreeFeature.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/IcebergFeature.h>
+#include <mc/world/level/levelgen/feature/IFeature.h>
+#include <mc/world/level/levelgen/feature/ITreeFeature.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>
@@ -6725,8 +6726,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/SeaPickleFeature.h>
 #include <mc/world/level/levelgen/feature/SeagrassFeature.h>
+#include <mc/world/level/levelgen/feature/SeaPickleFeature.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>
@@ -6878,9 +6879,14 @@
 #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>
@@ -6891,11 +6897,6 @@
 #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>
@@ -6990,8 +6991,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/BeardKernel.h>
 #include <mc/world/level/levelgen/v1/BeardingDescriptionCache.h>
+#include <mc/world/level/levelgen/v1/BeardKernel.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>
@@ -7065,8 +7066,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/ExperimentStorage.h>
 #include <mc/world/level/storage/Experiments.h>
+#include <mc/world/level/storage/ExperimentStorage.h>
 #include <mc/world/level/storage/ExternalFileLevelStorageSource.h>
 #include <mc/world/level/storage/FlushableEnv.h>
 #include <mc/world/level/storage/FlushableStorageAreaEnv.h>
@@ -7097,8 +7098,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/SaveTransactionManager.h>
 #include <mc/world/level/storage/SavedDataStorage.h>
+#include <mc/world/level/storage/SaveTransactionManager.h>
 #include <mc/world/level/storage/SnapshotEnv.h>
 #include <mc/world/level/storage/SnapshotFilenameAndLength.h>
 #include <mc/world/level/storage/SnapshotWritableFile.h>
@@ -7120,9 +7121,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>
@@ -7157,8 +7158,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/TickingAreaView.h>
 #include <mc/world/level/ticking/TickingAreasManager.h>
+#include <mc/world/level/ticking/TickingAreaView.h>
 #include <mc/world/module/GameModuleServer.h>
 #include <mc/world/module/IGameModuleShared.h>
 #include <mc/world/persistence/DynamicPropertiesDefinition.h>
@@ -7220,11 +7221,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>