diff --git a/LiteLoader/include/llapi/SendPacketAPI.h b/LiteLoader/include/llapi/SendPacketAPI.h
index b2eab77405..838944654f 100644
--- a/LiteLoader/include/llapi/SendPacketAPI.h
+++ b/LiteLoader/include/llapi/SendPacketAPI.h
@@ -1,6 +1,7 @@
 #pragma once
 #include "llapi/mc/BinaryStream.hpp"
 #include "llapi/mc/Packet.hpp"
+#include "llapi/mc/ExtendedStreamReadResult.hpp"
 
 template <int pid, bool batching = true, bool compress = true>
 class NetworkPacket : public Packet {
@@ -25,14 +26,17 @@ class NetworkPacket : public Packet {
     virtual void write(BinaryStream& bs) const {
         bs.getRaw().append(view);
     }
-    virtual enum StreamReadResult _read(class ReadOnlyBinaryStream&) override {
-        throw("TODO in MyPkt::_read()");
-        return (enum StreamReadResult)0;
-    }
-    virtual void dummyread() {
-        throw("TODO in MyPkt::dummyread()");
+    virtual struct ExtendedStreamReadResult readExtended(class ReadOnlyBinaryStream &) {
+        throw("TODO");
     }
     virtual bool disallowBatching() const {
         return !batching;
     }
+    virtual bool isValid() const {
+        throw("TODO");
+    }
+    virtual enum StreamReadResult _read(class ReadOnlyBinaryStream&) override {
+        throw("TODO in MyPkt::_read()");
+        return (enum StreamReadResult)0;
+    }
 };
\ No newline at end of file
diff --git a/LiteLoader/include/llapi/mc/Abilities.hpp b/LiteLoader/include/llapi/mc/Abilities.hpp
index fe626d4e5d..35ac773806 100644
--- a/LiteLoader/include/llapi/mc/Abilities.hpp
+++ b/LiteLoader/include/llapi/mc/Abilities.hpp
@@ -76,14 +76,14 @@ class Abilities {
      * @symbol ??4Abilities\@\@QEAAAEAV0\@AEBV0\@\@Z
      */
     MCAPI class Abilities & operator=(class Abilities const &);
-    /**
-     * @symbol ?setAbility\@Abilities\@\@QEAAXW4AbilitiesIndex\@\@M\@Z
-     */
-    MCAPI void setAbility(enum class AbilitiesIndex, float);
     /**
      * @symbol ?setAbility\@Abilities\@\@QEAAXW4AbilitiesIndex\@\@AEBVAbility\@\@\@Z
      */
     MCAPI void setAbility(enum class AbilitiesIndex, class Ability const &);
+    /**
+     * @symbol ?setAbility\@Abilities\@\@QEAAXW4AbilitiesIndex\@\@M\@Z
+     */
+    MCAPI void setAbility(enum class AbilitiesIndex, float);
     /**
      * @symbol ?setAbility\@Abilities\@\@QEAAXW4AbilitiesIndex\@\@_N\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/Actor.hpp b/LiteLoader/include/llapi/mc/Actor.hpp
index d363b5ccac..67fa642413 100644
--- a/LiteLoader/include/llapi/mc/Actor.hpp
+++ b/LiteLoader/include/llapi/mc/Actor.hpp
@@ -1684,14 +1684,14 @@ class Actor {
      * @symbol ?clearFishingHookID\@Actor\@\@QEAAXXZ
      */
     MCAPI void clearFishingHookID();
-    /**
-     * @symbol ?closerThan\@Actor\@\@QEBA_NAEBV1\@MM\@Z
-     */
-    MCAPI bool closerThan(class Actor const &, float, float) const;
     /**
      * @symbol ?closerThan\@Actor\@\@QEBA_NAEBV1\@M\@Z
      */
     MCAPI bool closerThan(class Actor const &, float) const;
+    /**
+     * @symbol ?closerThan\@Actor\@\@QEBA_NAEBV1\@MM\@Z
+     */
+    MCAPI bool closerThan(class Actor const &, float, float) const;
     /**
      * @symbol ?consumeItem\@Actor\@\@QEAAXAEAVItemActor\@\@H\@Z
      */
@@ -1716,22 +1716,22 @@ class Actor {
      * @symbol ?distanceSqrToBlockPosCenter\@Actor\@\@QEBAMAEBVBlockPos\@\@\@Z
      */
     MCAPI float distanceSqrToBlockPosCenter(class BlockPos const &) const;
-    /**
-     * @symbol ?distanceTo\@Actor\@\@QEBAMAEBV1\@\@Z
-     */
-    MCAPI float distanceTo(class Actor const &) const;
     /**
      * @symbol ?distanceTo\@Actor\@\@QEBAMAEBVVec3\@\@\@Z
      */
     MCAPI float distanceTo(class Vec3 const &) const;
     /**
-     * @symbol ?distanceToSqr\@Actor\@\@QEBAMAEBV1\@\@Z
+     * @symbol ?distanceTo\@Actor\@\@QEBAMAEBV1\@\@Z
      */
-    MCAPI float distanceToSqr(class Actor const &) const;
+    MCAPI float distanceTo(class Actor const &) const;
     /**
      * @symbol ?distanceToSqr\@Actor\@\@QEBAMAEBVVec3\@\@\@Z
      */
     MCAPI float distanceToSqr(class Vec3 const &) const;
+    /**
+     * @symbol ?distanceToSqr\@Actor\@\@QEBAMAEBV1\@\@Z
+     */
+    MCAPI float distanceToSqr(class Actor const &) const;
     /**
      * @symbol ?dropLeash\@Actor\@\@QEAAX_N0\@Z
      */
@@ -1884,22 +1884,22 @@ class Actor {
      * @symbol ?getEconomyTradeableComponent\@Actor\@\@QEBAPEAVEconomyTradeableComponent\@\@XZ
      */
     MCAPI class EconomyTradeableComponent * getEconomyTradeableComponent() const;
-    /**
-     * @symbol ?getEffect\@Actor\@\@QEBAPEBVMobEffectInstance\@\@AEBVMobEffect\@\@\@Z
-     */
-    MCAPI class MobEffectInstance const * getEffect(class MobEffect const &) const;
     /**
      * @symbol ?getEffect\@Actor\@\@QEBAPEBVMobEffectInstance\@\@I\@Z
      */
     MCAPI class MobEffectInstance const * getEffect(unsigned int) const;
     /**
-     * @symbol ?getEntityData\@Actor\@\@QEAAAEAVSynchedActorDataEntityWrapper\@\@XZ
+     * @symbol ?getEffect\@Actor\@\@QEBAPEBVMobEffectInstance\@\@AEBVMobEffect\@\@\@Z
      */
-    MCAPI class SynchedActorDataEntityWrapper & getEntityData();
+    MCAPI class MobEffectInstance const * getEffect(class MobEffect const &) const;
     /**
      * @symbol ?getEntityData\@Actor\@\@QEBAAEBVSynchedActorDataEntityWrapper\@\@XZ
      */
     MCAPI class SynchedActorDataEntityWrapper const & getEntityData() const;
+    /**
+     * @symbol ?getEntityData\@Actor\@\@QEAAAEAVSynchedActorDataEntityWrapper\@\@XZ
+     */
+    MCAPI class SynchedActorDataEntityWrapper & getEntityData();
     /**
      * @symbol ?getEntityRegistry\@Actor\@\@QEAA?AV?$StackRefResultT\@UEntityRegistryRefTraits\@\@\@\@XZ
      */
@@ -2320,14 +2320,14 @@ class Actor {
      * @symbol ?initActorProperties\@Actor\@\@QEAAXXZ
      */
     MCAPI void initActorProperties();
-    /**
-     * @symbol ?initParams\@Actor\@\@QEAAXAEAVVariantParameterList\@\@\@Z
-     */
-    MCAPI void initParams(class VariantParameterList &);
     /**
      * @symbol ?initParams\@Actor\@\@QEAAXAEAVRenderParams\@\@\@Z
      */
     MCAPI void initParams(class RenderParams &);
+    /**
+     * @symbol ?initParams\@Actor\@\@QEAAXAEAVVariantParameterList\@\@\@Z
+     */
+    MCAPI void initParams(class VariantParameterList &);
     /**
      * @symbol ?isActorLocationInMaterial\@Actor\@\@QEBA_NW4ActorLocation\@\@W4MaterialType\@\@\@Z
      */
@@ -2656,10 +2656,6 @@ class Actor {
      * @symbol ?playMovementSound\@Actor\@\@QEAAXXZ
      */
     MCAPI void playMovementSound();
-    /**
-     * @symbol ?playSound\@Actor\@\@QEAAXAEBVIConstBlockSource\@\@W4LevelSoundEvent\@\@AEBVVec3\@\@H\@Z
-     */
-    MCAPI void playSound(class IConstBlockSource const &, enum class LevelSoundEvent, class Vec3 const &, int);
     /**
      * @symbol ?playSound\@Actor\@\@QEAAXW4LevelSoundEvent\@\@AEBVVec3\@\@AEBVBlock\@\@\@Z
      */
@@ -2668,6 +2664,10 @@ class Actor {
      * @symbol ?playSound\@Actor\@\@QEAAXW4LevelSoundEvent\@\@AEBVVec3\@\@H\@Z
      */
     MCAPI void playSound(enum class LevelSoundEvent, class Vec3 const &, int);
+    /**
+     * @symbol ?playSound\@Actor\@\@QEAAXAEBVIConstBlockSource\@\@W4LevelSoundEvent\@\@AEBVVec3\@\@H\@Z
+     */
+    MCAPI void playSound(class IConstBlockSource const &, enum class LevelSoundEvent, class Vec3 const &, int);
     /**
      * @symbol ?positionAllPassengers\@Actor\@\@QEAAXXZ
      */
diff --git a/LiteLoader/include/llapi/mc/ActorContainerDiffHelperImpl.hpp b/LiteLoader/include/llapi/mc/ActorContainerDiffHelperImpl.hpp
index d4357ea6ec..53c10f1702 100644
--- a/LiteLoader/include/llapi/mc/ActorContainerDiffHelperImpl.hpp
+++ b/LiteLoader/include/llapi/mc/ActorContainerDiffHelperImpl.hpp
@@ -25,14 +25,14 @@ namespace ActorContainerDiffHelperImpl {
      * @symbol ?_applyDiff\@ActorContainerDiffHelperImpl\@\@YAXAEAVBaseAttributeMap\@\@AEBV?$vector\@V?$not_null\@PEBVAttributeInstance\@\@\@gsl\@\@V?$allocator\@V?$not_null\@PEBVAttributeInstance\@\@\@gsl\@\@\@std\@\@\@std\@\@\@Z
      */
     MCAPI void _applyDiff(class BaseAttributeMap &, std::vector<class gsl::not_null<class AttributeInstance const *>> const &);
-    /**
-     * @symbol ?_createListOfPointers\@ActorContainerDiffHelperImpl\@\@YA?BV?$vector\@V?$not_null\@PEBVDataItem\@\@\@gsl\@\@V?$allocator\@V?$not_null\@PEBVDataItem\@\@\@gsl\@\@\@std\@\@\@std\@\@AEBVSynchedActorData\@\@\@Z
-     */
-    MCAPI std::vector<class gsl::not_null<class DataItem const *>> const _createListOfPointers(class SynchedActorData const &);
     /**
      * @symbol ?_createListOfPointers\@ActorContainerDiffHelperImpl\@\@YA?BV?$vector\@V?$not_null\@PEBVAttributeInstance\@\@\@gsl\@\@V?$allocator\@V?$not_null\@PEBVAttributeInstance\@\@\@gsl\@\@\@std\@\@\@std\@\@AEBVBaseAttributeMap\@\@\@Z
      */
     MCAPI std::vector<class gsl::not_null<class AttributeInstance const *>> const _createListOfPointers(class BaseAttributeMap const &);
+    /**
+     * @symbol ?_createListOfPointers\@ActorContainerDiffHelperImpl\@\@YA?BV?$vector\@V?$not_null\@PEBVDataItem\@\@\@gsl\@\@V?$allocator\@V?$not_null\@PEBVDataItem\@\@\@gsl\@\@\@std\@\@\@std\@\@AEBVSynchedActorData\@\@\@Z
+     */
+    MCAPI std::vector<class gsl::not_null<class DataItem const *>> const _createListOfPointers(class SynchedActorData const &);
     /**
      * @symbol ?_createListOfPointers\@ActorContainerDiffHelperImpl\@\@YA?BV?$vector\@V?$not_null\@PEBVMobEffectInstance\@\@\@gsl\@\@V?$allocator\@V?$not_null\@PEBVMobEffectInstance\@\@\@gsl\@\@\@std\@\@\@std\@\@AEBV?$vector\@VMobEffectInstance\@\@V?$allocator\@VMobEffectInstance\@\@\@std\@\@\@3\@\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/ActorDefinitionDescriptor.hpp b/LiteLoader/include/llapi/mc/ActorDefinitionDescriptor.hpp
index 85f044f653..971396148f 100644
--- a/LiteLoader/include/llapi/mc/ActorDefinitionDescriptor.hpp
+++ b/LiteLoader/include/llapi/mc/ActorDefinitionDescriptor.hpp
@@ -22,14 +22,14 @@ class ActorDefinitionDescriptor {
 
 #undef AFTER_EXTRA
 public:
-    /**
-     * @symbol ??0ActorDefinitionDescriptor\@\@QEAA\@AEBV0\@\@Z
-     */
-    MCAPI ActorDefinitionDescriptor(class ActorDefinitionDescriptor const &);
     /**
      * @symbol ??0ActorDefinitionDescriptor\@\@QEAA\@XZ
      */
     MCAPI ActorDefinitionDescriptor();
+    /**
+     * @symbol ??0ActorDefinitionDescriptor\@\@QEAA\@AEBV0\@\@Z
+     */
+    MCAPI ActorDefinitionDescriptor(class ActorDefinitionDescriptor const &);
     /**
      * @symbol ??0ActorDefinitionDescriptor\@\@QEAA\@$$QEAV0\@\@Z
      */
@@ -62,14 +62,14 @@ class ActorDefinitionDescriptor {
      * @symbol ?hasNavigationSubComponent\@ActorDefinitionDescriptor\@\@QEAA_NXZ
      */
     MCAPI bool hasNavigationSubComponent();
-    /**
-     * @symbol ??4ActorDefinitionDescriptor\@\@QEAAAEAV0\@AEBV0\@\@Z
-     */
-    MCAPI class ActorDefinitionDescriptor & operator=(class ActorDefinitionDescriptor const &);
     /**
      * @symbol ??4ActorDefinitionDescriptor\@\@QEAAAEAV0\@$$QEAV0\@\@Z
      */
     MCAPI class ActorDefinitionDescriptor & operator=(class ActorDefinitionDescriptor &&);
+    /**
+     * @symbol ??4ActorDefinitionDescriptor\@\@QEAAAEAV0\@AEBV0\@\@Z
+     */
+    MCAPI class ActorDefinitionDescriptor & operator=(class ActorDefinitionDescriptor const &);
     /**
      * @symbol ?overlaps\@ActorDefinitionDescriptor\@\@QEBA_NAEBV1\@\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/ActorDefinitionIdentifier.hpp b/LiteLoader/include/llapi/mc/ActorDefinitionIdentifier.hpp
index 135c82424e..fdcc72320c 100644
--- a/LiteLoader/include/llapi/mc/ActorDefinitionIdentifier.hpp
+++ b/LiteLoader/include/llapi/mc/ActorDefinitionIdentifier.hpp
@@ -28,34 +28,34 @@ struct ActorDefinitionIdentifier {
 
 #undef AFTER_EXTRA
 public:
+    /**
+     * @symbol ??0ActorDefinitionIdentifier\@\@QEAA\@W4ActorType\@\@\@Z
+     */
+    MCAPI ActorDefinitionIdentifier(enum class ActorType);
     /**
      * @symbol ??0ActorDefinitionIdentifier\@\@QEAA\@AEBU0\@\@Z
      */
     MCAPI ActorDefinitionIdentifier(struct ActorDefinitionIdentifier const &);
     /**
-     * @symbol ??0ActorDefinitionIdentifier\@\@QEAA\@XZ
+     * @symbol ??0ActorDefinitionIdentifier\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z
      */
-    MCAPI ActorDefinitionIdentifier();
+    MCAPI ActorDefinitionIdentifier(std::string const &);
     /**
-     * @symbol ??0ActorDefinitionIdentifier\@\@QEAA\@PEBD\@Z
+     * @symbol ??0ActorDefinitionIdentifier\@\@QEAA\@XZ
      */
-    MCAPI ActorDefinitionIdentifier(char const *);
+    MCAPI ActorDefinitionIdentifier();
     /**
-     * @symbol ??0ActorDefinitionIdentifier\@\@QEAA\@W4ActorType\@\@\@Z
+     * @symbol ??0ActorDefinitionIdentifier\@\@QEAA\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@00\@Z
      */
-    MCAPI ActorDefinitionIdentifier(enum class ActorType);
+    MCAPI ActorDefinitionIdentifier(std::string, std::string, std::string);
     /**
-     * @symbol ??0ActorDefinitionIdentifier\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z
+     * @symbol ??0ActorDefinitionIdentifier\@\@QEAA\@PEBD\@Z
      */
-    MCAPI ActorDefinitionIdentifier(std::string const &);
+    MCAPI ActorDefinitionIdentifier(char const *);
     /**
      * @symbol ??0ActorDefinitionIdentifier\@\@QEAA\@$$QEAU0\@\@Z
      */
     MCAPI ActorDefinitionIdentifier(struct ActorDefinitionIdentifier &&);
-    /**
-     * @symbol ??0ActorDefinitionIdentifier\@\@QEAA\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@00\@Z
-     */
-    MCAPI ActorDefinitionIdentifier(std::string, std::string, std::string);
     /**
      * @symbol ?_getLegacyActorType\@ActorDefinitionIdentifier\@\@QEBA?AW4ActorType\@\@XZ
      */
diff --git a/LiteLoader/include/llapi/mc/ActorEventCoordinator.hpp b/LiteLoader/include/llapi/mc/ActorEventCoordinator.hpp
index ddf6c22428..0b17b731db 100644
--- a/LiteLoader/include/llapi/mc/ActorEventCoordinator.hpp
+++ b/LiteLoader/include/llapi/mc/ActorEventCoordinator.hpp
@@ -81,13 +81,13 @@ class ActorEventCoordinator {
      * @symbol ?sendEvent\@ActorEventCoordinator\@\@QEAA?AW4CoordinatorResult\@\@V?$EventRef\@U?$MutableActorGameplayEvent\@W4CoordinatorResult\@\@\@\@\@\@\@Z
      */
     MCAPI enum class CoordinatorResult sendEvent(class EventRef<struct MutableActorGameplayEvent<enum class CoordinatorResult>>);
-    /**
-     * @symbol ?sendEvent\@ActorEventCoordinator\@\@QEAA?AW4CoordinatorResult\@\@AEBV?$EventRef\@U?$ActorGameplayEvent\@W4CoordinatorResult\@\@\@\@\@\@\@Z
-     */
-    MCAPI enum class CoordinatorResult sendEvent(class EventRef<struct ActorGameplayEvent<enum class CoordinatorResult>> const &);
     /**
      * @symbol ?sendEvent\@ActorEventCoordinator\@\@QEAAXAEBV?$EventRef\@U?$ActorGameplayEvent\@X\@\@\@\@\@Z
      */
     MCAPI void sendEvent(class EventRef<struct ActorGameplayEvent<void>> const &);
+    /**
+     * @symbol ?sendEvent\@ActorEventCoordinator\@\@QEAA?AW4CoordinatorResult\@\@AEBV?$EventRef\@U?$ActorGameplayEvent\@W4CoordinatorResult\@\@\@\@\@\@\@Z
+     */
+    MCAPI enum class CoordinatorResult sendEvent(class EventRef<struct ActorGameplayEvent<enum class CoordinatorResult>> const &);
 
 };
diff --git a/LiteLoader/include/llapi/mc/ActorEventPacket.hpp b/LiteLoader/include/llapi/mc/ActorEventPacket.hpp
index 64f1b9f318..59e9107f6e 100644
--- a/LiteLoader/include/llapi/mc/ActorEventPacket.hpp
+++ b/LiteLoader/include/llapi/mc/ActorEventPacket.hpp
@@ -53,7 +53,7 @@ class ActorEventPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@ActorEventPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/ActorPickRequestPacket.hpp b/LiteLoader/include/llapi/mc/ActorPickRequestPacket.hpp
index 3e45de8416..369e7f22ea 100644
--- a/LiteLoader/include/llapi/mc/ActorPickRequestPacket.hpp
+++ b/LiteLoader/include/llapi/mc/ActorPickRequestPacket.hpp
@@ -50,7 +50,7 @@ class ActorPickRequestPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@ActorPickRequestPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/ActorTickNeededComponent.hpp b/LiteLoader/include/llapi/mc/ActorTickNeededComponent.hpp
index 52e260ea59..fcb65bf8a8 100644
--- a/LiteLoader/include/llapi/mc/ActorTickNeededComponent.hpp
+++ b/LiteLoader/include/llapi/mc/ActorTickNeededComponent.hpp
@@ -30,14 +30,14 @@ class ActorTickNeededComponent {
 #endif
 
 public:
-    /**
-     * @symbol ??0ActorTickNeededComponent\@\@QEAA\@AEAVBlockSource\@\@\@Z
-     */
-    MCAPI ActorTickNeededComponent(class BlockSource &);
     /**
      * @symbol ??0ActorTickNeededComponent\@\@QEAA\@$$QEAV0\@\@Z
      */
     MCAPI ActorTickNeededComponent(class ActorTickNeededComponent &&);
+    /**
+     * @symbol ??0ActorTickNeededComponent\@\@QEAA\@AEAVBlockSource\@\@\@Z
+     */
+    MCAPI ActorTickNeededComponent(class BlockSource &);
     /**
      * @symbol ?getBlockSource\@ActorTickNeededComponent\@\@QEAA?AV?$WeakRefT\@U?$SharePtrRefTraits\@VBlockSource\@\@\@\@\@\@XZ
      */
diff --git a/LiteLoader/include/llapi/mc/ActorValueValidation.hpp b/LiteLoader/include/llapi/mc/ActorValueValidation.hpp
index 8f54f576f8..683aab0a0b 100644
--- a/LiteLoader/include/llapi/mc/ActorValueValidation.hpp
+++ b/LiteLoader/include/llapi/mc/ActorValueValidation.hpp
@@ -20,28 +20,36 @@ namespace ActorValueValidation {
 
 #undef AFTER_EXTRA
     /**
-     * @symbol ?_fireTelemetryEvent\@ActorValueValidation\@\@YAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEBD\@Z
+     * @symbol ?_fireTelemetryEvent\@ActorValueValidation\@\@YAXAEBVBlockPos\@\@PEBD\@Z
      */
-    MCAPI void _fireTelemetryEvent(std::string const &, char const *);
+    MCAPI void _fireTelemetryEvent(class BlockPos const &, char const *);
     /**
      * @symbol ?_fireTelemetryEvent\@ActorValueValidation\@\@YAXAEBVVec3\@\@PEBD\@Z
      */
     MCAPI void _fireTelemetryEvent(class Vec3 const &, char const *);
+    /**
+     * @symbol ?_fireTelemetryEvent\@ActorValueValidation\@\@YAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEBD\@Z
+     */
+    MCAPI void _fireTelemetryEvent(std::string const &, char const *);
     /**
      * @symbol ?isLegalPlayerPosition\@ActorValueValidation\@\@YA_NAEBVVec3\@\@PEBD\@Z
      */
     MCAPI bool isLegalPlayerPosition(class Vec3 const &, char const *);
     /**
-     * @symbol ?validateBlockPos\@ActorValueValidation\@\@YAXAEBVBlockPos\@\@PEBD\@Z
+     * @symbol ?validateBlockPos\@ActorValueValidation\@\@YA_NAEBVBlockPos\@\@PEBD\@Z
+     */
+    MCAPI bool validateBlockPos(class BlockPos const &, char const *);
+    /**
+     * @symbol ?validateFloatValue\@ActorValueValidation\@\@YA_NMPEBD\@Z
      */
-    MCAPI void validateBlockPos(class BlockPos const &, char const *);
+    MCAPI bool validateFloatValue(float, char const *);
     /**
-     * @symbol ?validateVec3Position\@ActorValueValidation\@\@YAXAEBVVec3\@\@PEBD\@Z
+     * @symbol ?validateVec2Position\@ActorValueValidation\@\@YA_NAEBVVec2\@\@PEBD\@Z
      */
-    MCAPI void validateVec3Position(class Vec3 const &, char const *);
+    MCAPI bool validateVec2Position(class Vec2 const &, char const *);
     /**
-     * @symbol ?validateYHeadRot\@ActorValueValidation\@\@YAXMPEBD\@Z
+     * @symbol ?validateVec3Position\@ActorValueValidation\@\@YA_NAEBVVec3\@\@PEBD\@Z
      */
-    MCAPI void validateYHeadRot(float, char const *);
+    MCAPI bool validateVec3Position(class Vec3 const &, char const *);
 
 };
\ No newline at end of file
diff --git a/LiteLoader/include/llapi/mc/AddActorPacket.hpp b/LiteLoader/include/llapi/mc/AddActorPacket.hpp
index c1132f2452..34e8dd586f 100644
--- a/LiteLoader/include/llapi/mc/AddActorPacket.hpp
+++ b/LiteLoader/include/llapi/mc/AddActorPacket.hpp
@@ -50,7 +50,7 @@ class AddActorPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@AddActorPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/AddBehaviorTreePacket.hpp b/LiteLoader/include/llapi/mc/AddBehaviorTreePacket.hpp
index 324fc88da7..79bc39555f 100644
--- a/LiteLoader/include/llapi/mc/AddBehaviorTreePacket.hpp
+++ b/LiteLoader/include/llapi/mc/AddBehaviorTreePacket.hpp
@@ -50,7 +50,7 @@ class AddBehaviorTreePacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@AddBehaviorTreePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/AddItemActorPacket.hpp b/LiteLoader/include/llapi/mc/AddItemActorPacket.hpp
index eb3912334c..43fcd4cdab 100644
--- a/LiteLoader/include/llapi/mc/AddItemActorPacket.hpp
+++ b/LiteLoader/include/llapi/mc/AddItemActorPacket.hpp
@@ -50,7 +50,7 @@ class AddItemActorPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@AddItemActorPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/AddPaintingPacket.hpp b/LiteLoader/include/llapi/mc/AddPaintingPacket.hpp
index b906810113..7db2fcc7df 100644
--- a/LiteLoader/include/llapi/mc/AddPaintingPacket.hpp
+++ b/LiteLoader/include/llapi/mc/AddPaintingPacket.hpp
@@ -50,7 +50,7 @@ class AddPaintingPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@AddPaintingPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/AddPlayerPacket.hpp b/LiteLoader/include/llapi/mc/AddPlayerPacket.hpp
index f980e6106c..fa4c9228cb 100644
--- a/LiteLoader/include/llapi/mc/AddPlayerPacket.hpp
+++ b/LiteLoader/include/llapi/mc/AddPlayerPacket.hpp
@@ -50,7 +50,7 @@ class AddPlayerPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@AddPlayerPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/AddVolumeEntityPacket.hpp b/LiteLoader/include/llapi/mc/AddVolumeEntityPacket.hpp
index ae1aacc6e3..a5f60d64de 100644
--- a/LiteLoader/include/llapi/mc/AddVolumeEntityPacket.hpp
+++ b/LiteLoader/include/llapi/mc/AddVolumeEntityPacket.hpp
@@ -51,7 +51,7 @@ class AddVolumeEntityPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@AddVolumeEntityPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/AgentActionEventPacket.hpp b/LiteLoader/include/llapi/mc/AgentActionEventPacket.hpp
index 5327407411..0062b54772 100644
--- a/LiteLoader/include/llapi/mc/AgentActionEventPacket.hpp
+++ b/LiteLoader/include/llapi/mc/AgentActionEventPacket.hpp
@@ -49,7 +49,7 @@ class AgentActionEventPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@AgentActionEventPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/AllowListEntry.hpp b/LiteLoader/include/llapi/mc/AllowListEntry.hpp
index 19625928ed..2a049a66b4 100644
--- a/LiteLoader/include/llapi/mc/AllowListEntry.hpp
+++ b/LiteLoader/include/llapi/mc/AllowListEntry.hpp
@@ -51,13 +51,13 @@ class AllowListEntry {
      */
     MCVAPI ~AllowListEntry();
 #endif
-    /**
-     * @symbol ??0AllowListEntry\@\@QEAA\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z
-     */
-    MCAPI AllowListEntry(std::string);
     /**
      * @symbol ??0AllowListEntry\@\@QEAA\@AEAVValue\@Json\@\@\@Z
      */
     MCAPI AllowListEntry(class Json::Value &);
+    /**
+     * @symbol ??0AllowListEntry\@\@QEAA\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z
+     */
+    MCAPI AllowListEntry(std::string);
 
 };
diff --git a/LiteLoader/include/llapi/mc/AnimateEntityPacket.hpp b/LiteLoader/include/llapi/mc/AnimateEntityPacket.hpp
index 41b787d78c..4f0d4a6111 100644
--- a/LiteLoader/include/llapi/mc/AnimateEntityPacket.hpp
+++ b/LiteLoader/include/llapi/mc/AnimateEntityPacket.hpp
@@ -50,7 +50,7 @@ class AnimateEntityPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@AnimateEntityPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/AnimatePacket.hpp b/LiteLoader/include/llapi/mc/AnimatePacket.hpp
index 425c1cdb78..66bc33e26b 100644
--- a/LiteLoader/include/llapi/mc/AnimatePacket.hpp
+++ b/LiteLoader/include/llapi/mc/AnimatePacket.hpp
@@ -64,7 +64,7 @@ class AnimatePacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@AnimatePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
@@ -78,6 +78,10 @@ class AnimatePacket : public Packet {
      * @symbol ??0AnimatePacket\@\@QEAA\@W4Action\@0\@AEAVActor\@\@\@Z
      */
     MCAPI AnimatePacket(enum class AnimatePacket::Action, class Actor &);
+    /**
+     * @symbol ??0AnimatePacket\@\@QEAA\@XZ
+     */
+    MCAPI AnimatePacket();
     /**
      * @symbol ??0AnimatePacket\@\@QEAA\@W4Action\@0\@VActorRuntimeID\@\@M\@Z
      */
@@ -86,9 +90,5 @@ class AnimatePacket : public Packet {
      * @symbol ??0AnimatePacket\@\@QEAA\@W4Action\@0\@VActorRuntimeID\@\@\@Z
      */
     MCAPI AnimatePacket(enum class AnimatePacket::Action, class ActorRuntimeID);
-    /**
-     * @symbol ??0AnimatePacket\@\@QEAA\@XZ
-     */
-    MCAPI AnimatePacket();
 
 };
diff --git a/LiteLoader/include/llapi/mc/AnimatedImageData.hpp b/LiteLoader/include/llapi/mc/AnimatedImageData.hpp
index fb3a2f62e9..3bf46ffa94 100644
--- a/LiteLoader/include/llapi/mc/AnimatedImageData.hpp
+++ b/LiteLoader/include/llapi/mc/AnimatedImageData.hpp
@@ -26,14 +26,14 @@ class AnimatedImageData {
 #endif
 
 public:
-    /**
-     * @symbol ??0AnimatedImageData\@\@QEAA\@W4AnimatedTextureType\@persona\@\@W4AnimationExpression\@2\@AEBUImage\@mce\@\@M\@Z
-     */
-    MCAPI AnimatedImageData(enum class persona::AnimatedTextureType, enum class persona::AnimationExpression, struct mce::Image const &, float);
     /**
      * @symbol ??0AnimatedImageData\@\@QEAA\@AEBV0\@\@Z
      */
     MCAPI AnimatedImageData(class AnimatedImageData const &);
+    /**
+     * @symbol ??0AnimatedImageData\@\@QEAA\@W4AnimatedTextureType\@persona\@\@W4AnimationExpression\@2\@AEBUImage\@mce\@\@M\@Z
+     */
+    MCAPI AnimatedImageData(enum class persona::AnimatedTextureType, enum class persona::AnimationExpression, struct mce::Image const &, float);
     /**
      * @symbol ??4AnimatedImageData\@\@QEAAAEAV0\@AEBV0\@\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/AnvilDamagePacket.hpp b/LiteLoader/include/llapi/mc/AnvilDamagePacket.hpp
index 760b597c18..a56a7f8a46 100644
--- a/LiteLoader/include/llapi/mc/AnvilDamagePacket.hpp
+++ b/LiteLoader/include/llapi/mc/AnvilDamagePacket.hpp
@@ -50,7 +50,7 @@ class AnvilDamagePacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@AnvilDamagePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/AppPlatform.hpp b/LiteLoader/include/llapi/mc/AppPlatform.hpp
index 0f6792fcc8..e0974fcb24 100644
--- a/LiteLoader/include/llapi/mc/AppPlatform.hpp
+++ b/LiteLoader/include/llapi/mc/AppPlatform.hpp
@@ -134,14 +134,14 @@ struct AndroidScopedStorageInfo {
      * @symbol ?createLoggingStorageArea\@AppPlatform\@\@UEAA?AV?$shared_ptr\@VFileStorageArea\@Core\@\@\@std\@\@W4FileAccessType\@Core\@\@AEBVPath\@5\@\@Z
      */
     MCVAPI class std::shared_ptr<class Core::FileStorageArea> createLoggingStorageArea(enum class Core::FileAccessType, class Core::Path const &);
-    /**
-     * @symbol ?createUserInput\@AppPlatform\@\@UEAAXH\@Z
-     */
-    MCVAPI void createUserInput(int);
     /**
      * @symbol ?createUserInput\@AppPlatform\@\@UEAAXXZ
      */
     MCVAPI void createUserInput();
+    /**
+     * @symbol ?createUserInput\@AppPlatform\@\@UEAAXH\@Z
+     */
+    MCVAPI void createUserInput(int);
     /**
      * @symbol ?createWebview\@AppPlatform\@\@UEBA?AV?$shared_ptr\@VWebviewInterface\@\@\@std\@\@$$QEAVPlatformArguments\@Webview\@\@\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/AttributeInstance.hpp b/LiteLoader/include/llapi/mc/AttributeInstance.hpp
index dad5885a25..1109354b15 100644
--- a/LiteLoader/include/llapi/mc/AttributeInstance.hpp
+++ b/LiteLoader/include/llapi/mc/AttributeInstance.hpp
@@ -99,14 +99,14 @@ class AttributeInstance {
      * @symbol ?getModifier\@AttributeInstance\@\@QEBA?AVAttributeModifier\@\@AEBVUUID\@mce\@\@\@Z
      */
     MCAPI class AttributeModifier getModifier(class mce::UUID const &) const;
-    /**
-     * @symbol ?getModifiers\@AttributeInstance\@\@QEBA?AV?$vector\@VAttributeModifier\@\@V?$allocator\@VAttributeModifier\@\@\@std\@\@\@std\@\@XZ
-     */
-    MCAPI std::vector<class AttributeModifier> getModifiers() const;
     /**
      * @symbol ?getModifiers\@AttributeInstance\@\@QEBA?AV?$vector\@VAttributeModifier\@\@V?$allocator\@VAttributeModifier\@\@\@std\@\@\@std\@\@H\@Z
      */
     MCAPI std::vector<class AttributeModifier> getModifiers(int) const;
+    /**
+     * @symbol ?getModifiers\@AttributeInstance\@\@QEBA?AV?$vector\@VAttributeModifier\@\@V?$allocator\@VAttributeModifier\@\@\@std\@\@\@std\@\@XZ
+     */
+    MCAPI std::vector<class AttributeModifier> getModifiers() const;
     /**
      * @symbol ?hasModifier\@AttributeInstance\@\@QEBA_NAEBVUUID\@mce\@\@\@Z
      */
@@ -159,6 +159,10 @@ class AttributeInstance {
      * @symbol ?removeBuffs\@AttributeInstance\@\@QEAAXXZ
      */
     MCAPI void removeBuffs();
+    /**
+     * @symbol ?removeModifier\@AttributeInstance\@\@QEAA_NAEBVUUID\@mce\@\@\@Z
+     */
+    MCAPI bool removeModifier(class mce::UUID const &);
     /**
      * @symbol ?removeModifier\@AttributeInstance\@\@QEAAXV?$shared_ptr\@VAttributeModifier\@\@\@std\@\@\@Z
      */
@@ -167,10 +171,6 @@ class AttributeInstance {
      * @symbol ?removeModifier\@AttributeInstance\@\@QEAAXAEBVAttributeModifier\@\@\@Z
      */
     MCAPI void removeModifier(class AttributeModifier const &);
-    /**
-     * @symbol ?removeModifier\@AttributeInstance\@\@QEAA_NAEBVUUID\@mce\@\@\@Z
-     */
-    MCAPI bool removeModifier(class mce::UUID const &);
     /**
      * @symbol ?removeModifiers\@AttributeInstance\@\@QEAAXXZ
      */
diff --git a/LiteLoader/include/llapi/mc/AttributeModifier.hpp b/LiteLoader/include/llapi/mc/AttributeModifier.hpp
index 93e00238a7..b3cec94e81 100644
--- a/LiteLoader/include/llapi/mc/AttributeModifier.hpp
+++ b/LiteLoader/include/llapi/mc/AttributeModifier.hpp
@@ -69,14 +69,14 @@ class AttributeModifier {
      * @symbol ??0AttributeModifier\@\@QEAA\@XZ
      */
     MCAPI AttributeModifier();
-    /**
-     * @symbol ??0AttributeModifier\@\@QEAA\@VUUID\@mce\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@MW4AttributeModifierOperation\@\@W4AttributeOperands\@\@_N\@Z
-     */
-    MCAPI AttributeModifier(class mce::UUID, std::string const &, float, enum class AttributeModifierOperation, enum class AttributeOperands, bool);
     /**
      * @symbol ??0AttributeModifier\@\@QEAA\@VUUID\@mce\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@MHH_N\@Z
      */
     MCAPI AttributeModifier(class mce::UUID, std::string const &, float, int, int, bool);
+    /**
+     * @symbol ??0AttributeModifier\@\@QEAA\@VUUID\@mce\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@MW4AttributeModifierOperation\@\@W4AttributeOperands\@\@_N\@Z
+     */
+    MCAPI AttributeModifier(class mce::UUID, std::string const &, float, enum class AttributeModifierOperation, enum class AttributeOperands, bool);
     /**
      * @symbol ?getAmount\@AttributeModifier\@\@QEBAMXZ
      */
diff --git a/LiteLoader/include/llapi/mc/AutomationClientConnectPacket.hpp b/LiteLoader/include/llapi/mc/AutomationClientConnectPacket.hpp
index d4cbd506ff..fb9d0ef0c6 100644
--- a/LiteLoader/include/llapi/mc/AutomationClientConnectPacket.hpp
+++ b/LiteLoader/include/llapi/mc/AutomationClientConnectPacket.hpp
@@ -50,7 +50,7 @@ class AutomationClientConnectPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@AutomationClientConnectPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/AvailableActorIdentifiersPacket.hpp b/LiteLoader/include/llapi/mc/AvailableActorIdentifiersPacket.hpp
index 4bfb0bd5a9..57a373fc94 100644
--- a/LiteLoader/include/llapi/mc/AvailableActorIdentifiersPacket.hpp
+++ b/LiteLoader/include/llapi/mc/AvailableActorIdentifiersPacket.hpp
@@ -55,7 +55,7 @@ class AvailableActorIdentifiersPacket : public Packet {
      */
     virtual struct ExtendedStreamReadResult readExtended(class ReadOnlyBinaryStream &);
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@AvailableActorIdentifiersPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/AvailableCommandsPacket.hpp b/LiteLoader/include/llapi/mc/AvailableCommandsPacket.hpp
index 374766d26f..7832ea4a07 100644
--- a/LiteLoader/include/llapi/mc/AvailableCommandsPacket.hpp
+++ b/LiteLoader/include/llapi/mc/AvailableCommandsPacket.hpp
@@ -148,7 +148,7 @@ inline std::vector<std::string> getSoftEnumValues(std::string const& name)
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@AvailableCommandsPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/BannerAddPatternRecipe.hpp b/LiteLoader/include/llapi/mc/BannerAddPatternRecipe.hpp
index aba7676ec5..ba0612cbce 100644
--- a/LiteLoader/include/llapi/mc/BannerAddPatternRecipe.hpp
+++ b/LiteLoader/include/llapi/mc/BannerAddPatternRecipe.hpp
@@ -66,14 +66,14 @@ class BannerAddPatternRecipe : public Recipe {
      * @symbol ?size\@BannerAddPatternRecipe\@\@UEBAHXZ
      */
     virtual int size() const;
-    /**
-     * @symbol ??0BannerAddPatternRecipe\@\@QEAA\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z
-     */
-    MCAPI BannerAddPatternRecipe(class std::basic_string_view<char, struct std::char_traits<char>>);
     /**
      * @symbol ??0BannerAddPatternRecipe\@\@QEAA\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@AEBVUUID\@mce\@\@\@Z
      */
     MCAPI BannerAddPatternRecipe(class std::basic_string_view<char, struct std::char_traits<char>>, class mce::UUID const &);
+    /**
+     * @symbol ??0BannerAddPatternRecipe\@\@QEAA\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z
+     */
+    MCAPI BannerAddPatternRecipe(class std::basic_string_view<char, struct std::char_traits<char>>);
     /**
      * @symbol ?matchPatterns\@BannerAddPatternRecipe\@\@QEBA?BV?$NonOwnerPointer\@$$CBVBannerPattern\@\@\@Bedrock\@\@AEAVCraftingContainer\@\@\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/BaseAttributeMap.hpp b/LiteLoader/include/llapi/mc/BaseAttributeMap.hpp
index 68cdd9cd29..0f09bbc363 100644
--- a/LiteLoader/include/llapi/mc/BaseAttributeMap.hpp
+++ b/LiteLoader/include/llapi/mc/BaseAttributeMap.hpp
@@ -56,14 +56,14 @@ class BaseAttributeMap {
      * @symbol ?getDirtyAttributes\@BaseAttributeMap\@\@QEBAAEBV?$vector\@VAttributeInstanceHandle\@\@V?$allocator\@VAttributeInstanceHandle\@\@\@std\@\@\@std\@\@XZ
      */
     MCAPI std::vector<class AttributeInstanceHandle> const & getDirtyAttributes() const;
-    /**
-     * @symbol ?getInstance\@BaseAttributeMap\@\@QEBAAEBVAttributeInstance\@\@AEBVAttribute\@\@\@Z
-     */
-    MCAPI class AttributeInstance const & getInstance(class Attribute const &) const;
     /**
      * @symbol ?getInstance\@BaseAttributeMap\@\@QEBAAEBVAttributeInstance\@\@I\@Z
      */
     MCAPI class AttributeInstance const & getInstance(unsigned int) const;
+    /**
+     * @symbol ?getInstance\@BaseAttributeMap\@\@QEBAAEBVAttributeInstance\@\@AEBVAttribute\@\@\@Z
+     */
+    MCAPI class AttributeInstance const & getInstance(class Attribute const &) const;
     /**
      * @symbol ?getMutableInstance\@BaseAttributeMap\@\@QEAAPEAVAttributeInstance\@\@AEBVHashedString\@\@\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/BaseGameVersion.hpp b/LiteLoader/include/llapi/mc/BaseGameVersion.hpp
index 40c0626079..452416e00e 100644
--- a/LiteLoader/include/llapi/mc/BaseGameVersion.hpp
+++ b/LiteLoader/include/llapi/mc/BaseGameVersion.hpp
@@ -31,14 +31,14 @@ class BaseGameVersion {
      * @symbol ??0BaseGameVersion\@\@QEAA\@AEBVSemVersion\@\@\@Z
      */
     MCAPI BaseGameVersion(class SemVersion const &);
-    /**
-     * @symbol ??0BaseGameVersion\@\@QEAA\@XZ
-     */
-    MCAPI BaseGameVersion();
     /**
      * @symbol ??0BaseGameVersion\@\@QEAA\@GII\@Z
      */
     MCAPI BaseGameVersion(unsigned short, unsigned int, unsigned int);
+    /**
+     * @symbol ??0BaseGameVersion\@\@QEAA\@XZ
+     */
+    MCAPI BaseGameVersion();
     /**
      * @symbol ?asSemVersion\@BaseGameVersion\@\@QEBAAEBVSemVersion\@\@XZ
      */
diff --git a/LiteLoader/include/llapi/mc/BaseMoveToGoal.hpp b/LiteLoader/include/llapi/mc/BaseMoveToGoal.hpp
index 9774a98576..584bc26fd8 100644
--- a/LiteLoader/include/llapi/mc/BaseMoveToGoal.hpp
+++ b/LiteLoader/include/llapi/mc/BaseMoveToGoal.hpp
@@ -66,7 +66,7 @@ class BaseMoveToGoal {
     virtual void tick();
     /**
      * @vftbl 7
-     * @symbol ?appendDebugInfo\@RaidGardenGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z
+     * @symbol ?appendDebugInfo\@LayEggGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z
      */
     virtual void appendDebugInfo(std::string &) const = 0;
     /**
@@ -86,7 +86,7 @@ class BaseMoveToGoal {
     virtual bool hasReachedTarget() const;
     /**
      * @vftbl 11
-     * @symbol ?isValidTarget\@RaidGardenGoal\@\@UEAA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z
+     * @symbol ?isValidTarget\@LayEggGoal\@\@UEAA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z
      */
     virtual bool isValidTarget(class BlockSource &, class BlockPos const &) = 0;
     /**
diff --git a/LiteLoader/include/llapi/mc/BinaryStream.hpp b/LiteLoader/include/llapi/mc/BinaryStream.hpp
index 9c9175911a..5e69e8d095 100644
--- a/LiteLoader/include/llapi/mc/BinaryStream.hpp
+++ b/LiteLoader/include/llapi/mc/BinaryStream.hpp
@@ -78,14 +78,14 @@ class BinaryStream : public ReadOnlyBinaryStream {
      */
     MCVAPI ~BinaryStream();
 #endif
-    /**
-     * @symbol ??0BinaryStream\@\@QEAA\@XZ
-     */
-    MCAPI BinaryStream();
     /**
      * @symbol ??0BinaryStream\@\@QEAA\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z
      */
     MCAPI BinaryStream(std::string &, bool);
+    /**
+     * @symbol ??0BinaryStream\@\@QEAA\@XZ
+     */
+    MCAPI BinaryStream();
     /**
      * @symbol ?getAndReleaseData\@BinaryStream\@\@QEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ
      */
diff --git a/LiteLoader/include/llapi/mc/Biome.hpp b/LiteLoader/include/llapi/mc/Biome.hpp
index e0a86c2aa5..d41820ef7b 100644
--- a/LiteLoader/include/llapi/mc/Biome.hpp
+++ b/LiteLoader/include/llapi/mc/Biome.hpp
@@ -117,14 +117,14 @@ class Biome {
      * @symbol ?getTemperatureWorldGen\@Biome\@\@QEBAMAEBVBlockPos\@\@F\@Z
      */
     MCAPI float getTemperatureWorldGen(class BlockPos const &, short) const;
-    /**
-     * @symbol ?hasTag\@Biome\@\@QEBA_N_KAEBV?$TagRegistry\@U?$IDType\@UBiomeTagIDType\@\@\@\@U?$IDType\@UBiomeTagSetIDType\@\@\@\@\@\@\@Z
-     */
-    MCAPI bool hasTag(unsigned __int64, class TagRegistry<struct IDType<struct BiomeTagIDType>, struct IDType<struct BiomeTagSetIDType>> const &) const;
     /**
      * @symbol ?hasTag\@Biome\@\@QEBA_NAEBU?$IDType\@UBiomeTagIDType\@\@\@\@AEBV?$TagRegistry\@U?$IDType\@UBiomeTagIDType\@\@\@\@U?$IDType\@UBiomeTagSetIDType\@\@\@\@\@\@\@Z
      */
     MCAPI bool hasTag(struct IDType<struct BiomeTagIDType> const &, class TagRegistry<struct IDType<struct BiomeTagIDType>, struct IDType<struct BiomeTagSetIDType>> const &) const;
+    /**
+     * @symbol ?hasTag\@Biome\@\@QEBA_N_KAEBV?$TagRegistry\@U?$IDType\@UBiomeTagIDType\@\@\@\@U?$IDType\@UBiomeTagSetIDType\@\@\@\@\@\@\@Z
+     */
+    MCAPI bool hasTag(unsigned __int64, class TagRegistry<struct IDType<struct BiomeTagIDType>, struct IDType<struct BiomeTagSetIDType>> const &) const;
     /**
      * @symbol ?hasTag\@Biome\@\@QEBA_NAEBVWellKnownTagID\@\@\@Z
      */
@@ -141,14 +141,14 @@ class Biome {
      * @symbol ?isSnowCovered\@Biome\@\@QEBA_NXZ
      */
     MCAPI bool isSnowCovered() const;
-    /**
-     * @symbol ?setColor\@Biome\@\@QEAAAEAV1\@H_N\@Z
-     */
-    MCAPI class Biome & setColor(int, bool);
     /**
      * @symbol ?setColor\@Biome\@\@QEAAAEAV1\@H\@Z
      */
     MCAPI class Biome & setColor(int);
+    /**
+     * @symbol ?setColor\@Biome\@\@QEAAAEAV1\@H_N\@Z
+     */
+    MCAPI class Biome & setColor(int, bool);
     /**
      * @symbol ?setDepthAndScale\@Biome\@\@QEAAAEAV1\@AEBUBiomeHeight\@\@\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/BiomeComponentFactory.hpp b/LiteLoader/include/llapi/mc/BiomeComponentFactory.hpp
index 2d3fddccf7..9a94221f4f 100644
--- a/LiteLoader/include/llapi/mc/BiomeComponentFactory.hpp
+++ b/LiteLoader/include/llapi/mc/BiomeComponentFactory.hpp
@@ -34,14 +34,14 @@ class BiomeComponentFactory {
      * @symbol ??0BiomeComponentFactory\@\@QEAA\@W4FactoryScope\@0\@\@Z
      */
     MCAPI BiomeComponentFactory(enum class BiomeComponentFactory::FactoryScope);
-    /**
-     * @symbol ?processDataComponents\@BiomeComponentFactory\@\@QEBAXAEAVBiome\@\@AEAVIWorldRegistriesProvider\@\@AEAVCompoundTag\@\@\@Z
-     */
-    MCAPI void processDataComponents(class Biome &, class IWorldRegistriesProvider &, class CompoundTag &) const;
     /**
      * @symbol ?processDataComponents\@BiomeComponentFactory\@\@QEBAXAEAVBiome\@\@AEAVIWorldRegistriesProvider\@\@AEAVValue\@Json\@\@AEBVSemVersion\@\@\@Z
      */
     MCAPI void processDataComponents(class Biome &, class IWorldRegistriesProvider &, class Json::Value &, class SemVersion const &) const;
+    /**
+     * @symbol ?processDataComponents\@BiomeComponentFactory\@\@QEBAXAEAVBiome\@\@AEAVIWorldRegistriesProvider\@\@AEAVCompoundTag\@\@\@Z
+     */
+    MCAPI void processDataComponents(class Biome &, class IWorldRegistriesProvider &, class CompoundTag &) const;
     /**
      * @symbol ?registrationFinished\@BiomeComponentFactory\@\@QEAAXXZ
      */
diff --git a/LiteLoader/include/llapi/mc/BiomeDecorationSystem.hpp b/LiteLoader/include/llapi/mc/BiomeDecorationSystem.hpp
index e3d7f8c129..2e8cc188e9 100644
--- a/LiteLoader/include/llapi/mc/BiomeDecorationSystem.hpp
+++ b/LiteLoader/include/llapi/mc/BiomeDecorationSystem.hpp
@@ -33,13 +33,13 @@ namespace BiomeDecorationSystem {
      * @symbol ?decorateBiome\@BiomeDecorationSystem\@\@YA_NAEAVLevelChunk\@\@AEAVBlockSource\@\@AEAVRandom\@\@V?$span\@UBiomeDecorationFeature\@\@$0?0\@gsl\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEBVBiome\@\@AEBVIPreliminarySurfaceProvider\@\@\@Z
      */
     MCAPI bool decorateBiome(class LevelChunk &, class BlockSource &, class Random &, class gsl::span<struct BiomeDecorationFeature, -1>, std::string const &, class Biome const *, class IPreliminarySurfaceProvider const &);
-    /**
-     * @symbol ?decorateLargeFeature\@BiomeDecorationSystem\@\@YAXAEAVBiome\@\@AEAVLevelChunk\@\@AEAVBlockVolumeTarget\@\@AEAVRandom\@\@AEBVChunkPos\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z
-     */
-    MCAPI void decorateLargeFeature(class Biome &, class LevelChunk &, class BlockVolumeTarget &, class Random &, class ChunkPos const &, std::string const &);
     /**
      * @symbol ?decorateLargeFeature\@BiomeDecorationSystem\@\@YA_NAEAVLevelChunk\@\@AEAVBlockVolumeTarget\@\@AEAVRandom\@\@V?$span\@UBiomeDecorationFeature\@\@$0?0\@gsl\@\@AEBVChunkPos\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z
      */
     MCAPI bool decorateLargeFeature(class LevelChunk &, class BlockVolumeTarget &, class Random &, class gsl::span<struct BiomeDecorationFeature, -1>, class ChunkPos const &, std::string const &);
+    /**
+     * @symbol ?decorateLargeFeature\@BiomeDecorationSystem\@\@YAXAEAVBiome\@\@AEAVLevelChunk\@\@AEAVBlockVolumeTarget\@\@AEAVRandom\@\@AEBVChunkPos\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z
+     */
+    MCAPI void decorateLargeFeature(class Biome &, class LevelChunk &, class BlockVolumeTarget &, class Random &, class ChunkPos const &, std::string const &);
 
 };
\ No newline at end of file
diff --git a/LiteLoader/include/llapi/mc/BiomeDefinitionListPacket.hpp b/LiteLoader/include/llapi/mc/BiomeDefinitionListPacket.hpp
index b16d95a6e4..ead933cc6a 100644
--- a/LiteLoader/include/llapi/mc/BiomeDefinitionListPacket.hpp
+++ b/LiteLoader/include/llapi/mc/BiomeDefinitionListPacket.hpp
@@ -55,7 +55,7 @@ class BiomeDefinitionListPacket : public Packet {
      */
     virtual struct ExtendedStreamReadResult readExtended(class ReadOnlyBinaryStream &);
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@BiomeDefinitionListPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/Block.hpp b/LiteLoader/include/llapi/mc/Block.hpp
index 53b27de905..0b78eb6bd1 100644
--- a/LiteLoader/include/llapi/mc/Block.hpp
+++ b/LiteLoader/include/llapi/mc/Block.hpp
@@ -74,14 +74,14 @@ class Block {
      * @symbol ?getRenderLayer\@Block\@\@UEBA?AW4BlockRenderLayer\@\@XZ
      */
     virtual enum class BlockRenderLayer getRenderLayer() const;
-    /**
-     * @symbol ??0Block\@\@QEAA\@GV?$not_null\@PEAVBlockLegacy\@\@\@gsl\@\@VCompoundTag\@\@AEBI\@Z
-     */
-    MCAPI Block(unsigned short, class gsl::not_null<class BlockLegacy *>, class CompoundTag, unsigned int const &);
     /**
      * @symbol ??0Block\@\@QEAA\@GV?$not_null\@PEAVBlockLegacy\@\@\@gsl\@\@\@Z
      */
     MCAPI Block(unsigned short, class gsl::not_null<class BlockLegacy *>);
+    /**
+     * @symbol ??0Block\@\@QEAA\@GV?$not_null\@PEAVBlockLegacy\@\@\@gsl\@\@VCompoundTag\@\@AEBI\@Z
+     */
+    MCAPI Block(unsigned short, class gsl::not_null<class BlockLegacy *>, class CompoundTag, unsigned int const &);
     /**
      * @symbol ?addAABBs\@Block\@\@QEBAXAEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@\@Z
      */
@@ -134,14 +134,14 @@ class Block {
      * @symbol ?canBeBrokenFromFalling\@Block\@\@QEBA_NXZ
      */
     MCAPI bool canBeBrokenFromFalling() const;
-    /**
-     * @symbol ?canBeBuiltOver\@Block\@\@QEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlockItem\@\@\@Z
-     */
-    MCAPI bool canBeBuiltOver(class BlockSource &, class BlockPos const &, class BlockItem const &) const;
     /**
      * @symbol ?canBeBuiltOver\@Block\@\@QEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z
      */
     MCAPI bool canBeBuiltOver(class BlockSource &, class BlockPos const &) const;
+    /**
+     * @symbol ?canBeBuiltOver\@Block\@\@QEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlockItem\@\@\@Z
+     */
+    MCAPI bool canBeBuiltOver(class BlockSource &, class BlockPos const &, class BlockItem const &) const;
     /**
      * @symbol ?canBeFertilized\@Block\@\@QEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBV1\@\@Z
      */
@@ -258,14 +258,14 @@ class Block {
      * @symbol ?getCollisionShape\@Block\@\@QEBA_NAEAVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z
      */
     MCAPI bool getCollisionShape(class AABB &, class IConstBlockSource const &, class BlockPos const &, class optional_ref<class GetCollisionShapeInterface const>) const;
-    /**
-     * @symbol ?getColor\@Block\@\@QEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z
-     */
-    MCAPI int getColor(class BlockSource &, class BlockPos const &) const;
     /**
      * @symbol ?getColor\@Block\@\@QEBAHXZ
      */
     MCAPI int getColor() const;
+    /**
+     * @symbol ?getColor\@Block\@\@QEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z
+     */
+    MCAPI int getColor(class BlockSource &, class BlockPos const &) const;
     /**
      * @symbol ?getComparatorSignal\@Block\@\@QEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z
      */
@@ -570,14 +570,14 @@ class Block {
      * @symbol ?mayPick\@Block\@\@QEBA_NXZ
      */
     MCAPI bool mayPick() const;
-    /**
-     * @symbol ?mayPlace\@Block\@\@QEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z
-     */
-    MCAPI bool mayPlace(class BlockSource &, class BlockPos const &, unsigned char) const;
     /**
      * @symbol ?mayPlace\@Block\@\@QEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z
      */
     MCAPI bool mayPlace(class BlockSource &, class BlockPos const &) const;
+    /**
+     * @symbol ?mayPlace\@Block\@\@QEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z
+     */
+    MCAPI bool mayPlace(class BlockSource &, class BlockPos const &, unsigned char) const;
     /**
      * @symbol ?mayPlaceOn\@Block\@\@QEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/BlockActorDataPacket.hpp b/LiteLoader/include/llapi/mc/BlockActorDataPacket.hpp
index 10bbd78917..72c181e166 100644
--- a/LiteLoader/include/llapi/mc/BlockActorDataPacket.hpp
+++ b/LiteLoader/include/llapi/mc/BlockActorDataPacket.hpp
@@ -51,7 +51,7 @@ class BlockActorDataPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@BlockActorDataPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/BlockCommandOrigin.hpp b/LiteLoader/include/llapi/mc/BlockCommandOrigin.hpp
index 2b9c85dacc..784db4286a 100644
--- a/LiteLoader/include/llapi/mc/BlockCommandOrigin.hpp
+++ b/LiteLoader/include/llapi/mc/BlockCommandOrigin.hpp
@@ -127,14 +127,14 @@ class BlockCommandOrigin : public CommandOrigin {
      */
     MCVAPI ~BlockCommandOrigin();
 #endif
-    /**
-     * @symbol ??0BlockCommandOrigin\@\@QEAA\@AEAVLevel\@\@V?$AutomaticID\@VDimension\@\@H\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlockPos\@\@\@Z
-     */
-    MCAPI BlockCommandOrigin(class Level &, class AutomaticID<class Dimension, int>, std::string const &, class BlockPos const &);
     /**
      * @symbol ??0BlockCommandOrigin\@\@QEAA\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z
      */
     MCAPI BlockCommandOrigin(class BlockSource &, class BlockPos const &);
+    /**
+     * @symbol ??0BlockCommandOrigin\@\@QEAA\@AEAVLevel\@\@V?$AutomaticID\@VDimension\@\@H\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlockPos\@\@\@Z
+     */
+    MCAPI BlockCommandOrigin(class Level &, class AutomaticID<class Dimension, int>, std::string const &, class BlockPos const &);
     /**
      * @symbol ?load\@BlockCommandOrigin\@\@SA?AV?$unique_ptr\@VBlockCommandOrigin\@\@U?$default_delete\@VBlockCommandOrigin\@\@\@std\@\@\@std\@\@AEBVCompoundTag\@\@AEAVLevel\@\@\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/BlockDescriptor.hpp b/LiteLoader/include/llapi/mc/BlockDescriptor.hpp
index 6aedadeb03..62f8ad77c8 100644
--- a/LiteLoader/include/llapi/mc/BlockDescriptor.hpp
+++ b/LiteLoader/include/llapi/mc/BlockDescriptor.hpp
@@ -71,14 +71,14 @@ class BlockDescriptor {
      * @symbol ?isValid\@BlockDescriptor\@\@QEBA_NXZ
      */
     MCAPI bool isValid() const;
-    /**
-     * @symbol ?matches\@BlockDescriptor\@\@QEBA_NAEBVBlock\@\@\@Z
-     */
-    MCAPI bool matches(class Block const &) const;
     /**
      * @symbol ?matches\@BlockDescriptor\@\@QEBA_NAEBV1\@\@Z
      */
     MCAPI bool matches(class BlockDescriptor const &) const;
+    /**
+     * @symbol ?matches\@BlockDescriptor\@\@QEBA_NAEBVBlock\@\@\@Z
+     */
+    MCAPI bool matches(class Block const &) const;
     /**
      * @symbol ??4BlockDescriptor\@\@QEAAXAEBV0\@\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/BlockEventPacket.hpp b/LiteLoader/include/llapi/mc/BlockEventPacket.hpp
index 04d12e91ff..90074cdad6 100644
--- a/LiteLoader/include/llapi/mc/BlockEventPacket.hpp
+++ b/LiteLoader/include/llapi/mc/BlockEventPacket.hpp
@@ -50,7 +50,7 @@ class BlockEventPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@BlockEventPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/BlockLegacy.hpp b/LiteLoader/include/llapi/mc/BlockLegacy.hpp
index 58e669cd3f..70af6f3fbf 100644
--- a/LiteLoader/include/llapi/mc/BlockLegacy.hpp
+++ b/LiteLoader/include/llapi/mc/BlockLegacy.hpp
@@ -1310,14 +1310,14 @@ class BlockLegacy {
      * @symbol ?hasState\@BlockLegacy\@\@QEBA_NAEBVItemState\@\@\@Z
      */
     MCAPI bool hasState(class ItemState const &) const;
-    /**
-     * @symbol ?hasTag\@BlockLegacy\@\@QEBA_NAEB_K\@Z
-     */
-    MCAPI bool hasTag(unsigned __int64 const &) const;
     /**
      * @symbol ?hasTag\@BlockLegacy\@\@QEBA_NAEBVHashedString\@\@\@Z
      */
     MCAPI bool hasTag(class HashedString const &) const;
+    /**
+     * @symbol ?hasTag\@BlockLegacy\@\@QEBA_NAEB_K\@Z
+     */
+    MCAPI bool hasTag(unsigned __int64 const &) const;
     /**
      * @symbol ?initEntity\@BlockLegacy\@\@QEAAXAEAVEntityRegistry\@\@\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/BlockPalette.hpp b/LiteLoader/include/llapi/mc/BlockPalette.hpp
index 48d27519fe..4c5b7205d1 100644
--- a/LiteLoader/include/llapi/mc/BlockPalette.hpp
+++ b/LiteLoader/include/llapi/mc/BlockPalette.hpp
@@ -49,14 +49,14 @@ class BlockPalette {
      * @symbol ?convertLegacyBlocks\@BlockPalette\@\@QEBA_NV?$buffer_span_mut\@PEBVBlock\@\@\@\@V?$buffer_span\@UBlockID\@\@\@\@V?$buffer_span\@UNibblePair\@\@\@\@_K\@Z
      */
     MCAPI bool convertLegacyBlocks(class buffer_span_mut<class Block const *>, class buffer_span<struct BlockID>, class buffer_span<struct NibblePair>, unsigned __int64) const;
-    /**
-     * @symbol ?getBlock\@BlockPalette\@\@QEBAAEBVBlock\@\@AEBI\@Z
-     */
-    MCAPI class Block const & getBlock(unsigned int const &) const;
     /**
      * @symbol ?getBlock\@BlockPalette\@\@QEBAAEBVBlock\@\@AEBVCompoundTag\@\@\@Z
      */
     MCAPI class Block const & getBlock(class CompoundTag const &) const;
+    /**
+     * @symbol ?getBlock\@BlockPalette\@\@QEBAAEBVBlock\@\@AEBI\@Z
+     */
+    MCAPI class Block const & getBlock(unsigned int const &) const;
     /**
      * @symbol ?getBlockFromLegacyData\@BlockPalette\@\@QEBAAEBVBlock\@\@UNewBlockID\@\@I\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/BlockPatternBuilder.hpp b/LiteLoader/include/llapi/mc/BlockPatternBuilder.hpp
index 95a2e82e9f..a17a5cec06 100644
--- a/LiteLoader/include/llapi/mc/BlockPatternBuilder.hpp
+++ b/LiteLoader/include/llapi/mc/BlockPatternBuilder.hpp
@@ -49,14 +49,14 @@ class BlockPatternBuilder {
      * @symbol ?isReadyForMatch\@BlockPatternBuilder\@\@QEAA_NXZ
      */
     MCAPI bool isReadyForMatch();
-    /**
-     * @symbol ?match\@BlockPatternBuilder\@\@QEAA?AUBuildMatch\@\@AEBVBlockPos\@\@\@Z
-     */
-    MCAPI struct BuildMatch match(class BlockPos const &);
     /**
      * @symbol ?match\@BlockPatternBuilder\@\@QEAA?AUBuildMatch\@\@AEBVBlockPos\@\@HHEE\@Z
      */
     MCAPI struct BuildMatch match(class BlockPos const &, int, int, unsigned char, unsigned char);
+    /**
+     * @symbol ?match\@BlockPatternBuilder\@\@QEAA?AUBuildMatch\@\@AEBVBlockPos\@\@\@Z
+     */
+    MCAPI struct BuildMatch match(class BlockPos const &);
     /**
      * @symbol ?match\@BlockPatternBuilder\@\@QEAA?AUBuildMatch\@\@AEBVBlockPos\@\@HH\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/BlockPickRequestPacket.hpp b/LiteLoader/include/llapi/mc/BlockPickRequestPacket.hpp
index d7ca307a42..2c1ad3413e 100644
--- a/LiteLoader/include/llapi/mc/BlockPickRequestPacket.hpp
+++ b/LiteLoader/include/llapi/mc/BlockPickRequestPacket.hpp
@@ -50,7 +50,7 @@ class BlockPickRequestPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@BlockPickRequestPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/BlockSource.hpp b/LiteLoader/include/llapi/mc/BlockSource.hpp
index 29f459ba34..ca8117cfa4 100644
--- a/LiteLoader/include/llapi/mc/BlockSource.hpp
+++ b/LiteLoader/include/llapi/mc/BlockSource.hpp
@@ -275,14 +275,14 @@ struct ClipParameters
      */
     MCVAPI ~BlockSource();
 #endif
-    /**
-     * @symbol ??0BlockSource\@\@QEAA\@AEAVChunkSource\@\@_N1\@Z
-     */
-    MCAPI BlockSource(class ChunkSource &, bool, bool);
     /**
      * @symbol ??0BlockSource\@\@QEAA\@AEAVLevel\@\@AEAVDimension\@\@AEAVChunkSource\@\@_N33\@Z
      */
     MCAPI BlockSource(class Level &, class Dimension &, class ChunkSource &, bool, bool, bool);
+    /**
+     * @symbol ??0BlockSource\@\@QEAA\@AEAVChunkSource\@\@_N1\@Z
+     */
+    MCAPI BlockSource(class ChunkSource &, bool, bool);
     /**
      * @symbol ?_fetchEntities\@BlockSource\@\@QEAA?AV?$span\@V?$not_null\@PEAVActor\@\@\@gsl\@\@$0?0\@gsl\@\@PEBUIActorMovementProxy\@\@AEBVAABB\@\@_N\@Z
      */
@@ -319,14 +319,14 @@ struct ClipParameters
      * @symbol ?canProvideSupport\@BlockSource\@\@QEBA_NAEBVBlockPos\@\@EW4BlockSupportType\@\@\@Z
      */
     MCAPI bool canProvideSupport(class BlockPos const &, unsigned char, enum class BlockSupportType) const;
-    /**
-     * @symbol ?canSeeSky\@BlockSource\@\@QEBA_NHHH\@Z
-     */
-    MCAPI bool canSeeSky(int, int, int) const;
     /**
      * @symbol ?canSeeSky\@BlockSource\@\@QEBA_NAEBVBlockPos\@\@\@Z
      */
     MCAPI bool canSeeSky(class BlockPos const &) const;
+    /**
+     * @symbol ?canSeeSky\@BlockSource\@\@QEBA_NHHH\@Z
+     */
+    MCAPI bool canSeeSky(int, int, int) const;
     /**
      * @symbol ?canSeeSkyFromBelowWater\@BlockSource\@\@QEAA_NAEBVBlockPos\@\@\@Z
      */
@@ -367,14 +367,14 @@ struct ClipParameters
      * @symbol ?countBlocksOfType\@BlockSource\@\@QEBA_KAEBVBlockDescriptor\@\@AEBVBlockPos\@\@1_K\@Z
      */
     MCAPI unsigned __int64 countBlocksOfType(class BlockDescriptor const &, class BlockPos const &, class BlockPos const &, unsigned __int64) const;
-    /**
-     * @symbol ?fetchActorIds\@BlockSource\@\@QEBAXAEBVAABB\@\@AEAV?$vector\@UActorUniqueID\@\@V?$allocator\@UActorUniqueID\@\@\@std\@\@\@std\@\@\@Z
-     */
-    MCAPI void fetchActorIds(class AABB const &, std::vector<struct ActorUniqueID> &) const;
     /**
      * @symbol ?fetchActorIds\@BlockSource\@\@QEBAX_KAEBVAABB\@\@AEAV?$vector\@UActorUniqueID\@\@V?$allocator\@UActorUniqueID\@\@\@std\@\@\@std\@\@\@Z
      */
     MCAPI void fetchActorIds(unsigned __int64, class AABB const &, std::vector<struct ActorUniqueID> &) const;
+    /**
+     * @symbol ?fetchActorIds\@BlockSource\@\@QEBAXAEBVAABB\@\@AEAV?$vector\@UActorUniqueID\@\@V?$allocator\@UActorUniqueID\@\@\@std\@\@\@std\@\@\@Z
+     */
+    MCAPI void fetchActorIds(class AABB const &, std::vector<struct ActorUniqueID> &) const;
     /**
      * @symbol ?fetchActors\@BlockSource\@\@QEAA?AV?$span\@V?$not_null\@PEAVActor\@\@\@gsl\@\@$0?0\@gsl\@\@AEBUActorDefinitionIdentifier\@\@AEBVAABB\@\@\@Z
      */
@@ -383,14 +383,14 @@ struct ClipParameters
      * @symbol ?fetchBlockEntities\@BlockSource\@\@QEBA?AV?$vector\@PEAVBlockActor\@\@V?$allocator\@PEAVBlockActor\@\@\@std\@\@\@std\@\@W4BlockActorType\@\@AEBVAABB\@\@\@Z
      */
     MCAPI std::vector<class BlockActor *> fetchBlockEntities(enum class BlockActorType, class AABB const &) const;
-    /**
-     * @symbol ?fetchBlockEntities\@BlockSource\@\@QEAAXAEBVAABB\@\@AEAV?$vector\@PEAVBlockActor\@\@V?$allocator\@PEAVBlockActor\@\@\@std\@\@\@std\@\@_N\@Z
-     */
-    MCAPI void fetchBlockEntities(class AABB const &, std::vector<class BlockActor *> &, bool);
     /**
      * @symbol ?fetchBlockEntities\@BlockSource\@\@QEAAAEBV?$vector\@PEAVBlockActor\@\@V?$allocator\@PEAVBlockActor\@\@\@std\@\@\@std\@\@AEBVAABB\@\@\@Z
      */
     MCAPI std::vector<class BlockActor *> const & fetchBlockEntities(class AABB const &);
+    /**
+     * @symbol ?fetchBlockEntities\@BlockSource\@\@QEAAXAEBVAABB\@\@AEAV?$vector\@PEAVBlockActor\@\@V?$allocator\@PEAVBlockActor\@\@\@std\@\@\@std\@\@_N\@Z
+     */
+    MCAPI void fetchBlockEntities(class AABB const &, std::vector<class BlockActor *> &, bool);
     /**
      * @symbol ?fetchBlocks\@BlockSource\@\@QEBA_NAEBVBlockPos\@\@AEAVBlockVolume\@\@\@Z
      */
@@ -459,14 +459,14 @@ struct ClipParameters
      * @symbol ?getAABBFetchResultCache\@BlockSource\@\@QEAAAEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@XZ
      */
     MCAPI std::vector<class AABB> & getAABBFetchResultCache();
-    /**
-     * @symbol ?getAboveTopSolidBlock\@BlockSource\@\@QEAAFAEBVBlockPos\@\@_N1\@Z
-     */
-    MCAPI short getAboveTopSolidBlock(class BlockPos const &, bool, bool);
     /**
      * @symbol ?getAboveTopSolidBlock\@BlockSource\@\@QEAAFHH_N0\@Z
      */
     MCAPI short getAboveTopSolidBlock(int, int, bool, bool);
+    /**
+     * @symbol ?getAboveTopSolidBlock\@BlockSource\@\@QEAAFAEBVBlockPos\@\@_N1\@Z
+     */
+    MCAPI short getAboveTopSolidBlock(class BlockPos const &, bool, bool);
     /**
      * @symbol ?getAllocatedHeightAt\@BlockSource\@\@QEAAFAEBVBlockPos\@\@\@Z
      */
@@ -487,14 +487,14 @@ struct ClipParameters
      * @symbol ?getBrightnessPair\@BlockSource\@\@QEBA?AUBrightnessPair\@\@AEBVBlockPos\@\@\@Z
      */
     MCAPI struct BrightnessPair getBrightnessPair(class BlockPos const &) const;
-    /**
-     * @symbol ?getChunk\@BlockSource\@\@QEBAPEAVLevelChunk\@\@AEBVChunkPos\@\@\@Z
-     */
-    MCAPI class LevelChunk * getChunk(class ChunkPos const &) const;
     /**
      * @symbol ?getChunk\@BlockSource\@\@QEBAPEAVLevelChunk\@\@HH\@Z
      */
     MCAPI class LevelChunk * getChunk(int, int) const;
+    /**
+     * @symbol ?getChunk\@BlockSource\@\@QEBAPEAVLevelChunk\@\@AEBVChunkPos\@\@\@Z
+     */
+    MCAPI class LevelChunk * getChunk(class ChunkPos const &) const;
     /**
      * @symbol ?getConstBiome\@BlockSource\@\@QEBAAEBVBiome\@\@AEBVBlockPos\@\@\@Z
      */
@@ -519,14 +519,14 @@ struct ClipParameters
      * @symbol ?getHeightmapPos\@BlockSource\@\@QEBA?AVBlockPos\@\@AEBV2\@\@Z
      */
     MCAPI class BlockPos getHeightmapPos(class BlockPos const &) const;
-    /**
-     * @symbol ?getLevel\@BlockSource\@\@QEBAAEAVLevel\@\@XZ
-     */
-    MCAPI class Level & getLevel() const;
     /**
      * @symbol ?getLevel\@BlockSource\@\@QEAAAEAVLevel\@\@XZ
      */
     MCAPI class Level & getLevel();
+    /**
+     * @symbol ?getLevel\@BlockSource\@\@QEBAAEAVLevel\@\@XZ
+     */
+    MCAPI class Level & getLevel() const;
     /**
      * @symbol ?getLevelConst\@BlockSource\@\@QEBAAEBVLevel\@\@XZ
      */
@@ -584,13 +584,17 @@ struct ClipParameters
      */
     MCAPI bool hasTickInCurrentTick(class BlockPos const &, enum class TickingQueueType) const;
     /**
-     * @symbol ?hasTickInPendingTicks\@BlockSource\@\@QEBA_NAEBVBlockPos\@\@AEBVBlock\@\@\@Z
+     * @symbol ?hasTickInPendingTicks\@BlockSource\@\@QEBA_NAEBVBlockPos\@\@AEBVBlock\@\@W4TickingQueueType\@\@\@Z
      */
-    MCAPI bool hasTickInPendingTicks(class BlockPos const &, class Block const &) const;
+    MCAPI bool hasTickInPendingTicks(class BlockPos const &, class Block const &, enum class TickingQueueType) const;
     /**
      * @symbol ?hasTickInPendingTicks\@BlockSource\@\@QEBA_NAEBVBlockPos\@\@W4TickingQueueType\@\@\@Z
      */
     MCAPI bool hasTickInPendingTicks(class BlockPos const &, enum class TickingQueueType) const;
+    /**
+     * @symbol ?hasTickInPendingTicks\@BlockSource\@\@QEBA_NAEBVBlockPos\@\@AEBVBlock\@\@\@Z
+     */
+    MCAPI bool hasTickInPendingTicks(class BlockPos const &, class Block const &) const;
     /**
      * @symbol ?hasTickInPendingTicks\@BlockSource\@\@QEBA_NAEBVBlockPos\@\@AEBVBlockLegacy\@\@W4TickingQueueType\@\@\@Z
      */
@@ -599,10 +603,6 @@ struct ClipParameters
      * @symbol ?hasTickInPendingTicks\@BlockSource\@\@QEBA_NAEBVBlockPos\@\@AEBVBlockLegacy\@\@\@Z
      */
     MCAPI bool hasTickInPendingTicks(class BlockPos const &, class BlockLegacy const &) const;
-    /**
-     * @symbol ?hasTickInPendingTicks\@BlockSource\@\@QEBA_NAEBVBlockPos\@\@AEBVBlock\@\@W4TickingQueueType\@\@\@Z
-     */
-    MCAPI bool hasTickInPendingTicks(class BlockPos const &, class Block const &, enum class TickingQueueType) const;
     /**
      * @symbol ?hasTickInPendingTicks\@BlockSource\@\@QEBA_NAEBVBlockPos\@\@\@Z
      */
@@ -619,14 +619,14 @@ struct ClipParameters
      * @symbol ?isConsideredSolidBlock\@BlockSource\@\@QEAA_NAEBVBlockPos\@\@\@Z
      */
     MCAPI bool isConsideredSolidBlock(class BlockPos const &);
-    /**
-     * @symbol ?isEmptyBlock\@BlockSource\@\@QEAA_NHHH\@Z
-     */
-    MCAPI bool isEmptyBlock(int, int, int);
     /**
      * @symbol ?isEmptyBlock\@BlockSource\@\@QEBA_NAEBVBlockPos\@\@\@Z
      */
     MCAPI bool isEmptyBlock(class BlockPos const &) const;
+    /**
+     * @symbol ?isEmptyBlock\@BlockSource\@\@QEAA_NHHH\@Z
+     */
+    MCAPI bool isEmptyBlock(int, int, int);
     /**
      * @symbol ?isEmptyWaterBlock\@BlockSource\@\@QEBA_NAEBVBlockPos\@\@\@Z
      */
@@ -651,14 +651,14 @@ struct ClipParameters
      * @symbol ?isUnderWater\@BlockSource\@\@QEBA_NAEBVVec3\@\@AEBVBlock\@\@\@Z
      */
     MCAPI bool isUnderWater(class Vec3 const &, class Block const &) const;
-    /**
-     * @symbol ?isUnobstructedByEntities\@BlockSource\@\@QEAA_NAEBVAABB\@\@V?$span\@V?$not_null\@PEBVActor\@\@\@gsl\@\@$0?0\@gsl\@\@\@Z
-     */
-    MCAPI bool isUnobstructedByEntities(class AABB const &, class gsl::span<class gsl::not_null<class Actor const *>, -1>);
     /**
      * @symbol ?isUnobstructedByEntities\@BlockSource\@\@QEAA_NAEBVAABB\@\@PEBVActor\@\@\@Z
      */
     MCAPI bool isUnobstructedByEntities(class AABB const &, class Actor const *);
+    /**
+     * @symbol ?isUnobstructedByEntities\@BlockSource\@\@QEAA_NAEBVAABB\@\@V?$span\@V?$not_null\@PEBVActor\@\@\@gsl\@\@$0?0\@gsl\@\@\@Z
+     */
+    MCAPI bool isUnobstructedByEntities(class AABB const &, class gsl::span<class gsl::not_null<class Actor const *>, -1>);
     /**
      * @symbol ?isWithinHeightLimits\@BlockSource\@\@QEBA_NH\@Z
      */
@@ -671,22 +671,22 @@ struct ClipParameters
      * @symbol ?neighborChanged\@BlockSource\@\@QEAAXAEBVBlockPos\@\@0\@Z
      */
     MCAPI void neighborChanged(class BlockPos const &, class BlockPos const &);
-    /**
-     * @symbol ?postGameEvent\@BlockSource\@\@QEAAXPEAVActor\@\@AEBVGameEvent\@\@AEBVBlockPos\@\@PEBVBlock\@\@\@Z
-     */
-    MCAPI void postGameEvent(class Actor *, class GameEvent const &, class BlockPos const &, class Block const *);
     /**
      * @symbol ?postGameEvent\@BlockSource\@\@QEAAXPEAVActor\@\@AEBVGameEvent\@\@AEBVVec3\@\@PEBVBlock\@\@\@Z
      */
     MCAPI void postGameEvent(class Actor *, class GameEvent const &, class Vec3 const &, class Block const *);
     /**
-     * @symbol ?removeBlock\@BlockSource\@\@QEAA_NAEBVBlockPos\@\@\@Z
+     * @symbol ?postGameEvent\@BlockSource\@\@QEAAXPEAVActor\@\@AEBVGameEvent\@\@AEBVBlockPos\@\@PEBVBlock\@\@\@Z
      */
-    MCAPI bool removeBlock(class BlockPos const &);
+    MCAPI void postGameEvent(class Actor *, class GameEvent const &, class BlockPos const &, class Block const *);
     /**
      * @symbol ?removeBlock\@BlockSource\@\@QEAA_NHHH\@Z
      */
     MCAPI bool removeBlock(int, int, int);
+    /**
+     * @symbol ?removeBlock\@BlockSource\@\@QEAA_NAEBVBlockPos\@\@\@Z
+     */
+    MCAPI bool removeBlock(class BlockPos const &);
     /**
      * @symbol ?removeBlockEntity\@BlockSource\@\@QEAA?AV?$shared_ptr\@VBlockActor\@\@\@std\@\@AEBVBlockPos\@\@\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/BlockTickingQueue.hpp b/LiteLoader/include/llapi/mc/BlockTickingQueue.hpp
index a495869afe..7a1572728b 100644
--- a/LiteLoader/include/llapi/mc/BlockTickingQueue.hpp
+++ b/LiteLoader/include/llapi/mc/BlockTickingQueue.hpp
@@ -40,14 +40,14 @@ class TickDataSet {
      * @symbol ?acquireAllRandomTicks\@BlockTickingQueue\@\@QEAAXAEAVLevelChunk\@\@\@Z
      */
     MCAPI void acquireAllRandomTicks(class LevelChunk &);
-    /**
-     * @symbol ?acquireAllTicks\@BlockTickingQueue\@\@QEAAXAEAVLevelChunk\@\@\@Z
-     */
-    MCAPI void acquireAllTicks(class LevelChunk &);
     /**
      * @symbol ?acquireAllTicks\@BlockTickingQueue\@\@QEAAXAEAV1\@\@Z
      */
     MCAPI void acquireAllTicks(class BlockTickingQueue &);
+    /**
+     * @symbol ?acquireAllTicks\@BlockTickingQueue\@\@QEAAXAEAVLevelChunk\@\@\@Z
+     */
+    MCAPI void acquireAllTicks(class LevelChunk &);
     /**
      * @symbol ?add\@BlockTickingQueue\@\@QEAAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@HH\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/BlockTypeRegistry.hpp b/LiteLoader/include/llapi/mc/BlockTypeRegistry.hpp
index 744ebc6c12..b26965b9df 100644
--- a/LiteLoader/include/llapi/mc/BlockTypeRegistry.hpp
+++ b/LiteLoader/include/llapi/mc/BlockTypeRegistry.hpp
@@ -79,14 +79,14 @@ class BlockTypeRegistry {
      * @symbol ?lockForRegistryModifications\@BlockTypeRegistry\@\@SA?AVBlockTypeRegistryModificationsLock\@\@XZ
      */
     MCAPI static class BlockTypeRegistryModificationsLock lockForRegistryModifications();
-    /**
-     * @symbol ?lookupByName\@BlockTypeRegistry\@\@SAPEBVBlock\@\@AEBVHashedString\@\@AEBV?$vector\@UBlockComplexAliasBlockState\@BlockTypeRegistry\@\@V?$allocator\@UBlockComplexAliasBlockState\@BlockTypeRegistry\@\@\@std\@\@\@std\@\@_N\@Z
-     */
-    MCAPI static class Block const * lookupByName(class HashedString const &, std::vector<struct BlockTypeRegistry::BlockComplexAliasBlockState> const &, bool);
     /**
      * @symbol ?lookupByName\@BlockTypeRegistry\@\@SA?AV?$WeakPtr\@VBlockLegacy\@\@\@\@AEBVHashedString\@\@_N\@Z
      */
     MCAPI static class WeakPtr<class BlockLegacy> lookupByName(class HashedString const &, bool);
+    /**
+     * @symbol ?lookupByName\@BlockTypeRegistry\@\@SAPEBVBlock\@\@AEBVHashedString\@\@AEBV?$vector\@UBlockComplexAliasBlockState\@BlockTypeRegistry\@\@V?$allocator\@UBlockComplexAliasBlockState\@BlockTypeRegistry\@\@\@std\@\@\@std\@\@_N\@Z
+     */
+    MCAPI static class Block const * lookupByName(class HashedString const &, std::vector<struct BlockTypeRegistry::BlockComplexAliasBlockState> const &, bool);
     /**
      * @symbol ?lookupByName\@BlockTypeRegistry\@\@SAPEBVBlock\@\@AEBVHashedString\@\@H_N\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/BookEditPacket.hpp b/LiteLoader/include/llapi/mc/BookEditPacket.hpp
index ecb8399178..801cc1e86d 100644
--- a/LiteLoader/include/llapi/mc/BookEditPacket.hpp
+++ b/LiteLoader/include/llapi/mc/BookEditPacket.hpp
@@ -49,7 +49,7 @@ class BookEditPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@BookEditPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
@@ -59,14 +59,14 @@ class BookEditPacket : public Packet {
      */
     MCVAPI ~BookEditPacket();
 #endif
-    /**
-     * @symbol ??0BookEditPacket\@\@QEAA\@XZ
-     */
-    MCAPI BookEditPacket();
     /**
      * @symbol ??0BookEditPacket\@\@QEAA\@AEBV0\@\@Z
      */
     MCAPI BookEditPacket(class BookEditPacket const &);
+    /**
+     * @symbol ??0BookEditPacket\@\@QEAA\@XZ
+     */
+    MCAPI BookEditPacket();
     /**
      * @symbol ?getPage\@BookEditPacket\@\@QEBA?AUPageContent\@\@XZ
      */
diff --git a/LiteLoader/include/llapi/mc/BossEventPacket.hpp b/LiteLoader/include/llapi/mc/BossEventPacket.hpp
index 33e9e23c8d..0815a6cf2c 100644
--- a/LiteLoader/include/llapi/mc/BossEventPacket.hpp
+++ b/LiteLoader/include/llapi/mc/BossEventPacket.hpp
@@ -50,7 +50,7 @@ class BossEventPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@BossEventPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/BuoyancyComponent.hpp b/LiteLoader/include/llapi/mc/BuoyancyComponent.hpp
index 7d2c752236..5ee6ba425e 100644
--- a/LiteLoader/include/llapi/mc/BuoyancyComponent.hpp
+++ b/LiteLoader/include/llapi/mc/BuoyancyComponent.hpp
@@ -27,14 +27,14 @@ class BuoyancyComponent {
 #endif
 
 public:
-    /**
-     * @symbol ??0BuoyancyComponent\@\@QEAA\@XZ
-     */
-    MCAPI BuoyancyComponent();
     /**
      * @symbol ??0BuoyancyComponent\@\@QEAA\@AEBV0\@\@Z
      */
     MCAPI BuoyancyComponent(class BuoyancyComponent const &);
+    /**
+     * @symbol ??0BuoyancyComponent\@\@QEAA\@XZ
+     */
+    MCAPI BuoyancyComponent();
     /**
      * @symbol ?canFloat\@BuoyancyComponent\@\@QEBA_NAEBVActor\@\@\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/ByteTag.hpp b/LiteLoader/include/llapi/mc/ByteTag.hpp
index 1255039980..41e05bcb6c 100644
--- a/LiteLoader/include/llapi/mc/ByteTag.hpp
+++ b/LiteLoader/include/llapi/mc/ByteTag.hpp
@@ -84,13 +84,13 @@ unsigned char val;
      */
     MCVAPI ~ByteTag();
 #endif
-    /**
-     * @symbol ??0ByteTag\@\@QEAA\@E\@Z
-     */
-    MCAPI ByteTag(unsigned char);
     /**
      * @symbol ??0ByteTag\@\@QEAA\@XZ
      */
     MCAPI ByteTag();
+    /**
+     * @symbol ??0ByteTag\@\@QEAA\@E\@Z
+     */
+    MCAPI ByteTag(unsigned char);
 
 };
diff --git a/LiteLoader/include/llapi/mc/CameraInstructionPacket.hpp b/LiteLoader/include/llapi/mc/CameraInstructionPacket.hpp
index 31381a5596..82d639e283 100644
--- a/LiteLoader/include/llapi/mc/CameraInstructionPacket.hpp
+++ b/LiteLoader/include/llapi/mc/CameraInstructionPacket.hpp
@@ -50,7 +50,7 @@ class CameraInstructionPacket : public Packet {
      */
     virtual struct ExtendedStreamReadResult readExtended(class ReadOnlyBinaryStream &);
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@CameraInstructionPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/CameraPacket.hpp b/LiteLoader/include/llapi/mc/CameraPacket.hpp
index b69aa5bcdf..1587cda225 100644
--- a/LiteLoader/include/llapi/mc/CameraPacket.hpp
+++ b/LiteLoader/include/llapi/mc/CameraPacket.hpp
@@ -50,7 +50,7 @@ class CameraPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@CameraPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/CameraPresetsPacket.hpp b/LiteLoader/include/llapi/mc/CameraPresetsPacket.hpp
index 249c12ca3b..e776f60368 100644
--- a/LiteLoader/include/llapi/mc/CameraPresetsPacket.hpp
+++ b/LiteLoader/include/llapi/mc/CameraPresetsPacket.hpp
@@ -50,7 +50,7 @@ class CameraPresetsPacket : public Packet {
      */
     virtual struct ExtendedStreamReadResult readExtended(class ReadOnlyBinaryStream &);
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@CameraPresetsPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/CameraShakePacket.hpp b/LiteLoader/include/llapi/mc/CameraShakePacket.hpp
index f5d3f93c29..9090fdb0ff 100644
--- a/LiteLoader/include/llapi/mc/CameraShakePacket.hpp
+++ b/LiteLoader/include/llapi/mc/CameraShakePacket.hpp
@@ -50,7 +50,7 @@ class CameraShakePacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@CameraShakePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/ChanceInformation.hpp b/LiteLoader/include/llapi/mc/ChanceInformation.hpp
index 6b609be208..044c8db902 100644
--- a/LiteLoader/include/llapi/mc/ChanceInformation.hpp
+++ b/LiteLoader/include/llapi/mc/ChanceInformation.hpp
@@ -37,13 +37,13 @@ class ChanceInformation {
      * @symbol ?roll\@ChanceInformation\@\@QEBA_NAEAVRandom\@\@\@Z
      */
     MCAPI bool roll(class Random &) const;
-    /**
-     * @symbol ?set\@ChanceInformation\@\@QEAAXII\@Z
-     */
-    MCAPI void set(unsigned int, unsigned int);
     /**
      * @symbol ?set\@ChanceInformation\@\@QEAAXM\@Z
      */
     MCAPI void set(float);
+    /**
+     * @symbol ?set\@ChanceInformation\@\@QEAAXII\@Z
+     */
+    MCAPI void set(unsigned int, unsigned int);
 
 };
diff --git a/LiteLoader/include/llapi/mc/ChangeDimensionPacket.hpp b/LiteLoader/include/llapi/mc/ChangeDimensionPacket.hpp
index 546f938c2b..4f90013c00 100644
--- a/LiteLoader/include/llapi/mc/ChangeDimensionPacket.hpp
+++ b/LiteLoader/include/llapi/mc/ChangeDimensionPacket.hpp
@@ -59,7 +59,7 @@ class ChangeDimensionPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@ChangeDimensionPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/ChangeMobPropertyPacket.hpp b/LiteLoader/include/llapi/mc/ChangeMobPropertyPacket.hpp
index a373a351c3..aba7092467 100644
--- a/LiteLoader/include/llapi/mc/ChangeMobPropertyPacket.hpp
+++ b/LiteLoader/include/llapi/mc/ChangeMobPropertyPacket.hpp
@@ -55,7 +55,7 @@ class ChangeMobPropertyPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@ChangeMobPropertyPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/ChunkLoadedRequest.hpp b/LiteLoader/include/llapi/mc/ChunkLoadedRequest.hpp
index a29fa2fc75..1988e92919 100644
--- a/LiteLoader/include/llapi/mc/ChunkLoadedRequest.hpp
+++ b/LiteLoader/include/llapi/mc/ChunkLoadedRequest.hpp
@@ -34,14 +34,14 @@ class ChunkLoadedRequest {
      * @symbol ??0ChunkLoadedRequest\@\@QEAA\@$$QEAV0\@\@Z
      */
     MCAPI ChunkLoadedRequest(class ChunkLoadedRequest &&);
-    /**
-     * @symbol ??0ChunkLoadedRequest\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$unique_ptr\@VIRequestAction\@\@U?$default_delete\@VIRequestAction\@\@\@std\@\@\@2\@_N\@Z
-     */
-    MCAPI ChunkLoadedRequest(std::string const &, std::unique_ptr<class IRequestAction>, bool);
     /**
      * @symbol ??0ChunkLoadedRequest\@\@QEAA\@AEBUBounds\@\@V?$unique_ptr\@VIRequestAction\@\@U?$default_delete\@VIRequestAction\@\@\@std\@\@\@std\@\@_N2\@Z
      */
     MCAPI ChunkLoadedRequest(struct Bounds const &, std::unique_ptr<class IRequestAction>, bool, bool);
+    /**
+     * @symbol ??0ChunkLoadedRequest\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$unique_ptr\@VIRequestAction\@\@U?$default_delete\@VIRequestAction\@\@\@std\@\@\@2\@_N\@Z
+     */
+    MCAPI ChunkLoadedRequest(std::string const &, std::unique_ptr<class IRequestAction>, bool);
     /**
      * @symbol ?areAllChunksLoaded\@ChunkLoadedRequest\@\@QEBA?AW4ChunksLoadedStatus\@\@AEAVDimension\@\@UTick\@\@\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/ChunkRadiusUpdatedPacket.hpp b/LiteLoader/include/llapi/mc/ChunkRadiusUpdatedPacket.hpp
index dbf21e4a90..4fbd3078df 100644
--- a/LiteLoader/include/llapi/mc/ChunkRadiusUpdatedPacket.hpp
+++ b/LiteLoader/include/llapi/mc/ChunkRadiusUpdatedPacket.hpp
@@ -50,7 +50,7 @@ class ChunkRadiusUpdatedPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@ChunkRadiusUpdatedPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/ClientCacheBlobStatusPacket.hpp b/LiteLoader/include/llapi/mc/ClientCacheBlobStatusPacket.hpp
index 925e380bbc..86f7533658 100644
--- a/LiteLoader/include/llapi/mc/ClientCacheBlobStatusPacket.hpp
+++ b/LiteLoader/include/llapi/mc/ClientCacheBlobStatusPacket.hpp
@@ -51,7 +51,7 @@ class ClientCacheBlobStatusPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@ClientCacheBlobStatusPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/ClientCacheMissResponsePacket.hpp b/LiteLoader/include/llapi/mc/ClientCacheMissResponsePacket.hpp
index c9d7c2784c..369230b091 100644
--- a/LiteLoader/include/llapi/mc/ClientCacheMissResponsePacket.hpp
+++ b/LiteLoader/include/llapi/mc/ClientCacheMissResponsePacket.hpp
@@ -50,7 +50,7 @@ class ClientCacheMissResponsePacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@ClientCacheMissResponsePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/ClientCacheStatusPacket.hpp b/LiteLoader/include/llapi/mc/ClientCacheStatusPacket.hpp
index b822602b8d..f3c045556a 100644
--- a/LiteLoader/include/llapi/mc/ClientCacheStatusPacket.hpp
+++ b/LiteLoader/include/llapi/mc/ClientCacheStatusPacket.hpp
@@ -50,7 +50,7 @@ class ClientCacheStatusPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@ClientCacheStatusPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/ClientCheatAbilityPacket.hpp b/LiteLoader/include/llapi/mc/ClientCheatAbilityPacket.hpp
index b3f93e3a18..3225f2456f 100644
--- a/LiteLoader/include/llapi/mc/ClientCheatAbilityPacket.hpp
+++ b/LiteLoader/include/llapi/mc/ClientCheatAbilityPacket.hpp
@@ -45,7 +45,7 @@ class ClientCheatAbilityPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@ClientCheatAbilityPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/ClientToServerHandshakePacket.hpp b/LiteLoader/include/llapi/mc/ClientToServerHandshakePacket.hpp
index 6bfde88ebd..d82496745d 100644
--- a/LiteLoader/include/llapi/mc/ClientToServerHandshakePacket.hpp
+++ b/LiteLoader/include/llapi/mc/ClientToServerHandshakePacket.hpp
@@ -50,7 +50,7 @@ class ClientToServerHandshakePacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@ClientToServerHandshakePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/ClientboundDebugRendererPacket.hpp b/LiteLoader/include/llapi/mc/ClientboundDebugRendererPacket.hpp
index fb3027137a..19b4075750 100644
--- a/LiteLoader/include/llapi/mc/ClientboundDebugRendererPacket.hpp
+++ b/LiteLoader/include/llapi/mc/ClientboundDebugRendererPacket.hpp
@@ -50,7 +50,7 @@ class ClientboundDebugRendererPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@ClientboundDebugRendererPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
@@ -64,13 +64,13 @@ class ClientboundDebugRendererPacket : public Packet {
      * @symbol ??0ClientboundDebugRendererPacket\@\@QEAA\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVColor\@mce\@\@AEBVVec3\@\@V?$duration\@_JU?$ratio\@$00$0DOI\@\@std\@\@\@chrono\@2\@\@Z
      */
     MCAPI ClientboundDebugRendererPacket(std::string, class mce::Color const &, class Vec3 const &, class std::chrono::duration<__int64, struct std::ratio<1, 1000>>);
-    /**
-     * @symbol ??0ClientboundDebugRendererPacket\@\@QEAA\@W4Type\@0\@\@Z
-     */
-    MCAPI ClientboundDebugRendererPacket(enum class ClientboundDebugRendererPacket::Type);
     /**
      * @symbol ??0ClientboundDebugRendererPacket\@\@QEAA\@XZ
      */
     MCAPI ClientboundDebugRendererPacket();
+    /**
+     * @symbol ??0ClientboundDebugRendererPacket\@\@QEAA\@W4Type\@0\@\@Z
+     */
+    MCAPI ClientboundDebugRendererPacket(enum class ClientboundDebugRendererPacket::Type);
 
 };
diff --git a/LiteLoader/include/llapi/mc/ClientboundMapItemDataPacket.hpp b/LiteLoader/include/llapi/mc/ClientboundMapItemDataPacket.hpp
index 72b094a51d..616fdebbb8 100644
--- a/LiteLoader/include/llapi/mc/ClientboundMapItemDataPacket.hpp
+++ b/LiteLoader/include/llapi/mc/ClientboundMapItemDataPacket.hpp
@@ -51,7 +51,7 @@ class ClientboundMapItemDataPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@ClientboundMapItemDataPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/CodeBuilder.hpp b/LiteLoader/include/llapi/mc/CodeBuilder.hpp
index 4f6994af03..3f08353942 100644
--- a/LiteLoader/include/llapi/mc/CodeBuilder.hpp
+++ b/LiteLoader/include/llapi/mc/CodeBuilder.hpp
@@ -44,10 +44,6 @@ struct DataMessage;
      * @symbol ?fromString\@CodeBuilder\@\@YA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAW4EncryptionCipherMode\@1\@\@Z
      */
     MCAPI bool fromString(std::string const &, enum class CodeBuilder::EncryptionCipherMode &);
-    /**
-     * @symbol ?serialize\@CodeBuilder\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBUEventMessage\@1\@\@Z
-     */
-    MCAPI std::string serialize(struct CodeBuilder::EventMessage const &);
     /**
      * @symbol ?serialize\@CodeBuilder\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBUChatMessage\@1\@\@Z
      */
@@ -56,14 +52,14 @@ struct DataMessage;
      * @symbol ?serialize\@CodeBuilder\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBUCommandMessage\@1\@\@Z
      */
     MCAPI std::string serialize(struct CodeBuilder::CommandMessage const &);
-    /**
-     * @symbol ?serialize\@CodeBuilder\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBUEncryptionResult\@1\@\@Z
-     */
-    MCAPI std::string serialize(struct CodeBuilder::EncryptionResult const &);
     /**
      * @symbol ?serialize\@CodeBuilder\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBUChatMessage\@1\@AEBV23\@\@Z
      */
     MCAPI std::string serialize(struct CodeBuilder::ChatMessage const &, std::string const &);
+    /**
+     * @symbol ?serialize\@CodeBuilder\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBUEncryptionResult\@1\@\@Z
+     */
+    MCAPI std::string serialize(struct CodeBuilder::EncryptionResult const &);
     /**
      * @symbol ?serialize\@CodeBuilder\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBUErrorMessage\@1\@\@Z
      */
@@ -72,6 +68,10 @@ struct DataMessage;
      * @symbol ?serialize\@CodeBuilder\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBUDataMessage\@1\@\@Z
      */
     MCAPI std::string serialize(struct CodeBuilder::DataMessage const &);
+    /**
+     * @symbol ?serialize\@CodeBuilder\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBUEventMessage\@1\@\@Z
+     */
+    MCAPI std::string serialize(struct CodeBuilder::EventMessage const &);
     /**
      * @symbol ?serialize\@CodeBuilder\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBUAgentMessage\@1\@\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/CodeBuilderPacket.hpp b/LiteLoader/include/llapi/mc/CodeBuilderPacket.hpp
index 6652aa5387..b12de3e3ef 100644
--- a/LiteLoader/include/llapi/mc/CodeBuilderPacket.hpp
+++ b/LiteLoader/include/llapi/mc/CodeBuilderPacket.hpp
@@ -51,7 +51,7 @@ class CodeBuilderPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@CodeBuilderPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/CodeBuilderSourcePacket.hpp b/LiteLoader/include/llapi/mc/CodeBuilderSourcePacket.hpp
index 70abd2f0dc..48a64f5eef 100644
--- a/LiteLoader/include/llapi/mc/CodeBuilderSourcePacket.hpp
+++ b/LiteLoader/include/llapi/mc/CodeBuilderSourcePacket.hpp
@@ -48,7 +48,7 @@ class CodeBuilderSourcePacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@CodeBuilderSourcePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/Command.hpp b/LiteLoader/include/llapi/mc/Command.hpp
index 5f27bf45ee..7fb8b17d1c 100644
--- a/LiteLoader/include/llapi/mc/Command.hpp
+++ b/LiteLoader/include/llapi/mc/Command.hpp
@@ -57,19 +57,17 @@ class Command {
      * @symbol __unk_vfn_0
      */
     virtual ~Command();
-
-protected:
     /**
      * @vftbl 1
      * @symbol ?collectOptionalArguments\@Command\@\@MEAA_NXZ
      */
+protected:
     virtual bool collectOptionalArguments();
-
-public:
     /**
      * @vftbl 2
-     * @symbol ?execute\@SpawnPointCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z
+     * @symbol ?execute\@PlaySoundCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z
      */
+public:
     virtual void execute(class CommandOrigin const &, class CommandOutput &) const = 0;
 #ifdef ENABLE_VIRTUAL_FAKESYMBOL_COMMAND
     /**
diff --git a/LiteLoader/include/llapi/mc/CommandAreaFactory.hpp b/LiteLoader/include/llapi/mc/CommandAreaFactory.hpp
index de971488d5..87cd58000f 100644
--- a/LiteLoader/include/llapi/mc/CommandAreaFactory.hpp
+++ b/LiteLoader/include/llapi/mc/CommandAreaFactory.hpp
@@ -33,14 +33,14 @@ class CommandAreaFactory {
      * @symbol ??0CommandAreaFactory\@\@QEAA\@AEAVDimension\@\@\@Z
      */
     MCAPI CommandAreaFactory(class Dimension &);
-    /**
-     * @symbol ?findArea\@CommandAreaFactory\@\@QEBA?AV?$unique_ptr\@VCommandArea\@\@U?$default_delete\@VCommandArea\@\@\@std\@\@\@std\@\@AEBVBlockPos\@\@0H_N1\@Z
-     */
-    MCAPI std::unique_ptr<class CommandArea> findArea(class BlockPos const &, class BlockPos const &, int, bool, bool) const;
     /**
      * @symbol ?findArea\@CommandAreaFactory\@\@QEBA?AV?$unique_ptr\@VCommandArea\@\@U?$default_delete\@VCommandArea\@\@\@std\@\@\@std\@\@AEBVBlockPos\@\@0_N11\@Z
      */
     MCAPI std::unique_ptr<class CommandArea> findArea(class BlockPos const &, class BlockPos const &, bool, bool, bool) const;
+    /**
+     * @symbol ?findArea\@CommandAreaFactory\@\@QEBA?AV?$unique_ptr\@VCommandArea\@\@U?$default_delete\@VCommandArea\@\@\@std\@\@\@std\@\@AEBVBlockPos\@\@0H_N1\@Z
+     */
+    MCAPI std::unique_ptr<class CommandArea> findArea(class BlockPos const &, class BlockPos const &, int, bool, bool) const;
     /**
      * @symbol ?findArea\@CommandAreaFactory\@\@QEBA?AV?$unique_ptr\@VCommandArea\@\@U?$default_delete\@VCommandArea\@\@\@std\@\@\@std\@\@AEBVBlockPos\@\@H_N1\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/CommandBlockUpdatePacket.hpp b/LiteLoader/include/llapi/mc/CommandBlockUpdatePacket.hpp
index 0aca73cba5..4edc3c7077 100644
--- a/LiteLoader/include/llapi/mc/CommandBlockUpdatePacket.hpp
+++ b/LiteLoader/include/llapi/mc/CommandBlockUpdatePacket.hpp
@@ -49,7 +49,7 @@ class CommandBlockUpdatePacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@CommandBlockUpdatePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
@@ -59,13 +59,13 @@ class CommandBlockUpdatePacket : public Packet {
      */
     MCVAPI ~CommandBlockUpdatePacket();
 #endif
-    /**
-     * @symbol ??0CommandBlockUpdatePacket\@\@QEAA\@XZ
-     */
-    MCAPI CommandBlockUpdatePacket();
     /**
      * @symbol ??0CommandBlockUpdatePacket\@\@QEAA\@AEBV0\@\@Z
      */
     MCAPI CommandBlockUpdatePacket(class CommandBlockUpdatePacket const &);
+    /**
+     * @symbol ??0CommandBlockUpdatePacket\@\@QEAA\@XZ
+     */
+    MCAPI CommandBlockUpdatePacket();
 
 };
diff --git a/LiteLoader/include/llapi/mc/CommandOrigin.hpp b/LiteLoader/include/llapi/mc/CommandOrigin.hpp
index d3cbcc1489..13845bf2f9 100644
--- a/LiteLoader/include/llapi/mc/CommandOrigin.hpp
+++ b/LiteLoader/include/llapi/mc/CommandOrigin.hpp
@@ -49,52 +49,52 @@ LIAPI ServerPlayer* getPlayer() const;
     virtual void __unk_vfn_0();
     /**
      * @vftbl 1
-     * @symbol ?getRequestId\@VirtualCommandOrigin\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ
+     * @symbol ?getRequestId\@ActorCommandOrigin\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ
      */
     virtual std::string const & getRequestId() const = 0;
     /**
      * @vftbl 2
-     * @symbol ?getName\@VirtualCommandOrigin\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ
+     * @symbol ?getName\@ActorCommandOrigin\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ
      */
     virtual std::string getName() const = 0;
     /**
      * @vftbl 3
-     * @symbol ?getBlockPosition\@VirtualCommandOrigin\@\@UEBA?AVBlockPos\@\@XZ
+     * @symbol ?getBlockPosition\@ActorCommandOrigin\@\@UEBA?AVBlockPos\@\@XZ
      */
     virtual class BlockPos getBlockPosition() const = 0;
     /**
      * @vftbl 4
-     * @symbol ?getWorldPosition\@VirtualCommandOrigin\@\@UEBA?AVVec3\@\@XZ
+     * @symbol ?getWorldPosition\@ActorCommandOrigin\@\@UEBA?AVVec3\@\@XZ
      */
     virtual class Vec3 getWorldPosition() const = 0;
     /**
      * @vftbl 5
-     * @symbol ?getRotation\@VirtualCommandOrigin\@\@UEBA?AV?$optional\@VVec2\@\@\@std\@\@XZ
+     * @symbol ?getRotation\@ActorCommandOrigin\@\@UEBA?AV?$optional\@VVec2\@\@\@std\@\@XZ
      */
     virtual class std::optional<class Vec2> getRotation() const = 0;
     /**
      * @vftbl 6
-     * @symbol ?getLevel\@VirtualCommandOrigin\@\@UEBAPEAVLevel\@\@XZ
+     * @symbol ?getLevel\@ActorCommandOrigin\@\@UEBAPEAVLevel\@\@XZ
      */
     virtual class Level * getLevel() const = 0;
     /**
      * @vftbl 7
-     * @symbol ?getDimension\@VirtualCommandOrigin\@\@UEBAPEAVDimension\@\@XZ
+     * @symbol ?getDimension\@ActorCommandOrigin\@\@UEBAPEAVDimension\@\@XZ
      */
     virtual class Dimension * getDimension() const = 0;
     /**
      * @vftbl 8
-     * @symbol ?getEntity\@VirtualCommandOrigin\@\@UEBAPEAVActor\@\@XZ
+     * @symbol ?getEntity\@ActorCommandOrigin\@\@UEBAPEAVActor\@\@XZ
      */
     virtual class Actor * getEntity() const = 0;
     /**
      * @vftbl 9
-     * @symbol ?getPermissionsLevel\@VirtualCommandOrigin\@\@UEBA?AW4CommandPermissionLevel\@\@XZ
+     * @symbol ?getPermissionsLevel\@ActorCommandOrigin\@\@UEBA?AW4CommandPermissionLevel\@\@XZ
      */
     virtual enum class CommandPermissionLevel getPermissionsLevel() const = 0;
     /**
      * @vftbl 10
-     * @symbol ?clone\@VirtualCommandOrigin\@\@UEBA?AV?$unique_ptr\@VCommandOrigin\@\@U?$default_delete\@VCommandOrigin\@\@\@std\@\@\@std\@\@XZ
+     * @symbol ?clone\@ActorCommandOrigin\@\@UEBA?AV?$unique_ptr\@VCommandOrigin\@\@U?$default_delete\@VCommandOrigin\@\@\@std\@\@\@std\@\@XZ
      */
     virtual std::unique_ptr<class CommandOrigin> clone() const = 0;
     /**
@@ -159,7 +159,7 @@ LIAPI ServerPlayer* getPlayer() const;
     virtual struct CommandOriginIdentity getIdentity() const;
     /**
      * @vftbl 23
-     * @symbol ?getOriginType\@VirtualCommandOrigin\@\@UEBA?AW4CommandOriginType\@\@XZ
+     * @symbol ?getOriginType\@ActorCommandOrigin\@\@UEBA?AW4CommandOriginType\@\@XZ
      */
     virtual enum class CommandOriginType getOriginType() const = 0;
     /**
@@ -194,7 +194,7 @@ LIAPI ServerPlayer* getPlayer() const;
     virtual class CompoundTag serialize() const;
     /**
      * @vftbl 30
-     * @symbol ?isValid\@VirtualCommandOrigin\@\@UEBA_NXZ
+     * @symbol ?isValid\@ActorCommandOrigin\@\@UEBA_NXZ
      */
     virtual bool isValid() const = 0;
     /**
@@ -214,14 +214,14 @@ LIAPI ServerPlayer* getPlayer() const;
      * @symbol ?getAreaAt\@CommandOrigin\@\@QEBA?AV?$unique_ptr\@VCommandArea\@\@U?$default_delete\@VCommandArea\@\@\@std\@\@\@std\@\@AEBVBlockPos\@\@H\@Z
      */
     MCAPI std::unique_ptr<class CommandArea> getAreaAt(class BlockPos const &, int) const;
-    /**
-     * @symbol ?getAreaAtWithBuffer\@CommandOrigin\@\@QEBA?AV?$unique_ptr\@VCommandArea\@\@U?$default_delete\@VCommandArea\@\@\@std\@\@\@std\@\@AEBVBlockPos\@\@H\@Z
-     */
-    MCAPI std::unique_ptr<class CommandArea> getAreaAtWithBuffer(class BlockPos const &, int) const;
     /**
      * @symbol ?getAreaAtWithBuffer\@CommandOrigin\@\@QEBA?AV?$unique_ptr\@VCommandArea\@\@U?$default_delete\@VCommandArea\@\@\@std\@\@\@std\@\@AEBVBlockPos\@\@0H_N\@Z
      */
     MCAPI std::unique_ptr<class CommandArea> getAreaAtWithBuffer(class BlockPos const &, class BlockPos const &, int, bool) const;
+    /**
+     * @symbol ?getAreaAtWithBuffer\@CommandOrigin\@\@QEBA?AV?$unique_ptr\@VCommandArea\@\@U?$default_delete\@VCommandArea\@\@\@std\@\@\@std\@\@AEBVBlockPos\@\@H\@Z
+     */
+    MCAPI std::unique_ptr<class CommandArea> getAreaAtWithBuffer(class BlockPos const &, int) const;
     /**
      * @symbol ?isEditorWorld\@CommandOrigin\@\@QEBA_NXZ
      */
diff --git a/LiteLoader/include/llapi/mc/CommandOriginData.hpp b/LiteLoader/include/llapi/mc/CommandOriginData.hpp
index cfd8caf4b9..fbd412252b 100644
--- a/LiteLoader/include/llapi/mc/CommandOriginData.hpp
+++ b/LiteLoader/include/llapi/mc/CommandOriginData.hpp
@@ -22,14 +22,14 @@ struct CommandOriginData {
 
 #undef AFTER_EXTRA
 public:
-    /**
-     * @symbol ??0CommandOriginData\@\@QEAA\@AEBU0\@\@Z
-     */
-    MCAPI CommandOriginData(struct CommandOriginData const &);
     /**
      * @symbol ??0CommandOriginData\@\@QEAA\@XZ
      */
     MCAPI CommandOriginData();
+    /**
+     * @symbol ??0CommandOriginData\@\@QEAA\@AEBU0\@\@Z
+     */
+    MCAPI CommandOriginData(struct CommandOriginData const &);
     /**
      * @symbol ??4CommandOriginData\@\@QEAAAEAU0\@AEBU0\@\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/CommandOutputMessage.hpp b/LiteLoader/include/llapi/mc/CommandOutputMessage.hpp
index 46550df731..9d8e1f5dd5 100644
--- a/LiteLoader/include/llapi/mc/CommandOutputMessage.hpp
+++ b/LiteLoader/include/llapi/mc/CommandOutputMessage.hpp
@@ -32,14 +32,14 @@ class CommandOutputMessage {
      * @symbol ??0CommandOutputMessage\@\@QEAA\@$$QEAV0\@\@Z
      */
     MCAPI CommandOutputMessage(class CommandOutputMessage &&);
-    /**
-     * @symbol ??0CommandOutputMessage\@\@QEAA\@W4CommandOutputMessageType\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$$QEAV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@3\@\@Z
-     */
-    MCAPI CommandOutputMessage(enum class CommandOutputMessageType, std::string const &, std::vector<std::string> &&);
     /**
      * @symbol ??0CommandOutputMessage\@\@QEAA\@AEBV0\@\@Z
      */
     MCAPI CommandOutputMessage(class CommandOutputMessage const &);
+    /**
+     * @symbol ??0CommandOutputMessage\@\@QEAA\@W4CommandOutputMessageType\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$$QEAV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@3\@\@Z
+     */
+    MCAPI CommandOutputMessage(enum class CommandOutputMessageType, std::string const &, std::vector<std::string> &&);
     /**
      * @symbol ?getMessageId\@CommandOutputMessage\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ
      */
diff --git a/LiteLoader/include/llapi/mc/CommandOutputPacket.hpp b/LiteLoader/include/llapi/mc/CommandOutputPacket.hpp
index 1078977869..35083ae7dc 100644
--- a/LiteLoader/include/llapi/mc/CommandOutputPacket.hpp
+++ b/LiteLoader/include/llapi/mc/CommandOutputPacket.hpp
@@ -50,7 +50,7 @@ class CommandOutputPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@CommandOutputPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/CommandOutputParameter.hpp b/LiteLoader/include/llapi/mc/CommandOutputParameter.hpp
index 0d6c69044a..819303b08a 100644
--- a/LiteLoader/include/llapi/mc/CommandOutputParameter.hpp
+++ b/LiteLoader/include/llapi/mc/CommandOutputParameter.hpp
@@ -33,13 +33,9 @@ class CommandOutputParameter {
      */
     MCAPI CommandOutputParameter(std::vector<std::string> const &);
     /**
-     * @symbol ??0CommandOutputParameter\@\@QEAA\@AEBVActor\@\@\@Z
-     */
-    MCAPI CommandOutputParameter(class Actor const &);
-    /**
-     * @symbol ??0CommandOutputParameter\@\@QEAA\@PEBVActor\@\@\@Z
+     * @symbol ??0CommandOutputParameter\@\@QEAA\@$$QEAV0\@\@Z
      */
-    MCAPI CommandOutputParameter(class Actor const *);
+    MCAPI CommandOutputParameter(class CommandOutputParameter &&);
     /**
      * @symbol ??0CommandOutputParameter\@\@QEAA\@VBlockPos\@\@\@Z
      */
@@ -57,29 +53,25 @@ class CommandOutputParameter {
      */
     MCAPI CommandOutputParameter(int);
     /**
-     * @symbol ??0CommandOutputParameter\@\@QEAA\@W4NoCountType\@0\@\@Z
-     */
-    MCAPI CommandOutputParameter(enum class CommandOutputParameter::NoCountType);
-    /**
-     * @symbol ??0CommandOutputParameter\@\@QEAA\@AEBV?$CommandSelectorResults\@VActor\@\@\@\@\@Z
+     * @symbol ??0CommandOutputParameter\@\@QEAA\@_N\@Z
      */
-    MCAPI CommandOutputParameter(class CommandSelectorResults<class Actor> const &);
+    MCAPI CommandOutputParameter(bool);
     /**
-     * @symbol ??0CommandOutputParameter\@\@QEAA\@AEBV?$CommandSelectorResults\@VPlayer\@\@\@\@\@Z
+     * @symbol ??0CommandOutputParameter\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z
      */
-    MCAPI CommandOutputParameter(class CommandSelectorResults<class Player> const &);
+    MCAPI CommandOutputParameter(std::string const &);
     /**
-     * @symbol ??0CommandOutputParameter\@\@QEAA\@$$QEAV0\@\@Z
+     * @symbol ??0CommandOutputParameter\@\@QEAA\@AEBVActor\@\@\@Z
      */
-    MCAPI CommandOutputParameter(class CommandOutputParameter &&);
+    MCAPI CommandOutputParameter(class Actor const &);
     /**
-     * @symbol ??0CommandOutputParameter\@\@QEAA\@_N\@Z
+     * @symbol ??0CommandOutputParameter\@\@QEAA\@PEBVActor\@\@\@Z
      */
-    MCAPI CommandOutputParameter(bool);
+    MCAPI CommandOutputParameter(class Actor const *);
     /**
-     * @symbol ??0CommandOutputParameter\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z
+     * @symbol ??0CommandOutputParameter\@\@QEAA\@W4NoCountType\@0\@\@Z
      */
-    MCAPI CommandOutputParameter(std::string const &);
+    MCAPI CommandOutputParameter(enum class CommandOutputParameter::NoCountType);
     /**
      * @symbol ??0CommandOutputParameter\@\@QEAA\@AEBV?$vector\@PEBVActor\@\@V?$allocator\@PEBVActor\@\@\@std\@\@\@std\@\@\@Z
      */
@@ -92,6 +84,14 @@ class CommandOutputParameter {
      * @symbol ??0CommandOutputParameter\@\@QEAA\@AEBV0\@\@Z
      */
     MCAPI CommandOutputParameter(class CommandOutputParameter const &);
+    /**
+     * @symbol ??0CommandOutputParameter\@\@QEAA\@AEBV?$CommandSelectorResults\@VActor\@\@\@\@\@Z
+     */
+    MCAPI CommandOutputParameter(class CommandSelectorResults<class Actor> const &);
+    /**
+     * @symbol ??0CommandOutputParameter\@\@QEAA\@AEBV?$CommandSelectorResults\@VPlayer\@\@\@\@\@Z
+     */
+    MCAPI CommandOutputParameter(class CommandSelectorResults<class Player> const &);
     /**
      * @symbol ??4CommandOutputParameter\@\@QEAAAEAV0\@$$QEAV0\@\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/CommandRegistry.hpp b/LiteLoader/include/llapi/mc/CommandRegistry.hpp
index 6ec21b4077..836358ae8f 100644
--- a/LiteLoader/include/llapi/mc/CommandRegistry.hpp
+++ b/LiteLoader/include/llapi/mc/CommandRegistry.hpp
@@ -690,14 +690,14 @@ class CommandRegistry {
     MCAPI static char const * TAG_VALUES_SOFTENUM_NAME;
 
 //private:
-    /**
-     * @symbol ?_addEnumValuesInternal\@CommandRegistry\@\@AEAA?AVSymbol\@1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$vector\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_K\@std\@\@V?$allocator\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_K\@std\@\@\@2\@\@4\@V?$typeid_t\@VCommandRegistry\@\@\@\@P81\@EBA_NPEAXAEBUParseToken\@1\@AEBVCommandOrigin\@\@HAEAV34\@AEAV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@4\@\@Z\@Z
-     */
-    MCAPI class CommandRegistry::Symbol _addEnumValuesInternal(std::string const &, std::vector<struct std::pair<std::string, unsigned __int64>> const &, class typeid_t<class CommandRegistry>, bool ( CommandRegistry::*)(void *, struct CommandRegistry::ParseToken const &, class CommandOrigin const &, int, std::string &, std::vector<std::string> &) const);
     /**
      * @symbol ?_addEnumValuesInternal\@CommandRegistry\@\@AEAA?AVSymbol\@1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$vector\@U?$pair\@_K_K\@std\@\@V?$allocator\@U?$pair\@_K_K\@std\@\@\@2\@\@4\@V?$typeid_t\@VCommandRegistry\@\@\@\@P81\@EBA_NPEAXAEBUParseToken\@1\@AEBVCommandOrigin\@\@HAEAV34\@AEAV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@4\@\@Z\@Z
      */
     MCAPI class CommandRegistry::Symbol _addEnumValuesInternal(std::string const &, std::vector<struct std::pair<unsigned __int64, unsigned __int64>> const &, class typeid_t<class CommandRegistry>, bool ( CommandRegistry::*)(void *, struct CommandRegistry::ParseToken const &, class CommandOrigin const &, int, std::string &, std::vector<std::string> &) const);
+    /**
+     * @symbol ?_addEnumValuesInternal\@CommandRegistry\@\@AEAA?AVSymbol\@1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$vector\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_K\@std\@\@V?$allocator\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_K\@std\@\@\@2\@\@4\@V?$typeid_t\@VCommandRegistry\@\@\@\@P81\@EBA_NPEAXAEBUParseToken\@1\@AEBVCommandOrigin\@\@HAEAV34\@AEAV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@4\@\@Z\@Z
+     */
+    MCAPI class CommandRegistry::Symbol _addEnumValuesInternal(std::string const &, std::vector<struct std::pair<std::string, unsigned __int64>> const &, class typeid_t<class CommandRegistry>, bool ( CommandRegistry::*)(void *, struct CommandRegistry::ParseToken const &, class CommandOrigin const &, int, std::string &, std::vector<std::string> &) const);
     /**
      * @symbol ?_addFunctionSoftEnum\@CommandRegistry\@\@AEAA?AVSymbol\@1\@XZ
      */
@@ -814,14 +814,14 @@ class CommandRegistry {
      * @symbol ?isValid\@CommandRegistry\@\@AEBA_NVSymbol\@1\@\@Z
      */
     MCAPI bool isValid(class CommandRegistry::Symbol) const;
-    /**
-     * @symbol ?originCanRun\@CommandRegistry\@\@AEBA_NAEBVCommandOrigin\@\@AEBUSignature\@1\@\@Z
-     */
-    MCAPI bool originCanRun(class CommandOrigin const &, struct CommandRegistry::Signature const &) const;
     /**
      * @symbol ?originCanRun\@CommandRegistry\@\@AEBA_NAEBVCommandOrigin\@\@AEBUOverload\@1\@\@Z
      */
     MCAPI bool originCanRun(class CommandOrigin const &, struct CommandRegistry::Overload const &) const;
+    /**
+     * @symbol ?originCanRun\@CommandRegistry\@\@AEBA_NAEBVCommandOrigin\@\@AEBUSignature\@1\@\@Z
+     */
+    MCAPI bool originCanRun(class CommandOrigin const &, struct CommandRegistry::Signature const &) const;
     /**
      * @symbol ?parseSelector\@CommandRegistry\@\@AEBA_NAEAUActorSelectorArgs\@\@AEBUParseToken\@1\@AEBVCommandOrigin\@\@HAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@6\@\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/CommandRequestPacket.hpp b/LiteLoader/include/llapi/mc/CommandRequestPacket.hpp
index 3f3ae9922b..0fcf6464d0 100644
--- a/LiteLoader/include/llapi/mc/CommandRequestPacket.hpp
+++ b/LiteLoader/include/llapi/mc/CommandRequestPacket.hpp
@@ -51,7 +51,7 @@ class CommandRequestPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@CommandRequestPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
@@ -61,14 +61,14 @@ class CommandRequestPacket : public Packet {
      */
     MCVAPI ~CommandRequestPacket();
 #endif
-    /**
-     * @symbol ??0CommandRequestPacket\@\@QEAA\@XZ
-     */
-    MCAPI CommandRequestPacket();
     /**
      * @symbol ??0CommandRequestPacket\@\@QEAA\@AEAVCommandContext\@\@_N\@Z
      */
     MCAPI CommandRequestPacket(class CommandContext &, bool);
+    /**
+     * @symbol ??0CommandRequestPacket\@\@QEAA\@XZ
+     */
+    MCAPI CommandRequestPacket();
     /**
      * @symbol ?createCommandContext\@CommandRequestPacket\@\@QEBA?AV?$unique_ptr\@VCommandContext\@\@U?$default_delete\@VCommandContext\@\@\@std\@\@\@std\@\@AEBVNetworkIdentifier\@\@AEBV?$NonOwnerPointer\@VILevel\@\@\@Bedrock\@\@\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/CommunitySiftProcessor.hpp b/LiteLoader/include/llapi/mc/CommunitySiftProcessor.hpp
index af06fee660..286e7c087b 100644
--- a/LiteLoader/include/llapi/mc/CommunitySiftProcessor.hpp
+++ b/LiteLoader/include/llapi/mc/CommunitySiftProcessor.hpp
@@ -86,14 +86,14 @@ class CommunitySiftProcessor {
      * @symbol ?_processEvent\@CommunitySiftProcessor\@\@AEAAXAEBVPlayer\@\@W4TextProcessingEventOrigin\@\@PEBVUserEntityIdentifierComponent\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z
      */
     MCAPI void _processEvent(class Player const &, enum class TextProcessingEventOrigin, class UserEntityIdentifierComponent const *, std::string const &);
-    /**
-     * @symbol ?_processMessages\@CommunitySiftProcessor\@\@AEAA?AVCallbackToken\@\@AEBVPlayer\@\@_NW4TextProcessingEventOrigin\@\@AEBV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@6\@V?$function\@$$A6AXAEBV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@0\@Z\@6\@\@Z
-     */
-    MCAPI class CallbackToken _processMessages(class Player const &, bool, enum class TextProcessingEventOrigin, std::vector<std::string> const &, std::string const &, class std::function<void (std::vector<std::string> const &, std::vector<std::string> const &)>);
     /**
      * @symbol ?_processMessages\@CommunitySiftProcessor\@\@AEAA?AVCallbackToken\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0PEAVIMinecraftEventing\@\@_NW4TextProcessingEventOrigin\@\@AEBV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@4\@AEBV34\@V?$function\@$$A6AXAEBV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@0\@Z\@4\@\@Z
      */
     MCAPI class CallbackToken _processMessages(std::string, std::string, class IMinecraftEventing *, bool, enum class TextProcessingEventOrigin, std::vector<std::string> const &, std::string const &, class std::function<void (std::vector<std::string> const &, std::vector<std::string> const &)>);
+    /**
+     * @symbol ?_processMessages\@CommunitySiftProcessor\@\@AEAA?AVCallbackToken\@\@AEBVPlayer\@\@_NW4TextProcessingEventOrigin\@\@AEBV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@6\@V?$function\@$$A6AXAEBV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@0\@Z\@6\@\@Z
+     */
+    MCAPI class CallbackToken _processMessages(class Player const &, bool, enum class TextProcessingEventOrigin, std::vector<std::string> const &, std::string const &, class std::function<void (std::vector<std::string> const &, std::vector<std::string> const &)>);
     /**
      * @symbol ?_validateCommunitySiftConfiguration\@CommunitySiftProcessor\@\@AEAA_NXZ
      */
diff --git a/LiteLoader/include/llapi/mc/CompletedUsingItemPacket.hpp b/LiteLoader/include/llapi/mc/CompletedUsingItemPacket.hpp
index f4df2f5976..3adeba82e5 100644
--- a/LiteLoader/include/llapi/mc/CompletedUsingItemPacket.hpp
+++ b/LiteLoader/include/llapi/mc/CompletedUsingItemPacket.hpp
@@ -50,7 +50,7 @@ class CompletedUsingItemPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@CompletedUsingItemPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
@@ -60,13 +60,13 @@ class CompletedUsingItemPacket : public Packet {
      */
     MCVAPI ~CompletedUsingItemPacket();
 #endif
-    /**
-     * @symbol ??0CompletedUsingItemPacket\@\@QEAA\@FH\@Z
-     */
-    MCAPI CompletedUsingItemPacket(short, int);
     /**
      * @symbol ??0CompletedUsingItemPacket\@\@QEAA\@XZ
      */
     MCAPI CompletedUsingItemPacket();
+    /**
+     * @symbol ??0CompletedUsingItemPacket\@\@QEAA\@FH\@Z
+     */
+    MCAPI CompletedUsingItemPacket(short, int);
 
 };
diff --git a/LiteLoader/include/llapi/mc/ComposterBlock.hpp b/LiteLoader/include/llapi/mc/ComposterBlock.hpp
index c909e5baad..be9ddb26ad 100644
--- a/LiteLoader/include/llapi/mc/ComposterBlock.hpp
+++ b/LiteLoader/include/llapi/mc/ComposterBlock.hpp
@@ -329,14 +329,14 @@ inline void emitBoneMeal(class Level& a1, class BlockSource& a2, class BlockPos
      * @symbol ?addItem\@ComposterBlock\@\@SA_NAEAVContainer\@\@HAEAVItemStack\@\@AEAVBlockSource\@\@AEBVBlock\@\@AEBVBlockPos\@\@\@Z
      */
     MCAPI static bool addItem(class Container &, int, class ItemStack &, class BlockSource &, class Block const &, class BlockPos const &);
-    /**
-     * @symbol ?addItems\@ComposterBlock\@\@SAHAEBVItemStack\@\@HAEAVBlockSource\@\@AEBVBlock\@\@AEBVBlockPos\@\@\@Z
-     */
-    MCAPI static int addItems(class ItemStack const &, int, class BlockSource &, class Block const &, class BlockPos const &);
     /**
      * @symbol ?addItems\@ComposterBlock\@\@SA_NAEAVContainer\@\@HAEAVItemStack\@\@HAEAVBlockSource\@\@AEBVBlock\@\@AEBVBlockPos\@\@\@Z
      */
     MCAPI static bool addItems(class Container &, int, class ItemStack &, int, class BlockSource &, class Block const &, class BlockPos const &);
+    /**
+     * @symbol ?addItems\@ComposterBlock\@\@SAHAEBVItemStack\@\@HAEAVBlockSource\@\@AEBVBlock\@\@AEBVBlockPos\@\@\@Z
+     */
+    MCAPI static int addItems(class ItemStack const &, int, class BlockSource &, class Block const &, class BlockPos const &);
     /**
      * @symbol ?empty\@ComposterBlock\@\@SAXAEAVBlockSource\@\@AEBVBlock\@\@AEBVBlockPos\@\@\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/CompoundTag.hpp b/LiteLoader/include/llapi/mc/CompoundTag.hpp
index e69141a186..22236de2a0 100644
--- a/LiteLoader/include/llapi/mc/CompoundTag.hpp
+++ b/LiteLoader/include/llapi/mc/CompoundTag.hpp
@@ -156,14 +156,14 @@ class CompoundTag : public Tag {
      */
     MCVAPI ~CompoundTag();
 #endif
-    /**
-     * @symbol ??0CompoundTag\@\@QEAA\@XZ
-     */
-    MCAPI CompoundTag();
     /**
      * @symbol ??0CompoundTag\@\@QEAA\@$$QEAV0\@\@Z
      */
     MCAPI CompoundTag(class CompoundTag &&);
+    /**
+     * @symbol ??0CompoundTag\@\@QEAA\@XZ
+     */
+    MCAPI CompoundTag();
     /**
      * @symbol ?append\@CompoundTag\@\@QEAAXAEBV1\@\@Z
      */
@@ -196,14 +196,14 @@ class CompoundTag : public Tag {
      * @symbol ?end\@CompoundTag\@\@QEBA?AV?$_Tree_const_iterator\@V?$_Tree_val\@U?$_Tree_simple_types\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@VCompoundTagVariant\@\@\@std\@\@\@std\@\@\@std\@\@\@std\@\@XZ
      */
     MCAPI class std::_Tree_const_iterator<class std::_Tree_val<struct std::_Tree_simple_types<struct std::pair<std::string const, class CompoundTagVariant>>>> end() const;
-    /**
-     * @symbol ?get\@CompoundTag\@\@QEBAPEBVTag\@\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z
-     */
-    MCAPI class Tag const * get(class std::basic_string_view<char, struct std::char_traits<char>>) const;
     /**
      * @symbol ?get\@CompoundTag\@\@QEAAPEAVTag\@\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z
      */
     MCAPI class Tag * get(class std::basic_string_view<char, struct std::char_traits<char>>);
+    /**
+     * @symbol ?get\@CompoundTag\@\@QEBAPEBVTag\@\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z
+     */
+    MCAPI class Tag const * get(class std::basic_string_view<char, struct std::char_traits<char>>) const;
     /**
      * @symbol ?getBoolean\@CompoundTag\@\@QEBA_NV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z
      */
@@ -256,14 +256,14 @@ class CompoundTag : public Tag {
      * @symbol ?getIntTag\@CompoundTag\@\@QEBAPEBVIntTag\@\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z
      */
     MCAPI class IntTag const * getIntTag(class std::basic_string_view<char, struct std::char_traits<char>>) const;
-    /**
-     * @symbol ?getList\@CompoundTag\@\@QEAAPEAVListTag\@\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z
-     */
-    MCAPI class ListTag * getList(class std::basic_string_view<char, struct std::char_traits<char>>);
     /**
      * @symbol ?getList\@CompoundTag\@\@QEBAPEBVListTag\@\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z
      */
     MCAPI class ListTag const * getList(class std::basic_string_view<char, struct std::char_traits<char>>) const;
+    /**
+     * @symbol ?getList\@CompoundTag\@\@QEAAPEAVListTag\@\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z
+     */
+    MCAPI class ListTag * getList(class std::basic_string_view<char, struct std::char_traits<char>>);
     /**
      * @symbol ?getShort\@CompoundTag\@\@QEBAFV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z
      */
@@ -308,14 +308,14 @@ class CompoundTag : public Tag {
      * @symbol ?putByteArray\@CompoundTag\@\@QEAAAEAUTagMemoryChunk\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@U2\@\@Z
      */
     MCAPI struct TagMemoryChunk & putByteArray(std::string, struct TagMemoryChunk);
-    /**
-     * @symbol ?putCompound\@CompoundTag\@\@QEAAPEAV1\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@3\@\@Z
-     */
-    MCAPI class CompoundTag * putCompound(std::string, std::unique_ptr<class CompoundTag>);
     /**
      * @symbol ?putCompound\@CompoundTag\@\@QEAAAEAV1\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V1\@\@Z
      */
     MCAPI class CompoundTag & putCompound(std::string, class CompoundTag);
+    /**
+     * @symbol ?putCompound\@CompoundTag\@\@QEAAPEAV1\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@3\@\@Z
+     */
+    MCAPI class CompoundTag * putCompound(std::string, std::unique_ptr<class CompoundTag>);
     /**
      * @symbol ?putFloat\@CompoundTag\@\@QEAAAEAMV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@M\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/Container.hpp b/LiteLoader/include/llapi/mc/Container.hpp
index 7d74dde432..2375611f52 100644
--- a/LiteLoader/include/llapi/mc/Container.hpp
+++ b/LiteLoader/include/llapi/mc/Container.hpp
@@ -230,14 +230,14 @@ class Container {
      * @symbol ??0Container\@\@QEAA\@W4ContainerType\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z
      */
     MCAPI Container(enum class ContainerType, std::string const &, bool);
-    /**
-     * @symbol ??0Container\@\@QEAA\@AEBV0\@\@Z
-     */
-    MCAPI Container(class Container const &);
     /**
      * @symbol ??0Container\@\@QEAA\@W4ContainerType\@\@\@Z
      */
     MCAPI Container(enum class ContainerType);
+    /**
+     * @symbol ??0Container\@\@QEAA\@AEBV0\@\@Z
+     */
+    MCAPI Container(class Container const &);
     /**
      * @symbol ?getContainerType\@Container\@\@QEBA?AW4ContainerType\@\@XZ
      */
diff --git a/LiteLoader/include/llapi/mc/ContainerClosePacket.hpp b/LiteLoader/include/llapi/mc/ContainerClosePacket.hpp
index 44b36c70b3..ec8c43926c 100644
--- a/LiteLoader/include/llapi/mc/ContainerClosePacket.hpp
+++ b/LiteLoader/include/llapi/mc/ContainerClosePacket.hpp
@@ -50,7 +50,7 @@ class ContainerClosePacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@ContainerClosePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/ContainerOpenPacket.hpp b/LiteLoader/include/llapi/mc/ContainerOpenPacket.hpp
index 92843cf9ff..ec3367a3f9 100644
--- a/LiteLoader/include/llapi/mc/ContainerOpenPacket.hpp
+++ b/LiteLoader/include/llapi/mc/ContainerOpenPacket.hpp
@@ -50,7 +50,7 @@ class ContainerOpenPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@ContainerOpenPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/ContainerScreenContext.hpp b/LiteLoader/include/llapi/mc/ContainerScreenContext.hpp
index f50664c550..d2ee40a04b 100644
--- a/LiteLoader/include/llapi/mc/ContainerScreenContext.hpp
+++ b/LiteLoader/include/llapi/mc/ContainerScreenContext.hpp
@@ -28,14 +28,14 @@ class ContainerScreenContext {
 #endif
 
 public:
-    /**
-     * @symbol ??0ContainerScreenContext\@\@QEAA\@AEAVPlayer\@\@W4ContainerType\@\@AEBVBlockPos\@\@\@Z
-     */
-    MCAPI ContainerScreenContext(class Player &, enum class ContainerType, class BlockPos const &);
     /**
      * @symbol ??0ContainerScreenContext\@\@QEAA\@AEAVPlayer\@\@W4ContainerType\@\@AEBUActorUniqueID\@\@\@Z
      */
     MCAPI ContainerScreenContext(class Player &, enum class ContainerType, struct ActorUniqueID const &);
+    /**
+     * @symbol ??0ContainerScreenContext\@\@QEAA\@AEAVPlayer\@\@W4ContainerType\@\@AEBVBlockPos\@\@\@Z
+     */
+    MCAPI ContainerScreenContext(class Player &, enum class ContainerType, class BlockPos const &);
     /**
      * @symbol ??0ContainerScreenContext\@\@QEAA\@XZ
      */
diff --git a/LiteLoader/include/llapi/mc/ContainerSetDataPacket.hpp b/LiteLoader/include/llapi/mc/ContainerSetDataPacket.hpp
index 5f93d182d0..3e25dd2856 100644
--- a/LiteLoader/include/llapi/mc/ContainerSetDataPacket.hpp
+++ b/LiteLoader/include/llapi/mc/ContainerSetDataPacket.hpp
@@ -50,7 +50,7 @@ class ContainerSetDataPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@ContainerSetDataPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/ContainerValidationResult.hpp b/LiteLoader/include/llapi/mc/ContainerValidationResult.hpp
index 3292ec7797..ff1b178606 100644
--- a/LiteLoader/include/llapi/mc/ContainerValidationResult.hpp
+++ b/LiteLoader/include/llapi/mc/ContainerValidationResult.hpp
@@ -29,14 +29,14 @@ struct ContainerValidationResult {
 #endif
 
 public:
-    /**
-     * @symbol ??0ContainerValidationResult\@\@QEAA\@W4ContainerValidationOutcome\@\@\@Z
-     */
-    MCAPI ContainerValidationResult(enum class ContainerValidationOutcome);
     /**
      * @symbol ??0ContainerValidationResult\@\@QEAA\@$$QEAV?$vector\@UContainerValidationOperation\@\@V?$allocator\@UContainerValidationOperation\@\@\@std\@\@\@std\@\@W4ContainerValidationOutcome\@\@W4ContainerScreenRequestActionType\@\@\@Z
      */
     MCAPI ContainerValidationResult(std::vector<struct ContainerValidationOperation> &&, enum class ContainerValidationOutcome, enum class ContainerScreenRequestActionType);
+    /**
+     * @symbol ??0ContainerValidationResult\@\@QEAA\@W4ContainerValidationOutcome\@\@\@Z
+     */
+    MCAPI ContainerValidationResult(enum class ContainerValidationOutcome);
     /**
      * @symbol ?isSuccess\@ContainerValidationResult\@\@QEBA_NXZ
      */
diff --git a/LiteLoader/include/llapi/mc/ContainerValidationSlotData.hpp b/LiteLoader/include/llapi/mc/ContainerValidationSlotData.hpp
index be256f4f5d..3ba11f5261 100644
--- a/LiteLoader/include/llapi/mc/ContainerValidationSlotData.hpp
+++ b/LiteLoader/include/llapi/mc/ContainerValidationSlotData.hpp
@@ -26,14 +26,14 @@ struct ContainerValidationSlotData {
 #endif
 
 public:
-    /**
-     * @symbol ??0ContainerValidationSlotData\@\@QEAA\@W4ContainerEnumName\@\@H\@Z
-     */
-    MCAPI ContainerValidationSlotData(enum class ContainerEnumName, int);
     /**
      * @symbol ??0ContainerValidationSlotData\@\@QEAA\@XZ
      */
     MCAPI ContainerValidationSlotData();
+    /**
+     * @symbol ??0ContainerValidationSlotData\@\@QEAA\@W4ContainerEnumName\@\@H\@Z
+     */
+    MCAPI ContainerValidationSlotData(enum class ContainerEnumName, int);
     /**
      * @symbol ?matches\@ContainerValidationSlotData\@\@QEBA_NAEBU1\@\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/ContainerWeakRef.hpp b/LiteLoader/include/llapi/mc/ContainerWeakRef.hpp
index aad2d45034..058f24071f 100644
--- a/LiteLoader/include/llapi/mc/ContainerWeakRef.hpp
+++ b/LiteLoader/include/llapi/mc/ContainerWeakRef.hpp
@@ -28,6 +28,10 @@ class ContainerWeakRef {
 #endif
 
 public:
+    /**
+     * @symbol ??0ContainerWeakRef\@\@QEAA\@AEBUActorUniqueID\@\@W4ActorContainerType\@\@AEBV?$TypedRuntimeId\@UContainerRuntimeIdTag\@\@I$0A\@\@\@\@Z
+     */
+    MCAPI ContainerWeakRef(struct ActorUniqueID const &, enum class ActorContainerType, class TypedRuntimeId<struct ContainerRuntimeIdTag, unsigned int, 0> const &);
     /**
      * @symbol ??0ContainerWeakRef\@\@QEAA\@AEBVBlockPos\@\@AEBV?$TypedRuntimeId\@UContainerRuntimeIdTag\@\@I$0A\@\@\@\@Z
      */
@@ -36,10 +40,6 @@ class ContainerWeakRef {
      * @symbol ??0ContainerWeakRef\@\@QEAA\@XZ
      */
     MCAPI ContainerWeakRef();
-    /**
-     * @symbol ??0ContainerWeakRef\@\@QEAA\@AEBUActorUniqueID\@\@W4ActorContainerType\@\@AEBV?$TypedRuntimeId\@UContainerRuntimeIdTag\@\@I$0A\@\@\@\@Z
-     */
-    MCAPI ContainerWeakRef(struct ActorUniqueID const &, enum class ActorContainerType, class TypedRuntimeId<struct ContainerRuntimeIdTag, unsigned int, 0> const &);
     /**
      * @symbol ??BContainerWeakRef\@\@QEBA_NXZ
      */
diff --git a/LiteLoader/include/llapi/mc/CopperBlock.hpp b/LiteLoader/include/llapi/mc/CopperBlock.hpp
index ebffad4c29..0c256f8b2d 100644
--- a/LiteLoader/include/llapi/mc/CopperBlock.hpp
+++ b/LiteLoader/include/llapi/mc/CopperBlock.hpp
@@ -269,13 +269,13 @@ class CopperBlock : public BlockLegacy {
      * @symbol ?getDescriptionId\@BlockLegacy\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ
      */
     MCAPI std::string const & getDescriptionId() const;
-    /**
-     * @symbol ??0CopperBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HW4CopperType\@\@AEBVHashedString\@\@\@Z
-     */
-    MCAPI CopperBlock(std::string const &, int, enum class CopperType, class HashedString const &);
     /**
      * @symbol ??0CopperBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HW4CopperType\@\@AEBVHashedString\@\@22\@Z
      */
     MCAPI CopperBlock(std::string const &, int, enum class CopperType, class HashedString const &, class HashedString const &, class HashedString const &);
+    /**
+     * @symbol ??0CopperBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HW4CopperType\@\@AEBVHashedString\@\@\@Z
+     */
+    MCAPI CopperBlock(std::string const &, int, enum class CopperType, class HashedString const &);
 
 };
diff --git a/LiteLoader/include/llapi/mc/CorrectPlayerMovePredictionPacket.hpp b/LiteLoader/include/llapi/mc/CorrectPlayerMovePredictionPacket.hpp
index 86ab56b578..69e96b0d22 100644
--- a/LiteLoader/include/llapi/mc/CorrectPlayerMovePredictionPacket.hpp
+++ b/LiteLoader/include/llapi/mc/CorrectPlayerMovePredictionPacket.hpp
@@ -51,7 +51,7 @@ class CorrectPlayerMovePredictionPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@CorrectPlayerMovePredictionPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/CraftHandlerBase.hpp b/LiteLoader/include/llapi/mc/CraftHandlerBase.hpp
index a248ba6e43..fc727a87d0 100644
--- a/LiteLoader/include/llapi/mc/CraftHandlerBase.hpp
+++ b/LiteLoader/include/llapi/mc/CraftHandlerBase.hpp
@@ -52,7 +52,7 @@ class CraftHandlerBase {
     virtual void endRequestBatch();
     /**
      * @vftbl 4
-     * @symbol ?_handleCraftAction\@CraftHandlerEnchant\@\@MEAA?AW4ItemStackNetResult\@\@AEBVItemStackRequestActionCraftBase\@\@\@Z
+     * @symbol ?_handleCraftAction\@CraftHandleNonImplemented_DEPRECATEDASKTYLAING\@\@MEAA?AW4ItemStackNetResult\@\@AEBVItemStackRequestActionCraftBase\@\@\@Z
      */
     virtual enum class ItemStackNetResult _handleCraftAction(class ItemStackRequestActionCraftBase const &) = 0;
     /**
diff --git a/LiteLoader/include/llapi/mc/CraftingDataPacket.hpp b/LiteLoader/include/llapi/mc/CraftingDataPacket.hpp
index 36a250dbde..607212c4a3 100644
--- a/LiteLoader/include/llapi/mc/CraftingDataPacket.hpp
+++ b/LiteLoader/include/llapi/mc/CraftingDataPacket.hpp
@@ -50,7 +50,7 @@ class CraftingDataPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@CraftingDataPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/CraftingEventPacket.hpp b/LiteLoader/include/llapi/mc/CraftingEventPacket.hpp
index 348738d322..820522be5d 100644
--- a/LiteLoader/include/llapi/mc/CraftingEventPacket.hpp
+++ b/LiteLoader/include/llapi/mc/CraftingEventPacket.hpp
@@ -77,7 +77,7 @@ class CraftingEventPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@CraftingEventPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/CreatePhotoPacket.hpp b/LiteLoader/include/llapi/mc/CreatePhotoPacket.hpp
index b96d4b93ae..d5d32f699e 100644
--- a/LiteLoader/include/llapi/mc/CreatePhotoPacket.hpp
+++ b/LiteLoader/include/llapi/mc/CreatePhotoPacket.hpp
@@ -50,7 +50,7 @@ class CreatePhotoPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@CreatePhotoPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/CreativeContentPacket.hpp b/LiteLoader/include/llapi/mc/CreativeContentPacket.hpp
index d530dc83f6..a6c0addec4 100644
--- a/LiteLoader/include/llapi/mc/CreativeContentPacket.hpp
+++ b/LiteLoader/include/llapi/mc/CreativeContentPacket.hpp
@@ -50,7 +50,7 @@ class CreativeContentPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@CreativeContentPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/CreativeItemEntry.hpp b/LiteLoader/include/llapi/mc/CreativeItemEntry.hpp
index 9a769b5a03..7a6fe2a640 100644
--- a/LiteLoader/include/llapi/mc/CreativeItemEntry.hpp
+++ b/LiteLoader/include/llapi/mc/CreativeItemEntry.hpp
@@ -29,14 +29,14 @@ class CreativeItemEntry {
 #endif
 
 public:
-    /**
-     * @symbol ??0CreativeItemEntry\@\@QEAA\@PEAVCreativeItemRegistry\@\@AEBV?$TypedServerNetId\@UCreativeItemNetIdTag\@\@I$0A\@\@\@AEBVItemInstance\@\@I\@Z
-     */
-    MCAPI CreativeItemEntry(class CreativeItemRegistry *, class TypedServerNetId<struct CreativeItemNetIdTag, unsigned int, 0> const &, class ItemInstance const &, unsigned int);
     /**
      * @symbol ??0CreativeItemEntry\@\@QEAA\@$$QEAV0\@\@Z
      */
     MCAPI CreativeItemEntry(class CreativeItemEntry &&);
+    /**
+     * @symbol ??0CreativeItemEntry\@\@QEAA\@PEAVCreativeItemRegistry\@\@AEBV?$TypedServerNetId\@UCreativeItemNetIdTag\@\@I$0A\@\@\@AEBVItemInstance\@\@I\@Z
+     */
+    MCAPI CreativeItemEntry(class CreativeItemRegistry *, class TypedServerNetId<struct CreativeItemNetIdTag, unsigned int, 0> const &, class ItemInstance const &, unsigned int);
     /**
      * @symbol ?getCreativeNetId\@CreativeItemEntry\@\@QEBAAEBV?$TypedServerNetId\@UCreativeItemNetIdTag\@\@I$0A\@\@\@XZ
      */
diff --git a/LiteLoader/include/llapi/mc/DeathInfoPacket.hpp b/LiteLoader/include/llapi/mc/DeathInfoPacket.hpp
index 9966555c06..f94898f999 100644
--- a/LiteLoader/include/llapi/mc/DeathInfoPacket.hpp
+++ b/LiteLoader/include/llapi/mc/DeathInfoPacket.hpp
@@ -48,7 +48,7 @@ class DeathInfoPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@DeathInfoPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/DebugInfoPacket.hpp b/LiteLoader/include/llapi/mc/DebugInfoPacket.hpp
index f3b55be17f..7dcc82140a 100644
--- a/LiteLoader/include/llapi/mc/DebugInfoPacket.hpp
+++ b/LiteLoader/include/llapi/mc/DebugInfoPacket.hpp
@@ -50,7 +50,7 @@ class DebugInfoPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@DebugInfoPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/Dependencies.hpp b/LiteLoader/include/llapi/mc/Dependencies.hpp
index 85f1680c90..050009068e 100644
--- a/LiteLoader/include/llapi/mc/Dependencies.hpp
+++ b/LiteLoader/include/llapi/mc/Dependencies.hpp
@@ -26,14 +26,14 @@ struct Dependencies {
 #endif
 
 public:
-    /**
-     * @symbol ??4Dependencies\@\@QEAAAEAU0\@$$QEAU0\@\@Z
-     */
-    MCAPI struct Dependencies & operator=(struct Dependencies &&);
     /**
      * @symbol ??4Dependencies\@\@QEAAAEAU0\@AEBU0\@\@Z
      */
     MCAPI struct Dependencies & operator=(struct Dependencies const &);
+    /**
+     * @symbol ??4Dependencies\@\@QEAAAEAU0\@$$QEAU0\@\@Z
+     */
+    MCAPI struct Dependencies & operator=(struct Dependencies &&);
     /**
      * @symbol ??1Dependencies\@\@QEAA\@XZ
      */
diff --git a/LiteLoader/include/llapi/mc/Description.hpp b/LiteLoader/include/llapi/mc/Description.hpp
index f8f4ec8a7f..5d18df1f90 100644
--- a/LiteLoader/include/llapi/mc/Description.hpp
+++ b/LiteLoader/include/llapi/mc/Description.hpp
@@ -31,7 +31,7 @@ struct Description {
 public:
     /**
      * @vftbl 0
-     * @symbol ?getJsonName\@ManagedWanderingTraderDescription\@\@UEBAPEBDXZ
+     * @symbol ?getJsonName\@BehaviorTreeDescription\@\@UEBAPEBDXZ
      */
     virtual char const * getJsonName() const = 0;
     /**
diff --git a/LiteLoader/include/llapi/mc/Dimension.hpp b/LiteLoader/include/llapi/mc/Dimension.hpp
index 0aff097981..4f89ec2d10 100644
--- a/LiteLoader/include/llapi/mc/Dimension.hpp
+++ b/LiteLoader/include/llapi/mc/Dimension.hpp
@@ -464,14 +464,14 @@ class Dimension {
      * @symbol ?transferEntity\@Dimension\@\@QEAAXAEBVChunkPos\@\@AEBVVec3\@\@V?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@_N\@Z
      */
     MCAPI void transferEntity(class ChunkPos const &, class Vec3 const &, std::unique_ptr<class CompoundTag>, bool);
-    /**
-     * @symbol ?transferEntityToUnloadedChunk\@Dimension\@\@QEAAXAEAVActor\@\@PEAVLevelChunk\@\@\@Z
-     */
-    MCAPI void transferEntityToUnloadedChunk(class Actor &, class LevelChunk *);
     /**
      * @symbol ?transferEntityToUnloadedChunk\@Dimension\@\@QEAAXAEBVChunkPos\@\@0V?$AutomaticID\@VDimension\@\@H\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@5\@\@Z
      */
     MCAPI void transferEntityToUnloadedChunk(class ChunkPos const &, class ChunkPos const &, class AutomaticID<class Dimension, int>, std::string &, std::unique_ptr<class CompoundTag>);
+    /**
+     * @symbol ?transferEntityToUnloadedChunk\@Dimension\@\@QEAAXAEAVActor\@\@PEAVLevelChunk\@\@\@Z
+     */
+    MCAPI void transferEntityToUnloadedChunk(class Actor &, class LevelChunk *);
     /**
      * @symbol ?tryGarbageCollectStructures\@Dimension\@\@QEAAXXZ
      */
diff --git a/LiteLoader/include/llapi/mc/DimensionDataPacket.hpp b/LiteLoader/include/llapi/mc/DimensionDataPacket.hpp
index 0e7cd44549..44457b3aab 100644
--- a/LiteLoader/include/llapi/mc/DimensionDataPacket.hpp
+++ b/LiteLoader/include/llapi/mc/DimensionDataPacket.hpp
@@ -49,7 +49,7 @@ class DimensionDataPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@DimensionDataPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/DisconnectPacket.hpp b/LiteLoader/include/llapi/mc/DisconnectPacket.hpp
index 71c18e6d4e..cb7ebe6405 100644
--- a/LiteLoader/include/llapi/mc/DisconnectPacket.hpp
+++ b/LiteLoader/include/llapi/mc/DisconnectPacket.hpp
@@ -50,7 +50,7 @@ class DisconnectPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@DisconnectPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/DwellerComponent.hpp b/LiteLoader/include/llapi/mc/DwellerComponent.hpp
index 87439413af..9ef671516d 100644
--- a/LiteLoader/include/llapi/mc/DwellerComponent.hpp
+++ b/LiteLoader/include/llapi/mc/DwellerComponent.hpp
@@ -34,14 +34,14 @@ enum class DwellingType;
      * @symbol ?DecrementDwellingUpdateInterval\@DwellerComponent\@\@QEAAXXZ
      */
     MCAPI void DecrementDwellingUpdateInterval();
-    /**
-     * @symbol ??0DwellerComponent\@\@QEAA\@XZ
-     */
-    MCAPI DwellerComponent();
     /**
      * @symbol ??0DwellerComponent\@\@QEAA\@$$QEAV0\@\@Z
      */
     MCAPI DwellerComponent(class DwellerComponent &&);
+    /**
+     * @symbol ??0DwellerComponent\@\@QEAA\@XZ
+     */
+    MCAPI DwellerComponent();
     /**
      * @symbol ?addAdditionalSaveData\@DwellerComponent\@\@QEBAXAEAVCompoundTag\@\@AEBVActor\@\@\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/Editor.hpp b/LiteLoader/include/llapi/mc/Editor.hpp
index 6f89d11642..6d8465947f 100644
--- a/LiteLoader/include/llapi/mc/Editor.hpp
+++ b/LiteLoader/include/llapi/mc/Editor.hpp
@@ -10,4 +10,3 @@
 
 #undef BEFORE_EXTRA
 
-
diff --git a/LiteLoader/include/llapi/mc/EditorNetworkPacket.hpp b/LiteLoader/include/llapi/mc/EditorNetworkPacket.hpp
index c6a5125560..f15d65d43d 100644
--- a/LiteLoader/include/llapi/mc/EditorNetworkPacket.hpp
+++ b/LiteLoader/include/llapi/mc/EditorNetworkPacket.hpp
@@ -48,7 +48,7 @@ class EditorNetworkPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@EditorNetworkPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/EduUriResourcePacket.hpp b/LiteLoader/include/llapi/mc/EduUriResourcePacket.hpp
index 9cfb0ba214..3fa78312e4 100644
--- a/LiteLoader/include/llapi/mc/EduUriResourcePacket.hpp
+++ b/LiteLoader/include/llapi/mc/EduUriResourcePacket.hpp
@@ -50,7 +50,7 @@ class EduUriResourcePacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@EduUriResourcePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
@@ -60,13 +60,13 @@ class EduUriResourcePacket : public Packet {
      */
     MCVAPI ~EduUriResourcePacket();
 #endif
-    /**
-     * @symbol ??0EduUriResourcePacket\@\@QEAA\@AEBUEduSharedUriResource\@\@\@Z
-     */
-    MCAPI EduUriResourcePacket(struct EduSharedUriResource const &);
     /**
      * @symbol ??0EduUriResourcePacket\@\@QEAA\@XZ
      */
     MCAPI EduUriResourcePacket();
+    /**
+     * @symbol ??0EduUriResourcePacket\@\@QEAA\@AEBUEduSharedUriResource\@\@\@Z
+     */
+    MCAPI EduUriResourcePacket(struct EduSharedUriResource const &);
 
 };
diff --git a/LiteLoader/include/llapi/mc/EducationSettingsPacket.hpp b/LiteLoader/include/llapi/mc/EducationSettingsPacket.hpp
index 57838b09a6..225d314f4c 100644
--- a/LiteLoader/include/llapi/mc/EducationSettingsPacket.hpp
+++ b/LiteLoader/include/llapi/mc/EducationSettingsPacket.hpp
@@ -50,7 +50,7 @@ class EducationSettingsPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@EducationSettingsPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/EmoteListPacket.hpp b/LiteLoader/include/llapi/mc/EmoteListPacket.hpp
index fdc651efe8..17dd7cb9fa 100644
--- a/LiteLoader/include/llapi/mc/EmoteListPacket.hpp
+++ b/LiteLoader/include/llapi/mc/EmoteListPacket.hpp
@@ -50,7 +50,7 @@ class EmoteListPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@EmoteListPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/EmotePacket.hpp b/LiteLoader/include/llapi/mc/EmotePacket.hpp
index d3c19faf39..604813e05b 100644
--- a/LiteLoader/include/llapi/mc/EmotePacket.hpp
+++ b/LiteLoader/include/llapi/mc/EmotePacket.hpp
@@ -50,7 +50,7 @@ class EmotePacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@EmotePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/EnchantUtils.hpp b/LiteLoader/include/llapi/mc/EnchantUtils.hpp
index 912f691f19..8073f62b16 100644
--- a/LiteLoader/include/llapi/mc/EnchantUtils.hpp
+++ b/LiteLoader/include/llapi/mc/EnchantUtils.hpp
@@ -46,14 +46,14 @@ class EnchantUtils {
      * @symbol ?appendEnchantToFormattedText\@EnchantUtils\@\@SAXW4Type\@Enchant\@\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@5\@\@Z
      */
     MCAPI static void appendEnchantToFormattedText(enum class Enchant::Type, class std::basic_string_view<char, struct std::char_traits<char>>, std::string &);
-    /**
-     * @symbol ?applyEnchant\@EnchantUtils\@\@SA_NAEAVItemStackBase\@\@AEBVEnchantmentInstance\@\@_N\@Z
-     */
-    MCAPI static bool applyEnchant(class ItemStackBase &, class EnchantmentInstance const &, bool);
     /**
      * @symbol ?applyEnchant\@EnchantUtils\@\@SAHAEAVItemStackBase\@\@AEBVItemEnchants\@\@_N\@Z
      */
     MCAPI static int applyEnchant(class ItemStackBase &, class ItemEnchants const &, bool);
+    /**
+     * @symbol ?applyEnchant\@EnchantUtils\@\@SA_NAEAVItemStackBase\@\@AEBVEnchantmentInstance\@\@_N\@Z
+     */
+    MCAPI static bool applyEnchant(class ItemStackBase &, class EnchantmentInstance const &, bool);
     /**
      * @symbol ?applyEnchant\@EnchantUtils\@\@SA_NAEAVItemStackBase\@\@W4Type\@Enchant\@\@H_N\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/EntityServerPacket.hpp b/LiteLoader/include/llapi/mc/EntityServerPacket.hpp
index bbc2e78b09..11a29b1f30 100644
--- a/LiteLoader/include/llapi/mc/EntityServerPacket.hpp
+++ b/LiteLoader/include/llapi/mc/EntityServerPacket.hpp
@@ -40,7 +40,7 @@ class EntityServerPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@EntityServerPacket\@\@MEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/EntitySet.hpp b/LiteLoader/include/llapi/mc/EntitySet.hpp
index 79bd8b2f2f..c12b6d506e 100644
--- a/LiteLoader/include/llapi/mc/EntitySet.hpp
+++ b/LiteLoader/include/llapi/mc/EntitySet.hpp
@@ -31,14 +31,14 @@ class EntitySet {
      * @symbol ??0EntitySet\@\@QEAA\@$$QEAV0\@\@Z
      */
     MCAPI EntitySet(class EntitySet &&);
-    /**
-     * @symbol ??0EntitySet\@\@QEAA\@AEBV0\@\@Z
-     */
-    MCAPI EntitySet(class EntitySet const &);
     /**
      * @symbol ??0EntitySet\@\@QEAA\@XZ
      */
     MCAPI EntitySet();
+    /**
+     * @symbol ??0EntitySet\@\@QEAA\@AEBV0\@\@Z
+     */
+    MCAPI EntitySet(class EntitySet const &);
     /**
      * @symbol ?add\@EntitySet\@\@QEAA_NAEBVEntityContext\@\@\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/EventPacket.hpp b/LiteLoader/include/llapi/mc/EventPacket.hpp
index ac563f2bbe..68cbf17163 100644
--- a/LiteLoader/include/llapi/mc/EventPacket.hpp
+++ b/LiteLoader/include/llapi/mc/EventPacket.hpp
@@ -103,7 +103,7 @@ class EventPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@EventPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
@@ -122,21 +122,25 @@ class EventPacket : public Packet {
      */
     MCAPI EventPacket(class Player const &, enum class MovementEventType, float, float, float, float, float);
     /**
-     * @symbol ??0EventPacket\@\@QEAA\@PEBVPlayer\@\@V?$not_null\@PEBVMob\@\@\@gsl\@\@\@Z
+     * @symbol ??0EventPacket\@\@QEAA\@PEBVPlayer\@\@PEBVActor\@\@V?$not_null\@PEBVMob\@\@\@gsl\@\@W4ActorDamageCause\@\@W4ActorType\@\@\@Z
      */
-    MCAPI EventPacket(class Player const *, class gsl::not_null<class Mob const *>);
+    MCAPI EventPacket(class Player const *, class Actor const *, class gsl::not_null<class Mob const *>, enum class ActorDamageCause, enum class ActorType);
     /**
      * @symbol ??0EventPacket\@\@QEAA\@PEBVPlayer\@\@V?$not_null\@PEBVActor\@\@\@gsl\@\@W4InteractionType\@MinecraftEventing\@\@\@Z
      */
     MCAPI EventPacket(class Player const *, class gsl::not_null<class Actor const *>, enum class MinecraftEventing::InteractionType);
+    /**
+     * @symbol ??0EventPacket\@\@QEAA\@AEBVPlayer\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z
+     */
+    MCAPI EventPacket(class Player const &, std::string const &, int);
     /**
      * @symbol ??0EventPacket\@\@QEAA\@PEBVPlayer\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@Z
      */
     MCAPI EventPacket(class Player const *, class AutomaticID<class Dimension, int>);
     /**
-     * @symbol ??0EventPacket\@\@QEAA\@PEBVPlayer\@\@HV?$not_null\@PEBVActor\@\@\@gsl\@\@\@Z
+     * @symbol ??0EventPacket\@\@QEAA\@PEBVPlayer\@\@FIF\@Z
      */
-    MCAPI EventPacket(class Player const *, int, class gsl::not_null<class Actor const *>);
+    MCAPI EventPacket(class Player const *, short, unsigned int, short);
     /**
      * @symbol ??0EventPacket\@\@QEAA\@PEBVPlayer\@\@HHW4ActorDamageCause\@\@_N\@Z
      */
@@ -154,21 +158,21 @@ class EventPacket : public Packet {
      */
     MCAPI EventPacket(class Player const *, enum class MinecraftEventing::AchievementIds, bool);
     /**
-     * @symbol ??0EventPacket\@\@QEAA\@AEBVPlayer\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z
+     * @symbol ??0EventPacket\@\@QEAA\@PEBVPlayer\@\@AEBVRaid\@\@_N\@Z
      */
-    MCAPI EventPacket(class Player const &, std::string const &, int);
+    MCAPI EventPacket(class Player const *, class Raid const &, bool);
     /**
-     * @symbol ??0EventPacket\@\@QEAA\@PEBVPlayer\@\@FIF\@Z
+     * @symbol ??0EventPacket\@\@QEAA\@PEBVPlayer\@\@V?$not_null\@PEBVMob\@\@\@gsl\@\@\@Z
      */
-    MCAPI EventPacket(class Player const *, short, unsigned int, short);
+    MCAPI EventPacket(class Player const *, class gsl::not_null<class Mob const *>);
     /**
      * @symbol ??0EventPacket\@\@QEAA\@PEBVPlayer\@\@V?$AutomaticID\@VDimension\@\@H\@\@1\@Z
      */
     MCAPI EventPacket(class Player const *, class AutomaticID<class Dimension, int>, class AutomaticID<class Dimension, int>);
     /**
-     * @symbol ??0EventPacket\@\@QEAA\@PEBVPlayer\@\@PEBVActor\@\@V?$not_null\@PEBVMob\@\@\@gsl\@\@W4ActorDamageCause\@\@W4ActorType\@\@\@Z
+     * @symbol ??0EventPacket\@\@QEAA\@PEBVPlayer\@\@HV?$not_null\@PEBVActor\@\@\@gsl\@\@\@Z
      */
-    MCAPI EventPacket(class Player const *, class Actor const *, class gsl::not_null<class Mob const *>, enum class ActorDamageCause, enum class ActorType);
+    MCAPI EventPacket(class Player const *, int, class gsl::not_null<class Actor const *>);
     /**
      * @symbol ??0EventPacket\@\@QEAA\@PEBVPlayer\@\@AEBUData\@0\@\@Z
      */
@@ -177,10 +181,6 @@ class EventPacket : public Packet {
      * @symbol ??0EventPacket\@\@QEAA\@PEBVPlayer\@\@PEBVActor\@\@V?$not_null\@PEBVMob\@\@\@gsl\@\@W4ActorDamageCause\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HW4ActorType\@\@\@Z
      */
     MCAPI EventPacket(class Player const *, class Actor const *, class gsl::not_null<class Mob const *>, enum class ActorDamageCause, std::string, int, enum class ActorType);
-    /**
-     * @symbol ??0EventPacket\@\@QEAA\@PEBVPlayer\@\@AEBVRaid\@\@_N\@Z
-     */
-    MCAPI EventPacket(class Player const *, class Raid const &, bool);
     /**
      * @symbol ??4EventPacket\@\@QEAAAEAV0\@$$QEAV0\@\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/ExecuteContextCommandOrigin.hpp b/LiteLoader/include/llapi/mc/ExecuteContextCommandOrigin.hpp
index 06704cf264..b067351aef 100644
--- a/LiteLoader/include/llapi/mc/ExecuteContextCommandOrigin.hpp
+++ b/LiteLoader/include/llapi/mc/ExecuteContextCommandOrigin.hpp
@@ -117,14 +117,14 @@ class ExecuteContextCommandOrigin : public CommandOrigin {
      * @symbol ?getPositionEntity\@ExecuteContextCommandOrigin\@\@QEAAPEBVActor\@\@XZ
      */
     MCAPI class Actor const * getPositionEntity();
-    /**
-     * @symbol ?setDimension\@ExecuteContextCommandOrigin\@\@QEAAXAEBVDimension\@\@\@Z
-     */
-    MCAPI void setDimension(class Dimension const &);
     /**
      * @symbol ?setDimension\@ExecuteContextCommandOrigin\@\@QEAAXAEBV?$AutomaticID\@VDimension\@\@H\@\@\@Z
      */
     MCAPI void setDimension(class AutomaticID<class Dimension, int> const &);
+    /**
+     * @symbol ?setDimension\@ExecuteContextCommandOrigin\@\@QEAAXAEBVDimension\@\@\@Z
+     */
+    MCAPI void setDimension(class Dimension const &);
     /**
      * @symbol ?setExecutionEntity\@ExecuteContextCommandOrigin\@\@QEAAXAEBVActor\@\@\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/ExpressionNode.hpp b/LiteLoader/include/llapi/mc/ExpressionNode.hpp
index 70182a31e6..be84d70e51 100644
--- a/LiteLoader/include/llapi/mc/ExpressionNode.hpp
+++ b/LiteLoader/include/llapi/mc/ExpressionNode.hpp
@@ -54,22 +54,18 @@ class ExpressionNode {
      * @symbol ??0ExpressionNode\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVSemVersion\@\@V?$span\@$$CBVHashedString\@\@$0?0\@gsl\@\@\@Z
      */
     MCAPI ExpressionNode(std::string const &, class SemVersion const &, class gsl::span<class HashedString const, -1>);
-    /**
-     * @symbol ??0ExpressionNode\@\@QEAA\@AEBV0\@\@Z
-     */
-    MCAPI ExpressionNode(class ExpressionNode const &);
     /**
      * @symbol ??0ExpressionNode\@\@QEAA\@AEBVValue\@Json\@\@W4MolangVersion\@\@V?$span\@$$CBVHashedString\@\@$0?0\@gsl\@\@\@Z
      */
     MCAPI ExpressionNode(class Json::Value const &, enum class MolangVersion, class gsl::span<class HashedString const, -1>);
-    /**
-     * @symbol ??0ExpressionNode\@\@QEAA\@M\@Z
-     */
-    MCAPI ExpressionNode(float);
     /**
      * @symbol ??0ExpressionNode\@\@QEAA\@AEAUMolangScriptArg\@\@W4ExpressionOp\@\@\@Z
      */
     MCAPI ExpressionNode(struct MolangScriptArg &, enum class ExpressionOp);
+    /**
+     * @symbol ??0ExpressionNode\@\@QEAA\@M\@Z
+     */
+    MCAPI ExpressionNode(float);
     /**
      * @symbol ??0ExpressionNode\@\@QEAA\@$$QEAV0\@\@Z
      */
@@ -78,6 +74,10 @@ class ExpressionNode {
      * @symbol ??0ExpressionNode\@\@QEAA\@AEBVValue\@Json\@\@AEBVSemVersion\@\@V?$span\@$$CBVHashedString\@\@$0?0\@gsl\@\@\@Z
      */
     MCAPI ExpressionNode(class Json::Value const &, class SemVersion const &, class gsl::span<class HashedString const, -1>);
+    /**
+     * @symbol ??0ExpressionNode\@\@QEAA\@AEBV0\@\@Z
+     */
+    MCAPI ExpressionNode(class ExpressionNode const &);
     /**
      * @symbol ?clear\@ExpressionNode\@\@QEAAXXZ
      */
@@ -130,26 +130,26 @@ class ExpressionNode {
      * @symbol ?isValid\@ExpressionNode\@\@QEBA_NXZ
      */
     MCAPI bool isValid() const;
-    /**
-     * @symbol ?link\@ExpressionNode\@\@QEBA?AW4MolangCompileResult\@\@W4MolangVersion\@\@\@Z
-     */
-    MCAPI enum class MolangCompileResult link(enum class MolangVersion) const;
     /**
      * @symbol ?link\@ExpressionNode\@\@QEBA?AW4MolangCompileResult\@\@XZ
      */
     MCAPI enum class MolangCompileResult link() const;
     /**
-     * @symbol ?moveConstantChildToValueIfFloatOrHashType\@ExpressionNode\@\@QEAAXH\@Z
+     * @symbol ?link\@ExpressionNode\@\@QEBA?AW4MolangCompileResult\@\@W4MolangVersion\@\@\@Z
      */
-    MCAPI void moveConstantChildToValueIfFloatOrHashType(int);
+    MCAPI enum class MolangCompileResult link(enum class MolangVersion) const;
     /**
-     * @symbol ??4ExpressionNode\@\@QEAAAEAV0\@AEBV0\@\@Z
+     * @symbol ?moveConstantChildToValueIfFloatOrHashType\@ExpressionNode\@\@QEAAXH\@Z
      */
-    MCAPI class ExpressionNode & operator=(class ExpressionNode const &);
+    MCAPI void moveConstantChildToValueIfFloatOrHashType(int);
     /**
      * @symbol ??4ExpressionNode\@\@QEAAAEAV0\@M\@Z
      */
     MCAPI class ExpressionNode & operator=(float);
+    /**
+     * @symbol ??4ExpressionNode\@\@QEAAAEAV0\@AEBV0\@\@Z
+     */
+    MCAPI class ExpressionNode & operator=(class ExpressionNode const &);
     /**
      * @symbol ??8ExpressionNode\@\@QEBA_NAEBV0\@\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/ExpressionOpBitField.hpp b/LiteLoader/include/llapi/mc/ExpressionOpBitField.hpp
index 2b691e976a..27a92a301f 100644
--- a/LiteLoader/include/llapi/mc/ExpressionOpBitField.hpp
+++ b/LiteLoader/include/llapi/mc/ExpressionOpBitField.hpp
@@ -30,21 +30,21 @@ struct ExpressionOpBitField {
 
 public:
     /**
-     * @symbol ?areBitsSet\@ExpressionOpBitField\@\@QEBA_NW4ExpressionOp\@\@0000\@Z
+     * @symbol ?areBitsSet\@ExpressionOpBitField\@\@QEBA_NW4ExpressionOp\@\@00000\@Z
      */
-    MCAPI bool areBitsSet(enum class ExpressionOp, enum class ExpressionOp, enum class ExpressionOp, enum class ExpressionOp, enum class ExpressionOp) const;
+    MCAPI bool areBitsSet(enum class ExpressionOp, enum class ExpressionOp, enum class ExpressionOp, enum class ExpressionOp, enum class ExpressionOp, enum class ExpressionOp) const;
     /**
      * @symbol ?areBitsSet\@ExpressionOpBitField\@\@QEBA_NW4ExpressionOp\@\@00\@Z
      */
     MCAPI bool areBitsSet(enum class ExpressionOp, enum class ExpressionOp, enum class ExpressionOp) const;
     /**
-     * @symbol ?areBitsSet\@ExpressionOpBitField\@\@QEBA_NW4ExpressionOp\@\@000\@Z
+     * @symbol ?areBitsSet\@ExpressionOpBitField\@\@QEBA_NW4ExpressionOp\@\@0000\@Z
      */
-    MCAPI bool areBitsSet(enum class ExpressionOp, enum class ExpressionOp, enum class ExpressionOp, enum class ExpressionOp) const;
+    MCAPI bool areBitsSet(enum class ExpressionOp, enum class ExpressionOp, enum class ExpressionOp, enum class ExpressionOp, enum class ExpressionOp) const;
     /**
-     * @symbol ?areBitsSet\@ExpressionOpBitField\@\@QEBA_NW4ExpressionOp\@\@00000\@Z
+     * @symbol ?areBitsSet\@ExpressionOpBitField\@\@QEBA_NW4ExpressionOp\@\@000\@Z
      */
-    MCAPI bool areBitsSet(enum class ExpressionOp, enum class ExpressionOp, enum class ExpressionOp, enum class ExpressionOp, enum class ExpressionOp, enum class ExpressionOp) const;
+    MCAPI bool areBitsSet(enum class ExpressionOp, enum class ExpressionOp, enum class ExpressionOp, enum class ExpressionOp) const;
     /**
      * @symbol ?areBitsSet\@ExpressionOpBitField\@\@QEBA_NW4ExpressionOp\@\@0000000\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/ExtendedStreamReadResult.hpp b/LiteLoader/include/llapi/mc/ExtendedStreamReadResult.hpp
index 5b888f0af9..bbd8b4769e 100644
--- a/LiteLoader/include/llapi/mc/ExtendedStreamReadResult.hpp
+++ b/LiteLoader/include/llapi/mc/ExtendedStreamReadResult.hpp
@@ -27,14 +27,14 @@ struct ExtendedStreamReadResult {
 #endif
 
 public:
-    /**
-     * @symbol ??0ExtendedStreamReadResult\@\@QEAA\@W4StreamReadResult\@\@\@Z
-     */
-    MCAPI ExtendedStreamReadResult(enum class StreamReadResult);
     /**
      * @symbol ??0ExtendedStreamReadResult\@\@QEAA\@XZ
      */
     MCAPI ExtendedStreamReadResult();
+    /**
+     * @symbol ??0ExtendedStreamReadResult\@\@QEAA\@W4StreamReadResult\@\@\@Z
+     */
+    MCAPI ExtendedStreamReadResult(enum class StreamReadResult);
     /**
      * @symbol ??1ExtendedStreamReadResult\@\@QEAA\@XZ
      */
diff --git a/LiteLoader/include/llapi/mc/FeatureRegistryPacket.hpp b/LiteLoader/include/llapi/mc/FeatureRegistryPacket.hpp
index 64d897ab32..637f35af97 100644
--- a/LiteLoader/include/llapi/mc/FeatureRegistryPacket.hpp
+++ b/LiteLoader/include/llapi/mc/FeatureRegistryPacket.hpp
@@ -50,7 +50,7 @@ class FeatureRegistryPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@FeatureRegistryPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/FilterGroup.hpp b/LiteLoader/include/llapi/mc/FilterGroup.hpp
index def6e9714b..6cb07bc01d 100644
--- a/LiteLoader/include/llapi/mc/FilterGroup.hpp
+++ b/LiteLoader/include/llapi/mc/FilterGroup.hpp
@@ -39,7 +39,7 @@ enum class CollectionType;
     virtual void __unk_vfn_0();
     /**
      * @vftbl 1
-     * @symbol ?_createSubgroup\@BiomeFilterGroup\@\@MEBA?AV?$shared_ptr\@VFilterGroup\@\@\@std\@\@W4CollectionType\@FilterGroup\@\@\@Z
+     * @symbol ?_createSubgroup\@ActorFilterGroup\@\@MEBA?AV?$shared_ptr\@VFilterGroup\@\@\@std\@\@W4CollectionType\@FilterGroup\@\@\@Z
      */
     virtual class std::shared_ptr<class FilterGroup> _createSubgroup(enum class FilterGroup::CollectionType) const = 0;
     /**
diff --git a/LiteLoader/include/llapi/mc/FilterInput.hpp b/LiteLoader/include/llapi/mc/FilterInput.hpp
index de22544e1a..f4ecf79e37 100644
--- a/LiteLoader/include/llapi/mc/FilterInput.hpp
+++ b/LiteLoader/include/llapi/mc/FilterInput.hpp
@@ -32,14 +32,14 @@ class FilterInput {
      * @symbol ??0FilterInput\@\@QEAA\@H\@Z
      */
     MCAPI FilterInput(int);
-    /**
-     * @symbol ??4FilterInput\@\@QEAAAEAV0\@$$QEAV0\@\@Z
-     */
-    MCAPI class FilterInput & operator=(class FilterInput &&);
     /**
      * @symbol ??4FilterInput\@\@QEAAAEAV0\@AEBV0\@\@Z
      */
     MCAPI class FilterInput & operator=(class FilterInput const &);
+    /**
+     * @symbol ??4FilterInput\@\@QEAAAEAV0\@$$QEAV0\@\@Z
+     */
+    MCAPI class FilterInput & operator=(class FilterInput &&);
     /**
      * @symbol ??1FilterInput\@\@QEAA\@XZ
      */
diff --git a/LiteLoader/include/llapi/mc/FilterParamDefinition.hpp b/LiteLoader/include/llapi/mc/FilterParamDefinition.hpp
index dfbb2c962e..1d9475d270 100644
--- a/LiteLoader/include/llapi/mc/FilterParamDefinition.hpp
+++ b/LiteLoader/include/llapi/mc/FilterParamDefinition.hpp
@@ -27,14 +27,14 @@ struct FilterParamDefinition {
 #endif
 
 public:
-    /**
-     * @symbol ??0FilterParamDefinition\@\@QEAA\@W4FilterParamType\@\@W4FilterParamRequirement\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@VFilterInput\@\@UFilterStringMap\@\@\@Z
-     */
-    MCAPI FilterParamDefinition(enum class FilterParamType, enum class FilterParamRequirement, std::string, class FilterInput, struct FilterStringMap);
     /**
      * @symbol ??0FilterParamDefinition\@\@QEAA\@W4FilterParamType\@\@W4FilterParamRequirement\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4FilterParamOption\@\@VFilterInput\@\@UFilterStringMap\@\@\@Z
      */
     MCAPI FilterParamDefinition(enum class FilterParamType, enum class FilterParamRequirement, std::string, enum class FilterParamOption, class FilterInput, struct FilterStringMap);
+    /**
+     * @symbol ??0FilterParamDefinition\@\@QEAA\@W4FilterParamType\@\@W4FilterParamRequirement\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@VFilterInput\@\@UFilterStringMap\@\@\@Z
+     */
+    MCAPI FilterParamDefinition(enum class FilterParamType, enum class FilterParamRequirement, std::string, class FilterInput, struct FilterStringMap);
     /**
      * @symbol ??1FilterParamDefinition\@\@QEAA\@XZ
      */
diff --git a/LiteLoader/include/llapi/mc/FilterStringMap.hpp b/LiteLoader/include/llapi/mc/FilterStringMap.hpp
index a96269010e..86e0d0d440 100644
--- a/LiteLoader/include/llapi/mc/FilterStringMap.hpp
+++ b/LiteLoader/include/llapi/mc/FilterStringMap.hpp
@@ -28,14 +28,14 @@ struct FilterStringMap {
 #endif
 
 public:
-    /**
-     * @symbol ??0FilterStringMap\@\@QEAA\@V?$initializer_list\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@UFilterInputDefinition\@\@\@std\@\@\@std\@\@\@Z
-     */
-    MCAPI FilterStringMap(class std::initializer_list<struct std::pair<std::string const, struct FilterInputDefinition>>);
     /**
      * @symbol ??0FilterStringMap\@\@QEAA\@AEBU0\@\@Z
      */
     MCAPI FilterStringMap(struct FilterStringMap const &);
+    /**
+     * @symbol ??0FilterStringMap\@\@QEAA\@V?$initializer_list\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@UFilterInputDefinition\@\@\@std\@\@\@std\@\@\@Z
+     */
+    MCAPI FilterStringMap(class std::initializer_list<struct std::pair<std::string const, struct FilterInputDefinition>>);
     /**
      * @symbol ??4FilterStringMap\@\@QEAAAEAU0\@$$QEAU0\@\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/FilterTest.hpp b/LiteLoader/include/llapi/mc/FilterTest.hpp
index e1f2f8308c..4725db842d 100644
--- a/LiteLoader/include/llapi/mc/FilterTest.hpp
+++ b/LiteLoader/include/llapi/mc/FilterTest.hpp
@@ -48,7 +48,7 @@ struct Definition {
     virtual bool setup(struct FilterTest::Definition const &, struct FilterInputs const &);
     /**
      * @vftbl 2
-     * @symbol ?evaluate\@ActorInBlockTest\@\@UEBA_NAEBUFilterContext\@\@\@Z
+     * @symbol ?evaluate\@FilterTestGameRule\@\@UEBA_NAEBUFilterContext\@\@\@Z
      */
     virtual bool evaluate(struct FilterContext const &) const = 0;
     /**
@@ -58,7 +58,7 @@ struct Definition {
     virtual void finalizeParsedValue(class IWorldRegistriesProvider &);
     /**
      * @vftbl 4
-     * @symbol ?getName\@ActorInBlockTest\@\@UEBA?AV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@XZ
+     * @symbol ?getName\@FilterTestGameRule\@\@UEBA?AV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@XZ
      */
     virtual class std::basic_string_view<char, struct std::char_traits<char>> getName() const = 0;
     /**
@@ -68,7 +68,7 @@ struct Definition {
     virtual class Json::Value _serializeDomain() const;
     /**
      * @vftbl 6
-     * @symbol ?_serializeValue\@ActorHasPropertyTest\@\@MEBA?AVValue\@Json\@\@XZ
+     * @symbol ?_serializeValue\@FilterTestGameRule\@\@MEBA?AVValue\@Json\@\@XZ
      */
     virtual class Json::Value _serializeValue() const = 0;
 #ifdef ENABLE_VIRTUAL_FAKESYMBOL_FILTERTEST
@@ -83,10 +83,6 @@ struct Definition {
     MCAPI class Json::Value serialize() const;
 
 //protected:
-    /**
-     * @symbol ?_testValuesWithOperator\@FilterTest\@\@IEBA_NAEBVHashedString\@\@0\@Z
-     */
-    MCAPI bool _testValuesWithOperator(class HashedString const &, class HashedString const &) const;
     /**
      * @symbol ?_testValuesWithOperator\@FilterTest\@\@IEBA_N_N0\@Z
      */
@@ -95,6 +91,10 @@ struct Definition {
      * @symbol ?_testValuesWithOperator\@FilterTest\@\@IEBA_NMM\@Z
      */
     MCAPI bool _testValuesWithOperator(float, float) const;
+    /**
+     * @symbol ?_testValuesWithOperator\@FilterTest\@\@IEBA_NAEBVHashedString\@\@0\@Z
+     */
+    MCAPI bool _testValuesWithOperator(class HashedString const &, class HashedString const &) const;
     /**
      * @symbol ?_testValuesWithOperator\@FilterTest\@\@IEBA_NHH\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/FilterTextPacket.hpp b/LiteLoader/include/llapi/mc/FilterTextPacket.hpp
index 90d69d518b..eb9cc9502a 100644
--- a/LiteLoader/include/llapi/mc/FilterTextPacket.hpp
+++ b/LiteLoader/include/llapi/mc/FilterTextPacket.hpp
@@ -50,7 +50,7 @@ class FilterTextPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@FilterTextPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/FoliageColor.hpp b/LiteLoader/include/llapi/mc/FoliageColor.hpp
index abb98f33bb..256e38e5b8 100644
--- a/LiteLoader/include/llapi/mc/FoliageColor.hpp
+++ b/LiteLoader/include/llapi/mc/FoliageColor.hpp
@@ -43,14 +43,14 @@ enum class PaletteName;
      * @symbol ?getEvergreenColor\@FoliageColor\@\@SAHMM\@Z
      */
     MCAPI static int getEvergreenColor(float, float);
-    /**
-     * @symbol ?getFoliageColor\@FoliageColor\@\@SAHMM\@Z
-     */
-    MCAPI static int getFoliageColor(float, float);
     /**
      * @symbol ?getFoliageColor\@FoliageColor\@\@SAHW4PaletteName\@1\@MM\@Z
      */
     MCAPI static int getFoliageColor(enum class FoliageColor::PaletteName, float, float);
+    /**
+     * @symbol ?getFoliageColor\@FoliageColor\@\@SAHMM\@Z
+     */
+    MCAPI static int getFoliageColor(float, float);
     /**
      * @symbol ?getMapBirchColor\@FoliageColor\@\@SAHMM\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/FunctionEntry.hpp b/LiteLoader/include/llapi/mc/FunctionEntry.hpp
index 1e527daa32..d5dc6e7296 100644
--- a/LiteLoader/include/llapi/mc/FunctionEntry.hpp
+++ b/LiteLoader/include/llapi/mc/FunctionEntry.hpp
@@ -39,14 +39,14 @@ class FunctionEntry {
      * @symbol ?execute\@FunctionEntry\@\@UEAAXAEAVFunctionManager\@\@AEBVCommandOrigin\@\@W4FunctionQueueOrder\@\@\@Z
      */
     virtual void execute(class FunctionManager &, class CommandOrigin const &, enum class FunctionQueueOrder);
-    /**
-     * @symbol ??0FunctionEntry\@\@QEAA\@W4FunctionState\@\@\@Z
-     */
-    MCAPI FunctionEntry(enum class FunctionState);
     /**
      * @symbol ??0FunctionEntry\@\@QEAA\@$$QEAV?$vector\@V?$unique_ptr\@VIFunctionEntry\@\@U?$default_delete\@VIFunctionEntry\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VIFunctionEntry\@\@U?$default_delete\@VIFunctionEntry\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@W4FunctionState\@\@\@Z
      */
     MCAPI FunctionEntry(std::vector<std::unique_ptr<class IFunctionEntry>> &&, enum class FunctionState);
+    /**
+     * @symbol ??0FunctionEntry\@\@QEAA\@W4FunctionState\@\@\@Z
+     */
+    MCAPI FunctionEntry(enum class FunctionState);
     /**
      * @symbol ?getErrorState\@FunctionEntry\@\@QEBA?AW4FunctionState\@\@XZ
      */
diff --git a/LiteLoader/include/llapi/mc/GameRule.hpp b/LiteLoader/include/llapi/mc/GameRule.hpp
index c73e754fa2..ac95f21285 100644
--- a/LiteLoader/include/llapi/mc/GameRule.hpp
+++ b/LiteLoader/include/llapi/mc/GameRule.hpp
@@ -40,14 +40,14 @@ enum class Type;
      * @symbol ??0GameRule\@\@QEAA\@$$QEAV0\@\@Z
      */
     MCAPI GameRule(class GameRule &&);
-    /**
-     * @symbol ??0GameRule\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z
-     */
-    MCAPI GameRule(std::string const &, bool);
     /**
      * @symbol ??0GameRule\@\@QEAA\@AEBV0\@\@Z
      */
     MCAPI GameRule(class GameRule const &);
+    /**
+     * @symbol ??0GameRule\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z
+     */
+    MCAPI GameRule(std::string const &, bool);
     /**
      * @symbol ?allowUseInCommand\@GameRule\@\@QEBA_NXZ
      */
diff --git a/LiteLoader/include/llapi/mc/GameRulesChangedPacket.hpp b/LiteLoader/include/llapi/mc/GameRulesChangedPacket.hpp
index bab09ffc83..0f9e3473f3 100644
--- a/LiteLoader/include/llapi/mc/GameRulesChangedPacket.hpp
+++ b/LiteLoader/include/llapi/mc/GameRulesChangedPacket.hpp
@@ -51,7 +51,7 @@ class GameRulesChangedPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@GameRulesChangedPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/GameTestRequestPacket.hpp b/LiteLoader/include/llapi/mc/GameTestRequestPacket.hpp
index 4654a08e19..1c4e3590c8 100644
--- a/LiteLoader/include/llapi/mc/GameTestRequestPacket.hpp
+++ b/LiteLoader/include/llapi/mc/GameTestRequestPacket.hpp
@@ -48,7 +48,7 @@ class GameTestRequestPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@GameTestRequestPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/GameTestResultsPacket.hpp b/LiteLoader/include/llapi/mc/GameTestResultsPacket.hpp
index 67fd35c18b..01710ffd15 100644
--- a/LiteLoader/include/llapi/mc/GameTestResultsPacket.hpp
+++ b/LiteLoader/include/llapi/mc/GameTestResultsPacket.hpp
@@ -48,7 +48,7 @@ class GameTestResultsPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@GameTestResultsPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/GameVersion.hpp b/LiteLoader/include/llapi/mc/GameVersion.hpp
index b476648aea..3da509437c 100644
--- a/LiteLoader/include/llapi/mc/GameVersion.hpp
+++ b/LiteLoader/include/llapi/mc/GameVersion.hpp
@@ -32,17 +32,17 @@ class GameVersion {
      */
     MCAPI GameVersion(class GameVersion const &);
     /**
-     * @symbol ??0GameVersion\@\@QEAA\@AEBVListTag\@\@\@Z
+     * @symbol ??0GameVersion\@\@QEAA\@IIIII\@Z
      */
-    MCAPI GameVersion(class ListTag const &);
+    MCAPI GameVersion(unsigned int, unsigned int, unsigned int, unsigned int, unsigned int);
     /**
      * @symbol ??0GameVersion\@\@QEAA\@XZ
      */
     MCAPI GameVersion();
     /**
-     * @symbol ??0GameVersion\@\@QEAA\@IIIII\@Z
+     * @symbol ??0GameVersion\@\@QEAA\@AEBVListTag\@\@\@Z
      */
-    MCAPI GameVersion(unsigned int, unsigned int, unsigned int, unsigned int, unsigned int);
+    MCAPI GameVersion(class ListTag const &);
     /**
      * @symbol ?asString\@GameVersion\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ
      */
diff --git a/LiteLoader/include/llapi/mc/GuiDataPickItemPacket.hpp b/LiteLoader/include/llapi/mc/GuiDataPickItemPacket.hpp
index 1996d236ef..141207d165 100644
--- a/LiteLoader/include/llapi/mc/GuiDataPickItemPacket.hpp
+++ b/LiteLoader/include/llapi/mc/GuiDataPickItemPacket.hpp
@@ -50,7 +50,7 @@ class GuiDataPickItemPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@GuiDataPickItemPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/HangingActor.hpp b/LiteLoader/include/llapi/mc/HangingActor.hpp
index 79b45c75b0..7f460a8c25 100644
--- a/LiteLoader/include/llapi/mc/HangingActor.hpp
+++ b/LiteLoader/include/llapi/mc/HangingActor.hpp
@@ -202,17 +202,17 @@ class HangingActor : public Actor {
     virtual void setDir(int);
     /**
      * @vftbl 277
-     * @symbol ?getWidth\@Painting\@\@UEBAHXZ
+     * @symbol ?getWidth\@LeashFenceKnotActor\@\@UEBAHXZ
      */
     virtual int getWidth() const = 0;
     /**
      * @vftbl 278
-     * @symbol ?getHeight\@Painting\@\@UEBAHXZ
+     * @symbol ?getHeight\@LeashFenceKnotActor\@\@UEBAHXZ
      */
     virtual int getHeight() const = 0;
     /**
      * @vftbl 279
-     * @symbol ?dropItem\@Painting\@\@UEAAXXZ
+     * @symbol ?dropItem\@LeashFenceKnotActor\@\@UEAAXXZ
      */
     virtual void dropItem() = 0;
     /**
diff --git a/LiteLoader/include/llapi/mc/HeavyBlock.hpp b/LiteLoader/include/llapi/mc/HeavyBlock.hpp
index 4b711858f4..0aaae009e3 100644
--- a/LiteLoader/include/llapi/mc/HeavyBlock.hpp
+++ b/LiteLoader/include/llapi/mc/HeavyBlock.hpp
@@ -242,12 +242,12 @@ class HeavyBlock : public BlockLegacy {
     virtual void __unk_vfn_186();
     /**
      * @vftbl 194
-     * @symbol ?getDustColor\@DragonEggBlock\@\@UEBA?AVColor\@mce\@\@AEBVBlock\@\@\@Z
+     * @symbol ?getDustColor\@SuspiciousSandBlock\@\@UEBA?AVColor\@mce\@\@AEBVBlock\@\@\@Z
      */
     virtual class mce::Color getDustColor(class Block const &) const = 0;
     /**
      * @vftbl 195
-     * @symbol ?getDustParticleName\@DragonEggBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z
+     * @symbol ?getDustParticleName\@SuspiciousSandBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z
      */
     virtual std::string getDustParticleName(class Block const &) const = 0;
     /**
diff --git a/LiteLoader/include/llapi/mc/HitResult.hpp b/LiteLoader/include/llapi/mc/HitResult.hpp
index 910bdcecbe..c19dbd2f62 100644
--- a/LiteLoader/include/llapi/mc/HitResult.hpp
+++ b/LiteLoader/include/llapi/mc/HitResult.hpp
@@ -71,26 +71,26 @@ class HitResult {
      * @symbol ??0HitResult\@\@QEAA\@AEBVVec3\@\@0AEAVActor\@\@\@Z
      */
     MCAPI HitResult(class Vec3 const &, class Vec3 const &, class Actor &);
-    /**
-     * @symbol ??0HitResult\@\@QEAA\@AEBVVec3\@\@0AEAVActor\@\@0\@Z
-     */
-    MCAPI HitResult(class Vec3 const &, class Vec3 const &, class Actor &, class Vec3 const &);
     /**
      * @symbol ??0HitResult\@\@QEAA\@AEBV0\@\@Z
      */
     MCAPI HitResult(class HitResult const &);
     /**
-     * @symbol ??0HitResult\@\@QEAA\@AEBVVec3\@\@00\@Z
+     * @symbol ??0HitResult\@\@QEAA\@XZ
      */
-    MCAPI HitResult(class Vec3 const &, class Vec3 const &, class Vec3 const &);
+    MCAPI HitResult();
+    /**
+     * @symbol ??0HitResult\@\@QEAA\@AEBVVec3\@\@0AEAVActor\@\@0\@Z
+     */
+    MCAPI HitResult(class Vec3 const &, class Vec3 const &, class Actor &, class Vec3 const &);
     /**
      * @symbol ??0HitResult\@\@QEAA\@AEBVVec3\@\@0AEBVBlockPos\@\@E0\@Z
      */
     MCAPI HitResult(class Vec3 const &, class Vec3 const &, class BlockPos const &, unsigned char, class Vec3 const &);
     /**
-     * @symbol ??0HitResult\@\@QEAA\@XZ
+     * @symbol ??0HitResult\@\@QEAA\@AEBVVec3\@\@00\@Z
      */
-    MCAPI HitResult();
+    MCAPI HitResult(class Vec3 const &, class Vec3 const &, class Vec3 const &);
     /**
      * @symbol ??0HitResult\@\@QEAA\@$$QEAV0\@\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/HopperContainerManagerModel.hpp b/LiteLoader/include/llapi/mc/HopperContainerManagerModel.hpp
index 39471f9863..6c5e9f15e8 100644
--- a/LiteLoader/include/llapi/mc/HopperContainerManagerModel.hpp
+++ b/LiteLoader/include/llapi/mc/HopperContainerManagerModel.hpp
@@ -40,13 +40,13 @@ class HopperContainerManagerModel : public LevelContainerManagerModel {
      * @symbol ?_postInit\@HopperContainerManagerModel\@\@MEAA?AVContainerScreenContext\@\@XZ
      */
     virtual class ContainerScreenContext _postInit();
-    /**
-     * @symbol ??0HopperContainerManagerModel\@\@QEAA\@W4ContainerID\@\@AEAVPlayer\@\@AEBVBlockPos\@\@\@Z
-     */
-    MCAPI HopperContainerManagerModel(enum class ContainerID, class Player &, class BlockPos const &);
     /**
      * @symbol ??0HopperContainerManagerModel\@\@QEAA\@W4ContainerID\@\@AEAVPlayer\@\@AEBUActorUniqueID\@\@\@Z
      */
     MCAPI HopperContainerManagerModel(enum class ContainerID, class Player &, struct ActorUniqueID const &);
+    /**
+     * @symbol ??0HopperContainerManagerModel\@\@QEAA\@W4ContainerID\@\@AEAVPlayer\@\@AEBVBlockPos\@\@\@Z
+     */
+    MCAPI HopperContainerManagerModel(enum class ContainerID, class Player &, class BlockPos const &);
 
 };
diff --git a/LiteLoader/include/llapi/mc/Horse.hpp b/LiteLoader/include/llapi/mc/Horse.hpp
index 6f6e480231..3e70f667c0 100644
--- a/LiteLoader/include/llapi/mc/Horse.hpp
+++ b/LiteLoader/include/llapi/mc/Horse.hpp
@@ -336,14 +336,14 @@ class Horse : public Animal {
      * @symbol ?postTravel\@Horse\@\@QEAAXPEAVActor\@\@_NW4HorsePostTravelType\@\@\@Z
      */
     MCAPI void postTravel(class Actor *, bool, enum class HorsePostTravelType);
-    /**
-     * @symbol ?getInterpolatedRidingOffset\@Horse\@\@SA?AVVec3\@\@AEBURenderRotationComponent\@\@AEBUStandAnimationComponent\@\@M\@Z
-     */
-    MCAPI static class Vec3 getInterpolatedRidingOffset(struct RenderRotationComponent const &, struct StandAnimationComponent const &, float);
     /**
      * @symbol ?getInterpolatedRidingOffset\@Horse\@\@SA?AVVec3\@\@AEBVVec2\@\@MMM\@Z
      */
     MCAPI static class Vec3 getInterpolatedRidingOffset(class Vec2 const &, float, float, float);
+    /**
+     * @symbol ?getInterpolatedRidingOffset\@Horse\@\@SA?AVVec3\@\@AEBURenderRotationComponent\@\@AEBUStandAnimationComponent\@\@M\@Z
+     */
+    MCAPI static class Vec3 getInterpolatedRidingOffset(struct RenderRotationComponent const &, struct StandAnimationComponent const &, float);
     /**
      * @symbol ?getNewPassengerPos\@Horse\@\@SA?AVVec3\@\@AEBURenderPositionComponent\@\@AEBURenderRotationComponent\@\@AEBUStandAnimationComponent\@\@MM\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/HurtArmorPacket.hpp b/LiteLoader/include/llapi/mc/HurtArmorPacket.hpp
index 8778ffd5d2..3e856833b9 100644
--- a/LiteLoader/include/llapi/mc/HurtArmorPacket.hpp
+++ b/LiteLoader/include/llapi/mc/HurtArmorPacket.hpp
@@ -50,7 +50,7 @@ class HurtArmorPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@HurtArmorPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/I18n.hpp b/LiteLoader/include/llapi/mc/I18n.hpp
index 756c4a3c66..877123062e 100644
--- a/LiteLoader/include/llapi/mc/I18n.hpp
+++ b/LiteLoader/include/llapi/mc/I18n.hpp
@@ -69,14 +69,14 @@ class I18n {
      * @symbol ?findAvailableLanguages\@I18n\@\@SA?AV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@AEAVResourcePackManager\@\@\@Z
      */
     MCAPI static std::vector<std::string> findAvailableLanguages(class ResourcePackManager &);
-    /**
-     * @symbol ?get\@I18n\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@AEBV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@3\@PEBVLocalization\@\@\@Z
-     */
-    MCAPI static std::string get(std::string const &, std::vector<std::string> const &, class Localization const *);
     /**
      * @symbol ?get\@I18n\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@PEBVLocalization\@\@\@Z
      */
     MCAPI static std::string get(std::string const &, class Localization const *);
+    /**
+     * @symbol ?get\@I18n\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@AEBV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@3\@PEBVLocalization\@\@\@Z
+     */
+    MCAPI static std::string get(std::string const &, std::vector<std::string> const &, class Localization const *);
     /**
      * @symbol ?getCurrentLanguage\@I18n\@\@SA?AV?$optional_ref\@$$CBVLocalization\@\@\@\@XZ
      */
diff --git a/LiteLoader/include/llapi/mc/IdentityDefinition.hpp b/LiteLoader/include/llapi/mc/IdentityDefinition.hpp
index 6a0f784e77..fee8c80851 100644
--- a/LiteLoader/include/llapi/mc/IdentityDefinition.hpp
+++ b/LiteLoader/include/llapi/mc/IdentityDefinition.hpp
@@ -35,26 +35,26 @@ enum class Type : char
 #endif
 
 public:
-    /**
-     * @symbol ??0IdentityDefinition\@\@QEAA\@AEBUScoreboardId\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z
-     */
-    MCAPI IdentityDefinition(struct ScoreboardId const &, std::string const &);
     /**
      * @symbol ??0IdentityDefinition\@\@QEAA\@AEBV0\@\@Z
      */
     MCAPI IdentityDefinition(class IdentityDefinition const &);
     /**
-     * @symbol ??0IdentityDefinition\@\@QEAA\@AEBUScoreboardId\@\@AEBUPlayerScoreboardId\@\@\@Z
+     * @symbol ??0IdentityDefinition\@\@QEAA\@AEBUScoreboardId\@\@AEBUActorUniqueID\@\@\@Z
      */
-    MCAPI IdentityDefinition(struct ScoreboardId const &, struct PlayerScoreboardId const &);
+    MCAPI IdentityDefinition(struct ScoreboardId const &, struct ActorUniqueID const &);
+    /**
+     * @symbol ??0IdentityDefinition\@\@QEAA\@AEBUScoreboardId\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z
+     */
+    MCAPI IdentityDefinition(struct ScoreboardId const &, std::string const &);
     /**
      * @symbol ??0IdentityDefinition\@\@QEAA\@$$QEAV0\@\@Z
      */
     MCAPI IdentityDefinition(class IdentityDefinition &&);
     /**
-     * @symbol ??0IdentityDefinition\@\@QEAA\@AEBUScoreboardId\@\@AEBUActorUniqueID\@\@\@Z
+     * @symbol ??0IdentityDefinition\@\@QEAA\@AEBUScoreboardId\@\@AEBUPlayerScoreboardId\@\@\@Z
      */
-    MCAPI IdentityDefinition(struct ScoreboardId const &, struct ActorUniqueID const &);
+    MCAPI IdentityDefinition(struct ScoreboardId const &, struct PlayerScoreboardId const &);
     /**
      * @symbol ?getEntityId\@IdentityDefinition\@\@QEBAAEBUActorUniqueID\@\@XZ
      */
diff --git a/LiteLoader/include/llapi/mc/IdentityDictionary.hpp b/LiteLoader/include/llapi/mc/IdentityDictionary.hpp
index 601c3aae56..95b0ae1ecd 100644
--- a/LiteLoader/include/llapi/mc/IdentityDictionary.hpp
+++ b/LiteLoader/include/llapi/mc/IdentityDictionary.hpp
@@ -44,6 +44,10 @@ class IdentityDictionary {
      * @symbol ?getAllScoreboardIds\@IdentityDictionary\@\@QEBA?AV?$vector\@UScoreboardId\@\@V?$allocator\@UScoreboardId\@\@\@std\@\@\@std\@\@XZ
      */
     MCAPI std::vector<struct ScoreboardId> getAllScoreboardIds() const;
+    /**
+     * @symbol ?getScoreboardId\@IdentityDictionary\@\@QEBAAEBUScoreboardId\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z
+     */
+    MCAPI struct ScoreboardId const & getScoreboardId(std::string const &) const;
     /**
      * @symbol ?getScoreboardId\@IdentityDictionary\@\@QEBAAEBUScoreboardId\@\@AEBUPlayerScoreboardId\@\@\@Z
      */
@@ -52,14 +56,6 @@ class IdentityDictionary {
      * @symbol ?getScoreboardId\@IdentityDictionary\@\@QEBAAEBUScoreboardId\@\@AEBUActorUniqueID\@\@\@Z
      */
     MCAPI struct ScoreboardId const & getScoreboardId(struct ActorUniqueID const &) const;
-    /**
-     * @symbol ?getScoreboardId\@IdentityDictionary\@\@QEBAAEBUScoreboardId\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z
-     */
-    MCAPI struct ScoreboardId const & getScoreboardId(std::string const &) const;
-    /**
-     * @symbol ?registerIdentity\@IdentityDictionary\@\@QEAAAEBUScoreboardId\@\@AEBU2\@AEBUActorUniqueID\@\@\@Z
-     */
-    MCAPI struct ScoreboardId const & registerIdentity(struct ScoreboardId const &, struct ActorUniqueID const &);
     /**
      * @symbol ?registerIdentity\@IdentityDictionary\@\@QEAAAEBUScoreboardId\@\@AEBU2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z
      */
@@ -68,6 +64,10 @@ class IdentityDictionary {
      * @symbol ?registerIdentity\@IdentityDictionary\@\@QEAAAEBUScoreboardId\@\@AEBU2\@AEBUPlayerScoreboardId\@\@\@Z
      */
     MCAPI struct ScoreboardId const & registerIdentity(struct ScoreboardId const &, struct PlayerScoreboardId const &);
+    /**
+     * @symbol ?registerIdentity\@IdentityDictionary\@\@QEAAAEBUScoreboardId\@\@AEBU2\@AEBUActorUniqueID\@\@\@Z
+     */
+    MCAPI struct ScoreboardId const & registerIdentity(struct ScoreboardId const &, struct ActorUniqueID const &);
     /**
      * @symbol ?shouldConvertFakePlayer\@IdentityDictionary\@\@QEAA_NAEBUPlayerScoreboardId\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/InstantaneousAttributeBuff.hpp b/LiteLoader/include/llapi/mc/InstantaneousAttributeBuff.hpp
index 572e8b266b..9d24a9cb89 100644
--- a/LiteLoader/include/llapi/mc/InstantaneousAttributeBuff.hpp
+++ b/LiteLoader/include/llapi/mc/InstantaneousAttributeBuff.hpp
@@ -51,13 +51,13 @@ class InstantaneousAttributeBuff : public AttributeBuff {
      */
     MCVAPI ~InstantaneousAttributeBuff();
 #endif
-    /**
-     * @symbol ??0InstantaneousAttributeBuff\@\@QEAA\@MAEBVActorDamageSource\@\@\@Z
-     */
-    MCAPI InstantaneousAttributeBuff(float, class ActorDamageSource const &);
     /**
      * @symbol ??0InstantaneousAttributeBuff\@\@QEAA\@MW4AttributeBuffType\@\@\@Z
      */
     MCAPI InstantaneousAttributeBuff(float, enum class AttributeBuffType);
+    /**
+     * @symbol ??0InstantaneousAttributeBuff\@\@QEAA\@MAEBVActorDamageSource\@\@\@Z
+     */
+    MCAPI InstantaneousAttributeBuff(float, class ActorDamageSource const &);
 
 };
diff --git a/LiteLoader/include/llapi/mc/InteractPacket.hpp b/LiteLoader/include/llapi/mc/InteractPacket.hpp
index 32073af9bd..ae9bf7c8a7 100644
--- a/LiteLoader/include/llapi/mc/InteractPacket.hpp
+++ b/LiteLoader/include/llapi/mc/InteractPacket.hpp
@@ -50,7 +50,7 @@ class InteractPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@InteractPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/Interaction.hpp b/LiteLoader/include/llapi/mc/Interaction.hpp
index 41b23f3d54..d116cf33f9 100644
--- a/LiteLoader/include/llapi/mc/Interaction.hpp
+++ b/LiteLoader/include/llapi/mc/Interaction.hpp
@@ -27,10 +27,6 @@ struct Interaction {
 #endif
 
 public:
-    /**
-     * @symbol ??0Interaction\@\@QEAA\@XZ
-     */
-    MCAPI Interaction();
     /**
      * @symbol ??0Interaction\@\@QEAA\@$$QEAU0\@\@Z
      */
@@ -39,6 +35,10 @@ struct Interaction {
      * @symbol ??0Interaction\@\@QEAA\@AEBU0\@\@Z
      */
     MCAPI Interaction(struct Interaction const &);
+    /**
+     * @symbol ??0Interaction\@\@QEAA\@XZ
+     */
+    MCAPI Interaction();
     /**
      * @symbol ?addActorDefinitionIdentifierByName\@Interaction\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/InventoryContentPacket.hpp b/LiteLoader/include/llapi/mc/InventoryContentPacket.hpp
index f6850062a2..80fb8d88e2 100644
--- a/LiteLoader/include/llapi/mc/InventoryContentPacket.hpp
+++ b/LiteLoader/include/llapi/mc/InventoryContentPacket.hpp
@@ -50,7 +50,7 @@ class InventoryContentPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@InventoryContentPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/InventorySlotPacket.hpp b/LiteLoader/include/llapi/mc/InventorySlotPacket.hpp
index f3300a33d7..cd39d8aa8f 100644
--- a/LiteLoader/include/llapi/mc/InventorySlotPacket.hpp
+++ b/LiteLoader/include/llapi/mc/InventorySlotPacket.hpp
@@ -50,7 +50,7 @@ class InventorySlotPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@InventorySlotPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
@@ -60,13 +60,13 @@ class InventorySlotPacket : public Packet {
      */
     MCVAPI ~InventorySlotPacket();
 #endif
-    /**
-     * @symbol ??0InventorySlotPacket\@\@QEAA\@W4ContainerID\@\@IAEBVItemStack\@\@\@Z
-     */
-    MCAPI InventorySlotPacket(enum class ContainerID, unsigned int, class ItemStack const &);
     /**
      * @symbol ??0InventorySlotPacket\@\@QEAA\@XZ
      */
     MCAPI InventorySlotPacket();
+    /**
+     * @symbol ??0InventorySlotPacket\@\@QEAA\@W4ContainerID\@\@IAEBVItemStack\@\@\@Z
+     */
+    MCAPI InventorySlotPacket(enum class ContainerID, unsigned int, class ItemStack const &);
 
 };
diff --git a/LiteLoader/include/llapi/mc/InventoryTransaction.hpp b/LiteLoader/include/llapi/mc/InventoryTransaction.hpp
index 50b85d6088..6059785417 100644
--- a/LiteLoader/include/llapi/mc/InventoryTransaction.hpp
+++ b/LiteLoader/include/llapi/mc/InventoryTransaction.hpp
@@ -99,18 +99,10 @@ class InventoryTransaction {
     MCAPI static std::string const getInventoryTransactionErrorName(enum class InventoryTransactionError);
 
 //private:
-    /**
-     * @symbol ?_dropCreatedItems\@InventoryTransaction\@\@AEBAXAEAVPlayer\@\@\@Z
-     */
-    MCAPI void _dropCreatedItems(class Player &) const;
     /**
      * @symbol ?addItemToContent\@InventoryTransaction\@\@AEAAXAEBVItemStack\@\@H\@Z
      */
     MCAPI void addItemToContent(class ItemStack const &, int);
-    /**
-     * @symbol ?_isAllowedUIOpenForNonImplementedSource\@InventoryTransaction\@\@CA_NAEBVPlayer\@\@\@Z
-     */
-    MCAPI static bool _isAllowedUIOpenForNonImplementedSource(class Player const &);
 
 private:
     /**
diff --git a/LiteLoader/include/llapi/mc/InventoryTransactionPacket.hpp b/LiteLoader/include/llapi/mc/InventoryTransactionPacket.hpp
index 11454b15d1..0c2ddd20d5 100644
--- a/LiteLoader/include/llapi/mc/InventoryTransactionPacket.hpp
+++ b/LiteLoader/include/llapi/mc/InventoryTransactionPacket.hpp
@@ -56,7 +56,7 @@ class InventoryTransactionPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@InventoryTransactionPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/Item.hpp b/LiteLoader/include/llapi/mc/Item.hpp
index f63da727d5..d73985d1c4 100644
--- a/LiteLoader/include/llapi/mc/Item.hpp
+++ b/LiteLoader/include/llapi/mc/Item.hpp
@@ -768,14 +768,14 @@ class Tier {
      * @symbol ?addOnResetBAIcallback\@Item\@\@QEAAXAEBV?$function\@$$A6AXXZ\@std\@\@\@Z
      */
     MCAPI void addOnResetBAIcallback(class std::function<void (void)> const &);
-    /**
-     * @symbol ?addTag\@Item\@\@QEAAAEAV1\@AEBVHashedString\@\@\@Z
-     */
-    MCAPI class Item & addTag(class HashedString const &);
     /**
      * @symbol ?addTag\@Item\@\@QEAAAEAV1\@AEBUItemTag\@\@\@Z
      */
     MCAPI class Item & addTag(struct ItemTag const &);
+    /**
+     * @symbol ?addTag\@Item\@\@QEAAAEAV1\@AEBVHashedString\@\@\@Z
+     */
+    MCAPI class Item & addTag(class HashedString const &);
     /**
      * @symbol ?addTags\@Item\@\@QEAAAEAV1\@V?$initializer_list\@V?$reference_wrapper\@$$CBUItemTag\@\@\@std\@\@\@std\@\@\@Z
      */
@@ -796,14 +796,14 @@ class Tier {
      * @symbol ?destroySpeedBonus\@Item\@\@QEBAMAEBVItemStackBase\@\@\@Z
      */
     MCAPI float destroySpeedBonus(class ItemStackBase const &) const;
-    /**
-     * @symbol ?fixupOnLoad\@Item\@\@QEBAXAEAVItemStackBase\@\@\@Z
-     */
-    MCAPI void fixupOnLoad(class ItemStackBase &) const;
     /**
      * @symbol ?fixupOnLoad\@Item\@\@QEBAXAEAVItemStackBase\@\@AEAVLevel\@\@\@Z
      */
     MCAPI void fixupOnLoad(class ItemStackBase &, class Level &) const;
+    /**
+     * @symbol ?fixupOnLoad\@Item\@\@QEBAXAEAVItemStackBase\@\@\@Z
+     */
+    MCAPI void fixupOnLoad(class ItemStackBase &) const;
     /**
      * @symbol ?getCommandNames\@Item\@\@QEBA?AV?$vector\@UCommandName\@\@V?$allocator\@UCommandName\@\@\@std\@\@\@std\@\@XZ
      */
diff --git a/LiteLoader/include/llapi/mc/ItemComponentPacket.hpp b/LiteLoader/include/llapi/mc/ItemComponentPacket.hpp
index e93e0c73ac..6ace18b909 100644
--- a/LiteLoader/include/llapi/mc/ItemComponentPacket.hpp
+++ b/LiteLoader/include/llapi/mc/ItemComponentPacket.hpp
@@ -55,7 +55,7 @@ class ItemComponentPacket : public Packet {
      */
     virtual struct ExtendedStreamReadResult readExtended(class ReadOnlyBinaryStream &);
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@ItemComponentPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/ItemDescriptor.hpp b/LiteLoader/include/llapi/mc/ItemDescriptor.hpp
index 7ad219f1eb..98edcb58ab 100644
--- a/LiteLoader/include/llapi/mc/ItemDescriptor.hpp
+++ b/LiteLoader/include/llapi/mc/ItemDescriptor.hpp
@@ -51,6 +51,10 @@ class ItemDescriptor {
      */
     MCVAPI ~ItemDescriptor();
 #endif
+    /**
+     * @symbol ??0ItemDescriptor\@\@QEAA\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@H\@Z
+     */
+    MCAPI ItemDescriptor(class std::basic_string_view<char, struct std::char_traits<char>>, int);
     /**
      * @symbol ??0ItemDescriptor\@\@QEAA\@XZ
      */
@@ -63,14 +67,6 @@ class ItemDescriptor {
      * @symbol ??0ItemDescriptor\@\@QEAA\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     MCAPI ItemDescriptor(class ReadOnlyBinaryStream &);
-    /**
-     * @symbol ??0ItemDescriptor\@\@QEAA\@AEBVItem\@\@H\@Z
-     */
-    MCAPI ItemDescriptor(class Item const &, int);
-    /**
-     * @symbol ??0ItemDescriptor\@\@QEAA\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@H\@Z
-     */
-    MCAPI ItemDescriptor(class std::basic_string_view<char, struct std::char_traits<char>>, int);
     /**
      * @symbol ??0ItemDescriptor\@\@QEAA\@AEBUItemTag\@\@\@Z
      */
@@ -84,13 +80,17 @@ class ItemDescriptor {
      */
     MCAPI ItemDescriptor(class Json::Value const &, class SemVersion const &);
     /**
-     * @symbol ??0ItemDescriptor\@\@QEAA\@AEBVBlock\@\@\@Z
+     * @symbol ??0ItemDescriptor\@\@QEAA\@AEBVItem\@\@H\@Z
      */
-    MCAPI ItemDescriptor(class Block const &);
+    MCAPI ItemDescriptor(class Item const &, int);
     /**
      * @symbol ??0ItemDescriptor\@\@QEAA\@$$QEAV0\@\@Z
      */
     MCAPI ItemDescriptor(class ItemDescriptor &&);
+    /**
+     * @symbol ??0ItemDescriptor\@\@QEAA\@AEBVBlock\@\@\@Z
+     */
+    MCAPI ItemDescriptor(class Block const &);
     /**
      * @symbol ?forEachItemUntil\@ItemDescriptor\@\@QEBA_NV?$function\@$$A6A_NAEBVItem\@\@F\@Z\@std\@\@\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/ItemDescriptorCount.hpp b/LiteLoader/include/llapi/mc/ItemDescriptorCount.hpp
index 05348904e2..910dfe9f25 100644
--- a/LiteLoader/include/llapi/mc/ItemDescriptorCount.hpp
+++ b/LiteLoader/include/llapi/mc/ItemDescriptorCount.hpp
@@ -53,6 +53,10 @@ class ItemDescriptorCount : public ItemDescriptor {
      * @symbol ??0ItemDescriptorCount\@\@QEAA\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     MCAPI ItemDescriptorCount(class ReadOnlyBinaryStream &);
+    /**
+     * @symbol ??0ItemDescriptorCount\@\@QEAA\@AEBVBlockLegacy\@\@G\@Z
+     */
+    MCAPI ItemDescriptorCount(class BlockLegacy const &, unsigned short);
     /**
      * @symbol ??0ItemDescriptorCount\@\@QEAA\@AEBVBlock\@\@G\@Z
      */
@@ -70,17 +74,13 @@ class ItemDescriptorCount : public ItemDescriptor {
      */
     MCAPI ItemDescriptorCount(struct ItemTag const &, unsigned short);
     /**
-     * @symbol ??0ItemDescriptorCount\@\@QEAA\@AEBVBlockLegacy\@\@G\@Z
+     * @symbol ??0ItemDescriptorCount\@\@QEAA\@XZ
      */
-    MCAPI ItemDescriptorCount(class BlockLegacy const &, unsigned short);
+    MCAPI ItemDescriptorCount();
     /**
      * @symbol ??0ItemDescriptorCount\@\@QEAA\@AEBVItemDescriptor\@\@G\@Z
      */
     MCAPI ItemDescriptorCount(class ItemDescriptor const &, unsigned short);
-    /**
-     * @symbol ??0ItemDescriptorCount\@\@QEAA\@XZ
-     */
-    MCAPI ItemDescriptorCount();
     /**
      * @symbol ?getStackSize\@ItemDescriptorCount\@\@QEBAFXZ
      */
diff --git a/LiteLoader/include/llapi/mc/ItemFrameDropItemPacket.hpp b/LiteLoader/include/llapi/mc/ItemFrameDropItemPacket.hpp
index 97ca2e9fb1..dd924e39b3 100644
--- a/LiteLoader/include/llapi/mc/ItemFrameDropItemPacket.hpp
+++ b/LiteLoader/include/llapi/mc/ItemFrameDropItemPacket.hpp
@@ -50,7 +50,7 @@ class ItemFrameDropItemPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@ItemFrameDropItemPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/ItemInstance.hpp b/LiteLoader/include/llapi/mc/ItemInstance.hpp
index 1cda2c6663..1926048748 100644
--- a/LiteLoader/include/llapi/mc/ItemInstance.hpp
+++ b/LiteLoader/include/llapi/mc/ItemInstance.hpp
@@ -57,14 +57,6 @@ class ItemInstance : public ItemStackBase {
      * @symbol ??0ItemInstance\@\@QEAA\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@HHPEBVCompoundTag\@\@\@Z
      */
     MCAPI ItemInstance(class std::basic_string_view<char, struct std::char_traits<char>>, int, int, class CompoundTag const *);
-    /**
-     * @symbol ??0ItemInstance\@\@QEAA\@AEBV0\@\@Z
-     */
-    MCAPI ItemInstance(class ItemInstance const &);
-    /**
-     * @symbol ??0ItemInstance\@\@QEAA\@AEBVItemStackBase\@\@\@Z
-     */
-    MCAPI ItemInstance(class ItemStackBase const &);
     /**
      * @symbol ??0ItemInstance\@\@QEAA\@AEBVBlock\@\@HPEBVCompoundTag\@\@\@Z
      */
@@ -77,6 +69,14 @@ class ItemInstance : public ItemStackBase {
      * @symbol ??0ItemInstance\@\@QEAA\@AEBVItem\@\@HHPEBVCompoundTag\@\@\@Z
      */
     MCAPI ItemInstance(class Item const &, int, int, class CompoundTag const *);
+    /**
+     * @symbol ??0ItemInstance\@\@QEAA\@AEBV0\@\@Z
+     */
+    MCAPI ItemInstance(class ItemInstance const &);
+    /**
+     * @symbol ??0ItemInstance\@\@QEAA\@AEBVItemStackBase\@\@\@Z
+     */
+    MCAPI ItemInstance(class ItemStackBase const &);
     /**
      * @symbol ?clone\@ItemInstance\@\@QEBA?AV1\@XZ
      */
diff --git a/LiteLoader/include/llapi/mc/ItemRegistry.hpp b/LiteLoader/include/llapi/mc/ItemRegistry.hpp
index a1f479a652..94f61d2ad8 100644
--- a/LiteLoader/include/llapi/mc/ItemRegistry.hpp
+++ b/LiteLoader/include/llapi/mc/ItemRegistry.hpp
@@ -168,14 +168,14 @@ struct ComplexAlias {
      * @symbol ?isServerInitializingCreativeItems\@ItemRegistry\@\@AEBA_NXZ
      */
     MCAPI bool isServerInitializingCreativeItems() const;
-    /**
-     * @symbol ?lookupByName\@ItemRegistry\@\@AEBA?AV?$WeakPtr\@VItem\@\@\@\@AEBVHashedString\@\@\@Z
-     */
-    MCAPI class WeakPtr<class Item> lookupByName(class HashedString const &) const;
     /**
      * @symbol ?lookupByName\@ItemRegistry\@\@AEBA?AV?$WeakPtr\@VItem\@\@\@\@AEAH0V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z
      */
     MCAPI class WeakPtr<class Item> lookupByName(int &, int &, class std::basic_string_view<char, struct std::char_traits<char>>) const;
+    /**
+     * @symbol ?lookupByName\@ItemRegistry\@\@AEBA?AV?$WeakPtr\@VItem\@\@\@\@AEBVHashedString\@\@\@Z
+     */
+    MCAPI class WeakPtr<class Item> lookupByName(class HashedString const &) const;
     /**
      * @symbol ?lookupByName\@ItemRegistry\@\@AEBA?AV?$WeakPtr\@VItem\@\@\@\@AEAHV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/ItemStack.hpp b/LiteLoader/include/llapi/mc/ItemStack.hpp
index 32724eb07d..f2488a4232 100644
--- a/LiteLoader/include/llapi/mc/ItemStack.hpp
+++ b/LiteLoader/include/llapi/mc/ItemStack.hpp
@@ -105,38 +105,38 @@ class ItemStack : public ItemStackBase {
      */
     MCVAPI ~ItemStack();
 #endif
+    /**
+     * @symbol ??0ItemStack\@\@QEAA\@AEBVItemInstance\@\@\@Z
+     */
+    MCAPI ItemStack(class ItemInstance const &);
     /**
      * @symbol ??0ItemStack\@\@QEAA\@AEBVRecipeIngredient\@\@\@Z
      */
     MCAPI ItemStack(class RecipeIngredient const &);
     /**
-     * @symbol ??0ItemStack\@\@QEAA\@AEBVItemInstance\@\@\@Z
+     * @symbol ??0ItemStack\@\@QEAA\@XZ
      */
-    MCAPI ItemStack(class ItemInstance const &);
+    MCAPI ItemStack();
     /**
      * @symbol ??0ItemStack\@\@QEAA\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@HHPEBVCompoundTag\@\@\@Z
      */
     MCAPI ItemStack(class std::basic_string_view<char, struct std::char_traits<char>>, int, int, class CompoundTag const *);
     /**
-     * @symbol ??0ItemStack\@\@QEAA\@AEBV0\@\@Z
+     * @symbol ??0ItemStack\@\@QEAA\@AEBVItem\@\@HHPEBVCompoundTag\@\@\@Z
      */
-    MCAPI ItemStack(class ItemStack const &);
+    MCAPI ItemStack(class Item const &, int, int, class CompoundTag const *);
     /**
-     * @symbol ??0ItemStack\@\@QEAA\@XZ
+     * @symbol ??0ItemStack\@\@QEAA\@AEBVBlock\@\@HPEBVCompoundTag\@\@\@Z
      */
-    MCAPI ItemStack();
+    MCAPI ItemStack(class Block const &, int, class CompoundTag const *);
     /**
      * @symbol ??0ItemStack\@\@QEAA\@AEBVBlockLegacy\@\@H\@Z
      */
     MCAPI ItemStack(class BlockLegacy const &, int);
     /**
-     * @symbol ??0ItemStack\@\@QEAA\@AEBVBlock\@\@HPEBVCompoundTag\@\@\@Z
-     */
-    MCAPI ItemStack(class Block const &, int, class CompoundTag const *);
-    /**
-     * @symbol ??0ItemStack\@\@QEAA\@AEBVItem\@\@HHPEBVCompoundTag\@\@\@Z
+     * @symbol ??0ItemStack\@\@QEAA\@AEBV0\@\@Z
      */
-    MCAPI ItemStack(class Item const &, int, int, class CompoundTag const *);
+    MCAPI ItemStack(class ItemStack const &);
     /**
      * @symbol ?_assignNetIdVariant\@ItemStack\@\@QEBAXAEBV1\@\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/ItemStackBase.hpp b/LiteLoader/include/llapi/mc/ItemStackBase.hpp
index 0ae3a5a59d..bf6e008f5a 100644
--- a/LiteLoader/include/llapi/mc/ItemStackBase.hpp
+++ b/LiteLoader/include/llapi/mc/ItemStackBase.hpp
@@ -83,14 +83,14 @@ class ItemStackBase {
      * @symbol ?addComponents\@ItemStackBase\@\@QEAA_NAEBVValue\@Json\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z
      */
     MCAPI bool addComponents(class Json::Value const &, std::string &);
-    /**
-     * @symbol ?addCustomUserData\@ItemStackBase\@\@QEAAXAEAVBlockActor\@\@AEAVBlockSource\@\@\@Z
-     */
-    MCAPI void addCustomUserData(class BlockActor &, class BlockSource &);
     /**
      * @symbol ?addCustomUserData\@ItemStackBase\@\@QEAAXAEAVContainerComponent\@\@\@Z
      */
     MCAPI void addCustomUserData(class ContainerComponent &);
+    /**
+     * @symbol ?addCustomUserData\@ItemStackBase\@\@QEAAXAEAVBlockActor\@\@AEAVBlockSource\@\@\@Z
+     */
+    MCAPI void addCustomUserData(class BlockActor &, class BlockSource &);
     /**
      * @symbol ?canBeCharged\@ItemStackBase\@\@QEBA_NXZ
      */
@@ -263,14 +263,14 @@ class ItemStackBase {
      * @symbol ?getUseAnimation\@ItemStackBase\@\@QEBA?AW4UseAnimation\@\@XZ
      */
     MCAPI enum class UseAnimation getUseAnimation() const;
-    /**
-     * @symbol ?getUserData\@ItemStackBase\@\@QEBAPEBVCompoundTag\@\@XZ
-     */
-    MCAPI class CompoundTag const * getUserData() const;
     /**
      * @symbol ?getUserData\@ItemStackBase\@\@QEAAPEAVCompoundTag\@\@XZ
      */
     MCAPI class CompoundTag * getUserData();
+    /**
+     * @symbol ?getUserData\@ItemStackBase\@\@QEBAPEBVCompoundTag\@\@XZ
+     */
+    MCAPI class CompoundTag const * getUserData() const;
     /**
      * @symbol ?getWasPickedUp\@ItemStackBase\@\@QEBA_NXZ
      */
@@ -303,14 +303,14 @@ class ItemStackBase {
      * @symbol ?hasSameUserData\@ItemStackBase\@\@QEBA_NAEBV1\@\@Z
      */
     MCAPI bool hasSameUserData(class ItemStackBase const &) const;
-    /**
-     * @symbol ?hasTag\@ItemStackBase\@\@QEBA_NAEBUItemTag\@\@\@Z
-     */
-    MCAPI bool hasTag(struct ItemTag const &) const;
     /**
      * @symbol ?hasTag\@ItemStackBase\@\@QEBA_NAEB_K\@Z
      */
     MCAPI bool hasTag(unsigned __int64 const &) const;
+    /**
+     * @symbol ?hasTag\@ItemStackBase\@\@QEBA_NAEBUItemTag\@\@\@Z
+     */
+    MCAPI bool hasTag(struct ItemTag const &) const;
     /**
      * @symbol ?hasUserData\@ItemStackBase\@\@QEBA_NXZ
      */
@@ -479,14 +479,14 @@ class ItemStackBase {
      * @symbol ?resetHoverName\@ItemStackBase\@\@QEAAXXZ
      */
     MCAPI void resetHoverName();
-    /**
-     * @symbol ?sameItem\@ItemStackBase\@\@QEBA_NHH\@Z
-     */
-    MCAPI bool sameItem(int, int) const;
     /**
      * @symbol ?sameItem\@ItemStackBase\@\@QEBA_NAEBV1\@\@Z
      */
     MCAPI bool sameItem(class ItemStackBase const &) const;
+    /**
+     * @symbol ?sameItem\@ItemStackBase\@\@QEBA_NHH\@Z
+     */
+    MCAPI bool sameItem(int, int) const;
     /**
      * @symbol ?sameItemAndAux\@ItemStackBase\@\@QEBA_NAEBV1\@\@Z
      */
@@ -634,21 +634,21 @@ class ItemStackBase {
      */
     MCAPI ItemStackBase(class BlockLegacy const &, int);
     /**
-     * @symbol ??0ItemStackBase\@\@IEAA\@XZ
+     * @symbol ??0ItemStackBase\@\@IEAA\@AEBVBlock\@\@HPEBVCompoundTag\@\@\@Z
      */
-    MCAPI ItemStackBase();
+    MCAPI ItemStackBase(class Block const &, int, class CompoundTag const *);
     /**
      * @symbol ??0ItemStackBase\@\@IEAA\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@HHPEBVCompoundTag\@\@\@Z
      */
     MCAPI ItemStackBase(class std::basic_string_view<char, struct std::char_traits<char>>, int, int, class CompoundTag const *);
-    /**
-     * @symbol ??0ItemStackBase\@\@IEAA\@AEBVBlock\@\@HPEBVCompoundTag\@\@\@Z
-     */
-    MCAPI ItemStackBase(class Block const &, int, class CompoundTag const *);
     /**
      * @symbol ??0ItemStackBase\@\@IEAA\@AEBVRecipeIngredient\@\@\@Z
      */
     MCAPI ItemStackBase(class RecipeIngredient const &);
+    /**
+     * @symbol ??0ItemStackBase\@\@IEAA\@XZ
+     */
+    MCAPI ItemStackBase();
     /**
      * @symbol ?_getHoverFormattingPrefix\@ItemStackBase\@\@IEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ
      */
@@ -657,14 +657,14 @@ class ItemStackBase {
      * @symbol ?_setItem\@ItemStackBase\@\@IEAA_NH_N\@Z
      */
     MCAPI bool _setItem(int, bool);
-    /**
-     * @symbol ?init\@ItemStackBase\@\@IEAAXAEBVBlockLegacy\@\@H\@Z
-     */
-    MCAPI void init(class BlockLegacy const &, int);
     /**
      * @symbol ?init\@ItemStackBase\@\@IEAAXHHH_N\@Z
      */
     MCAPI void init(int, int, int, bool);
+    /**
+     * @symbol ?init\@ItemStackBase\@\@IEAAXAEBVBlockLegacy\@\@H\@Z
+     */
+    MCAPI void init(class BlockLegacy const &, int);
     /**
      * @symbol ?init\@ItemStackBase\@\@IEAAXAEBVItem\@\@HHPEBVCompoundTag\@\@_N\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/ItemStackNetIdVariant.hpp b/LiteLoader/include/llapi/mc/ItemStackNetIdVariant.hpp
index c71bf751a5..dd9a6a65d8 100644
--- a/LiteLoader/include/llapi/mc/ItemStackNetIdVariant.hpp
+++ b/LiteLoader/include/llapi/mc/ItemStackNetIdVariant.hpp
@@ -58,6 +58,10 @@ struct ItemStackNetIdVariant {
      * @symbol ?isValid\@ItemStackNetIdVariant\@\@QEBA_NXZ
      */
     MCAPI bool isValid() const;
+    /**
+     * @symbol ??4ItemStackNetIdVariant\@\@QEAAAEAU0\@AEBV?$TypedClientNetId\@UItemStackLegacyRequestIdTag\@\@H$0A\@\@\@\@Z
+     */
+    MCAPI struct ItemStackNetIdVariant & operator=(class TypedClientNetId<struct ItemStackLegacyRequestIdTag, int, 0> const &);
     /**
      * @symbol ??4ItemStackNetIdVariant\@\@QEAAAEAU0\@$$QEAU0\@\@Z
      */
@@ -66,10 +70,6 @@ struct ItemStackNetIdVariant {
      * @symbol ??4ItemStackNetIdVariant\@\@QEAAAEAU0\@AEBU0\@\@Z
      */
     MCAPI struct ItemStackNetIdVariant & operator=(struct ItemStackNetIdVariant const &);
-    /**
-     * @symbol ??4ItemStackNetIdVariant\@\@QEAAAEAU0\@AEBV?$TypedClientNetId\@UItemStackLegacyRequestIdTag\@\@H$0A\@\@\@\@Z
-     */
-    MCAPI struct ItemStackNetIdVariant & operator=(class TypedClientNetId<struct ItemStackLegacyRequestIdTag, int, 0> const &);
     /**
      * @symbol ??4ItemStackNetIdVariant\@\@QEAAAEAU0\@AEBV?$TypedServerNetId\@UItemStackNetIdTag\@\@H$0A\@\@\@\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/ItemStackRequestPacket.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestPacket.hpp
index a3b7d00ecc..f066e1651b 100644
--- a/LiteLoader/include/llapi/mc/ItemStackRequestPacket.hpp
+++ b/LiteLoader/include/llapi/mc/ItemStackRequestPacket.hpp
@@ -50,7 +50,7 @@ class ItemStackRequestPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@ItemStackRequestPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/ItemStackResponsePacket.hpp b/LiteLoader/include/llapi/mc/ItemStackResponsePacket.hpp
index 849067640e..a5dcb06188 100644
--- a/LiteLoader/include/llapi/mc/ItemStackResponsePacket.hpp
+++ b/LiteLoader/include/llapi/mc/ItemStackResponsePacket.hpp
@@ -50,7 +50,7 @@ class ItemStackResponsePacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@ItemStackResponsePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/Json.hpp b/LiteLoader/include/llapi/mc/Json.hpp
index 359cb2314b..ff135b399f 100644
--- a/LiteLoader/include/llapi/mc/Json.hpp
+++ b/LiteLoader/include/llapi/mc/Json.hpp
@@ -476,6 +476,10 @@ class StyledWriter : public Writer {
      * @symbol ?valueToQuotedString\@Json\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEBD\@Z
      */
     MCAPI std::string valueToQuotedString(char const *);
+    /**
+     * @symbol ?valueToString\@Json\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@N\@Z
+     */
+    MCAPI std::string valueToString(double);
     /**
      * @symbol ?valueToString\@Json\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_K\@Z
      */
@@ -484,9 +488,5 @@ class StyledWriter : public Writer {
      * @symbol ?valueToString\@Json\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_J\@Z
      */
     MCAPI std::string valueToString(__int64);
-    /**
-     * @symbol ?valueToString\@Json\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@N\@Z
-     */
-    MCAPI std::string valueToString(double);
 
 };
\ No newline at end of file
diff --git a/LiteLoader/include/llapi/mc/KeyFrameTransform.hpp b/LiteLoader/include/llapi/mc/KeyFrameTransform.hpp
index d20335b5e2..5642524747 100644
--- a/LiteLoader/include/llapi/mc/KeyFrameTransform.hpp
+++ b/LiteLoader/include/llapi/mc/KeyFrameTransform.hpp
@@ -49,14 +49,14 @@ class KeyFrameTransform {
      * @symbol ?set\@KeyFrameTransform\@\@QEAAXAEBVExpressionNode\@\@H\@Z
      */
     MCAPI void set(class ExpressionNode const &, int);
-    /**
-     * @symbol ?set\@KeyFrameTransform\@\@QEAAXAEBVExpressionNode\@\@AEBVVec3\@\@\@Z
-     */
-    MCAPI void set(class ExpressionNode const &, class Vec3 const &);
     /**
      * @symbol ?set\@KeyFrameTransform\@\@QEAAXAEBVExpressionNode\@\@\@Z
      */
     MCAPI void set(class ExpressionNode const &);
+    /**
+     * @symbol ?set\@KeyFrameTransform\@\@QEAAXAEBVExpressionNode\@\@AEBVVec3\@\@\@Z
+     */
+    MCAPI void set(class ExpressionNode const &, class Vec3 const &);
     /**
      * @symbol ?setPost\@KeyFrameTransform\@\@QEAAXAEBVExpressionNode\@\@H\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/LabTablePacket.hpp b/LiteLoader/include/llapi/mc/LabTablePacket.hpp
index f78409d143..37f07c67a8 100644
--- a/LiteLoader/include/llapi/mc/LabTablePacket.hpp
+++ b/LiteLoader/include/llapi/mc/LabTablePacket.hpp
@@ -50,7 +50,7 @@ class LabTablePacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@LabTablePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/LayeredAbilities.hpp b/LiteLoader/include/llapi/mc/LayeredAbilities.hpp
index 20dfc7d827..98020f9d5c 100644
--- a/LiteLoader/include/llapi/mc/LayeredAbilities.hpp
+++ b/LiteLoader/include/llapi/mc/LayeredAbilities.hpp
@@ -50,14 +50,14 @@ class LayeredAbilities {
      * @symbol ?forEachLayer\@LayeredAbilities\@\@QEBAXAEBV?$function\@$$A6AXW4AbilitiesLayer\@\@AEBVAbilities\@\@\@Z\@std\@\@\@Z
      */
     MCAPI void forEachLayer(class std::function<void (enum class AbilitiesLayer, class Abilities const &)> const &) const;
-    /**
-     * @symbol ?getAbility\@LayeredAbilities\@\@QEAAAEAVAbility\@\@W4AbilitiesLayer\@\@W4AbilitiesIndex\@\@\@Z
-     */
-    MCAPI class Ability & getAbility(enum class AbilitiesLayer, enum class AbilitiesIndex);
     /**
      * @symbol ?getAbility\@LayeredAbilities\@\@QEBAAEBVAbility\@\@W4AbilitiesIndex\@\@\@Z
      */
     MCAPI class Ability const & getAbility(enum class AbilitiesIndex) const;
+    /**
+     * @symbol ?getAbility\@LayeredAbilities\@\@QEAAAEAVAbility\@\@W4AbilitiesLayer\@\@W4AbilitiesIndex\@\@\@Z
+     */
+    MCAPI class Ability & getAbility(enum class AbilitiesLayer, enum class AbilitiesIndex);
     /**
      * @symbol ?getBool\@LayeredAbilities\@\@QEBA_NW4AbilitiesIndex\@\@\@Z
      */
@@ -90,14 +90,14 @@ class LayeredAbilities {
      * @symbol ??4LayeredAbilities\@\@QEAAAEAV0\@AEBV0\@\@Z
      */
     MCAPI class LayeredAbilities & operator=(class LayeredAbilities const &);
-    /**
-     * @symbol ?setAbility\@LayeredAbilities\@\@QEAAXW4AbilitiesIndex\@\@M\@Z
-     */
-    MCAPI void setAbility(enum class AbilitiesIndex, float);
     /**
      * @symbol ?setAbility\@LayeredAbilities\@\@QEAAXW4AbilitiesIndex\@\@_N\@Z
      */
     MCAPI void setAbility(enum class AbilitiesIndex, bool);
+    /**
+     * @symbol ?setAbility\@LayeredAbilities\@\@QEAAXW4AbilitiesIndex\@\@M\@Z
+     */
+    MCAPI void setAbility(enum class AbilitiesIndex, float);
     /**
      * @symbol ?setCommandPermissions\@LayeredAbilities\@\@QEAAXW4CommandPermissionLevel\@\@\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/LecternUpdatePacket.hpp b/LiteLoader/include/llapi/mc/LecternUpdatePacket.hpp
index 813027c963..59c0a01943 100644
--- a/LiteLoader/include/llapi/mc/LecternUpdatePacket.hpp
+++ b/LiteLoader/include/llapi/mc/LecternUpdatePacket.hpp
@@ -50,7 +50,7 @@ class LecternUpdatePacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@LecternUpdatePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/LessonProgressPacket.hpp b/LiteLoader/include/llapi/mc/LessonProgressPacket.hpp
index d595257eb1..0a0ab2bdae 100644
--- a/LiteLoader/include/llapi/mc/LessonProgressPacket.hpp
+++ b/LiteLoader/include/llapi/mc/LessonProgressPacket.hpp
@@ -48,7 +48,7 @@ class LessonProgressPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@LessonProgressPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/Level.hpp b/LiteLoader/include/llapi/mc/Level.hpp
index 4773bca68b..0c7691e521 100644
--- a/LiteLoader/include/llapi/mc/Level.hpp
+++ b/LiteLoader/include/llapi/mc/Level.hpp
@@ -384,14 +384,14 @@ class Level {
      * @symbol ?broadcastActorEvent\@Level\@\@UEAAXAEAVActor\@\@W4ActorEvent\@\@H\@Z
      */
     MCVAPI void broadcastActorEvent(class Actor &, enum class ActorEvent, int);
-    /**
-     * @symbol ?broadcastBossEvent\@Level\@\@UEAAXW4BossEventUpdateType\@\@\@Z
-     */
-    MCVAPI void broadcastBossEvent(enum class BossEventUpdateType);
     /**
      * @symbol ?broadcastBossEvent\@Level\@\@UEAAXW4BossEventUpdateType\@\@AEBUActorUniqueID\@\@AEBVBossEventPacket\@\@\@Z
      */
     MCVAPI void broadcastBossEvent(enum class BossEventUpdateType, struct ActorUniqueID const &, class BossEventPacket const &);
+    /**
+     * @symbol ?broadcastBossEvent\@Level\@\@UEAAXW4BossEventUpdateType\@\@\@Z
+     */
+    MCVAPI void broadcastBossEvent(enum class BossEventUpdateType);
     /**
      * @symbol ?broadcastLevelEvent\@Level\@\@UEAAXW4LevelEvent\@\@AEBVCompoundTag\@\@PEBVUserEntityIdentifierComponent\@\@\@Z
      */
@@ -408,10 +408,6 @@ class Level {
      * @symbol ?broadcastLocalEvent\@Level\@\@UEAAXAEAVBlockSource\@\@W4LevelEvent\@\@AEBVVec3\@\@H\@Z
      */
     MCVAPI void broadcastLocalEvent(class BlockSource &, enum class LevelEvent, class Vec3 const &, int);
-    /**
-     * @symbol ?broadcastSoundEvent\@Level\@\@UEAAXAEAVDimension\@\@W4LevelSoundEvent\@\@AEBVVec3\@\@HAEBUActorDefinitionIdentifier\@\@_N4\@Z
-     */
-    MCVAPI void broadcastSoundEvent(class Dimension &, enum class LevelSoundEvent, class Vec3 const &, int, struct ActorDefinitionIdentifier const &, bool, bool);
     /**
      * @symbol ?broadcastSoundEvent\@Level\@\@UEAAXAEAVBlockSource\@\@W4LevelSoundEvent\@\@AEBVVec3\@\@HAEBUActorDefinitionIdentifier\@\@_N4\@Z
      */
@@ -420,6 +416,10 @@ class Level {
      * @symbol ?broadcastSoundEvent\@Level\@\@UEAAXAEAVBlockSource\@\@W4LevelSoundEvent\@\@AEBVVec3\@\@AEBVBlock\@\@AEBUActorDefinitionIdentifier\@\@_N5\@Z
      */
     MCVAPI void broadcastSoundEvent(class BlockSource &, enum class LevelSoundEvent, class Vec3 const &, class Block const &, struct ActorDefinitionIdentifier const &, bool, bool);
+    /**
+     * @symbol ?broadcastSoundEvent\@Level\@\@UEAAXAEAVDimension\@\@W4LevelSoundEvent\@\@AEBVVec3\@\@HAEBUActorDefinitionIdentifier\@\@_N4\@Z
+     */
+    MCVAPI void broadcastSoundEvent(class Dimension &, enum class LevelSoundEvent, class Vec3 const &, int, struct ActorDefinitionIdentifier const &, bool, bool);
     /**
      * @symbol ?canUseSkin\@Level\@\@UEBA_NAEBVSerializedSkin\@\@AEBVNetworkIdentifier\@\@AEBVUUID\@mce\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z
      */
@@ -436,14 +436,14 @@ class Level {
      * @symbol ?countUsersWithMatchingNetworkId\@Level\@\@UEBAHAEBVNetworkIdentifier\@\@\@Z
      */
     MCVAPI int countUsersWithMatchingNetworkId(class NetworkIdentifier const &) const;
-    /**
-     * @symbol ?createMapSavedData\@Level\@\@UEAAAEAVMapItemSavedData\@\@AEBV?$vector\@UActorUniqueID\@\@V?$allocator\@UActorUniqueID\@\@\@std\@\@\@std\@\@AEBVBlockPos\@\@V?$AutomaticID\@VDimension\@\@H\@\@H\@Z
-     */
-    MCVAPI class MapItemSavedData & createMapSavedData(std::vector<struct ActorUniqueID> const &, class BlockPos const &, class AutomaticID<class Dimension, int>, int);
     /**
      * @symbol ?createMapSavedData\@Level\@\@UEAAAEAVMapItemSavedData\@\@AEBUActorUniqueID\@\@AEBVBlockPos\@\@V?$AutomaticID\@VDimension\@\@H\@\@H\@Z
      */
     MCVAPI class MapItemSavedData & createMapSavedData(struct ActorUniqueID const &, class BlockPos const &, class AutomaticID<class Dimension, int>, int);
+    /**
+     * @symbol ?createMapSavedData\@Level\@\@UEAAAEAVMapItemSavedData\@\@AEBV?$vector\@UActorUniqueID\@\@V?$allocator\@UActorUniqueID\@\@\@std\@\@\@std\@\@AEBVBlockPos\@\@V?$AutomaticID\@VDimension\@\@H\@\@H\@Z
+     */
+    MCVAPI class MapItemSavedData & createMapSavedData(std::vector<struct ActorUniqueID> const &, class BlockPos const &, class AutomaticID<class Dimension, int>, int);
     /**
      * @symbol ?createPhotoStorage\@Level\@\@UEAAXXZ
      */
@@ -504,26 +504,26 @@ class Level {
      * @symbol ?findPath\@Level\@\@UEAA?AV?$unique_ptr\@VPath\@\@U?$default_delete\@VPath\@\@\@std\@\@\@std\@\@AEAVActor\@\@0AEAVNavigationComponent\@\@\@Z
      */
     MCVAPI std::unique_ptr<class Path> findPath(class Actor &, class Actor &, class NavigationComponent &);
-    /**
-     * @symbol ?findPlayer\@Level\@\@UEBAPEAVPlayer\@\@V?$function\@$$A6A_NAEBVPlayer\@\@\@Z\@std\@\@\@Z
-     */
-    MCVAPI class Player * findPlayer(class std::function<bool (class Player const &)>) const;
     /**
      * @symbol ?findPlayer\@Level\@\@UEBAPEAVPlayer\@\@V?$function\@$$A6A_NAEBVWeakEntityRef\@\@\@Z\@std\@\@\@Z
      */
     MCVAPI class Player * findPlayer(class std::function<bool (class WeakEntityRef const &)>) const;
     /**
-     * @symbol ?flushRunTimeLighting\@Level\@\@UEAAXXZ
+     * @symbol ?findPlayer\@Level\@\@UEBAPEAVPlayer\@\@V?$function\@$$A6A_NAEBVPlayer\@\@\@Z\@std\@\@\@Z
      */
-    MCVAPI void flushRunTimeLighting();
+    MCVAPI class Player * findPlayer(class std::function<bool (class Player const &)>) const;
     /**
-     * @symbol ?forEachDimension\@Level\@\@UEBAXV?$function\@$$A6A_NAEBVDimension\@\@\@Z\@std\@\@\@Z
+     * @symbol ?flushRunTimeLighting\@Level\@\@UEAAXXZ
      */
-    MCVAPI void forEachDimension(class std::function<bool (class Dimension const &)>) const;
+    MCVAPI void flushRunTimeLighting();
     /**
      * @symbol ?forEachDimension\@Level\@\@UEAAXV?$function\@$$A6A_NAEAVDimension\@\@\@Z\@std\@\@\@Z
      */
     MCVAPI void forEachDimension(class std::function<bool (class Dimension &)>);
+    /**
+     * @symbol ?forEachDimension\@Level\@\@UEBAXV?$function\@$$A6A_NAEBVDimension\@\@\@Z\@std\@\@\@Z
+     */
+    MCVAPI void forEachDimension(class std::function<bool (class Dimension const &)>) const;
     /**
      * @symbol ?forEachPlayer\@Level\@\@UEBAXV?$function\@$$A6A_NAEBVPlayer\@\@\@Z\@std\@\@\@Z
      */
@@ -576,14 +576,14 @@ class Level {
      * @symbol ?getActorEventCoordinator\@Level\@\@UEAAAEAVActorEventCoordinator\@\@XZ
      */
     MCVAPI class ActorEventCoordinator & getActorEventCoordinator();
-    /**
-     * @symbol ?getActorFactory\@Level\@\@UEBAAEBVActorFactory\@\@XZ
-     */
-    MCVAPI class ActorFactory const & getActorFactory() const;
     /**
      * @symbol ?getActorFactory\@Level\@\@UEAAAEAVActorFactory\@\@XZ
      */
     MCVAPI class ActorFactory & getActorFactory();
+    /**
+     * @symbol ?getActorFactory\@Level\@\@UEBAAEBVActorFactory\@\@XZ
+     */
+    MCVAPI class ActorFactory const & getActorFactory() const;
     /**
      * @symbol ?getActorInfoRegistry\@Level\@\@UEAAPEAVActorInfoRegistry\@\@XZ
      */
@@ -636,14 +636,14 @@ class Level {
      * @symbol ?getBlockEventCoordinator\@Level\@\@UEAAAEAVBlockEventCoordinator\@\@XZ
      */
     MCVAPI class BlockEventCoordinator & getBlockEventCoordinator();
-    /**
-     * @symbol ?getBlockPalette\@Level\@\@UEAAAEAVBlockPalette\@\@XZ
-     */
-    MCVAPI class BlockPalette & getBlockPalette();
     /**
      * @symbol ?getBlockPalette\@Level\@\@UEBAAEBVBlockPalette\@\@XZ
      */
     MCVAPI class BlockPalette const & getBlockPalette() const;
+    /**
+     * @symbol ?getBlockPalette\@Level\@\@UEAAAEAVBlockPalette\@\@XZ
+     */
+    MCVAPI class BlockPalette & getBlockPalette();
     /**
      * @symbol ?getBlockReducer\@Level\@\@UEBAPEAVBlockReducer\@\@XZ
      */
@@ -652,14 +652,14 @@ class Level {
      * @symbol ?getBlockRegistry\@Level\@\@UEBA?AV?$weak_ptr\@VBlockTypeRegistry\@\@\@std\@\@XZ
      */
     MCVAPI class std::weak_ptr<class BlockTypeRegistry> getBlockRegistry() const;
-    /**
-     * @symbol ?getCameraPresets\@Level\@\@UEBAAEBVCameraPresets\@\@XZ
-     */
-    MCVAPI class CameraPresets const & getCameraPresets() const;
     /**
      * @symbol ?getCameraPresets\@Level\@\@UEAAAEAVCameraPresets\@\@XZ
      */
     MCVAPI class CameraPresets & getCameraPresets();
+    /**
+     * @symbol ?getCameraPresets\@Level\@\@UEBAAEBVCameraPresets\@\@XZ
+     */
+    MCVAPI class CameraPresets const & getCameraPresets() const;
     /**
      * @symbol ?getChunkTickRange\@Level\@\@UEBAIXZ
      */
@@ -692,14 +692,14 @@ class Level {
      * @symbol ?getDefaultGameType\@Level\@\@UEBA?AW4GameType\@\@XZ
      */
     MCVAPI enum class GameType getDefaultGameType() const;
-    /**
-     * @symbol ?getDefaultPermissions\@Level\@\@UEAAAEAVPermissionsHandler\@\@XZ
-     */
-    MCVAPI class PermissionsHandler & getDefaultPermissions();
     /**
      * @symbol ?getDefaultPermissions\@Level\@\@UEBAAEBVPermissionsHandler\@\@XZ
      */
     MCVAPI class PermissionsHandler const & getDefaultPermissions() const;
+    /**
+     * @symbol ?getDefaultPermissions\@Level\@\@UEAAAEAVPermissionsHandler\@\@XZ
+     */
+    MCVAPI class PermissionsHandler & getDefaultPermissions();
     /**
      * @symbol ?getDefaultSpawn\@Level\@\@UEBAAEBVBlockPos\@\@XZ
      */
@@ -764,22 +764,22 @@ class Level {
      * @symbol ?getEventing\@Level\@\@UEAAAEAVIMinecraftEventing\@\@XZ
      */
     MCVAPI class IMinecraftEventing & getEventing();
-    /**
-     * @symbol ?getFeatureRegistry\@Level\@\@UEBAAEBVFeatureRegistry\@\@XZ
-     */
-    MCVAPI class FeatureRegistry const & getFeatureRegistry() const;
     /**
      * @symbol ?getFeatureRegistry\@Level\@\@UEAAAEAVFeatureRegistry\@\@XZ
      */
     MCVAPI class FeatureRegistry & getFeatureRegistry();
     /**
-     * @symbol ?getFeatureTypeFactory\@Level\@\@UEBAAEBVFeatureTypeFactory\@\@XZ
+     * @symbol ?getFeatureRegistry\@Level\@\@UEBAAEBVFeatureRegistry\@\@XZ
      */
-    MCVAPI class FeatureTypeFactory const & getFeatureTypeFactory() const;
+    MCVAPI class FeatureRegistry const & getFeatureRegistry() const;
     /**
      * @symbol ?getFeatureTypeFactory\@Level\@\@UEAAAEAVFeatureTypeFactory\@\@XZ
      */
     MCVAPI class FeatureTypeFactory & getFeatureTypeFactory();
+    /**
+     * @symbol ?getFeatureTypeFactory\@Level\@\@UEBAAEBVFeatureTypeFactory\@\@XZ
+     */
+    MCVAPI class FeatureTypeFactory const & getFeatureTypeFactory() const;
     /**
      * @symbol ?getGameRules\@Level\@\@UEBAAEBVGameRules\@\@XZ
      */
@@ -856,22 +856,22 @@ class Level {
      * @symbol ?getLevelId\@Level\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ
      */
     MCVAPI std::string getLevelId() const;
-    /**
-     * @symbol ?getLevelStorage\@Level\@\@UEBAAEBVLevelStorage\@\@XZ
-     */
-    MCVAPI class LevelStorage const & getLevelStorage() const;
     /**
      * @symbol ?getLevelStorage\@Level\@\@UEAAAEAVLevelStorage\@\@XZ
      */
     MCVAPI class LevelStorage & getLevelStorage();
     /**
-     * @symbol ?getLightTextureImageBuilderFactory\@Level\@\@UEBAAEBV?$Factory\@VBaseLightTextureImageBuilder\@\@AEAVLevel\@\@AEAVScheduler\@\@\@\@XZ
+     * @symbol ?getLevelStorage\@Level\@\@UEBAAEBVLevelStorage\@\@XZ
      */
-    MCVAPI class Factory<class BaseLightTextureImageBuilder, class Level &, class Scheduler &> const & getLightTextureImageBuilderFactory() const;
+    MCVAPI class LevelStorage const & getLevelStorage() const;
     /**
      * @symbol ?getLightTextureImageBuilderFactory\@Level\@\@UEAAAEAV?$Factory\@VBaseLightTextureImageBuilder\@\@AEAVLevel\@\@AEAVScheduler\@\@\@\@XZ
      */
     MCVAPI class Factory<class BaseLightTextureImageBuilder, class Level &, class Scheduler &> & getLightTextureImageBuilderFactory();
+    /**
+     * @symbol ?getLightTextureImageBuilderFactory\@Level\@\@UEBAAEBV?$Factory\@VBaseLightTextureImageBuilder\@\@AEAVLevel\@\@AEAVScheduler\@\@\@\@XZ
+     */
+    MCVAPI class Factory<class BaseLightTextureImageBuilder, class Level &, class Scheduler &> const & getLightTextureImageBuilderFactory() const;
     /**
      * @symbol ?getLiquidHitResult\@Level\@\@UEAAAEAVHitResult\@\@XZ
      */
@@ -880,10 +880,6 @@ class Level {
      * @symbol ?getLootTables\@Level\@\@UEAAAEAVLootTables\@\@XZ
      */
     MCVAPI class LootTables & getLootTables();
-    /**
-     * @symbol ?getMapSavedData\@Level\@\@UEAAPEAVMapItemSavedData\@\@UActorUniqueID\@\@\@Z
-     */
-    MCVAPI class MapItemSavedData * getMapSavedData(struct ActorUniqueID);
     /**
      * @symbol ?getMapSavedData\@Level\@\@UEAAPEAVMapItemSavedData\@\@AEBVCompoundTag\@\@\@Z
      */
@@ -892,6 +888,10 @@ class Level {
      * @symbol ?getMapSavedData\@Level\@\@UEAAPEAVMapItemSavedData\@\@PEBVCompoundTag\@\@\@Z
      */
     MCVAPI class MapItemSavedData * getMapSavedData(class CompoundTag const *);
+    /**
+     * @symbol ?getMapSavedData\@Level\@\@UEAAPEAVMapItemSavedData\@\@UActorUniqueID\@\@\@Z
+     */
+    MCVAPI class MapItemSavedData * getMapSavedData(struct ActorUniqueID);
     /**
      * @symbol ?getMob\@Level\@\@UEBAPEAVMob\@\@UActorUniqueID\@\@\@Z
      */
@@ -960,14 +960,14 @@ class Level {
      * @symbol ?getPlayer\@Level\@\@UEBAPEAVPlayer\@\@AEBVUUID\@mce\@\@\@Z
      */
     MCVAPI class Player * getPlayer(class mce::UUID const &) const;
-    /**
-     * @symbol ?getPlayer\@Level\@\@UEBAPEAVPlayer\@\@UActorUniqueID\@\@\@Z
-     */
-    MCVAPI class Player * getPlayer(struct ActorUniqueID) const;
     /**
      * @symbol ?getPlayer\@Level\@\@UEBAPEAVPlayer\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z
      */
     MCVAPI class Player * getPlayer(std::string const &) const;
+    /**
+     * @symbol ?getPlayer\@Level\@\@UEBAPEAVPlayer\@\@UActorUniqueID\@\@\@Z
+     */
+    MCVAPI class Player * getPlayer(struct ActorUniqueID) const;
     /**
      * @symbol ?getPlayerAbilities\@Level\@\@UEAAPEAVLayeredAbilities\@\@AEBUActorUniqueID\@\@\@Z
      */
@@ -1124,14 +1124,14 @@ class Level {
      * @symbol ?getSpecialMultiplier\@Level\@\@UEBAMV?$AutomaticID\@VDimension\@\@H\@\@\@Z
      */
     MCVAPI float getSpecialMultiplier(class AutomaticID<class Dimension, int>) const;
-    /**
-     * @symbol ?getStructureManager\@Level\@\@UEAA?AV?$not_null\@V?$NonOwnerPointer\@VStructureManager\@\@\@Bedrock\@\@\@gsl\@\@XZ
-     */
-    MCVAPI class gsl::not_null<class Bedrock::NonOwnerPointer<class StructureManager>> getStructureManager();
     /**
      * @symbol ?getStructureManager\@Level\@\@UEBA?BV?$not_null\@V?$NonOwnerPointer\@VStructureManager\@\@\@Bedrock\@\@\@gsl\@\@XZ
      */
     MCVAPI class gsl::not_null<class Bedrock::NonOwnerPointer<class StructureManager>> const getStructureManager() const;
+    /**
+     * @symbol ?getStructureManager\@Level\@\@UEAA?AV?$not_null\@V?$NonOwnerPointer\@VStructureManager\@\@\@Bedrock\@\@\@gsl\@\@XZ
+     */
+    MCVAPI class gsl::not_null<class Bedrock::NonOwnerPointer<class StructureManager>> getStructureManager();
     /**
      * @symbol ?getSubChunkRequestManager\@Level\@\@UEAAPEAVSubChunkRequestManager\@\@XZ
      */
@@ -1196,14 +1196,14 @@ class Level {
      * @symbol ?getUsers\@Level\@\@UEBAAEBV?$vector\@V?$OwnerPtrT\@UEntityRefTraits\@\@\@\@V?$allocator\@V?$OwnerPtrT\@UEntityRefTraits\@\@\@\@\@std\@\@\@std\@\@XZ
      */
     MCVAPI std::vector<class OwnerPtrT<struct EntityRefTraits>> const & getUsers() const;
-    /**
-     * @symbol ?getWorldRegistriesProvider\@Level\@\@UEBAAEBVIWorldRegistriesProvider\@\@XZ
-     */
-    MCVAPI class IWorldRegistriesProvider const & getWorldRegistriesProvider() const;
     /**
      * @symbol ?getWorldRegistriesProvider\@Level\@\@UEAAAEAVIWorldRegistriesProvider\@\@XZ
      */
     MCVAPI class IWorldRegistriesProvider & getWorldRegistriesProvider();
+    /**
+     * @symbol ?getWorldRegistriesProvider\@Level\@\@UEBAAEBVIWorldRegistriesProvider\@\@XZ
+     */
+    MCVAPI class IWorldRegistriesProvider const & getWorldRegistriesProvider() const;
     /**
      * @symbol ?getXBLBroadcastIntent\@Level\@\@UEBA?AW4GamePublishSetting\@Social\@\@XZ
      */
@@ -1220,14 +1220,14 @@ class Level {
      * @symbol ?handleLevelEvent\@Level\@\@UEAAXW4LevelEvent\@\@AEBVCompoundTag\@\@\@Z
      */
     MCVAPI void handleLevelEvent(enum class LevelEvent, class CompoundTag const &);
-    /**
-     * @symbol ?handleSoundEvent\@Level\@\@UEAAXW4LevelSoundEvent\@\@AEBVVec3\@\@HAEBUActorDefinitionIdentifier\@\@_N3\@Z
-     */
-    MCVAPI void handleSoundEvent(enum class LevelSoundEvent, class Vec3 const &, int, struct ActorDefinitionIdentifier const &, bool, bool);
     /**
      * @symbol ?handleSoundEvent\@Level\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVVec3\@\@MM\@Z
      */
     MCVAPI void handleSoundEvent(std::string const &, class Vec3 const &, float, float);
+    /**
+     * @symbol ?handleSoundEvent\@Level\@\@UEAAXW4LevelSoundEvent\@\@AEBVVec3\@\@HAEBUActorDefinitionIdentifier\@\@_N3\@Z
+     */
+    MCVAPI void handleSoundEvent(enum class LevelSoundEvent, class Vec3 const &, int, struct ActorDefinitionIdentifier const &, bool, bool);
     /**
      * @symbol ?handleStopAllSounds\@Level\@\@UEAAXXZ
      */
@@ -1368,34 +1368,34 @@ class Level {
      * @symbol ?pauseAndFlushTaskGroups\@Level\@\@UEAAXXZ
      */
     MCVAPI void pauseAndFlushTaskGroups();
-    /**
-     * @symbol ?playSound\@Level\@\@UEAAXW4LevelSoundEvent\@\@AEBVVec3\@\@HAEBUActorDefinitionIdentifier\@\@_N3\@Z
-     */
-    MCVAPI void playSound(enum class LevelSoundEvent, class Vec3 const &, int, struct ActorDefinitionIdentifier const &, bool, bool);
     /**
      * @symbol ?playSound\@Level\@\@UEAAXW4LevelSoundEvent\@\@AEBVVec3\@\@MM\@Z
      */
     MCVAPI void playSound(enum class LevelSoundEvent, class Vec3 const &, float, float);
-    /**
-     * @symbol ?playSound\@Level\@\@UEAAXV?$AutomaticID\@VDimension\@\@H\@\@W4LevelSoundEvent\@\@AEBVVec3\@\@HAEBUActorDefinitionIdentifier\@\@_N4\@Z
-     */
-    MCVAPI void playSound(class AutomaticID<class Dimension, int>, enum class LevelSoundEvent, class Vec3 const &, int, struct ActorDefinitionIdentifier const &, bool, bool);
     /**
      * @symbol ?playSound\@Level\@\@UEAAXAEBVIConstBlockSource\@\@W4LevelSoundEvent\@\@AEBVVec3\@\@HAEBUActorDefinitionIdentifier\@\@_N4\@Z
      */
     MCVAPI void playSound(class IConstBlockSource const &, enum class LevelSoundEvent, class Vec3 const &, int, struct ActorDefinitionIdentifier const &, bool, bool);
     /**
-     * @symbol ?playSynchronizedSound\@Level\@\@UEAAXAEAVBlockSource\@\@W4LevelSoundEvent\@\@AEBVVec3\@\@HAEBUActorDefinitionIdentifier\@\@_N4\@Z
+     * @symbol ?playSound\@Level\@\@UEAAXW4LevelSoundEvent\@\@AEBVVec3\@\@HAEBUActorDefinitionIdentifier\@\@_N3\@Z
      */
-    MCVAPI void playSynchronizedSound(class BlockSource &, enum class LevelSoundEvent, class Vec3 const &, int, struct ActorDefinitionIdentifier const &, bool, bool);
+    MCVAPI void playSound(enum class LevelSoundEvent, class Vec3 const &, int, struct ActorDefinitionIdentifier const &, bool, bool);
     /**
-     * @symbol ?playSynchronizedSound\@Level\@\@UEAAXAEAVIDimension\@\@W4LevelSoundEvent\@\@AEBVVec3\@\@HAEBUActorDefinitionIdentifier\@\@_N4\@Z
+     * @symbol ?playSound\@Level\@\@UEAAXV?$AutomaticID\@VDimension\@\@H\@\@W4LevelSoundEvent\@\@AEBVVec3\@\@HAEBUActorDefinitionIdentifier\@\@_N4\@Z
      */
-    MCVAPI void playSynchronizedSound(class IDimension &, enum class LevelSoundEvent, class Vec3 const &, int, struct ActorDefinitionIdentifier const &, bool, bool);
+    MCVAPI void playSound(class AutomaticID<class Dimension, int>, enum class LevelSoundEvent, class Vec3 const &, int, struct ActorDefinitionIdentifier const &, bool, bool);
+    /**
+     * @symbol ?playSynchronizedSound\@Level\@\@UEAAXAEAVBlockSource\@\@W4LevelSoundEvent\@\@AEBVVec3\@\@HAEBUActorDefinitionIdentifier\@\@_N4\@Z
+     */
+    MCVAPI void playSynchronizedSound(class BlockSource &, enum class LevelSoundEvent, class Vec3 const &, int, struct ActorDefinitionIdentifier const &, bool, bool);
     /**
      * @symbol ?playSynchronizedSound\@Level\@\@UEAAXAEAVBlockSource\@\@W4LevelSoundEvent\@\@AEBVVec3\@\@AEBVBlock\@\@AEBUActorDefinitionIdentifier\@\@_N5\@Z
      */
     MCVAPI void playSynchronizedSound(class BlockSource &, enum class LevelSoundEvent, class Vec3 const &, class Block const &, struct ActorDefinitionIdentifier const &, bool, bool);
+    /**
+     * @symbol ?playSynchronizedSound\@Level\@\@UEAAXAEAVIDimension\@\@W4LevelSoundEvent\@\@AEBVVec3\@\@HAEBUActorDefinitionIdentifier\@\@_N4\@Z
+     */
+    MCVAPI void playSynchronizedSound(class IDimension &, enum class LevelSoundEvent, class Vec3 const &, int, struct ActorDefinitionIdentifier const &, bool, bool);
     /**
      * @symbol ?potionSplash\@Level\@\@UEAAXAEBVVec3\@\@AEBVColor\@mce\@\@_N\@Z
      */
@@ -1464,14 +1464,14 @@ class Level {
      * @symbol ?resumePlayer\@Level\@\@UEAAXAEAVPlayer\@\@\@Z
      */
     MCVAPI void resumePlayer(class Player &);
-    /**
-     * @symbol ?runCommand\@Level\@\@UEAAXAEAVCommand\@\@AEAVCommandOrigin\@\@W4CommandOriginSystem\@\@\@Z
-     */
-    MCVAPI void runCommand(class Command &, class CommandOrigin &, enum class CommandOriginSystem);
     /**
      * @symbol ?runCommand\@Level\@\@UEAAXAEBVHashedString\@\@AEAVCommandOrigin\@\@W4CommandOriginSystem\@\@W4CurrentCmdVersion\@\@\@Z
      */
     MCVAPI void runCommand(class HashedString const &, class CommandOrigin &, enum class CommandOriginSystem, enum class CurrentCmdVersion);
+    /**
+     * @symbol ?runCommand\@Level\@\@UEAAXAEAVCommand\@\@AEAVCommandOrigin\@\@W4CommandOriginSystem\@\@\@Z
+     */
+    MCVAPI void runCommand(class Command &, class CommandOrigin &, enum class CommandOriginSystem);
     /**
      * @symbol ?save\@Level\@\@UEAAXXZ
      */
diff --git a/LiteLoader/include/llapi/mc/LevelChunk.hpp b/LiteLoader/include/llapi/mc/LevelChunk.hpp
index 4b18499f5b..51479f5d5c 100644
--- a/LiteLoader/include/llapi/mc/LevelChunk.hpp
+++ b/LiteLoader/include/llapi/mc/LevelChunk.hpp
@@ -350,14 +350,14 @@ struct HardcodedSpawningArea {
      * @symbol ?getPosition\@LevelChunk\@\@QEBAAEBVChunkPos\@\@XZ
      */
     MCAPI class ChunkPos const & getPosition() const;
-    /**
-     * @symbol ?getPreWorldGenHeightmap\@LevelChunk\@\@QEBA?AVHeightmapWrapper\@\@XZ
-     */
-    MCAPI class HeightmapWrapper getPreWorldGenHeightmap() const;
     /**
      * @symbol ?getPreWorldGenHeightmap\@LevelChunk\@\@QEBA?AVChunkLocalHeight\@\@AEBVChunkBlockPos\@\@\@Z
      */
     MCAPI class ChunkLocalHeight getPreWorldGenHeightmap(class ChunkBlockPos const &) const;
+    /**
+     * @symbol ?getPreWorldGenHeightmap\@LevelChunk\@\@QEBA?AVHeightmapWrapper\@\@XZ
+     */
+    MCAPI class HeightmapWrapper getPreWorldGenHeightmap() const;
     /**
      * @symbol ?getPreservedBlockEntities\@LevelChunk\@\@QEBAAEBV?$vector\@V?$shared_ptr\@VBlockActor\@\@\@std\@\@V?$allocator\@V?$shared_ptr\@VBlockActor\@\@\@std\@\@\@2\@\@std\@\@XZ
      */
@@ -378,26 +378,26 @@ struct HardcodedSpawningArea {
      * @symbol ?getState\@LevelChunk\@\@QEBAAEBU?$atomic\@W4ChunkState\@\@\@std\@\@XZ
      */
     MCAPI struct std::atomic<enum class ChunkState> const & getState() const;
-    /**
-     * @symbol ?getSubChunk\@LevelChunk\@\@QEBAPEBUSubChunk\@\@F\@Z
-     */
-    MCAPI struct SubChunk const * getSubChunk(short) const;
     /**
      * @symbol ?getSubChunk\@LevelChunk\@\@QEAAPEAUSubChunk\@\@F\@Z
      */
     MCAPI struct SubChunk * getSubChunk(short);
     /**
-     * @symbol ?getSurfaceBiome\@LevelChunk\@\@QEBAAEBVBiome\@\@VChunkBlockPos\@\@\@Z
+     * @symbol ?getSubChunk\@LevelChunk\@\@QEBAPEBUSubChunk\@\@F\@Z
      */
-    MCAPI class Biome const & getSurfaceBiome(class ChunkBlockPos) const;
+    MCAPI struct SubChunk const * getSubChunk(short) const;
     /**
-     * @symbol ?getTickQueue\@LevelChunk\@\@QEBAAEBVBlockTickingQueue\@\@XZ
+     * @symbol ?getSurfaceBiome\@LevelChunk\@\@QEBAAEBVBiome\@\@VChunkBlockPos\@\@\@Z
      */
-    MCAPI class BlockTickingQueue const & getTickQueue() const;
+    MCAPI class Biome const & getSurfaceBiome(class ChunkBlockPos) const;
     /**
      * @symbol ?getTickQueue\@LevelChunk\@\@QEAAAEAVBlockTickingQueue\@\@XZ
      */
     MCAPI class BlockTickingQueue & getTickQueue();
+    /**
+     * @symbol ?getTickQueue\@LevelChunk\@\@QEBAAEBVBlockTickingQueue\@\@XZ
+     */
+    MCAPI class BlockTickingQueue const & getTickQueue() const;
     /**
      * @symbol ?getTopRainBlockPos\@LevelChunk\@\@QEAA?BVBlockPos\@\@AEBVChunkBlockPos\@\@\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/LevelChunkPacket.hpp b/LiteLoader/include/llapi/mc/LevelChunkPacket.hpp
index 71210bd9cc..cdf5091226 100644
--- a/LiteLoader/include/llapi/mc/LevelChunkPacket.hpp
+++ b/LiteLoader/include/llapi/mc/LevelChunkPacket.hpp
@@ -50,7 +50,7 @@ class LevelChunkPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@LevelChunkPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/LevelContainerModel.hpp b/LiteLoader/include/llapi/mc/LevelContainerModel.hpp
index dc67dc368a..8f8af34bcb 100644
--- a/LiteLoader/include/llapi/mc/LevelContainerModel.hpp
+++ b/LiteLoader/include/llapi/mc/LevelContainerModel.hpp
@@ -112,14 +112,14 @@ class LevelContainerModel : public ContainerModel {
      * @symbol ??0LevelContainerModel\@\@QEAA\@W4ContainerEnumName\@\@HAEAVPlayer\@\@UActorUniqueID\@\@W4ContainerCategory\@\@\@Z
      */
     MCAPI LevelContainerModel(enum class ContainerEnumName, int, class Player &, struct ActorUniqueID, enum class ContainerCategory);
-    /**
-     * @symbol ?getContainerHelper\@LevelContainerModel\@\@SAPEAVContainer\@\@AEAVPlayer\@\@AEBUActorUniqueID\@\@\@Z
-     */
-    MCAPI static class Container * getContainerHelper(class Player &, struct ActorUniqueID const &);
     /**
      * @symbol ?getContainerHelper\@LevelContainerModel\@\@SAPEAVContainer\@\@AEAVPlayer\@\@W4BlockActorType\@\@AEBVBlockPos\@\@\@Z
      */
     MCAPI static class Container * getContainerHelper(class Player &, enum class BlockActorType, class BlockPos const &);
+    /**
+     * @symbol ?getContainerHelper\@LevelContainerModel\@\@SAPEAVContainer\@\@AEAVPlayer\@\@AEBUActorUniqueID\@\@\@Z
+     */
+    MCAPI static class Container * getContainerHelper(class Player &, struct ActorUniqueID const &);
 
 //private:
     /**
diff --git a/LiteLoader/include/llapi/mc/LevelData.hpp b/LiteLoader/include/llapi/mc/LevelData.hpp
index fedd887aed..99d8716494 100644
--- a/LiteLoader/include/llapi/mc/LevelData.hpp
+++ b/LiteLoader/include/llapi/mc/LevelData.hpp
@@ -32,10 +32,6 @@ class LevelData {
 #endif
 
 public:
-    /**
-     * @symbol ??0LevelData\@\@QEAA\@$$QEAV0\@\@Z
-     */
-    MCAPI LevelData(class LevelData &&);
     /**
      * @symbol ??0LevelData\@\@QEAA\@_N\@Z
      */
@@ -44,6 +40,10 @@ class LevelData {
      * @symbol ??0LevelData\@\@QEAA\@AEBVLevelSettings\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4GeneratorType\@\@AEBVBlockPos\@\@_NW4EducationEditionOffer\@\@MM\@Z
      */
     MCAPI LevelData(class LevelSettings const &, std::string const &, enum class GeneratorType, class BlockPos const &, bool, enum class EducationEditionOffer, float, float);
+    /**
+     * @symbol ??0LevelData\@\@QEAA\@$$QEAV0\@\@Z
+     */
+    MCAPI LevelData(class LevelData &&);
     /**
      * @symbol ?_getValue\@LevelData\@\@QEBAPEBULevelDataValue\@\@AEBVHashedString\@\@\@Z
      */
@@ -64,14 +64,14 @@ class LevelData {
      * @symbol ?educationFeaturesEnabled\@LevelData\@\@QEBA_NXZ
      */
     MCAPI bool educationFeaturesEnabled() const;
-    /**
-     * @symbol ?getAdventureSettings\@LevelData\@\@QEAAAEAUAdventureSettings\@\@XZ
-     */
-    MCAPI struct AdventureSettings & getAdventureSettings();
     /**
      * @symbol ?getAdventureSettings\@LevelData\@\@QEBAAEBUAdventureSettings\@\@XZ
      */
     MCAPI struct AdventureSettings const & getAdventureSettings() const;
+    /**
+     * @symbol ?getAdventureSettings\@LevelData\@\@QEAAAEAUAdventureSettings\@\@XZ
+     */
+    MCAPI struct AdventureSettings & getAdventureSettings();
     /**
      * @symbol ?getBaseGameVersion\@LevelData\@\@QEBAAEBVBaseGameVersion\@\@XZ
      */
@@ -100,14 +100,14 @@ class LevelData {
      * @symbol ?getDefaultAbilities\@LevelData\@\@QEAAAEAVAbilities\@\@XZ
      */
     MCAPI class Abilities & getDefaultAbilities();
-    /**
-     * @symbol ?getDefaultPermissions\@LevelData\@\@QEBAAEBVPermissionsHandler\@\@XZ
-     */
-    MCAPI class PermissionsHandler const & getDefaultPermissions() const;
     /**
      * @symbol ?getDefaultPermissions\@LevelData\@\@QEAAAEAVPermissionsHandler\@\@XZ
      */
     MCAPI class PermissionsHandler & getDefaultPermissions();
+    /**
+     * @symbol ?getDefaultPermissions\@LevelData\@\@QEBAAEBVPermissionsHandler\@\@XZ
+     */
+    MCAPI class PermissionsHandler const & getDefaultPermissions() const;
     /**
      * @symbol ?getEduSharedUriResource\@LevelData\@\@QEBAAEBVCompoundTag\@\@XZ
      */
diff --git a/LiteLoader/include/llapi/mc/LevelEventGenericPacket.hpp b/LiteLoader/include/llapi/mc/LevelEventGenericPacket.hpp
index ccd99d7cb1..9652a162fb 100644
--- a/LiteLoader/include/llapi/mc/LevelEventGenericPacket.hpp
+++ b/LiteLoader/include/llapi/mc/LevelEventGenericPacket.hpp
@@ -50,7 +50,7 @@ class LevelEventGenericPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@LevelEventGenericPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/LevelEventPacket.hpp b/LiteLoader/include/llapi/mc/LevelEventPacket.hpp
index 16e398a077..7eff97ff52 100644
--- a/LiteLoader/include/llapi/mc/LevelEventPacket.hpp
+++ b/LiteLoader/include/llapi/mc/LevelEventPacket.hpp
@@ -50,7 +50,7 @@ class LevelEventPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@LevelEventPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
@@ -64,13 +64,13 @@ class LevelEventPacket : public Packet {
      * @symbol ??0LevelEventPacket\@\@QEAA\@W4LevelEvent\@\@MMMH\@Z
      */
     MCAPI LevelEventPacket(enum class LevelEvent, float, float, float, int);
-    /**
-     * @symbol ??0LevelEventPacket\@\@QEAA\@W4LevelEvent\@\@AEBVVec3\@\@H\@Z
-     */
-    MCAPI LevelEventPacket(enum class LevelEvent, class Vec3 const &, int);
     /**
      * @symbol ??0LevelEventPacket\@\@QEAA\@XZ
      */
     MCAPI LevelEventPacket();
+    /**
+     * @symbol ??0LevelEventPacket\@\@QEAA\@W4LevelEvent\@\@AEBVVec3\@\@H\@Z
+     */
+    MCAPI LevelEventPacket(enum class LevelEvent, class Vec3 const &, int);
 
 };
diff --git a/LiteLoader/include/llapi/mc/LevelSettings.hpp b/LiteLoader/include/llapi/mc/LevelSettings.hpp
index 7840ef668a..1bc9b1d031 100644
--- a/LiteLoader/include/llapi/mc/LevelSettings.hpp
+++ b/LiteLoader/include/llapi/mc/LevelSettings.hpp
@@ -28,10 +28,6 @@ class LevelSettings {
 #endif
 
 public:
-    /**
-     * @symbol ??0LevelSettings\@\@QEAA\@AEBV0\@\@Z
-     */
-    MCAPI LevelSettings(class LevelSettings const &);
     /**
      * @symbol ??0LevelSettings\@\@QEAA\@AEBVLevelData\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@Z
      */
@@ -40,6 +36,10 @@ class LevelSettings {
      * @symbol ??0LevelSettings\@\@QEAA\@$$QEAV0\@\@Z
      */
     MCAPI LevelSettings(class LevelSettings &&);
+    /**
+     * @symbol ??0LevelSettings\@\@QEAA\@AEBV0\@\@Z
+     */
+    MCAPI LevelSettings(class LevelSettings const &);
     /**
      * @symbol ??0LevelSettings\@\@QEAA\@XZ
      */
diff --git a/LiteLoader/include/llapi/mc/LevelSoundEventPacket.hpp b/LiteLoader/include/llapi/mc/LevelSoundEventPacket.hpp
index 08a7ec6afa..2f1f44bfd8 100644
--- a/LiteLoader/include/llapi/mc/LevelSoundEventPacket.hpp
+++ b/LiteLoader/include/llapi/mc/LevelSoundEventPacket.hpp
@@ -50,7 +50,7 @@ class LevelSoundEventPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@LevelSoundEventPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/LevelSoundEventPacketV1.hpp b/LiteLoader/include/llapi/mc/LevelSoundEventPacketV1.hpp
index 90042ae468..0b6bff2706 100644
--- a/LiteLoader/include/llapi/mc/LevelSoundEventPacketV1.hpp
+++ b/LiteLoader/include/llapi/mc/LevelSoundEventPacketV1.hpp
@@ -50,7 +50,7 @@ class LevelSoundEventPacketV1 : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@LevelSoundEventPacketV1\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/LevelSoundEventPacketV2.hpp b/LiteLoader/include/llapi/mc/LevelSoundEventPacketV2.hpp
index b59b754636..df0bb2ac9c 100644
--- a/LiteLoader/include/llapi/mc/LevelSoundEventPacketV2.hpp
+++ b/LiteLoader/include/llapi/mc/LevelSoundEventPacketV2.hpp
@@ -50,7 +50,7 @@ class LevelSoundEventPacketV2 : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@LevelSoundEventPacketV2\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/LevelSoundManager.hpp b/LiteLoader/include/llapi/mc/LevelSoundManager.hpp
index 7aec8a011a..60165a45a7 100644
--- a/LiteLoader/include/llapi/mc/LevelSoundManager.hpp
+++ b/LiteLoader/include/llapi/mc/LevelSoundManager.hpp
@@ -37,14 +37,14 @@ class LevelSoundManager {
      * @symbol ?getSoundPlayer\@LevelSoundManager\@\@QEBA?AV?$not_null\@V?$NonOwnerPointer\@VSoundPlayerInterface\@\@\@Bedrock\@\@\@gsl\@\@XZ
      */
     MCAPI class gsl::not_null<class Bedrock::NonOwnerPointer<class SoundPlayerInterface>> getSoundPlayer() const;
-    /**
-     * @symbol ?handleSoundEvent\@LevelSoundManager\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVVec3\@\@MM\@Z
-     */
-    MCAPI void handleSoundEvent(std::string const &, class Vec3 const &, float, float);
     /**
      * @symbol ?handleSoundEvent\@LevelSoundManager\@\@QEAAXW4LevelSoundEvent\@\@AEBVVec3\@\@HAEBUActorDefinitionIdentifier\@\@_N3\@Z
      */
     MCAPI void handleSoundEvent(enum class LevelSoundEvent, class Vec3 const &, int, struct ActorDefinitionIdentifier const &, bool, bool);
+    /**
+     * @symbol ?handleSoundEvent\@LevelSoundManager\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVVec3\@\@MM\@Z
+     */
+    MCAPI void handleSoundEvent(std::string const &, class Vec3 const &, float, float);
     /**
      * @symbol ?handleStopAllSounds\@LevelSoundManager\@\@QEAAXXZ
      */
@@ -53,14 +53,14 @@ class LevelSoundManager {
      * @symbol ?handleStopSoundEvent\@LevelSoundManager\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z
      */
     MCAPI void handleStopSoundEvent(std::string const &);
-    /**
-     * @symbol ?playSound\@LevelSoundManager\@\@QEAAXW4LevelSoundEvent\@\@AEBVVec3\@\@MM\@Z
-     */
-    MCAPI void playSound(enum class LevelSoundEvent, class Vec3 const &, float, float);
     /**
      * @symbol ?playSound\@LevelSoundManager\@\@QEAAXW4LevelSoundEvent\@\@AEBVVec3\@\@HAEBUActorDefinitionIdentifier\@\@_N3\@Z
      */
     MCAPI void playSound(enum class LevelSoundEvent, class Vec3 const &, int, struct ActorDefinitionIdentifier const &, bool, bool);
+    /**
+     * @symbol ?playSound\@LevelSoundManager\@\@QEAAXW4LevelSoundEvent\@\@AEBVVec3\@\@MM\@Z
+     */
+    MCAPI void playSound(enum class LevelSoundEvent, class Vec3 const &, float, float);
     /**
      * @symbol ?playSoundForPlayerInDimension\@LevelSoundManager\@\@QEAAXV?$AutomaticID\@VDimension\@\@H\@\@W4LevelSoundEvent\@\@AEBVVec3\@\@HAEBUActorDefinitionIdentifier\@\@_N4PEAVPlayer\@\@\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/LevelStorage.hpp b/LiteLoader/include/llapi/mc/LevelStorage.hpp
index a182d7ac26..265fe9f336 100644
--- a/LiteLoader/include/llapi/mc/LevelStorage.hpp
+++ b/LiteLoader/include/llapi/mc/LevelStorage.hpp
@@ -192,14 +192,14 @@ class LevelStorage {
      */
     MCVAPI ~LevelStorage();
 #endif
-    /**
-     * @symbol ?getServerId\@LevelStorage\@\@QEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVPlayer\@\@_N\@Z
-     */
-    MCAPI std::string getServerId(class Player const &, bool);
     /**
      * @symbol ?getServerId\@LevelStorage\@\@QEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBUPlayerStorageIds\@\@\@Z
      */
     MCAPI std::string getServerId(struct PlayerStorageIds const &);
+    /**
+     * @symbol ?getServerId\@LevelStorage\@\@QEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVPlayer\@\@_N\@Z
+     */
+    MCAPI std::string getServerId(class Player const &, bool);
     /**
      * @symbol ?loadAllPlayerIDs\@LevelStorage\@\@QEBA?AV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@_N\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/LevelSummary.hpp b/LiteLoader/include/llapi/mc/LevelSummary.hpp
index 02ab7bad1b..906d5ebd06 100644
--- a/LiteLoader/include/llapi/mc/LevelSummary.hpp
+++ b/LiteLoader/include/llapi/mc/LevelSummary.hpp
@@ -25,14 +25,14 @@ struct LevelSummary {
      * @symbol ??0LevelSummary\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0_JW4GameType\@\@W4Difficulty\@\@VLevelSeed64\@\@H_K_N6W4GamePublishSetting\@Social\@\@6W4EducationEditionOffer\@\@AEBVGameVersion\@\@9W4StorageVersion\@\@AEBVPath\@Core\@\@AEBVContentIdentity\@\@0_NAEBUEduSharedUriResource\@\@AEBVExperiments\@\@AEBVBaseGameVersion\@\@6\@Z
      */
     MCAPI LevelSummary(std::string const &, std::string const &, __int64, enum class GameType, enum class Difficulty, class LevelSeed64, int, unsigned __int64, bool, bool, enum class Social::GamePublishSetting, bool, enum class EducationEditionOffer, class GameVersion const &, class GameVersion const &, enum class StorageVersion, class Core::Path const &, class ContentIdentity const &, std::string const &, bool, struct EduSharedUriResource const &, class Experiments const &, class BaseGameVersion const &, bool);
-    /**
-     * @symbol ??0LevelSummary\@\@QEAA\@XZ
-     */
-    MCAPI LevelSummary();
     /**
      * @symbol ??0LevelSummary\@\@QEAA\@AEBU0\@\@Z
      */
     MCAPI LevelSummary(struct LevelSummary const &);
+    /**
+     * @symbol ??0LevelSummary\@\@QEAA\@XZ
+     */
+    MCAPI LevelSummary();
     /**
      * @symbol ??0LevelSummary\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVLevelData\@\@AEBVPath\@Core\@\@2_N\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/LoginPacket.hpp b/LiteLoader/include/llapi/mc/LoginPacket.hpp
index 925b7d88a9..9c5fea5d14 100644
--- a/LiteLoader/include/llapi/mc/LoginPacket.hpp
+++ b/LiteLoader/include/llapi/mc/LoginPacket.hpp
@@ -58,7 +58,7 @@ class LoginPacket : public Packet {
      */
     virtual bool disallowBatching() const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@LoginPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/LootItemFunction.hpp b/LiteLoader/include/llapi/mc/LootItemFunction.hpp
index 83909b426f..7f0c0b5400 100644
--- a/LiteLoader/include/llapi/mc/LootItemFunction.hpp
+++ b/LiteLoader/include/llapi/mc/LootItemFunction.hpp
@@ -37,7 +37,7 @@ class LootItemFunction {
     virtual void __unk_vfn_0();
     /**
      * @vftbl 1
-     * @symbol ?apply\@RandomDyeFunction\@\@UEAAXAEAVItemStack\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z
+     * @symbol ?apply\@EnchantRandomlyFunction\@\@UEAAXAEAVItemStack\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z
      */
     virtual void apply(class ItemStack &, class Random &, class LootTableContext &) = 0;
     /**
@@ -47,7 +47,7 @@ class LootItemFunction {
     virtual int apply(class ItemStack &, class Random &, struct Trade const &, class LootTableContext &);
     /**
      * @vftbl 3
-     * @symbol ?apply\@RandomDyeFunction\@\@UEAAXAEAVItemInstance\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z
+     * @symbol ?apply\@EnchantRandomlyFunction\@\@UEAAXAEAVItemInstance\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z
      */
     virtual void apply(class ItemInstance &, class Random &, class LootTableContext &) = 0;
     /**
diff --git a/LiteLoader/include/llapi/mc/MapCreateLockedCopyPacket.hpp b/LiteLoader/include/llapi/mc/MapCreateLockedCopyPacket.hpp
index fccf716750..723c4d4f89 100644
--- a/LiteLoader/include/llapi/mc/MapCreateLockedCopyPacket.hpp
+++ b/LiteLoader/include/llapi/mc/MapCreateLockedCopyPacket.hpp
@@ -50,7 +50,7 @@ class MapCreateLockedCopyPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@MapCreateLockedCopyPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/MapInfoRequestPacket.hpp b/LiteLoader/include/llapi/mc/MapInfoRequestPacket.hpp
index 921f35e0c4..da4ea1c375 100644
--- a/LiteLoader/include/llapi/mc/MapInfoRequestPacket.hpp
+++ b/LiteLoader/include/llapi/mc/MapInfoRequestPacket.hpp
@@ -50,7 +50,7 @@ class MapInfoRequestPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@MapInfoRequestPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
@@ -61,17 +61,17 @@ class MapInfoRequestPacket : public Packet {
     MCVAPI ~MapInfoRequestPacket();
 #endif
     /**
-     * @symbol ??0MapInfoRequestPacket\@\@QEAA\@UActorUniqueID\@\@AEAVMapItemSavedData\@\@\@Z
+     * @symbol ??0MapInfoRequestPacket\@\@QEAA\@XZ
      */
-    MCAPI MapInfoRequestPacket(struct ActorUniqueID, class MapItemSavedData &);
+    MCAPI MapInfoRequestPacket();
     /**
      * @symbol ??0MapInfoRequestPacket\@\@QEAA\@UActorUniqueID\@\@\@Z
      */
     MCAPI MapInfoRequestPacket(struct ActorUniqueID);
     /**
-     * @symbol ??0MapInfoRequestPacket\@\@QEAA\@XZ
+     * @symbol ??0MapInfoRequestPacket\@\@QEAA\@UActorUniqueID\@\@AEAVMapItemSavedData\@\@\@Z
      */
-    MCAPI MapInfoRequestPacket();
+    MCAPI MapInfoRequestPacket(struct ActorUniqueID, class MapItemSavedData &);
     /**
      * @symbol ?getMapId\@MapInfoRequestPacket\@\@QEBA?AUActorUniqueID\@\@XZ
      */
diff --git a/LiteLoader/include/llapi/mc/MapItemSavedData.hpp b/LiteLoader/include/llapi/mc/MapItemSavedData.hpp
index 03ed10191f..b1557f2955 100644
--- a/LiteLoader/include/llapi/mc/MapItemSavedData.hpp
+++ b/LiteLoader/include/llapi/mc/MapItemSavedData.hpp
@@ -41,14 +41,14 @@ struct ChunkBounds {
      * @symbol ??0MapItemSavedData\@\@QEAA\@UActorUniqueID\@\@_N\@Z
      */
     MCAPI MapItemSavedData(struct ActorUniqueID, bool);
-    /**
-     * @symbol ?addTrackedMapEntity\@MapItemSavedData\@\@QEAA?AV?$shared_ptr\@VMapItemTrackedActor\@\@\@std\@\@AEBVBlockPos\@\@AEAVBlockSource\@\@W4Type\@MapDecoration\@\@\@Z
-     */
-    MCAPI class std::shared_ptr<class MapItemTrackedActor> addTrackedMapEntity(class BlockPos const &, class BlockSource &, enum class MapDecoration::Type);
     /**
      * @symbol ?addTrackedMapEntity\@MapItemSavedData\@\@QEAA?AV?$shared_ptr\@VMapItemTrackedActor\@\@\@std\@\@AEAVActor\@\@W4Type\@MapDecoration\@\@\@Z
      */
     MCAPI class std::shared_ptr<class MapItemTrackedActor> addTrackedMapEntity(class Actor &, enum class MapDecoration::Type);
+    /**
+     * @symbol ?addTrackedMapEntity\@MapItemSavedData\@\@QEAA?AV?$shared_ptr\@VMapItemTrackedActor\@\@\@std\@\@AEBVBlockPos\@\@AEAVBlockSource\@\@W4Type\@MapDecoration\@\@\@Z
+     */
+    MCAPI class std::shared_ptr<class MapItemTrackedActor> addTrackedMapEntity(class BlockPos const &, class BlockSource &, enum class MapDecoration::Type);
     /**
      * @symbol ?areClientPixelsDirty\@MapItemSavedData\@\@QEBA_NXZ
      */
diff --git a/LiteLoader/include/llapi/mc/MerchantRecipe.hpp b/LiteLoader/include/llapi/mc/MerchantRecipe.hpp
index 9cf191dc07..dcebfcb7b1 100644
--- a/LiteLoader/include/llapi/mc/MerchantRecipe.hpp
+++ b/LiteLoader/include/llapi/mc/MerchantRecipe.hpp
@@ -55,14 +55,14 @@ class MerchantRecipe {
      * @symbol ??0MerchantRecipe\@\@QEAA\@AEBV0\@\@Z
      */
     MCAPI MerchantRecipe(class MerchantRecipe const &);
-    /**
-     * @symbol ??0MerchantRecipe\@\@QEAA\@AEBVItemInstance\@\@0\@Z
-     */
-    MCAPI MerchantRecipe(class ItemInstance const &, class ItemInstance const &);
     /**
      * @symbol ??0MerchantRecipe\@\@QEAA\@PEBVCompoundTag\@\@\@Z
      */
     MCAPI MerchantRecipe(class CompoundTag const *);
+    /**
+     * @symbol ??0MerchantRecipe\@\@QEAA\@AEBVItemInstance\@\@0\@Z
+     */
+    MCAPI MerchantRecipe(class ItemInstance const &, class ItemInstance const &);
     /**
      * @symbol ?calculateDemandPrices\@MerchantRecipe\@\@QEAAXHHH_N\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/Minecart.hpp b/LiteLoader/include/llapi/mc/Minecart.hpp
index a25788f769..37a63913d8 100644
--- a/LiteLoader/include/llapi/mc/Minecart.hpp
+++ b/LiteLoader/include/llapi/mc/Minecart.hpp
@@ -217,7 +217,7 @@ class Minecart : public Actor {
     virtual void destroy(class ActorDamageSource const &, bool);
     /**
      * @vftbl 277
-     * @symbol ?getType\@MinecartTNT\@\@UEAA?AW4MinecartType\@\@XZ
+     * @symbol ?getType\@MinecartRideable\@\@UEAA?AW4MinecartType\@\@XZ
      */
     virtual enum class MinecartType getType() = 0;
     /**
diff --git a/LiteLoader/include/llapi/mc/MinecraftEventing.hpp b/LiteLoader/include/llapi/mc/MinecraftEventing.hpp
index 890d12fd0f..a493bf7435 100644
--- a/LiteLoader/include/llapi/mc/MinecraftEventing.hpp
+++ b/LiteLoader/include/llapi/mc/MinecraftEventing.hpp
@@ -331,14 +331,14 @@ enum class AcquisitionMethod;
      * @symbol ?fireEventEntitySpawned\@MinecraftEventing\@\@UEAAXPEAVPlayer\@\@HI\@Z
      */
     MCVAPI void fireEventEntitySpawned(class Player *, int, unsigned int);
-    /**
-     * @symbol ?fireEventGameRulesUpdated\@MinecraftEventing\@\@UEAAXMMAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z
-     */
-    MCVAPI void fireEventGameRulesUpdated(float, float, std::string const &);
     /**
      * @symbol ?fireEventGameRulesUpdated\@MinecraftEventing\@\@UEAAXHHAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z
      */
     MCVAPI void fireEventGameRulesUpdated(int, int, std::string const &);
+    /**
+     * @symbol ?fireEventGameRulesUpdated\@MinecraftEventing\@\@UEAAXMMAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z
+     */
+    MCVAPI void fireEventGameRulesUpdated(float, float, std::string const &);
     /**
      * @symbol ?fireEventGameRulesUpdated\@MinecraftEventing\@\@UEAAX_N0AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z
      */
@@ -567,14 +567,14 @@ enum class AcquisitionMethod;
      * @symbol ?fireEventPlayerDamaged\@MinecraftEventing\@\@UEAAXPEAVPlayer\@\@W4ActorDamageCause\@\@\@Z
      */
     MCVAPI void fireEventPlayerDamaged(class Player *, enum class ActorDamageCause);
-    /**
-     * @symbol ?fireEventPlayerJoinWorld\@MinecraftEventing\@\@UEAAXAEBIW4SubClientId\@\@W4PlayerJoinWorldAttemptState\@IConnectionEventing\@\@HW4DisconnectFailReason\@Connection\@\@W4TransportLayer\@\@\@Z
-     */
-    MCVAPI void fireEventPlayerJoinWorld(unsigned int const &, enum class SubClientId, enum class IConnectionEventing::PlayerJoinWorldAttemptState, int, enum class Connection::DisconnectFailReason, enum class TransportLayer);
     /**
      * @symbol ?fireEventPlayerJoinWorld\@MinecraftEventing\@\@UEAAXAEBIW4SubClientId\@\@W4PlayerJoinWorldAttemptState\@IConnectionEventing\@\@HW4TransportLayer\@\@\@Z
      */
     MCVAPI void fireEventPlayerJoinWorld(unsigned int const &, enum class SubClientId, enum class IConnectionEventing::PlayerJoinWorldAttemptState, int, enum class TransportLayer);
+    /**
+     * @symbol ?fireEventPlayerJoinWorld\@MinecraftEventing\@\@UEAAXAEBIW4SubClientId\@\@W4PlayerJoinWorldAttemptState\@IConnectionEventing\@\@HW4DisconnectFailReason\@Connection\@\@W4TransportLayer\@\@\@Z
+     */
+    MCVAPI void fireEventPlayerJoinWorld(unsigned int const &, enum class SubClientId, enum class IConnectionEventing::PlayerJoinWorldAttemptState, int, enum class Connection::DisconnectFailReason, enum class TransportLayer);
     /**
      * @symbol ?fireEventPlayerKicked\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/Mob.hpp b/LiteLoader/include/llapi/mc/Mob.hpp
index 4123189f75..15be54ba86 100644
--- a/LiteLoader/include/llapi/mc/Mob.hpp
+++ b/LiteLoader/include/llapi/mc/Mob.hpp
@@ -832,14 +832,14 @@ struct JumpPreventionResult {
      */
     MCVAPI ~Mob();
 #endif
-    /**
-     * @symbol ??0Mob\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z
-     */
-    MCAPI Mob(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &);
     /**
      * @symbol ??0Mob\@\@QEAA\@AEAVLevel\@\@AEAVEntityContext\@\@\@Z
      */
     MCAPI Mob(class Level &, class EntityContext &);
+    /**
+     * @symbol ??0Mob\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z
+     */
+    MCAPI Mob(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &);
     /**
      * @symbol ?_endJump\@Mob\@\@QEAAXXZ
      */
diff --git a/LiteLoader/include/llapi/mc/MobArmorEquipmentPacket.hpp b/LiteLoader/include/llapi/mc/MobArmorEquipmentPacket.hpp
index 873d4d618d..dd135aff72 100644
--- a/LiteLoader/include/llapi/mc/MobArmorEquipmentPacket.hpp
+++ b/LiteLoader/include/llapi/mc/MobArmorEquipmentPacket.hpp
@@ -50,7 +50,7 @@ class MobArmorEquipmentPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@MobArmorEquipmentPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
@@ -60,13 +60,13 @@ class MobArmorEquipmentPacket : public Packet {
      */
     MCVAPI ~MobArmorEquipmentPacket();
 #endif
-    /**
-     * @symbol ??0MobArmorEquipmentPacket\@\@QEAA\@XZ
-     */
-    MCAPI MobArmorEquipmentPacket();
     /**
      * @symbol ??0MobArmorEquipmentPacket\@\@QEAA\@AEBVActor\@\@\@Z
      */
     MCAPI MobArmorEquipmentPacket(class Actor const &);
+    /**
+     * @symbol ??0MobArmorEquipmentPacket\@\@QEAA\@XZ
+     */
+    MCAPI MobArmorEquipmentPacket();
 
 };
diff --git a/LiteLoader/include/llapi/mc/MobEffectInstance.hpp b/LiteLoader/include/llapi/mc/MobEffectInstance.hpp
index 30ae5e0b78..084dc245f3 100644
--- a/LiteLoader/include/llapi/mc/MobEffectInstance.hpp
+++ b/LiteLoader/include/llapi/mc/MobEffectInstance.hpp
@@ -31,33 +31,33 @@ char filler[122];
 
 public:
     /**
-     * @symbol ??0MobEffectInstance\@\@QEAA\@IH\@Z
+     * @symbol ??0MobEffectInstance\@\@QEAA\@IHH\@Z
      */
-    MCAPI MobEffectInstance(unsigned int, int);
+    MCAPI MobEffectInstance(unsigned int, int, int);
     /**
-     * @symbol ??0MobEffectInstance\@\@QEAA\@AEBV0\@\@Z
+     * @symbol ??0MobEffectInstance\@\@QEAA\@$$QEAV0\@\@Z
      */
-    MCAPI MobEffectInstance(class MobEffectInstance const &);
+    MCAPI MobEffectInstance(class MobEffectInstance &&);
     /**
-     * @symbol ??0MobEffectInstance\@\@QEAA\@I\@Z
+     * @symbol ??0MobEffectInstance\@\@QEAA\@IHH_N00\@Z
      */
-    MCAPI MobEffectInstance(unsigned int);
+    MCAPI MobEffectInstance(unsigned int, int, int, bool, bool, bool);
     /**
-     * @symbol ??0MobEffectInstance\@\@QEAA\@IHHHHH_N00\@Z
+     * @symbol ??0MobEffectInstance\@\@QEAA\@I\@Z
      */
-    MCAPI MobEffectInstance(unsigned int, int, int, int, int, int, bool, bool, bool);
+    MCAPI MobEffectInstance(unsigned int);
     /**
-     * @symbol ??0MobEffectInstance\@\@QEAA\@IHH_N00\@Z
+     * @symbol ??0MobEffectInstance\@\@QEAA\@IH\@Z
      */
-    MCAPI MobEffectInstance(unsigned int, int, int, bool, bool, bool);
+    MCAPI MobEffectInstance(unsigned int, int);
     /**
-     * @symbol ??0MobEffectInstance\@\@QEAA\@$$QEAV0\@\@Z
+     * @symbol ??0MobEffectInstance\@\@QEAA\@IHHHHH_N00\@Z
      */
-    MCAPI MobEffectInstance(class MobEffectInstance &&);
+    MCAPI MobEffectInstance(unsigned int, int, int, int, int, int, bool, bool, bool);
     /**
-     * @symbol ??0MobEffectInstance\@\@QEAA\@IHH\@Z
+     * @symbol ??0MobEffectInstance\@\@QEAA\@AEBV0\@\@Z
      */
-    MCAPI MobEffectInstance(unsigned int, int, int);
+    MCAPI MobEffectInstance(class MobEffectInstance const &);
     /**
      * @symbol ?applyEffects\@MobEffectInstance\@\@QEAAXPEAVActor\@\@\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/MobEffectPacket.hpp b/LiteLoader/include/llapi/mc/MobEffectPacket.hpp
index cc44ce51f7..c7099f4a51 100644
--- a/LiteLoader/include/llapi/mc/MobEffectPacket.hpp
+++ b/LiteLoader/include/llapi/mc/MobEffectPacket.hpp
@@ -50,7 +50,7 @@ class MobEffectPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@MobEffectPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
@@ -60,13 +60,13 @@ class MobEffectPacket : public Packet {
      */
     MCVAPI ~MobEffectPacket();
 #endif
-    /**
-     * @symbol ??0MobEffectPacket\@\@QEAA\@VActorRuntimeID\@\@W4Event\@0\@HHH_N\@Z
-     */
-    MCAPI MobEffectPacket(class ActorRuntimeID, enum class MobEffectPacket::Event, int, int, int, bool);
     /**
      * @symbol ??0MobEffectPacket\@\@QEAA\@XZ
      */
     MCAPI MobEffectPacket();
+    /**
+     * @symbol ??0MobEffectPacket\@\@QEAA\@VActorRuntimeID\@\@W4Event\@0\@HHH_N\@Z
+     */
+    MCAPI MobEffectPacket(class ActorRuntimeID, enum class MobEffectPacket::Event, int, int, int, bool);
 
 };
diff --git a/LiteLoader/include/llapi/mc/MobEquipmentPacket.hpp b/LiteLoader/include/llapi/mc/MobEquipmentPacket.hpp
index b5758a041a..3645e95824 100644
--- a/LiteLoader/include/llapi/mc/MobEquipmentPacket.hpp
+++ b/LiteLoader/include/llapi/mc/MobEquipmentPacket.hpp
@@ -53,7 +53,7 @@ class MobEquipmentPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@MobEquipmentPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
@@ -67,13 +67,13 @@ class MobEquipmentPacket : public Packet {
      * @symbol ??0MobEquipmentPacket\@\@QEAA\@VActorRuntimeID\@\@AEBVItemStack\@\@HHW4ContainerID\@\@\@Z
      */
     MCAPI MobEquipmentPacket(class ActorRuntimeID, class ItemStack const &, int, int, enum class ContainerID);
-    /**
-     * @symbol ??0MobEquipmentPacket\@\@QEAA\@XZ
-     */
-    MCAPI MobEquipmentPacket();
     /**
      * @symbol ??0MobEquipmentPacket\@\@QEAA\@VActorRuntimeID\@\@AEBVNetworkItemStackDescriptor\@\@HHW4ContainerID\@\@\@Z
      */
     MCAPI MobEquipmentPacket(class ActorRuntimeID, class NetworkItemStackDescriptor const &, int, int, enum class ContainerID);
+    /**
+     * @symbol ??0MobEquipmentPacket\@\@QEAA\@XZ
+     */
+    MCAPI MobEquipmentPacket();
 
 };
diff --git a/LiteLoader/include/llapi/mc/MobSpawnRules.hpp b/LiteLoader/include/llapi/mc/MobSpawnRules.hpp
index a139361743..e9a1b1f511 100644
--- a/LiteLoader/include/llapi/mc/MobSpawnRules.hpp
+++ b/LiteLoader/include/llapi/mc/MobSpawnRules.hpp
@@ -27,10 +27,6 @@ class MobSpawnRules {
 #endif
 
 public:
-    /**
-     * @symbol ??0MobSpawnRules\@\@QEAA\@XZ
-     */
-    MCAPI MobSpawnRules();
     /**
      * @symbol ??0MobSpawnRules\@\@QEAA\@$$QEAV0\@\@Z
      */
@@ -39,6 +35,10 @@ class MobSpawnRules {
      * @symbol ??0MobSpawnRules\@\@QEAA\@AEBV0\@\@Z
      */
     MCAPI MobSpawnRules(class MobSpawnRules const &);
+    /**
+     * @symbol ??0MobSpawnRules\@\@QEAA\@XZ
+     */
+    MCAPI MobSpawnRules();
     /**
      * @symbol ?addHerd\@MobSpawnRules\@\@QEAAAEAV1\@HHAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/ModalFormRequestPacket.hpp b/LiteLoader/include/llapi/mc/ModalFormRequestPacket.hpp
index a17f126beb..f4e5964181 100644
--- a/LiteLoader/include/llapi/mc/ModalFormRequestPacket.hpp
+++ b/LiteLoader/include/llapi/mc/ModalFormRequestPacket.hpp
@@ -53,7 +53,7 @@ class ModalFormRequestPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@ModalFormRequestPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/ModalFormResponsePacket.hpp b/LiteLoader/include/llapi/mc/ModalFormResponsePacket.hpp
index f47bf0513f..c80ba2bda9 100644
--- a/LiteLoader/include/llapi/mc/ModalFormResponsePacket.hpp
+++ b/LiteLoader/include/llapi/mc/ModalFormResponsePacket.hpp
@@ -54,7 +54,7 @@ class ModalFormResponsePacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@ModalFormResponsePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/MolangMemberArray.hpp b/LiteLoader/include/llapi/mc/MolangMemberArray.hpp
index d68f8f37e6..5d26c0112f 100644
--- a/LiteLoader/include/llapi/mc/MolangMemberArray.hpp
+++ b/LiteLoader/include/llapi/mc/MolangMemberArray.hpp
@@ -45,6 +45,10 @@ struct MolangMemberArray {
      * @symbol ??0MolangMemberArray\@\@QEAA\@W4MolangStruct_XYZ\@\@AEBVVec3\@\@\@Z
      */
     MCAPI MolangMemberArray(enum class MolangStruct_XYZ, class Vec3 const &);
+    /**
+     * @symbol ??0MolangMemberArray\@\@QEAA\@W4MolangStruct_RGBA\@\@AEBVColor\@mce\@\@\@Z
+     */
+    MCAPI MolangMemberArray(enum class MolangStruct_RGBA, class mce::Color const &);
     /**
      * @symbol ??0MolangMemberArray\@\@QEAA\@W4MolangStruct_SpeedAndDirection\@\@MAEBVVec3\@\@\@Z
      */
@@ -69,10 +73,6 @@ struct MolangMemberArray {
      * @symbol ??0MolangMemberArray\@\@QEAA\@W4MolangStruct_PoseIndexAndHurtTime\@\@HH\@Z
      */
     MCAPI MolangMemberArray(enum class MolangStruct_PoseIndexAndHurtTime, int, int);
-    /**
-     * @symbol ??0MolangMemberArray\@\@QEAA\@W4MolangStruct_RGBA\@\@AEBVColor\@mce\@\@\@Z
-     */
-    MCAPI MolangMemberArray(enum class MolangStruct_RGBA, class mce::Color const &);
     /**
      * @symbol ??0MolangMemberArray\@\@QEAA\@W4MolangStruct_UV\@\@MM\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/MolangScriptArg.hpp b/LiteLoader/include/llapi/mc/MolangScriptArg.hpp
index 87a3a0184e..ef17c548f5 100644
--- a/LiteLoader/include/llapi/mc/MolangScriptArg.hpp
+++ b/LiteLoader/include/llapi/mc/MolangScriptArg.hpp
@@ -27,14 +27,14 @@ struct MolangScriptArg {
 #endif
 
 public:
-    /**
-     * @symbol ??0MolangScriptArg\@\@QEAA\@AEBU0\@\@Z
-     */
-    MCAPI MolangScriptArg(struct MolangScriptArg const &);
     /**
      * @symbol ??0MolangScriptArg\@\@QEAA\@H\@Z
      */
     MCAPI MolangScriptArg(int);
+    /**
+     * @symbol ??0MolangScriptArg\@\@QEAA\@AEBU0\@\@Z
+     */
+    MCAPI MolangScriptArg(struct MolangScriptArg const &);
     /**
      * @symbol ??0MolangScriptArg\@\@QEAA\@M\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/MolangVariable.hpp b/LiteLoader/include/llapi/mc/MolangVariable.hpp
index ddf00022f2..10c3365a70 100644
--- a/LiteLoader/include/llapi/mc/MolangVariable.hpp
+++ b/LiteLoader/include/llapi/mc/MolangVariable.hpp
@@ -37,14 +37,14 @@ class MolangVariable {
      * @symbol ??1MolangVariable\@\@QEAA\@XZ
      */
     MCAPI ~MolangVariable();
-    /**
-     * @symbol ?getVariableIndex\@MolangVariable\@\@SA?AW4MolangVariableIndex\@\@_K\@Z
-     */
-    MCAPI static enum class MolangVariableIndex getVariableIndex(unsigned __int64);
     /**
      * @symbol ?getVariableIndex\@MolangVariable\@\@SA?AW4MolangVariableIndex\@\@_KPEBD_N\@Z
      */
     MCAPI static enum class MolangVariableIndex getVariableIndex(unsigned __int64, char const *, bool);
+    /**
+     * @symbol ?getVariableIndex\@MolangVariable\@\@SA?AW4MolangVariableIndex\@\@_K\@Z
+     */
+    MCAPI static enum class MolangVariableIndex getVariableIndex(unsigned __int64);
     /**
      * @symbol ?getVariableIndex\@MolangVariable\@\@SA?AW4MolangVariableIndex\@\@AEBVHashedString\@\@\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/MolangVariableMap.hpp b/LiteLoader/include/llapi/mc/MolangVariableMap.hpp
index eb20b679ea..1d3341796f 100644
--- a/LiteLoader/include/llapi/mc/MolangVariableMap.hpp
+++ b/LiteLoader/include/llapi/mc/MolangVariableMap.hpp
@@ -47,14 +47,14 @@ class MolangVariableMap {
      * @symbol ?getMolangVariable\@MolangVariableMap\@\@QEBAAEBUMolangScriptArg\@\@AEBW4MolangVariableIndex\@\@AEA_N\@Z
      */
     MCAPI struct MolangScriptArg const & getMolangVariable(enum class MolangVariableIndex const &, bool &) const;
-    /**
-     * @symbol ?getMolangVariable\@MolangVariableMap\@\@QEBAAEBUMolangScriptArg\@\@AEB_KAEA_N\@Z
-     */
-    MCAPI struct MolangScriptArg const & getMolangVariable(unsigned __int64 const &, bool &) const;
     /**
      * @symbol ?getMolangVariable\@MolangVariableMap\@\@QEBAAEBUMolangScriptArg\@\@_KPEBD\@Z
      */
     MCAPI struct MolangScriptArg const & getMolangVariable(unsigned __int64, char const *) const;
+    /**
+     * @symbol ?getMolangVariable\@MolangVariableMap\@\@QEBAAEBUMolangScriptArg\@\@AEB_KAEA_N\@Z
+     */
+    MCAPI struct MolangScriptArg const & getMolangVariable(unsigned __int64 const &, bool &) const;
     /**
      * @symbol ?getNonConstScriptArgReference\@MolangVariableMap\@\@QEAAPEAUMolangScriptArg\@\@AEBW4MolangVariableIndex\@\@\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/MotionPredictionHintsPacket.hpp b/LiteLoader/include/llapi/mc/MotionPredictionHintsPacket.hpp
index 22b38f7328..d66a89a682 100644
--- a/LiteLoader/include/llapi/mc/MotionPredictionHintsPacket.hpp
+++ b/LiteLoader/include/llapi/mc/MotionPredictionHintsPacket.hpp
@@ -50,7 +50,7 @@ class MotionPredictionHintsPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@MotionPredictionHintsPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/MoveActorAbsolutePacket.hpp b/LiteLoader/include/llapi/mc/MoveActorAbsolutePacket.hpp
index d33826a922..bdb34730b1 100644
--- a/LiteLoader/include/llapi/mc/MoveActorAbsolutePacket.hpp
+++ b/LiteLoader/include/llapi/mc/MoveActorAbsolutePacket.hpp
@@ -50,7 +50,7 @@ class MoveActorAbsolutePacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@MoveActorAbsolutePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
@@ -60,13 +60,13 @@ class MoveActorAbsolutePacket : public Packet {
      */
     MCVAPI ~MoveActorAbsolutePacket();
 #endif
-    /**
-     * @symbol ??0MoveActorAbsolutePacket\@\@QEAA\@AEBVMoveActorAbsoluteData\@\@\@Z
-     */
-    MCAPI MoveActorAbsolutePacket(class MoveActorAbsoluteData const &);
     /**
      * @symbol ??0MoveActorAbsolutePacket\@\@QEAA\@XZ
      */
     MCAPI MoveActorAbsolutePacket();
+    /**
+     * @symbol ??0MoveActorAbsolutePacket\@\@QEAA\@AEBVMoveActorAbsoluteData\@\@\@Z
+     */
+    MCAPI MoveActorAbsolutePacket(class MoveActorAbsoluteData const &);
 
 };
diff --git a/LiteLoader/include/llapi/mc/MoveActorDeltaPacket.hpp b/LiteLoader/include/llapi/mc/MoveActorDeltaPacket.hpp
index 25d49bc02f..d714703f60 100644
--- a/LiteLoader/include/llapi/mc/MoveActorDeltaPacket.hpp
+++ b/LiteLoader/include/llapi/mc/MoveActorDeltaPacket.hpp
@@ -50,7 +50,7 @@ class MoveActorDeltaPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@MoveActorDeltaPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/MovePlayerPacket.hpp b/LiteLoader/include/llapi/mc/MovePlayerPacket.hpp
index 9d2d1e027e..181bb9b902 100644
--- a/LiteLoader/include/llapi/mc/MovePlayerPacket.hpp
+++ b/LiteLoader/include/llapi/mc/MovePlayerPacket.hpp
@@ -82,6 +82,11 @@ class MovePlayerPacket : public Packet {
     virtual void write(class BinaryStream &) const;
     /**
      * @vftbl 6
+     * @symbol ?isValid\@MovePlayerPacket\@\@UEBA_NXZ
+     */
+    virtual bool isValid() const;
+    /**
+     * @vftbl 7
      * @symbol ?_read\@MovePlayerPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
@@ -95,13 +100,13 @@ class MovePlayerPacket : public Packet {
      * @symbol ??0MovePlayerPacket\@\@QEAA\@AEBVPlayer\@\@W4PositionMode\@PlayerPositionModeComponent\@\@HH\@Z
      */
     MCAPI MovePlayerPacket(class Player const &, enum class PlayerPositionModeComponent::PositionMode, int, int);
-    /**
-     * @symbol ??0MovePlayerPacket\@\@QEAA\@XZ
-     */
-    MCAPI MovePlayerPacket();
     /**
      * @symbol ??0MovePlayerPacket\@\@QEAA\@AEBVPlayer\@\@AEBVVec3\@\@\@Z
      */
     MCAPI MovePlayerPacket(class Player const &, class Vec3 const &);
+    /**
+     * @symbol ??0MovePlayerPacket\@\@QEAA\@XZ
+     */
+    MCAPI MovePlayerPacket();
 
 };
diff --git a/LiteLoader/include/llapi/mc/MultiplayerSettingsPacket.hpp b/LiteLoader/include/llapi/mc/MultiplayerSettingsPacket.hpp
index a0abe25cd5..0bcbc8c9b7 100644
--- a/LiteLoader/include/llapi/mc/MultiplayerSettingsPacket.hpp
+++ b/LiteLoader/include/llapi/mc/MultiplayerSettingsPacket.hpp
@@ -50,7 +50,7 @@ class MultiplayerSettingsPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@MultiplayerSettingsPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/NBTSchemaWriter.hpp b/LiteLoader/include/llapi/mc/NBTSchemaWriter.hpp
index ba03139b9b..62cc80d118 100644
--- a/LiteLoader/include/llapi/mc/NBTSchemaWriter.hpp
+++ b/LiteLoader/include/llapi/mc/NBTSchemaWriter.hpp
@@ -129,6 +129,14 @@ class NBTSchemaWriter {
      * @symbol ?write\@NBTSchemaWriter\@\@UEAA_N_J\@Z
      */
     MCVAPI bool write(__int64);
+    /**
+     * @symbol ?write\@NBTSchemaWriter\@\@UEAA_NH\@Z
+     */
+    MCVAPI bool write(int);
+    /**
+     * @symbol ?write\@NBTSchemaWriter\@\@UEAA_NI\@Z
+     */
+    MCVAPI bool write(unsigned int);
     /**
      * @symbol ?write\@NBTSchemaWriter\@\@UEAA_N_N\@Z
      */
@@ -141,14 +149,6 @@ class NBTSchemaWriter {
      * @symbol ?write\@NBTSchemaWriter\@\@UEAA_NC\@Z
      */
     MCVAPI bool write(signed char);
-    /**
-     * @symbol ?write\@NBTSchemaWriter\@\@UEAA_NH\@Z
-     */
-    MCVAPI bool write(int);
-    /**
-     * @symbol ?write\@NBTSchemaWriter\@\@UEAA_NI\@Z
-     */
-    MCVAPI bool write(unsigned int);
     /**
      * @symbol ?write\@NBTSchemaWriter\@\@UEAA_NF\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/NavigationComponent.hpp b/LiteLoader/include/llapi/mc/NavigationComponent.hpp
index 301d5dde6f..c8f386146b 100644
--- a/LiteLoader/include/llapi/mc/NavigationComponent.hpp
+++ b/LiteLoader/include/llapi/mc/NavigationComponent.hpp
@@ -176,17 +176,17 @@ class NavigationComponent {
      */
     MCAPI bool moveTo(class Mob &, class Actor &, float);
     /**
-     * @symbol ?moveTo\@NavigationComponent\@\@QEAA_NAEAVMob\@\@AEBVVec3\@\@M\@Z
+     * @symbol ?moveTo\@NavigationComponent\@\@QEAA_NAEAVMob\@\@AEBVVec3\@\@M1\@Z
      */
-    MCAPI bool moveTo(class Mob &, class Vec3 const &, float);
+    MCAPI bool moveTo(class Mob &, class Vec3 const &, float, class Vec3 const &);
     /**
      * @symbol ?moveTo\@NavigationComponent\@\@QEAA_NAEAVMob\@\@V?$unique_ptr\@VPath\@\@U?$default_delete\@VPath\@\@\@std\@\@\@std\@\@M\@Z
      */
     MCAPI bool moveTo(class Mob &, std::unique_ptr<class Path>, float);
     /**
-     * @symbol ?moveTo\@NavigationComponent\@\@QEAA_NAEAVMob\@\@AEBVVec3\@\@M1\@Z
+     * @symbol ?moveTo\@NavigationComponent\@\@QEAA_NAEAVMob\@\@AEBVVec3\@\@M\@Z
      */
-    MCAPI bool moveTo(class Mob &, class Vec3 const &, float, class Vec3 const &);
+    MCAPI bool moveTo(class Mob &, class Vec3 const &, float);
     /**
      * @symbol ??4NavigationComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/NetworkChunkPublisherUpdatePacket.hpp b/LiteLoader/include/llapi/mc/NetworkChunkPublisherUpdatePacket.hpp
index f4c6962d61..0fa9ac9c58 100644
--- a/LiteLoader/include/llapi/mc/NetworkChunkPublisherUpdatePacket.hpp
+++ b/LiteLoader/include/llapi/mc/NetworkChunkPublisherUpdatePacket.hpp
@@ -50,7 +50,7 @@ class NetworkChunkPublisherUpdatePacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@NetworkChunkPublisherUpdatePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/NetworkItemInstanceDescriptor.hpp b/LiteLoader/include/llapi/mc/NetworkItemInstanceDescriptor.hpp
index 009c7b9254..17aef8d479 100644
--- a/LiteLoader/include/llapi/mc/NetworkItemInstanceDescriptor.hpp
+++ b/LiteLoader/include/llapi/mc/NetworkItemInstanceDescriptor.hpp
@@ -42,10 +42,6 @@ class NetworkItemInstanceDescriptor : public ItemDescriptorCount {
      */
     MCVAPI ~NetworkItemInstanceDescriptor();
 #endif
-    /**
-     * @symbol ??0NetworkItemInstanceDescriptor\@\@QEAA\@AEBVItemStackDescriptor\@\@\@Z
-     */
-    MCAPI NetworkItemInstanceDescriptor(class ItemStackDescriptor const &);
     /**
      * @symbol ??0NetworkItemInstanceDescriptor\@\@QEAA\@AEBVItemInstance\@\@\@Z
      */
@@ -54,6 +50,10 @@ class NetworkItemInstanceDescriptor : public ItemDescriptorCount {
      * @symbol ??0NetworkItemInstanceDescriptor\@\@QEAA\@$$QEAV0\@\@Z
      */
     MCAPI NetworkItemInstanceDescriptor(class NetworkItemInstanceDescriptor &&);
+    /**
+     * @symbol ??0NetworkItemInstanceDescriptor\@\@QEAA\@AEBVItemStackDescriptor\@\@\@Z
+     */
+    MCAPI NetworkItemInstanceDescriptor(class ItemStackDescriptor const &);
     /**
      * @symbol ?getItemInstance\@NetworkItemInstanceDescriptor\@\@QEBA?AVItemInstance\@\@AEBVBlockPalette\@\@\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/NetworkItemStackDescriptor.hpp b/LiteLoader/include/llapi/mc/NetworkItemStackDescriptor.hpp
index 595f6e2c7c..2a516712a8 100644
--- a/LiteLoader/include/llapi/mc/NetworkItemStackDescriptor.hpp
+++ b/LiteLoader/include/llapi/mc/NetworkItemStackDescriptor.hpp
@@ -49,21 +49,21 @@ class NetworkItemStackDescriptor : public ItemDescriptorCount {
      */
     MCAPI NetworkItemStackDescriptor(class ItemStack const &);
     /**
-     * @symbol ??0NetworkItemStackDescriptor\@\@QEAA\@AEBVItemStackDescriptor\@\@\@Z
+     * @symbol ??0NetworkItemStackDescriptor\@\@QEAA\@XZ
      */
-    MCAPI NetworkItemStackDescriptor(class ItemStackDescriptor const &);
+    MCAPI NetworkItemStackDescriptor();
     /**
      * @symbol ??0NetworkItemStackDescriptor\@\@QEAA\@AEBV0\@\@Z
      */
     MCAPI NetworkItemStackDescriptor(class NetworkItemStackDescriptor const &);
-    /**
-     * @symbol ??0NetworkItemStackDescriptor\@\@QEAA\@XZ
-     */
-    MCAPI NetworkItemStackDescriptor();
     /**
      * @symbol ??0NetworkItemStackDescriptor\@\@QEAA\@$$QEAV0\@\@Z
      */
     MCAPI NetworkItemStackDescriptor(class NetworkItemStackDescriptor &&);
+    /**
+     * @symbol ??0NetworkItemStackDescriptor\@\@QEAA\@AEBVItemStackDescriptor\@\@\@Z
+     */
+    MCAPI NetworkItemStackDescriptor(class ItemStackDescriptor const &);
     /**
      * @symbol ?read\@NetworkItemStackDescriptor\@\@QEAAXAEAVReadOnlyBinaryStream\@\@\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/NetworkSettingsPacket.hpp b/LiteLoader/include/llapi/mc/NetworkSettingsPacket.hpp
index c545b8ec24..9ae1194722 100644
--- a/LiteLoader/include/llapi/mc/NetworkSettingsPacket.hpp
+++ b/LiteLoader/include/llapi/mc/NetworkSettingsPacket.hpp
@@ -51,7 +51,7 @@ class NetworkSettingsPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@NetworkSettingsPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/NetworkStackLatencyPacket.hpp b/LiteLoader/include/llapi/mc/NetworkStackLatencyPacket.hpp
index bc74896fd0..72aa820a80 100644
--- a/LiteLoader/include/llapi/mc/NetworkStackLatencyPacket.hpp
+++ b/LiteLoader/include/llapi/mc/NetworkStackLatencyPacket.hpp
@@ -51,7 +51,7 @@ class NetworkStackLatencyPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@NetworkStackLatencyPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/NpcDialoguePacket.hpp b/LiteLoader/include/llapi/mc/NpcDialoguePacket.hpp
index 1b27384aae..e1d089e874 100644
--- a/LiteLoader/include/llapi/mc/NpcDialoguePacket.hpp
+++ b/LiteLoader/include/llapi/mc/NpcDialoguePacket.hpp
@@ -50,7 +50,7 @@ class NpcDialoguePacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@NpcDialoguePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/NpcRequestPacket.hpp b/LiteLoader/include/llapi/mc/NpcRequestPacket.hpp
index 14987905f3..78d77b873a 100644
--- a/LiteLoader/include/llapi/mc/NpcRequestPacket.hpp
+++ b/LiteLoader/include/llapi/mc/NpcRequestPacket.hpp
@@ -50,7 +50,7 @@ class NpcRequestPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@NpcRequestPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/OnScreenTextureAnimationPacket.hpp b/LiteLoader/include/llapi/mc/OnScreenTextureAnimationPacket.hpp
index d9e6750043..6ab6cda7e2 100644
--- a/LiteLoader/include/llapi/mc/OnScreenTextureAnimationPacket.hpp
+++ b/LiteLoader/include/llapi/mc/OnScreenTextureAnimationPacket.hpp
@@ -50,7 +50,7 @@ class OnScreenTextureAnimationPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@OnScreenTextureAnimationPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/OwnerStorageEntity.hpp b/LiteLoader/include/llapi/mc/OwnerStorageEntity.hpp
index 55c97b86a8..0213bde5c6 100644
--- a/LiteLoader/include/llapi/mc/OwnerStorageEntity.hpp
+++ b/LiteLoader/include/llapi/mc/OwnerStorageEntity.hpp
@@ -53,14 +53,14 @@ class OwnerStorageEntity {
 public:
 
 //protected:
-    /**
-     * @symbol ??0OwnerStorageEntity\@\@IEAA\@W4VariadicInit\@0\@AEAVEntityRegistry\@\@\@Z
-     */
-    MCAPI OwnerStorageEntity(enum class OwnerStorageEntity::VariadicInit, class EntityRegistry &);
     /**
      * @symbol ??0OwnerStorageEntity\@\@IEAA\@$$QEAV0\@\@Z
      */
     MCAPI OwnerStorageEntity(class OwnerStorageEntity &&);
+    /**
+     * @symbol ??0OwnerStorageEntity\@\@IEAA\@W4VariadicInit\@0\@AEAVEntityRegistry\@\@\@Z
+     */
+    MCAPI OwnerStorageEntity(enum class OwnerStorageEntity::VariadicInit, class EntityRegistry &);
     /**
      * @symbol ??0OwnerStorageEntity\@\@IEAA\@W4EmptyInit\@0\@\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/OwnerStorageFeature.hpp b/LiteLoader/include/llapi/mc/OwnerStorageFeature.hpp
index c12eac8629..91cf126367 100644
--- a/LiteLoader/include/llapi/mc/OwnerStorageFeature.hpp
+++ b/LiteLoader/include/llapi/mc/OwnerStorageFeature.hpp
@@ -29,14 +29,14 @@ class OwnerStorageFeature {
 public:
 
 //protected:
-    /**
-     * @symbol ??0OwnerStorageFeature\@\@IEAA\@$$QEAV0\@\@Z
-     */
-    MCAPI OwnerStorageFeature(class OwnerStorageFeature &&);
     /**
      * @symbol ??0OwnerStorageFeature\@\@IEAA\@W4VariadicInit\@0\@AEAVFeatureRegistry\@\@\@Z
      */
     MCAPI OwnerStorageFeature(enum class OwnerStorageFeature::VariadicInit, class FeatureRegistry &);
+    /**
+     * @symbol ??0OwnerStorageFeature\@\@IEAA\@$$QEAV0\@\@Z
+     */
+    MCAPI OwnerStorageFeature(class OwnerStorageFeature &&);
     /**
      * @symbol ?_getStackRef\@OwnerStorageFeature\@\@IEBAAEAVIFeature\@\@XZ
      */
diff --git a/LiteLoader/include/llapi/mc/PackAccessStrategy.hpp b/LiteLoader/include/llapi/mc/PackAccessStrategy.hpp
index 3697e9339c..665adb17e0 100644
--- a/LiteLoader/include/llapi/mc/PackAccessStrategy.hpp
+++ b/LiteLoader/include/llapi/mc/PackAccessStrategy.hpp
@@ -101,7 +101,7 @@ class PackAccessStrategy {
     virtual void forEachInAssetSet(class Core::Path const &, class std::function<void (class Core::Path const &)>) const;
     /**
      * @vftbl 14
-     * @symbol ?getStrategyType\@DirectoryPackWithEncryptionAccessStrategy\@\@UEBA?AW4PackAccessStrategyType\@\@XZ
+     * @symbol ?getStrategyType\@ZipPackAccessStrategy\@\@UEBA?AW4PackAccessStrategyType\@\@XZ
      */
     virtual enum class PackAccessStrategyType getStrategyType() const = 0;
     /**
diff --git a/LiteLoader/include/llapi/mc/PackInstance.hpp b/LiteLoader/include/llapi/mc/PackInstance.hpp
index e25660fe1f..8bbdb3ec50 100644
--- a/LiteLoader/include/llapi/mc/PackInstance.hpp
+++ b/LiteLoader/include/llapi/mc/PackInstance.hpp
@@ -30,6 +30,10 @@ class PackInstance {
 #endif
 
 public:
+    /**
+     * @symbol ??0PackInstance\@\@QEAA\@V?$not_null\@V?$NonOwnerPointer\@VResourcePack\@\@\@Bedrock\@\@\@gsl\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_NPEAVPackSettings\@\@\@Z
+     */
+    MCAPI PackInstance(class gsl::not_null<class Bedrock::NonOwnerPointer<class ResourcePack>>, std::string const &, bool, class PackSettings *);
     /**
      * @symbol ??0PackInstance\@\@QEAA\@AEBV0\@\@Z
      */
@@ -38,10 +42,6 @@ class PackInstance {
      * @symbol ??0PackInstance\@\@QEAA\@V?$not_null\@V?$NonOwnerPointer\@VResourcePack\@\@\@Bedrock\@\@\@gsl\@\@H_NPEAVPackSettings\@\@\@Z
      */
     MCAPI PackInstance(class gsl::not_null<class Bedrock::NonOwnerPointer<class ResourcePack>>, int, bool, class PackSettings *);
-    /**
-     * @symbol ??0PackInstance\@\@QEAA\@V?$not_null\@V?$NonOwnerPointer\@VResourcePack\@\@\@Bedrock\@\@\@gsl\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_NPEAVPackSettings\@\@\@Z
-     */
-    MCAPI PackInstance(class gsl::not_null<class Bedrock::NonOwnerPointer<class ResourcePack>>, std::string const &, bool, class PackSettings *);
     /**
      * @symbol ?forEachIn\@PackInstance\@\@QEBAXAEBVPath\@Core\@\@V?$function\@$$A6AXAEBVPath\@Core\@\@\@Z\@std\@\@_N\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/PackInstanceId.hpp b/LiteLoader/include/llapi/mc/PackInstanceId.hpp
index 0f230a10e6..e8c6ba3c27 100644
--- a/LiteLoader/include/llapi/mc/PackInstanceId.hpp
+++ b/LiteLoader/include/llapi/mc/PackInstanceId.hpp
@@ -27,14 +27,14 @@ struct PackInstanceId {
 #endif
 
 public:
-    /**
-     * @symbol ??0PackInstanceId\@\@QEAA\@AEBUPackIdVersion\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z
-     */
-    MCAPI PackInstanceId(struct PackIdVersion const &, std::string const &);
     /**
      * @symbol ??0PackInstanceId\@\@QEAA\@$$QEAU0\@\@Z
      */
     MCAPI PackInstanceId(struct PackInstanceId &&);
+    /**
+     * @symbol ??0PackInstanceId\@\@QEAA\@AEBUPackIdVersion\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z
+     */
+    MCAPI PackInstanceId(struct PackIdVersion const &, std::string const &);
     /**
      * @symbol ??1PackInstanceId\@\@QEAA\@XZ
      */
diff --git a/LiteLoader/include/llapi/mc/PackManifest.hpp b/LiteLoader/include/llapi/mc/PackManifest.hpp
index 09afad813f..03dd8c27f2 100644
--- a/LiteLoader/include/llapi/mc/PackManifest.hpp
+++ b/LiteLoader/include/llapi/mc/PackManifest.hpp
@@ -52,14 +52,14 @@ struct CapabilityRegisterer {
      */
     MCVAPI ~PackManifest();
 #endif
-    /**
-     * @symbol ??0PackManifest\@\@QEAA\@AEBV0\@\@Z
-     */
-    MCAPI PackManifest(class PackManifest const &);
     /**
      * @symbol ??0PackManifest\@\@QEAA\@W4ManifestType\@\@\@Z
      */
     MCAPI PackManifest(enum class ManifestType);
+    /**
+     * @symbol ??0PackManifest\@\@QEAA\@AEBV0\@\@Z
+     */
+    MCAPI PackManifest(class PackManifest const &);
     /**
      * @symbol ?addLegacyModuleDependency\@PackManifest\@\@QEAAXAEBULegacyPackIdVersion\@\@\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/PackSourceReport.hpp b/LiteLoader/include/llapi/mc/PackSourceReport.hpp
index 8693dc040f..8fb20866cf 100644
--- a/LiteLoader/include/llapi/mc/PackSourceReport.hpp
+++ b/LiteLoader/include/llapi/mc/PackSourceReport.hpp
@@ -27,14 +27,14 @@ class PackSourceReport {
 #endif
 
 public:
-    /**
-     * @symbol ??0PackSourceReport\@\@QEAA\@XZ
-     */
-    MCAPI PackSourceReport();
     /**
      * @symbol ??0PackSourceReport\@\@QEAA\@AEBV0\@\@Z
      */
     MCAPI PackSourceReport(class PackSourceReport const &);
+    /**
+     * @symbol ??0PackSourceReport\@\@QEAA\@XZ
+     */
+    MCAPI PackSourceReport();
     /**
      * @symbol ?addReport\@PackSourceReport\@\@QEAAXAEBUPackIdVersion\@\@$$QEAVPackReport\@\@\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/Packet.hpp b/LiteLoader/include/llapi/mc/Packet.hpp
index 8cbf506db4..ca0b3ec050 100644
--- a/LiteLoader/include/llapi/mc/Packet.hpp
+++ b/LiteLoader/include/llapi/mc/Packet.hpp
@@ -74,17 +74,17 @@ class Packet {
     virtual ~Packet();
     /**
      * @vftbl 1
-     * @symbol ?getId\@UpdateBlockSyncedPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ
+     * @symbol ?getId\@ChangeMobPropertyPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ
      */
     virtual enum class MinecraftPacketIds getId() const = 0;
     /**
      * @vftbl 2
-     * @symbol ?getName\@UpdateBlockSyncedPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ
+     * @symbol ?getName\@ChangeMobPropertyPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ
      */
     virtual std::string getName() const = 0;
     /**
      * @vftbl 3
-     * @symbol ?write\@UpdateBlockSyncedPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z
+     * @symbol ?write\@ChangeMobPropertyPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z
      */
     virtual void write(class BinaryStream &) const = 0;
     /**
@@ -99,7 +99,12 @@ class Packet {
     virtual bool disallowBatching() const;
     /**
      * @vftbl 6
-     * @symbol ?_read\@UpdateBlockSyncedPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
+     * @symbol ?isValid\@Packet\@\@UEBA_NXZ
+     */
+    virtual bool isValid() const;
+    /**
+     * @vftbl 7
+     * @symbol ?_read\@ChangeMobPropertyPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &) = 0;
 #ifdef ENABLE_VIRTUAL_FAKESYMBOL_PACKET
diff --git a/LiteLoader/include/llapi/mc/PacketViolationWarningPacket.hpp b/LiteLoader/include/llapi/mc/PacketViolationWarningPacket.hpp
index b128dac1bf..3a9b73176b 100644
--- a/LiteLoader/include/llapi/mc/PacketViolationWarningPacket.hpp
+++ b/LiteLoader/include/llapi/mc/PacketViolationWarningPacket.hpp
@@ -50,7 +50,7 @@ class PacketViolationWarningPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@PacketViolationWarningPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/Parser.hpp b/LiteLoader/include/llapi/mc/Parser.hpp
index 7dac5ece0f..de404ca875 100644
--- a/LiteLoader/include/llapi/mc/Parser.hpp
+++ b/LiteLoader/include/llapi/mc/Parser.hpp
@@ -31,81 +31,81 @@ class Parser {
 
 public:
     /**
-     * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAW4ParticleType\@\@PEBD3\@Z
+     * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAVBlockDescriptor\@\@\@Z
      */
-    MCAPI static void parse(class Json::Value const &, class SemVersion const &, enum class ParticleType &, char const *, char const *);
+    MCAPI static void parse(class Json::Value const &, class SemVersion const &, class BlockDescriptor &);
     /**
      * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAMPEBDM\@Z
      */
     MCAPI static void parse(class Json::Value const &, class SemVersion const &, float &, char const *, float);
-    /**
-     * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAV23\@PEBD\@Z
-     */
-    MCAPI static void parse(class Json::Value const &, class SemVersion const &, class Json::Value &, char const *);
     /**
      * @symbol ?parse\@Parser\@\@SA_NAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAW4FilterSubject\@\@PEBD3\@Z
      */
     MCAPI static bool parse(class Json::Value const &, class SemVersion const &, enum class FilterSubject &, char const *, char const *);
+    /**
+     * @symbol ?parse\@Parser\@\@SA_NAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAVDefinitionTrigger\@\@_N\@Z
+     */
+    MCAPI static bool parse(class Json::Value const &, class SemVersion const &, class DefinitionTrigger &, bool);
+    /**
+     * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAW4ActorType\@\@PEBD3\@Z
+     */
+    MCAPI static void parse(class Json::Value const &, class SemVersion const &, enum class ActorType &, char const *, char const *);
     /**
      * @symbol ?parse\@Parser\@\@SA_NAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAVItemDescriptor\@\@\@Z
      */
     MCAPI static bool parse(class Json::Value const &, class SemVersion const &, class ItemDescriptor &);
     /**
-     * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEBD3\@Z
+     * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAV23\@PEBD\@Z
      */
-    MCAPI static void parse(class Json::Value const &, class SemVersion const &, std::string &, char const *, char const *);
+    MCAPI static void parse(class Json::Value const &, class SemVersion const &, class Json::Value &, char const *);
     /**
-     * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAEE\@Z
+     * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@PEBD\@Z
      */
-    MCAPI static void parse(class Json::Value const &, class SemVersion const &, unsigned char &, unsigned char);
+    MCAPI static void parse(class Json::Value const &, class SemVersion const &, std::vector<std::string> &, char const *);
     /**
-     * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAHPEBDH\@Z
+     * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAEE\@Z
      */
-    MCAPI static void parse(class Json::Value const &, class SemVersion const &, int &, char const *, int);
+    MCAPI static void parse(class Json::Value const &, class SemVersion const &, unsigned char &, unsigned char);
     /**
-     * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAVHashedString\@\@PEBD3\@Z
+     * @symbol ?parse\@Parser\@\@SA_NAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAVActorDefinitionTrigger\@\@PEBD\@Z
      */
-    MCAPI static void parse(class Json::Value const &, class SemVersion const &, class HashedString &, char const *, char const *);
+    MCAPI static bool parse(class Json::Value const &, class SemVersion const &, class ActorDefinitionTrigger &, char const *);
     /**
      * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAIPEBDI\@Z
      */
     MCAPI static void parse(class Json::Value const &, class SemVersion const &, unsigned int &, char const *, unsigned int);
     /**
-     * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@PEBD\@Z
+     * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAVHashedString\@\@PEBD3\@Z
      */
-    MCAPI static void parse(class Json::Value const &, class SemVersion const &, std::vector<std::string> &, char const *);
+    MCAPI static void parse(class Json::Value const &, class SemVersion const &, class HashedString &, char const *, char const *);
     /**
-     * @symbol ?parse\@Parser\@\@SA_NAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAVDefinitionTrigger\@\@_N\@Z
+     * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAV?$vector\@VBlockDescriptor\@\@V?$allocator\@VBlockDescriptor\@\@\@std\@\@\@std\@\@\@Z
      */
-    MCAPI static bool parse(class Json::Value const &, class SemVersion const &, class DefinitionTrigger &, bool);
+    MCAPI static void parse(class Json::Value const &, class SemVersion const &, std::vector<class BlockDescriptor> &);
     /**
-     * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAW4ActorType\@\@PEBD3\@Z
+     * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAHPEBDH\@Z
      */
-    MCAPI static void parse(class Json::Value const &, class SemVersion const &, enum class ActorType &, char const *, char const *);
+    MCAPI static void parse(class Json::Value const &, class SemVersion const &, int &, char const *, int);
     /**
-     * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAV?$vector\@VBlockDescriptor\@\@V?$allocator\@VBlockDescriptor\@\@\@std\@\@\@std\@\@\@Z
+     * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEBD3\@Z
      */
-    MCAPI static void parse(class Json::Value const &, class SemVersion const &, std::vector<class BlockDescriptor> &);
+    MCAPI static void parse(class Json::Value const &, class SemVersion const &, std::string &, char const *, char const *);
     /**
-     * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAVBlockDescriptor\@\@\@Z
+     * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAVVec3\@\@PEBDAEBV5\@\@Z
      */
-    MCAPI static void parse(class Json::Value const &, class SemVersion const &, class BlockDescriptor &);
+    MCAPI static void parse(class Json::Value const &, class SemVersion const &, class Vec3 &, char const *, class Vec3 const &);
     /**
      * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAUIntRange\@\@PEBDHH\@Z
      */
     MCAPI static void parse(class Json::Value const &, class SemVersion const &, struct IntRange &, char const *, int, int);
     /**
-     * @symbol ?parse\@Parser\@\@SA_NAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAV?$vector\@VItemDescriptor\@\@V?$allocator\@VItemDescriptor\@\@\@std\@\@\@std\@\@\@Z
+     * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAW4ParticleType\@\@PEBD3\@Z
      */
-    MCAPI static bool parse(class Json::Value const &, class SemVersion const &, std::vector<class ItemDescriptor> &);
+    MCAPI static void parse(class Json::Value const &, class SemVersion const &, enum class ParticleType &, char const *, char const *);
     /**
      * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAUActorDefinitionIdentifier\@\@PEBD3\@Z
      */
     MCAPI static void parse(class Json::Value const &, class SemVersion const &, struct ActorDefinitionIdentifier &, char const *, char const *);
-    /**
-     * @symbol ?parse\@Parser\@\@SA_NAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAVActorDefinitionTrigger\@\@PEBD\@Z
-     */
-    MCAPI static bool parse(class Json::Value const &, class SemVersion const &, class ActorDefinitionTrigger &, char const *);
     /**
      * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAV?$vector\@W4LevelSoundEvent\@\@V?$allocator\@W4LevelSoundEvent\@\@\@std\@\@\@std\@\@PEBD3\@Z
      */
@@ -115,9 +115,9 @@ class Parser {
      */
     MCAPI static void parse(class Json::Value const &, class SemVersion const &, enum class Difficulty &, char const *, char const *);
     /**
-     * @symbol ?parse\@Parser\@\@SA_NAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAV?$vector\@VActorDefinitionTrigger\@\@V?$allocator\@VActorDefinitionTrigger\@\@\@std\@\@\@std\@\@\@Z
+     * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAVMobEffectInstance\@\@PEBD\@Z
      */
-    MCAPI static bool parse(class Json::Value const &, class SemVersion const &, std::vector<class ActorDefinitionTrigger> &);
+    MCAPI static void parse(class Json::Value const &, class SemVersion const &, class MobEffectInstance &, char const *);
     /**
      * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEA_NPEBD_N\@Z
      */
@@ -127,17 +127,17 @@ class Parser {
      */
     MCAPI static bool parse(class Json::Value const &, class SemVersion const &, class ActorDefinitionTrigger &, bool);
     /**
-     * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAVVec3\@\@PEBDAEBV5\@\@Z
+     * @symbol ?parse\@Parser\@\@SA_NAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAV?$vector\@VActorDefinitionTrigger\@\@V?$allocator\@VActorDefinitionTrigger\@\@\@std\@\@\@std\@\@\@Z
      */
-    MCAPI static void parse(class Json::Value const &, class SemVersion const &, class Vec3 &, char const *, class Vec3 const &);
+    MCAPI static bool parse(class Json::Value const &, class SemVersion const &, std::vector<class ActorDefinitionTrigger> &);
     /**
      * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAUFloatRange\@\@PEBD\@Z
      */
     MCAPI static void parse(class Json::Value const &, class SemVersion const &, struct FloatRange &, char const *);
     /**
-     * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAVMobEffectInstance\@\@PEBD\@Z
+     * @symbol ?parse\@Parser\@\@SA_NAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAV?$vector\@VItemDescriptor\@\@V?$allocator\@VItemDescriptor\@\@\@std\@\@\@std\@\@\@Z
      */
-    MCAPI static void parse(class Json::Value const &, class SemVersion const &, class MobEffectInstance &, char const *);
+    MCAPI static bool parse(class Json::Value const &, class SemVersion const &, std::vector<class ItemDescriptor> &);
     /**
      * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAV?$WeightedChoices\@VActorDefinitionTrigger\@\@\@\@PEBD\@Z
      */
@@ -147,33 +147,33 @@ class Parser {
      */
     MCAPI static void parse(class Json::Value const &, class SemVersion const &, std::vector<class BlockDescriptor> &, char const *);
     /**
-     * @symbol ?serialize\@Parser\@\@SAXAEBUFloatRange\@\@AEAVValue\@Json\@\@PEBD\@Z
-     */
-    MCAPI static void serialize(struct FloatRange const &, class Json::Value &, char const *);
-    /**
-     * @symbol ?serialize\@Parser\@\@SAXAEBW4FilterSubject\@\@AEAVValue\@Json\@\@PEBD\@Z
+     * @symbol ?serialize\@Parser\@\@SAXAEBVActorDefinitionTrigger\@\@AEAVValue\@Json\@\@PEBD\@Z
      */
-    MCAPI static void serialize(enum class FilterSubject const &, class Json::Value &, char const *);
+    MCAPI static void serialize(class ActorDefinitionTrigger const &, class Json::Value &, char const *);
     /**
      * @symbol ?serialize\@Parser\@\@SAXAEBV?$vector\@VMobEffectInstance\@\@V?$allocator\@VMobEffectInstance\@\@\@std\@\@\@std\@\@AEAVValue\@Json\@\@PEBD\@Z
      */
     MCAPI static void serialize(std::vector<class MobEffectInstance> const &, class Json::Value &, char const *);
     /**
-     * @symbol ?serialize\@Parser\@\@SAXAEBW4ParticleType\@\@AEAVValue\@Json\@\@PEBD\@Z
+     * @symbol ?serialize\@Parser\@\@SAXAEBW4FilterSubject\@\@AEAVValue\@Json\@\@PEBD\@Z
      */
-    MCAPI static void serialize(enum class ParticleType const &, class Json::Value &, char const *);
+    MCAPI static void serialize(enum class FilterSubject const &, class Json::Value &, char const *);
     /**
-     * @symbol ?serialize\@Parser\@\@SAXAEBVActorDefinitionTrigger\@\@AEAVValue\@Json\@\@PEBD\@Z
+     * @symbol ?serialize\@Parser\@\@SAXAEBV?$vector\@VBlockDescriptor\@\@V?$allocator\@VBlockDescriptor\@\@\@std\@\@\@std\@\@AEAVValue\@Json\@\@PEBD\@Z
      */
-    MCAPI static void serialize(class ActorDefinitionTrigger const &, class Json::Value &, char const *);
+    MCAPI static void serialize(std::vector<class BlockDescriptor> const &, class Json::Value &, char const *);
     /**
      * @symbol ?serialize\@Parser\@\@SAXAEBUActorDefinitionIdentifier\@\@AEAVValue\@Json\@\@PEBD\@Z
      */
     MCAPI static void serialize(struct ActorDefinitionIdentifier const &, class Json::Value &, char const *);
     /**
-     * @symbol ?serialize\@Parser\@\@SAXAEBV?$vector\@VBlockDescriptor\@\@V?$allocator\@VBlockDescriptor\@\@\@std\@\@\@std\@\@AEAVValue\@Json\@\@PEBD\@Z
+     * @symbol ?serialize\@Parser\@\@SAXAEBW4ParticleType\@\@AEAVValue\@Json\@\@PEBD\@Z
      */
-    MCAPI static void serialize(std::vector<class BlockDescriptor> const &, class Json::Value &, char const *);
+    MCAPI static void serialize(enum class ParticleType const &, class Json::Value &, char const *);
+    /**
+     * @symbol ?serialize\@Parser\@\@SAXAEBUFloatRange\@\@AEAVValue\@Json\@\@PEBD\@Z
+     */
+    MCAPI static void serialize(struct FloatRange const &, class Json::Value &, char const *);
     /**
      * @symbol ?serialize\@Parser\@\@SAXAEBW4ActorType\@\@AEAVValue\@Json\@\@PEBD\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/PassengerJumpPacket.hpp b/LiteLoader/include/llapi/mc/PassengerJumpPacket.hpp
index a274c54a4d..a6a6f70342 100644
--- a/LiteLoader/include/llapi/mc/PassengerJumpPacket.hpp
+++ b/LiteLoader/include/llapi/mc/PassengerJumpPacket.hpp
@@ -50,7 +50,7 @@ class PassengerJumpPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@PassengerJumpPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/Path.hpp b/LiteLoader/include/llapi/mc/Path.hpp
index e6c21cf14a..f537feea7d 100644
--- a/LiteLoader/include/llapi/mc/Path.hpp
+++ b/LiteLoader/include/llapi/mc/Path.hpp
@@ -45,14 +45,14 @@ class Path {
      * @symbol ??0Path\@\@QEAA\@XZ
      */
     MCAPI Path();
-    /**
-     * @symbol ?currentPos\@Path\@\@QEBA?AVVec3\@\@PEBVActor\@\@\@Z
-     */
-    MCAPI class Vec3 currentPos(class Actor const *) const;
     /**
      * @symbol ?currentPos\@Path\@\@QEBAAEBVBlockPos\@\@XZ
      */
     MCAPI class BlockPos const & currentPos() const;
+    /**
+     * @symbol ?currentPos\@Path\@\@QEBA?AVVec3\@\@PEBVActor\@\@\@Z
+     */
+    MCAPI class Vec3 currentPos(class Actor const *) const;
     /**
      * @symbol ?endsInXZ\@Path\@\@QEAA_NAEBVVec3\@\@\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/PathfinderNode.hpp b/LiteLoader/include/llapi/mc/PathfinderNode.hpp
index 063132cd6a..cb2bcebdd8 100644
--- a/LiteLoader/include/llapi/mc/PathfinderNode.hpp
+++ b/LiteLoader/include/llapi/mc/PathfinderNode.hpp
@@ -28,14 +28,14 @@ class PathfinderNode {
 #endif
 
 public:
-    /**
-     * @symbol ??0PathfinderNode\@\@QEAA\@AEBVBlockPos\@\@W4NodeType\@\@\@Z
-     */
-    MCAPI PathfinderNode(class BlockPos const &, enum class NodeType);
     /**
      * @symbol ??0PathfinderNode\@\@QEAA\@AEBV0\@\@Z
      */
     MCAPI PathfinderNode(class PathfinderNode const &);
+    /**
+     * @symbol ??0PathfinderNode\@\@QEAA\@AEBVBlockPos\@\@W4NodeType\@\@\@Z
+     */
+    MCAPI PathfinderNode(class BlockPos const &, enum class NodeType);
     /**
      * @symbol ?distanceTo\@PathfinderNode\@\@QEBAMPEAV1\@\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/PerlinNoise.hpp b/LiteLoader/include/llapi/mc/PerlinNoise.hpp
index 82b23cca8b..8f27a97072 100644
--- a/LiteLoader/include/llapi/mc/PerlinNoise.hpp
+++ b/LiteLoader/include/llapi/mc/PerlinNoise.hpp
@@ -28,6 +28,10 @@ class PerlinNoise {
 #endif
 
 public:
+    /**
+     * @symbol ??0PerlinNoise\@\@QEAA\@AEBV0\@\@Z
+     */
+    MCAPI PerlinNoise(class PerlinNoise const &);
     /**
      * @symbol ??0PerlinNoise\@\@QEAA\@AEAVIRandom\@\@UYBlendingBugSettings\@\@HH\@Z
      */
@@ -40,10 +44,6 @@ class PerlinNoise {
      * @symbol ??0PerlinNoise\@\@QEAA\@IHH\@Z
      */
     MCAPI PerlinNoise(unsigned int, int, int);
-    /**
-     * @symbol ??0PerlinNoise\@\@QEAA\@AEBV0\@\@Z
-     */
-    MCAPI PerlinNoise(class PerlinNoise const &);
     /**
      * @symbol ?getRegion\@PerlinNoise\@\@QEBAXPEAMAEBVVec3\@\@HHH1\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/PerlinSimplexNoise.hpp b/LiteLoader/include/llapi/mc/PerlinSimplexNoise.hpp
index 9b0083e061..06bc8aba44 100644
--- a/LiteLoader/include/llapi/mc/PerlinSimplexNoise.hpp
+++ b/LiteLoader/include/llapi/mc/PerlinSimplexNoise.hpp
@@ -52,14 +52,14 @@ class PerlinSimplexNoise {
      * @symbol ?getValue\@PerlinSimplexNoise\@\@QEBAMMM\@Z
      */
     MCAPI float getValue(float, float) const;
-    /**
-     * @symbol ?getValueNormalized\@PerlinSimplexNoise\@\@QEBAMAEBVVec3\@\@\@Z
-     */
-    MCAPI float getValueNormalized(class Vec3 const &) const;
     /**
      * @symbol ?getValueNormalized\@PerlinSimplexNoise\@\@QEBAMMM\@Z
      */
     MCAPI float getValueNormalized(float, float) const;
+    /**
+     * @symbol ?getValueNormalized\@PerlinSimplexNoise\@\@QEBAMAEBVVec3\@\@\@Z
+     */
+    MCAPI float getValueNormalized(class Vec3 const &) const;
     /**
      * @symbol ??1PerlinSimplexNoise\@\@QEAA\@XZ
      */
diff --git a/LiteLoader/include/llapi/mc/PermissionsFile.hpp b/LiteLoader/include/llapi/mc/PermissionsFile.hpp
index d6bf07182c..fc54ad8ba3 100644
--- a/LiteLoader/include/llapi/mc/PermissionsFile.hpp
+++ b/LiteLoader/include/llapi/mc/PermissionsFile.hpp
@@ -51,14 +51,14 @@ class PermissionsFile {
      * @symbol ?isPermissionsSet\@PermissionsFile\@\@QEBA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4PlayerPermissionLevel\@\@\@Z
      */
     MCAPI bool isPermissionsSet(std::string const &, enum class PlayerPermissionLevel) const;
-    /**
-     * @symbol ?persistPlayerPermissionsToDisk\@PermissionsFile\@\@QEAAXAEBVUserEntityIdentifierComponent\@\@W4PlayerPermissionLevel\@\@\@Z
-     */
-    MCAPI void persistPlayerPermissionsToDisk(class UserEntityIdentifierComponent const &, enum class PlayerPermissionLevel);
     /**
      * @symbol ?persistPlayerPermissionsToDisk\@PermissionsFile\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4PlayerPermissionLevel\@\@\@Z
      */
     MCAPI void persistPlayerPermissionsToDisk(std::string const &, enum class PlayerPermissionLevel);
+    /**
+     * @symbol ?persistPlayerPermissionsToDisk\@PermissionsFile\@\@QEAAXAEBVUserEntityIdentifierComponent\@\@W4PlayerPermissionLevel\@\@\@Z
+     */
+    MCAPI void persistPlayerPermissionsToDisk(class UserEntityIdentifierComponent const &, enum class PlayerPermissionLevel);
     /**
      * @symbol ?reload\@PermissionsFile\@\@QEAA?AW4FileReadResult\@\@XZ
      */
diff --git a/LiteLoader/include/llapi/mc/PhotoTransferPacket.hpp b/LiteLoader/include/llapi/mc/PhotoTransferPacket.hpp
index 0cf574251d..de499796f9 100644
--- a/LiteLoader/include/llapi/mc/PhotoTransferPacket.hpp
+++ b/LiteLoader/include/llapi/mc/PhotoTransferPacket.hpp
@@ -50,7 +50,7 @@ class PhotoTransferPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@PhotoTransferPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/PlaySoundPacket.hpp b/LiteLoader/include/llapi/mc/PlaySoundPacket.hpp
index 726c21219e..62be263f7a 100644
--- a/LiteLoader/include/llapi/mc/PlaySoundPacket.hpp
+++ b/LiteLoader/include/llapi/mc/PlaySoundPacket.hpp
@@ -50,7 +50,7 @@ class PlaySoundPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@PlaySoundPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/PlayStatusPacket.hpp b/LiteLoader/include/llapi/mc/PlayStatusPacket.hpp
index aaf4e05692..0fdf91df31 100644
--- a/LiteLoader/include/llapi/mc/PlayStatusPacket.hpp
+++ b/LiteLoader/include/llapi/mc/PlayStatusPacket.hpp
@@ -67,7 +67,7 @@ class PlayStatusPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@PlayStatusPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/Player.hpp b/LiteLoader/include/llapi/mc/Player.hpp
index 48cbad98fe..b7e4090700 100644
--- a/LiteLoader/include/llapi/mc/Player.hpp
+++ b/LiteLoader/include/llapi/mc/Player.hpp
@@ -106,7 +106,7 @@ class Player : public Mob {
     LIAPI bool sendText(const std::string& text, TextType type = TextType::RAW);
 
     template <TextType ttype = TextType::RAW, typename... Args>
-    inline bool sendText(const std::string& text, Args&&... args) {
+    inline bool trSendText(const std::string& text, Args&&... args) {
         return sendText(this->tr(text, std::forward<Args>(args)...), ttype);
     }
     template <typename... Args>
@@ -1587,14 +1587,14 @@ class Player : public Mob {
      * @symbol ?getSpawnPosition\@Player\@\@QEBAAEBVBlockPos\@\@XZ
      */
     MCAPI class BlockPos const & getSpawnPosition() const;
-    /**
-     * @symbol ?getSupplies\@Player\@\@QEAAAEAVPlayerInventory\@\@XZ
-     */
-    MCAPI class PlayerInventory & getSupplies();
     /**
      * @symbol ?getSupplies\@Player\@\@QEBAAEBVPlayerInventory\@\@XZ
      */
     MCAPI class PlayerInventory const & getSupplies() const;
+    /**
+     * @symbol ?getSupplies\@Player\@\@QEAAAEAVPlayerInventory\@\@XZ
+     */
+    MCAPI class PlayerInventory & getSupplies();
     /**
      * @symbol ?getTrackedBosses\@Player\@\@QEAAAEBV?$vector\@UActorUniqueID\@\@V?$allocator\@UActorUniqueID\@\@\@std\@\@\@std\@\@XZ
      */
@@ -2051,6 +2051,10 @@ class Player : public Mob {
      * @symbol ?tryGetFromComponent\@Player\@\@SAPEAV1\@AEBV?$FlagComponent\@UPlayerComponentFlag\@\@\@\@AEAVActorOwnerComponent\@\@_N\@Z
      */
     MCAPI static class Player * tryGetFromComponent(class FlagComponent<struct PlayerComponentFlag> const &, class ActorOwnerComponent &, bool);
+    /**
+     * @symbol ?tryGetFromEntity\@Player\@\@SAPEAV1\@AEAVEntityContext\@\@_N\@Z
+     */
+    MCAPI static class Player * tryGetFromEntity(class EntityContext &, bool);
     /**
      * @symbol ?tryGetFromEntity\@Player\@\@SAPEBV1\@AEBVEntityContext\@\@_N\@Z
      */
@@ -2059,10 +2063,6 @@ class Player : public Mob {
      * @symbol ?tryGetFromEntity\@Player\@\@SAPEAV1\@V?$StackRefResultT\@UEntityRefTraits\@\@\@\@_N\@Z
      */
     MCAPI static class Player * tryGetFromEntity(class StackRefResultT<struct EntityRefTraits>, bool);
-    /**
-     * @symbol ?tryGetFromEntity\@Player\@\@SAPEAV1\@AEAVEntityContext\@\@_N\@Z
-     */
-    MCAPI static class Player * tryGetFromEntity(class EntityContext &, bool);
 
 //protected:
     /**
diff --git a/LiteLoader/include/llapi/mc/PlayerActionPacket.hpp b/LiteLoader/include/llapi/mc/PlayerActionPacket.hpp
index 65a3dcaf8f..f4c1329a1c 100644
--- a/LiteLoader/include/llapi/mc/PlayerActionPacket.hpp
+++ b/LiteLoader/include/llapi/mc/PlayerActionPacket.hpp
@@ -6,7 +6,7 @@
 #define AUTO_GENERATED
 #include "llapi/Global.h"
 #include "Packet.hpp"
-#include "BlockPos.hpp"
+
 #define BEFORE_EXTRA
 // Include Headers or Declare Types Here
 // Refer to https://github.com/LiteLDev/BEProtocolGolang/blob/master/minecraft/protocol/player.go
@@ -93,7 +93,7 @@ class PlayerActionPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@PlayerActionPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/PlayerArmorDamagePacket.hpp b/LiteLoader/include/llapi/mc/PlayerArmorDamagePacket.hpp
index 0f68d2ff60..0a7dae085d 100644
--- a/LiteLoader/include/llapi/mc/PlayerArmorDamagePacket.hpp
+++ b/LiteLoader/include/llapi/mc/PlayerArmorDamagePacket.hpp
@@ -51,7 +51,7 @@ class PlayerArmorDamagePacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@PlayerArmorDamagePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/PlayerAuthInputPacket.hpp b/LiteLoader/include/llapi/mc/PlayerAuthInputPacket.hpp
index d0e2691df0..c7a76c1ba6 100644
--- a/LiteLoader/include/llapi/mc/PlayerAuthInputPacket.hpp
+++ b/LiteLoader/include/llapi/mc/PlayerAuthInputPacket.hpp
@@ -53,6 +53,11 @@ enum class InputData;
     virtual void write(class BinaryStream &) const;
     /**
      * @vftbl 6
+     * @symbol ?isValid\@PlayerAuthInputPacket\@\@UEBA_NXZ
+     */
+    virtual bool isValid() const;
+    /**
+     * @vftbl 7
      * @symbol ?_read\@PlayerAuthInputPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/PlayerDataSystem.hpp b/LiteLoader/include/llapi/mc/PlayerDataSystem.hpp
index ed48b7deb9..ad7dca2498 100644
--- a/LiteLoader/include/llapi/mc/PlayerDataSystem.hpp
+++ b/LiteLoader/include/llapi/mc/PlayerDataSystem.hpp
@@ -58,13 +58,13 @@ namespace PlayerDataSystem {
      * @symbol ?playerKey\@PlayerDataSystem\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@3\@\@Z
      */
     MCAPI std::string playerKey(class std::basic_string_view<char, struct std::char_traits<char>>);
-    /**
-     * @symbol ?serverKey\@PlayerDataSystem\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVLevelStorage\@\@AEBVPlayer\@\@\@Z
-     */
-    MCAPI std::string serverKey(class LevelStorage &, class Player const &);
     /**
      * @symbol ?serverKey\@PlayerDataSystem\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVLevelStorage\@\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@3\@\@Z
      */
     MCAPI std::string serverKey(class LevelStorage &, class std::basic_string_view<char, struct std::char_traits<char>>);
+    /**
+     * @symbol ?serverKey\@PlayerDataSystem\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVLevelStorage\@\@AEBVPlayer\@\@\@Z
+     */
+    MCAPI std::string serverKey(class LevelStorage &, class Player const &);
 
 };
\ No newline at end of file
diff --git a/LiteLoader/include/llapi/mc/PlayerEnchantOptionsPacket.hpp b/LiteLoader/include/llapi/mc/PlayerEnchantOptionsPacket.hpp
index 368c1d5271..2378b32a0d 100644
--- a/LiteLoader/include/llapi/mc/PlayerEnchantOptionsPacket.hpp
+++ b/LiteLoader/include/llapi/mc/PlayerEnchantOptionsPacket.hpp
@@ -51,7 +51,7 @@ class PlayerEnchantOptionsPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@PlayerEnchantOptionsPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/PlayerFogPacket.hpp b/LiteLoader/include/llapi/mc/PlayerFogPacket.hpp
index a2b616a2c3..5e421ef17b 100644
--- a/LiteLoader/include/llapi/mc/PlayerFogPacket.hpp
+++ b/LiteLoader/include/llapi/mc/PlayerFogPacket.hpp
@@ -51,7 +51,7 @@ class PlayerFogPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@PlayerFogPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/PlayerHotbarPacket.hpp b/LiteLoader/include/llapi/mc/PlayerHotbarPacket.hpp
index ec869056d4..63467b2ce3 100644
--- a/LiteLoader/include/llapi/mc/PlayerHotbarPacket.hpp
+++ b/LiteLoader/include/llapi/mc/PlayerHotbarPacket.hpp
@@ -50,7 +50,7 @@ class PlayerHotbarPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@PlayerHotbarPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/PlayerInputPacket.hpp b/LiteLoader/include/llapi/mc/PlayerInputPacket.hpp
index 925bf14a80..38605d48bd 100644
--- a/LiteLoader/include/llapi/mc/PlayerInputPacket.hpp
+++ b/LiteLoader/include/llapi/mc/PlayerInputPacket.hpp
@@ -50,7 +50,7 @@ class PlayerInputPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@PlayerInputPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/PlayerListEntry.hpp b/LiteLoader/include/llapi/mc/PlayerListEntry.hpp
index ef48f75223..d47f434f84 100644
--- a/LiteLoader/include/llapi/mc/PlayerListEntry.hpp
+++ b/LiteLoader/include/llapi/mc/PlayerListEntry.hpp
@@ -37,14 +37,14 @@ class PlayerListEntry {
 #endif
 
 public:
-    /**
-     * @symbol ??0PlayerListEntry\@\@QEAA\@AEBVPlayer\@\@\@Z
-     */
-    MCAPI PlayerListEntry(class Player const &);
     /**
      * @symbol ??0PlayerListEntry\@\@QEAA\@VUUID\@mce\@\@\@Z
      */
     MCAPI PlayerListEntry(class mce::UUID);
+    /**
+     * @symbol ??0PlayerListEntry\@\@QEAA\@AEBVPlayer\@\@\@Z
+     */
+    MCAPI PlayerListEntry(class Player const &);
     /**
      * @symbol ?clone\@PlayerListEntry\@\@QEBA?AV1\@XZ
      */
diff --git a/LiteLoader/include/llapi/mc/PlayerListPacket.hpp b/LiteLoader/include/llapi/mc/PlayerListPacket.hpp
index 251a47f138..9a7c7a6037 100644
--- a/LiteLoader/include/llapi/mc/PlayerListPacket.hpp
+++ b/LiteLoader/include/llapi/mc/PlayerListPacket.hpp
@@ -66,7 +66,7 @@ class PlayerListPacket : public Packet {
      */
     virtual struct ExtendedStreamReadResult readExtended(class ReadOnlyBinaryStream &);
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@PlayerListPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/PlayerMovement.hpp b/LiteLoader/include/llapi/mc/PlayerMovement.hpp
index 810755c445..854a076bd6 100644
--- a/LiteLoader/include/llapi/mc/PlayerMovement.hpp
+++ b/LiteLoader/include/llapi/mc/PlayerMovement.hpp
@@ -25,14 +25,14 @@ namespace PlayerMovement {
      * @symbol ?applyInputLocks\@PlayerMovement\@\@YAXAEBUClientInputLockComponent\@\@AEAUMoveInputState\@\@\@Z
      */
     MCAPI void applyInputLocks(struct ClientInputLockComponent const &, struct MoveInputState &);
-    /**
-     * @symbol ?calculateMoveVector\@PlayerMovement\@\@YA?AVVec2\@\@AEBUMoveInputState\@\@AEBVLayeredAbilities\@\@AEBVSynchedActorData\@\@_NPEBUSneakingComponent\@\@\@Z
-     */
-    MCAPI class Vec2 calculateMoveVector(struct MoveInputState const &, class LayeredAbilities const &, class SynchedActorData const &, bool, struct SneakingComponent const *);
     /**
      * @symbol ?calculateMoveVector\@PlayerMovement\@\@YA?AVVec2\@\@AEBUMoveInputState\@\@AEAUIPlayerMovementProxy\@\@\@Z
      */
     MCAPI class Vec2 calculateMoveVector(struct MoveInputState const &, struct IPlayerMovementProxy &);
+    /**
+     * @symbol ?calculateMoveVector\@PlayerMovement\@\@YA?AVVec2\@\@AEBUMoveInputState\@\@AEBVLayeredAbilities\@\@AEBVSynchedActorData\@\@_NPEBUSneakingComponent\@\@\@Z
+     */
+    MCAPI class Vec2 calculateMoveVector(struct MoveInputState const &, class LayeredAbilities const &, class SynchedActorData const &, bool, struct SneakingComponent const *);
     /**
      * @symbol ?getControllingPassengerID\@PlayerMovement\@\@YA?AUActorUniqueID\@\@AEBV?$vector\@UStrictActorIDEntityContextPair\@\@V?$allocator\@UStrictActorIDEntityContextPair\@\@\@std\@\@\@std\@\@H\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/PlayerSkinPacket.hpp b/LiteLoader/include/llapi/mc/PlayerSkinPacket.hpp
index edb79c9ef7..ff762565dd 100644
--- a/LiteLoader/include/llapi/mc/PlayerSkinPacket.hpp
+++ b/LiteLoader/include/llapi/mc/PlayerSkinPacket.hpp
@@ -55,7 +55,7 @@ class PlayerSkinPacket : public Packet {
      */
     virtual struct ExtendedStreamReadResult readExtended(class ReadOnlyBinaryStream &);
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@PlayerSkinPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/PlayerStartItemCooldownPacket.hpp b/LiteLoader/include/llapi/mc/PlayerStartItemCooldownPacket.hpp
index 3ffede05f5..e39c78cd24 100644
--- a/LiteLoader/include/llapi/mc/PlayerStartItemCooldownPacket.hpp
+++ b/LiteLoader/include/llapi/mc/PlayerStartItemCooldownPacket.hpp
@@ -48,7 +48,7 @@ class PlayerStartItemCooldownPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@PlayerStartItemCooldownPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/PositionTrackingDBClientRequestPacket.hpp b/LiteLoader/include/llapi/mc/PositionTrackingDBClientRequestPacket.hpp
index 3c5d679c37..103c2e15e5 100644
--- a/LiteLoader/include/llapi/mc/PositionTrackingDBClientRequestPacket.hpp
+++ b/LiteLoader/include/llapi/mc/PositionTrackingDBClientRequestPacket.hpp
@@ -50,7 +50,7 @@ class PositionTrackingDBClientRequestPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@PositionTrackingDBClientRequestPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/PositionTrackingDBServerBroadcastPacket.hpp b/LiteLoader/include/llapi/mc/PositionTrackingDBServerBroadcastPacket.hpp
index 4716f50a46..b7b60c37ba 100644
--- a/LiteLoader/include/llapi/mc/PositionTrackingDBServerBroadcastPacket.hpp
+++ b/LiteLoader/include/llapi/mc/PositionTrackingDBServerBroadcastPacket.hpp
@@ -50,7 +50,7 @@ class PositionTrackingDBServerBroadcastPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@PositionTrackingDBServerBroadcastPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/Potion.hpp b/LiteLoader/include/llapi/mc/Potion.hpp
index f80ddf9277..96512a696d 100644
--- a/LiteLoader/include/llapi/mc/Potion.hpp
+++ b/LiteLoader/include/llapi/mc/Potion.hpp
@@ -47,14 +47,14 @@ enum class PotionVariant;
      * @symbol ?effectPotencyToString\@Potion\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVMobEffectInstance\@\@\@Z
      */
     MCAPI std::string effectPotencyToString(class MobEffectInstance const &) const;
-    /**
-     * @symbol ?getDescriptionId\@Potion\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ
-     */
-    MCAPI std::string getDescriptionId() const;
     /**
      * @symbol ?getDescriptionId\@Potion\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4PotionType\@1\@\@Z
      */
     MCAPI std::string getDescriptionId(enum class Potion::PotionType) const;
+    /**
+     * @symbol ?getDescriptionId\@Potion\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ
+     */
+    MCAPI std::string getDescriptionId() const;
     /**
      * @symbol ?getMobEffect\@Potion\@\@QEBAAEBVMobEffectInstance\@\@XZ
      */
@@ -67,14 +67,14 @@ enum class PotionVariant;
      * @symbol ?getMobEffects\@Potion\@\@QEBAAEBV?$vector\@VMobEffectInstance\@\@V?$allocator\@VMobEffectInstance\@\@\@std\@\@\@std\@\@XZ
      */
     MCAPI std::vector<class MobEffectInstance> const & getMobEffects() const;
-    /**
-     * @symbol ?getPotentencyDescription\@Potion\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4PotionType\@1\@M\@Z
-     */
-    MCAPI std::string getPotentencyDescription(enum class Potion::PotionType, float) const;
     /**
      * @symbol ?getPotentencyDescription\@Potion\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4PotionType\@1\@MV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@3\@AEBVMobEffectInstance\@\@\@Z
      */
     MCAPI std::string getPotentencyDescription(enum class Potion::PotionType, float, class std::basic_string_view<char, struct std::char_traits<char>>, class MobEffectInstance const &) const;
+    /**
+     * @symbol ?getPotentencyDescription\@Potion\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4PotionType\@1\@M\@Z
+     */
+    MCAPI std::string getPotentencyDescription(enum class Potion::PotionType, float) const;
     /**
      * @symbol ?getPotionId\@Potion\@\@QEBAHXZ
      */
diff --git a/LiteLoader/include/llapi/mc/ProjectileComponent.hpp b/LiteLoader/include/llapi/mc/ProjectileComponent.hpp
index 3d124f2af2..e5950c60a7 100644
--- a/LiteLoader/include/llapi/mc/ProjectileComponent.hpp
+++ b/LiteLoader/include/llapi/mc/ProjectileComponent.hpp
@@ -181,14 +181,14 @@ enum class EAxis;
      * @symbol ?setSplashRange\@ProjectileComponent\@\@QEAAXM\@Z
      */
     MCAPI void setSplashRange(float);
-    /**
-     * @symbol ?shoot\@ProjectileComponent\@\@QEAAXAEAVActor\@\@0\@Z
-     */
-    MCAPI void shoot(class Actor &, class Actor &);
     /**
      * @symbol ?shoot\@ProjectileComponent\@\@QEAAXAEAVActor\@\@AEBVVec3\@\@MM1PEAV2\@\@Z
      */
     MCAPI void shoot(class Actor &, class Vec3 const &, float, float, class Vec3 const &, class Actor *);
+    /**
+     * @symbol ?shoot\@ProjectileComponent\@\@QEAAXAEAVActor\@\@0\@Z
+     */
+    MCAPI void shoot(class Actor &, class Actor &);
     /**
      * @symbol ??1ProjectileComponent\@\@QEAA\@XZ
      */
diff --git a/LiteLoader/include/llapi/mc/PurchaseReceiptPacket.hpp b/LiteLoader/include/llapi/mc/PurchaseReceiptPacket.hpp
index 23f5a34e83..c0abbd47a0 100644
--- a/LiteLoader/include/llapi/mc/PurchaseReceiptPacket.hpp
+++ b/LiteLoader/include/llapi/mc/PurchaseReceiptPacket.hpp
@@ -50,7 +50,7 @@ class PurchaseReceiptPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@PurchaseReceiptPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/PushableComponent.hpp b/LiteLoader/include/llapi/mc/PushableComponent.hpp
index bbd6304e79..ebc3bc39f9 100644
--- a/LiteLoader/include/llapi/mc/PushableComponent.hpp
+++ b/LiteLoader/include/llapi/mc/PushableComponent.hpp
@@ -32,14 +32,14 @@ class PushableComponent {
      * @symbol ??0PushableComponent\@\@QEAA\@XZ
      */
     MCAPI PushableComponent();
-    /**
-     * @symbol ?initFromDefinition\@PushableComponent\@\@QEAAXAEAVActor\@\@AEBUPushableDescription\@\@\@Z
-     */
-    MCAPI void initFromDefinition(class Actor &, struct PushableDescription const &);
     /**
      * @symbol ?initFromDefinition\@PushableComponent\@\@QEAAXAEAVActor\@\@\@Z
      */
     MCAPI void initFromDefinition(class Actor &);
+    /**
+     * @symbol ?initFromDefinition\@PushableComponent\@\@QEAAXAEAVActor\@\@AEBUPushableDescription\@\@\@Z
+     */
+    MCAPI void initFromDefinition(class Actor &, struct PushableDescription const &);
     /**
      * @symbol ?isPushable\@PushableComponent\@\@QEAA_NXZ
      */
diff --git a/LiteLoader/include/llapi/mc/RandomPos.hpp b/LiteLoader/include/llapi/mc/RandomPos.hpp
index 6edf4f403e..31caa96e7b 100644
--- a/LiteLoader/include/llapi/mc/RandomPos.hpp
+++ b/LiteLoader/include/llapi/mc/RandomPos.hpp
@@ -41,14 +41,14 @@ class RandomPos {
      * @symbol ?getPosInDirection\@RandomPos\@\@SA_NAEAVVec3\@\@AEAVMob\@\@HHH_N2PEAV2\@AEBUIntRange\@\@HW4SolidityCheckType\@\@\@Z
      */
     MCAPI static bool getPosInDirection(class Vec3 &, class Mob &, int, int, int, bool, bool, class Vec3 *, struct IntRange const &, int, enum class SolidityCheckType);
-    /**
-     * @symbol ?getPosTowards\@RandomPos\@\@SA_NAEAVVec3\@\@AEAVMob\@\@HHAEBV2\@\@Z
-     */
-    MCAPI static bool getPosTowards(class Vec3 &, class Mob &, int, int, class Vec3 const &);
     /**
      * @symbol ?getPosTowards\@RandomPos\@\@SA_NAEAVRandom\@\@AEAVVec3\@\@AEAVMob\@\@HHAEBV3\@\@Z
      */
     MCAPI static bool getPosTowards(class Random &, class Vec3 &, class Mob &, int, int, class Vec3 const &);
+    /**
+     * @symbol ?getPosTowards\@RandomPos\@\@SA_NAEAVVec3\@\@AEAVMob\@\@HHAEBV2\@\@Z
+     */
+    MCAPI static bool getPosTowards(class Vec3 &, class Mob &, int, int, class Vec3 const &);
     /**
      * @symbol ?getSpawnPos\@RandomPos\@\@SA_NAEAVBlockSource\@\@AEAVRandom\@\@AEAVVec3\@\@HHH\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/Recipe.hpp b/LiteLoader/include/llapi/mc/Recipe.hpp
index 13ba5a164a..4804390dc1 100644
--- a/LiteLoader/include/llapi/mc/Recipe.hpp
+++ b/LiteLoader/include/llapi/mc/Recipe.hpp
@@ -36,12 +36,12 @@ class Recipe {
     virtual void __unk_vfn_0();
     /**
      * @vftbl 1
-     * @symbol ?assemble\@ShulkerBoxRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@\@Z
+     * @symbol ?assemble\@ShapelessRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@\@Z
      */
     virtual std::vector<class ItemInstance> const & assemble(class CraftingContainer &) const = 0;
     /**
      * @vftbl 2
-     * @symbol ?getCraftingSize\@MapExtendingRecipe\@\@UEBAHXZ
+     * @symbol ?getCraftingSize\@BannerAddPatternRecipe\@\@UEBAHXZ
      */
     virtual int getCraftingSize() const = 0;
     /**
@@ -56,7 +56,7 @@ class Recipe {
     virtual std::vector<class ItemInstance> const & getResultItem() const = 0;
     /**
      * @vftbl 5
-     * @symbol ?isShapeless\@ShapelessRecipe\@\@UEBA_NXZ
+     * @symbol ?isShapeless\@MultiRecipe\@\@EEBA_NXZ
      */
     virtual bool isShapeless() const = 0;
     /**
@@ -66,7 +66,7 @@ class Recipe {
     virtual bool matches(class CraftingContainer &, class Level &) const = 0;
     /**
      * @vftbl 7
-     * @symbol ?size\@MapExtendingRecipe\@\@UEBAHXZ
+     * @symbol ?size\@BannerAddPatternRecipe\@\@UEBAHXZ
      */
     virtual int size() const = 0;
     /**
diff --git a/LiteLoader/include/llapi/mc/RecipeIngredient.hpp b/LiteLoader/include/llapi/mc/RecipeIngredient.hpp
index 2cc57a70a1..2bce642890 100644
--- a/LiteLoader/include/llapi/mc/RecipeIngredient.hpp
+++ b/LiteLoader/include/llapi/mc/RecipeIngredient.hpp
@@ -44,18 +44,22 @@ class RecipeIngredient : public ItemDescriptorCount {
      */
     MCVAPI ~RecipeIngredient();
 #endif
-    /**
-     * @symbol ??0RecipeIngredient\@\@QEAA\@XZ
-     */
-    MCAPI RecipeIngredient();
     /**
      * @symbol ??0RecipeIngredient\@\@QEAA\@AEBVBlock\@\@G\@Z
      */
     MCAPI RecipeIngredient(class Block const &, unsigned short);
+    /**
+     * @symbol ??0RecipeIngredient\@\@QEAA\@AEBVBlockLegacy\@\@G\@Z
+     */
+    MCAPI RecipeIngredient(class BlockLegacy const &, unsigned short);
     /**
      * @symbol ??0RecipeIngredient\@\@QEAA\@AEBV0\@\@Z
      */
     MCAPI RecipeIngredient(class RecipeIngredient const &);
+    /**
+     * @symbol ??0RecipeIngredient\@\@QEAA\@XZ
+     */
+    MCAPI RecipeIngredient();
     /**
      * @symbol ??0RecipeIngredient\@\@QEAA\@AEBUItemTag\@\@G\@Z
      */
@@ -64,14 +68,6 @@ class RecipeIngredient : public ItemDescriptorCount {
      * @symbol ??0RecipeIngredient\@\@QEAA\@AEBVItem\@\@HG\@Z
      */
     MCAPI RecipeIngredient(class Item const &, int, unsigned short);
-    /**
-     * @symbol ??0RecipeIngredient\@\@QEAA\@AEAVReadOnlyBinaryStream\@\@\@Z
-     */
-    MCAPI RecipeIngredient(class ReadOnlyBinaryStream &);
-    /**
-     * @symbol ??0RecipeIngredient\@\@QEAA\@AEBVBlockLegacy\@\@G\@Z
-     */
-    MCAPI RecipeIngredient(class BlockLegacy const &, unsigned short);
     /**
      * @symbol ??0RecipeIngredient\@\@QEAA\@$$QEAV0\@\@Z
      */
@@ -80,6 +76,10 @@ class RecipeIngredient : public ItemDescriptorCount {
      * @symbol ??0RecipeIngredient\@\@QEAA\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@HG\@Z
      */
     MCAPI RecipeIngredient(class std::basic_string_view<char, struct std::char_traits<char>>, int, unsigned short);
+    /**
+     * @symbol ??0RecipeIngredient\@\@QEAA\@AEAVReadOnlyBinaryStream\@\@\@Z
+     */
+    MCAPI RecipeIngredient(class ReadOnlyBinaryStream &);
     /**
      * @symbol ?EMPTY_INGREDIENT\@RecipeIngredient\@\@2V1\@A
      */
diff --git a/LiteLoader/include/llapi/mc/RecipeUnlockingRequirement.hpp b/LiteLoader/include/llapi/mc/RecipeUnlockingRequirement.hpp
index 6935d9efa2..8f0d384932 100644
--- a/LiteLoader/include/llapi/mc/RecipeUnlockingRequirement.hpp
+++ b/LiteLoader/include/llapi/mc/RecipeUnlockingRequirement.hpp
@@ -23,6 +23,10 @@ class RecipeUnlockingRequirement {
 #endif
 
 public:
+    /**
+     * @symbol ??0RecipeUnlockingRequirement\@\@QEAA\@W4UnlockingContext\@0\@\@Z
+     */
+    MCAPI RecipeUnlockingRequirement(enum class RecipeUnlockingRequirement::UnlockingContext);
     /**
      * @symbol ??0RecipeUnlockingRequirement\@\@QEAA\@XZ
      */
@@ -31,10 +35,6 @@ class RecipeUnlockingRequirement {
      * @symbol ??0RecipeUnlockingRequirement\@\@QEAA\@V?$vector\@VRecipeIngredient\@\@V?$allocator\@VRecipeIngredient\@\@\@std\@\@\@std\@\@\@Z
      */
     MCAPI RecipeUnlockingRequirement(std::vector<class RecipeIngredient>);
-    /**
-     * @symbol ??0RecipeUnlockingRequirement\@\@QEAA\@W4UnlockingContext\@0\@\@Z
-     */
-    MCAPI RecipeUnlockingRequirement(enum class RecipeUnlockingRequirement::UnlockingContext);
     /**
      * @symbol ?isValid\@RecipeUnlockingRequirement\@\@QEBA_NXZ
      */
diff --git a/LiteLoader/include/llapi/mc/Recipes.hpp b/LiteLoader/include/llapi/mc/Recipes.hpp
index f3672b92bd..fe18df514b 100644
--- a/LiteLoader/include/llapi/mc/Recipes.hpp
+++ b/LiteLoader/include/llapi/mc/Recipes.hpp
@@ -87,10 +87,6 @@ struct NormalizedRectangularRecipeResults {
      * @symbol ?addShapedRecipe\@Recipes\@\@QEAAXV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemInstance\@\@AEBV23\@AEBV?$vector\@VType\@Recipes\@\@V?$allocator\@VType\@Recipes\@\@\@std\@\@\@3\@AEBV?$vector\@VHashedString\@\@V?$allocator\@VHashedString\@\@\@std\@\@\@3\@HV?$function\@$$A6A?AV?$unique_ptr\@VShapedRecipe\@\@U?$default_delete\@VShapedRecipe\@\@\@std\@\@\@std\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@2\@HHAEBV?$vector\@VRecipeIngredient\@\@V?$allocator\@VRecipeIngredient\@\@\@std\@\@\@2\@AEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@2\@VHashedString\@\@HPEBVUUID\@mce\@\@V?$optional\@VRecipeUnlockingRequirement\@\@\@2\@\@Z\@3\@V?$optional\@VRecipeUnlockingRequirement\@\@\@3\@\@Z
      */
     MCAPI void addShapedRecipe(std::string, class ItemInstance const &, std::string const &, std::vector<class Recipes::Type> const &, std::vector<class HashedString> const &, int, class std::function<std::unique_ptr<class ShapedRecipe> (std::string, int, int, std::vector<class RecipeIngredient> const &, std::vector<class ItemInstance> const &, class HashedString, int, class mce::UUID const *, class std::optional<class RecipeUnlockingRequirement>)>, class std::optional<class RecipeUnlockingRequirement>);
-    /**
-     * @symbol ?addShapedRecipe\@Recipes\@\@QEAAXV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemInstance\@\@AEBV23\@2AEBV?$vector\@VType\@Recipes\@\@V?$allocator\@VType\@Recipes\@\@\@std\@\@\@3\@AEBV?$vector\@VHashedString\@\@V?$allocator\@VHashedString\@\@\@std\@\@\@3\@HV?$function\@$$A6A?AV?$unique_ptr\@VShapedRecipe\@\@U?$default_delete\@VShapedRecipe\@\@\@std\@\@\@std\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@2\@HHAEBV?$vector\@VRecipeIngredient\@\@V?$allocator\@VRecipeIngredient\@\@\@std\@\@\@2\@AEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@2\@VHashedString\@\@HPEBVUUID\@mce\@\@V?$optional\@VRecipeUnlockingRequirement\@\@\@2\@\@Z\@3\@V?$optional\@VRecipeUnlockingRequirement\@\@\@3\@\@Z
-     */
-    MCAPI void addShapedRecipe(std::string, class ItemInstance const &, std::string const &, std::string const &, std::vector<class Recipes::Type> const &, std::vector<class HashedString> const &, int, class std::function<std::unique_ptr<class ShapedRecipe> (std::string, int, int, std::vector<class RecipeIngredient> const &, std::vector<class ItemInstance> const &, class HashedString, int, class mce::UUID const *, class std::optional<class RecipeUnlockingRequirement>)>, class std::optional<class RecipeUnlockingRequirement>);
     /**
      * @symbol ?addShapedRecipe\@Recipes\@\@QEAAXV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemInstance\@\@AEBV23\@22AEBV?$vector\@VType\@Recipes\@\@V?$allocator\@VType\@Recipes\@\@\@std\@\@\@3\@AEBV?$vector\@VHashedString\@\@V?$allocator\@VHashedString\@\@\@std\@\@\@3\@HV?$function\@$$A6A?AV?$unique_ptr\@VShapedRecipe\@\@U?$default_delete\@VShapedRecipe\@\@\@std\@\@\@std\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@2\@HHAEBV?$vector\@VRecipeIngredient\@\@V?$allocator\@VRecipeIngredient\@\@\@std\@\@\@2\@AEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@2\@VHashedString\@\@HPEBVUUID\@mce\@\@V?$optional\@VRecipeUnlockingRequirement\@\@\@2\@\@Z\@3\@V?$optional\@VRecipeUnlockingRequirement\@\@\@3\@\@Z
      */
@@ -103,6 +99,10 @@ struct NormalizedRectangularRecipeResults {
      * @symbol ?addShapedRecipe\@Recipes\@\@QEAAXV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@3\@AEBV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@3\@AEBV?$vector\@VType\@Recipes\@\@V?$allocator\@VType\@Recipes\@\@\@std\@\@\@3\@AEBV?$vector\@VHashedString\@\@V?$allocator\@VHashedString\@\@\@std\@\@\@3\@HV?$function\@$$A6A?AV?$unique_ptr\@VShapedRecipe\@\@U?$default_delete\@VShapedRecipe\@\@\@std\@\@\@std\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@2\@HHAEBV?$vector\@VRecipeIngredient\@\@V?$allocator\@VRecipeIngredient\@\@\@std\@\@\@2\@AEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@2\@VHashedString\@\@HPEBVUUID\@mce\@\@V?$optional\@VRecipeUnlockingRequirement\@\@\@2\@\@Z\@3\@V?$optional\@VRecipeUnlockingRequirement\@\@\@3\@\@Z
      */
     MCAPI void addShapedRecipe(std::string, std::vector<class ItemInstance> const &, std::vector<std::string> const &, std::vector<class Recipes::Type> const &, std::vector<class HashedString> const &, int, class std::function<std::unique_ptr<class ShapedRecipe> (std::string, int, int, std::vector<class RecipeIngredient> const &, std::vector<class ItemInstance> const &, class HashedString, int, class mce::UUID const *, class std::optional<class RecipeUnlockingRequirement>)>, class std::optional<class RecipeUnlockingRequirement>);
+    /**
+     * @symbol ?addShapedRecipe\@Recipes\@\@QEAAXV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemInstance\@\@AEBV23\@2AEBV?$vector\@VType\@Recipes\@\@V?$allocator\@VType\@Recipes\@\@\@std\@\@\@3\@AEBV?$vector\@VHashedString\@\@V?$allocator\@VHashedString\@\@\@std\@\@\@3\@HV?$function\@$$A6A?AV?$unique_ptr\@VShapedRecipe\@\@U?$default_delete\@VShapedRecipe\@\@\@std\@\@\@std\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@2\@HHAEBV?$vector\@VRecipeIngredient\@\@V?$allocator\@VRecipeIngredient\@\@\@std\@\@\@2\@AEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@2\@VHashedString\@\@HPEBVUUID\@mce\@\@V?$optional\@VRecipeUnlockingRequirement\@\@\@2\@\@Z\@3\@V?$optional\@VRecipeUnlockingRequirement\@\@\@3\@\@Z
+     */
+    MCAPI void addShapedRecipe(std::string, class ItemInstance const &, std::string const &, std::string const &, std::vector<class Recipes::Type> const &, std::vector<class HashedString> const &, int, class std::function<std::unique_ptr<class ShapedRecipe> (std::string, int, int, std::vector<class RecipeIngredient> const &, std::vector<class ItemInstance> const &, class HashedString, int, class mce::UUID const *, class std::optional<class RecipeUnlockingRequirement>)>, class std::optional<class RecipeUnlockingRequirement>);
     /**
      * @symbol ?addShapelessRecipe\@Recipes\@\@QEAAXV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemInstance\@\@AEBV?$vector\@VType\@Recipes\@\@V?$allocator\@VType\@Recipes\@\@\@std\@\@\@3\@AEBV?$vector\@VHashedString\@\@V?$allocator\@VHashedString\@\@\@std\@\@\@3\@HV?$function\@$$A6A?AV?$unique_ptr\@VShapelessRecipe\@\@U?$default_delete\@VShapelessRecipe\@\@\@std\@\@\@std\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@2\@AEBV?$vector\@VRecipeIngredient\@\@V?$allocator\@VRecipeIngredient\@\@\@std\@\@\@2\@AEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@2\@VHashedString\@\@HPEBVUUID\@mce\@\@V?$optional\@VRecipeUnlockingRequirement\@\@\@2\@\@Z\@3\@V?$optional\@VRecipeUnlockingRequirement\@\@\@3\@\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/RelativeFloat.hpp b/LiteLoader/include/llapi/mc/RelativeFloat.hpp
index 8023b9a25f..ca659cfacf 100644
--- a/LiteLoader/include/llapi/mc/RelativeFloat.hpp
+++ b/LiteLoader/include/llapi/mc/RelativeFloat.hpp
@@ -41,14 +41,14 @@ class RelativeFloat {
 #endif
 
 public:
-    /**
-     * @symbol ??0RelativeFloat\@\@QEAA\@XZ
-     */
-    MCAPI RelativeFloat();
     /**
      * @symbol ??0RelativeFloat\@\@QEAA\@M_N\@Z
      */
     MCAPI RelativeFloat(float, bool);
+    /**
+     * @symbol ??0RelativeFloat\@\@QEAA\@XZ
+     */
+    MCAPI RelativeFloat();
     /**
      * @symbol ?getValue\@RelativeFloat\@\@QEBAMM\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/RemoveActorPacket.hpp b/LiteLoader/include/llapi/mc/RemoveActorPacket.hpp
index 5670706095..b3e3cc315b 100644
--- a/LiteLoader/include/llapi/mc/RemoveActorPacket.hpp
+++ b/LiteLoader/include/llapi/mc/RemoveActorPacket.hpp
@@ -50,7 +50,7 @@ class RemoveActorPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@RemoveActorPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/RemoveObjectivePacket.hpp b/LiteLoader/include/llapi/mc/RemoveObjectivePacket.hpp
index e07645d045..06e06fa297 100644
--- a/LiteLoader/include/llapi/mc/RemoveObjectivePacket.hpp
+++ b/LiteLoader/include/llapi/mc/RemoveObjectivePacket.hpp
@@ -50,7 +50,7 @@ class RemoveObjectivePacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@RemoveObjectivePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/RemoveVolumeEntityPacket.hpp b/LiteLoader/include/llapi/mc/RemoveVolumeEntityPacket.hpp
index f1bd308ea1..dd0586cff9 100644
--- a/LiteLoader/include/llapi/mc/RemoveVolumeEntityPacket.hpp
+++ b/LiteLoader/include/llapi/mc/RemoveVolumeEntityPacket.hpp
@@ -51,7 +51,7 @@ class RemoveVolumeEntityPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@RemoveVolumeEntityPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/RequestAbilityPacket.hpp b/LiteLoader/include/llapi/mc/RequestAbilityPacket.hpp
index 92c56b6375..baeaaea8fd 100644
--- a/LiteLoader/include/llapi/mc/RequestAbilityPacket.hpp
+++ b/LiteLoader/include/llapi/mc/RequestAbilityPacket.hpp
@@ -48,7 +48,7 @@ class RequestAbilityPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@RequestAbilityPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
@@ -58,14 +58,14 @@ class RequestAbilityPacket : public Packet {
      */
     MCVAPI ~RequestAbilityPacket();
 #endif
-    /**
-     * @symbol ??0RequestAbilityPacket\@\@QEAA\@XZ
-     */
-    MCAPI RequestAbilityPacket();
     /**
      * @symbol ??0RequestAbilityPacket\@\@QEAA\@W4AbilitiesIndex\@\@_N\@Z
      */
     MCAPI RequestAbilityPacket(enum class AbilitiesIndex, bool);
+    /**
+     * @symbol ??0RequestAbilityPacket\@\@QEAA\@XZ
+     */
+    MCAPI RequestAbilityPacket();
     /**
      * @symbol ?getAbility\@RequestAbilityPacket\@\@QEBA?AW4AbilitiesIndex\@\@XZ
      */
diff --git a/LiteLoader/include/llapi/mc/RequestChunkRadiusPacket.hpp b/LiteLoader/include/llapi/mc/RequestChunkRadiusPacket.hpp
index fb1b72ecf6..d76da3ff20 100644
--- a/LiteLoader/include/llapi/mc/RequestChunkRadiusPacket.hpp
+++ b/LiteLoader/include/llapi/mc/RequestChunkRadiusPacket.hpp
@@ -50,7 +50,7 @@ class RequestChunkRadiusPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@RequestChunkRadiusPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/RequestNetworkSettingsPacket.hpp b/LiteLoader/include/llapi/mc/RequestNetworkSettingsPacket.hpp
index dd1f0da940..44122d44ca 100644
--- a/LiteLoader/include/llapi/mc/RequestNetworkSettingsPacket.hpp
+++ b/LiteLoader/include/llapi/mc/RequestNetworkSettingsPacket.hpp
@@ -48,7 +48,7 @@ class RequestNetworkSettingsPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@RequestNetworkSettingsPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/RequestPermissionsPacket.hpp b/LiteLoader/include/llapi/mc/RequestPermissionsPacket.hpp
index 62d4afc89b..069c5280ff 100644
--- a/LiteLoader/include/llapi/mc/RequestPermissionsPacket.hpp
+++ b/LiteLoader/include/llapi/mc/RequestPermissionsPacket.hpp
@@ -48,7 +48,7 @@ class RequestPermissionsPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@RequestPermissionsPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/ResolvedItemIconInfo.hpp b/LiteLoader/include/llapi/mc/ResolvedItemIconInfo.hpp
index 69e2b9daba..bddcf887a2 100644
--- a/LiteLoader/include/llapi/mc/ResolvedItemIconInfo.hpp
+++ b/LiteLoader/include/llapi/mc/ResolvedItemIconInfo.hpp
@@ -27,21 +27,21 @@ struct ResolvedItemIconInfo {
 
 public:
     /**
-     * @symbol ??0ResolvedItemIconInfo\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@MMMMGG\@Z
+     * @symbol ??0ResolvedItemIconInfo\@\@QEAA\@IH\@Z
      */
-    MCAPI ResolvedItemIconInfo(std::string const &, float, float, float, float, unsigned short, unsigned short);
+    MCAPI ResolvedItemIconInfo(unsigned int, int);
     /**
      * @symbol ??0ResolvedItemIconInfo\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HW4ItemIconInfoType\@\@\@Z
      */
     MCAPI ResolvedItemIconInfo(std::string const &, int, enum class ItemIconInfoType);
-    /**
-     * @symbol ??0ResolvedItemIconInfo\@\@QEAA\@IH\@Z
-     */
-    MCAPI ResolvedItemIconInfo(unsigned int, int);
     /**
      * @symbol ??0ResolvedItemIconInfo\@\@QEAA\@XZ
      */
     MCAPI ResolvedItemIconInfo();
+    /**
+     * @symbol ??0ResolvedItemIconInfo\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@MMMMGG\@Z
+     */
+    MCAPI ResolvedItemIconInfo(std::string const &, float, float, float, float, unsigned short, unsigned short);
     /**
      * @symbol ??1ResolvedItemIconInfo\@\@QEAA\@XZ
      */
diff --git a/LiteLoader/include/llapi/mc/ResourceDropsContext.hpp b/LiteLoader/include/llapi/mc/ResourceDropsContext.hpp
index 179327524c..01b6514022 100644
--- a/LiteLoader/include/llapi/mc/ResourceDropsContext.hpp
+++ b/LiteLoader/include/llapi/mc/ResourceDropsContext.hpp
@@ -27,14 +27,14 @@ struct ResourceDropsContext {
 #endif
 
 public:
-    /**
-     * @symbol ??0ResourceDropsContext\@\@QEAA\@MAEBVItemStack\@\@AEBVBlockSource\@\@\@Z
-     */
-    MCAPI ResourceDropsContext(float, class ItemStack const &, class BlockSource const &);
     /**
      * @symbol ??0ResourceDropsContext\@\@QEAA\@MAEBVItemStack\@\@AEAVILevel\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@Z
      */
     MCAPI ResourceDropsContext(float, class ItemStack const &, class ILevel &, class AutomaticID<class Dimension, int>);
+    /**
+     * @symbol ??0ResourceDropsContext\@\@QEAA\@MAEBVItemStack\@\@AEBVBlockSource\@\@\@Z
+     */
+    MCAPI ResourceDropsContext(float, class ItemStack const &, class BlockSource const &);
     /**
      * @symbol ?getRandom\@ResourceDropsContext\@\@QEBAAEAVRandom\@\@XZ
      */
diff --git a/LiteLoader/include/llapi/mc/ResourceInformation.hpp b/LiteLoader/include/llapi/mc/ResourceInformation.hpp
index 7a38560424..78fa766afe 100644
--- a/LiteLoader/include/llapi/mc/ResourceInformation.hpp
+++ b/LiteLoader/include/llapi/mc/ResourceInformation.hpp
@@ -34,14 +34,14 @@ enum class ResourceType;
      * @symbol ??0ResourceInformation\@\@QEAA\@AEBV0\@\@Z
      */
     MCAPI ResourceInformation(class ResourceInformation const &);
-    /**
-     * @symbol ??0ResourceInformation\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVSemVersion\@\@AEBVUUID\@mce\@\@W4ResourceType\@0\@00\@Z
-     */
-    MCAPI ResourceInformation(std::string const &, class SemVersion const &, class mce::UUID const &, enum class ResourceInformation::ResourceType, std::string const &, std::string const &);
     /**
      * @symbol ??0ResourceInformation\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVSemVersion\@\@AEBVUUID\@mce\@\@000\@Z
      */
     MCAPI ResourceInformation(std::string const &, class SemVersion const &, class mce::UUID const &, std::string const &, std::string const &, std::string const &);
+    /**
+     * @symbol ??0ResourceInformation\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVSemVersion\@\@AEBVUUID\@mce\@\@W4ResourceType\@0\@00\@Z
+     */
+    MCAPI ResourceInformation(std::string const &, class SemVersion const &, class mce::UUID const &, enum class ResourceInformation::ResourceType, std::string const &, std::string const &);
     /**
      * @symbol ?satisfies\@ResourceInformation\@\@QEBA_NAEBUPackIdVersion\@\@\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/ResourceLocation.hpp b/LiteLoader/include/llapi/mc/ResourceLocation.hpp
index e986f3b874..76f8a77263 100644
--- a/LiteLoader/include/llapi/mc/ResourceLocation.hpp
+++ b/LiteLoader/include/llapi/mc/ResourceLocation.hpp
@@ -30,10 +30,6 @@ class ResourceLocation {
 #endif
 
 public:
-    /**
-     * @symbol ??0ResourceLocation\@\@QEAA\@AEBVPath\@Core\@\@W4ResourceFileSystem\@\@\@Z
-     */
-    MCAPI ResourceLocation(class Core::Path const &, enum class ResourceFileSystem);
     /**
      * @symbol ??0ResourceLocation\@\@QEAA\@AEBVPath\@Core\@\@\@Z
      */
@@ -42,6 +38,10 @@ class ResourceLocation {
      * @symbol ??0ResourceLocation\@\@QEAA\@XZ
      */
     MCAPI ResourceLocation();
+    /**
+     * @symbol ??0ResourceLocation\@\@QEAA\@AEBVPath\@Core\@\@W4ResourceFileSystem\@\@\@Z
+     */
+    MCAPI ResourceLocation(class Core::Path const &, enum class ResourceFileSystem);
     /**
      * @symbol ?getFullPath\@ResourceLocation\@\@QEBA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ
      */
diff --git a/LiteLoader/include/llapi/mc/ResourcePackChunkDataPacket.hpp b/LiteLoader/include/llapi/mc/ResourcePackChunkDataPacket.hpp
index 112dab7907..8ba21d97b9 100644
--- a/LiteLoader/include/llapi/mc/ResourcePackChunkDataPacket.hpp
+++ b/LiteLoader/include/llapi/mc/ResourcePackChunkDataPacket.hpp
@@ -50,7 +50,7 @@ class ResourcePackChunkDataPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@ResourcePackChunkDataPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/ResourcePackChunkRequestPacket.hpp b/LiteLoader/include/llapi/mc/ResourcePackChunkRequestPacket.hpp
index 411879acb3..3a6ebb5452 100644
--- a/LiteLoader/include/llapi/mc/ResourcePackChunkRequestPacket.hpp
+++ b/LiteLoader/include/llapi/mc/ResourcePackChunkRequestPacket.hpp
@@ -50,7 +50,7 @@ class ResourcePackChunkRequestPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@ResourcePackChunkRequestPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/ResourcePackClientResponsePacket.hpp b/LiteLoader/include/llapi/mc/ResourcePackClientResponsePacket.hpp
index 0e62ecccf5..3aa846822b 100644
--- a/LiteLoader/include/llapi/mc/ResourcePackClientResponsePacket.hpp
+++ b/LiteLoader/include/llapi/mc/ResourcePackClientResponsePacket.hpp
@@ -50,7 +50,7 @@ class ResourcePackClientResponsePacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@ResourcePackClientResponsePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/ResourcePackDataInfoPacket.hpp b/LiteLoader/include/llapi/mc/ResourcePackDataInfoPacket.hpp
index 3a29e45c15..fd637be352 100644
--- a/LiteLoader/include/llapi/mc/ResourcePackDataInfoPacket.hpp
+++ b/LiteLoader/include/llapi/mc/ResourcePackDataInfoPacket.hpp
@@ -57,7 +57,7 @@ class ResourcePackDataInfoPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@ResourcePackDataInfoPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
@@ -67,13 +67,13 @@ class ResourcePackDataInfoPacket : public Packet {
      */
     MCVAPI ~ResourcePackDataInfoPacket();
 #endif
-    /**
-     * @symbol ??0ResourcePackDataInfoPacket\@\@QEAA\@XZ
-     */
-    MCAPI ResourcePackDataInfoPacket();
     /**
      * @symbol ??0ResourcePackDataInfoPacket\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@IH_K0_NW4PackType\@\@\@Z
      */
     MCAPI ResourcePackDataInfoPacket(std::string const &, unsigned int, int, unsigned __int64, std::string const &, bool, enum class PackType);
+    /**
+     * @symbol ??0ResourcePackDataInfoPacket\@\@QEAA\@XZ
+     */
+    MCAPI ResourcePackDataInfoPacket();
 
 };
diff --git a/LiteLoader/include/llapi/mc/ResourcePackStackPacket.hpp b/LiteLoader/include/llapi/mc/ResourcePackStackPacket.hpp
index 0981a939ea..5674603c1a 100644
--- a/LiteLoader/include/llapi/mc/ResourcePackStackPacket.hpp
+++ b/LiteLoader/include/llapi/mc/ResourcePackStackPacket.hpp
@@ -50,7 +50,7 @@ class ResourcePackStackPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@ResourcePackStackPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/ResourcePacksInfoPacket.hpp b/LiteLoader/include/llapi/mc/ResourcePacksInfoPacket.hpp
index 02d7067b88..3f01e85b58 100644
--- a/LiteLoader/include/llapi/mc/ResourcePacksInfoPacket.hpp
+++ b/LiteLoader/include/llapi/mc/ResourcePacksInfoPacket.hpp
@@ -57,7 +57,7 @@ class ResourcePacksInfoPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@ResourcePacksInfoPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/RespawnPacket.hpp b/LiteLoader/include/llapi/mc/RespawnPacket.hpp
index d0d7e81663..cd8afc30da 100644
--- a/LiteLoader/include/llapi/mc/RespawnPacket.hpp
+++ b/LiteLoader/include/llapi/mc/RespawnPacket.hpp
@@ -78,7 +78,7 @@ return #var;
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@RespawnPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/RideableComponent.hpp b/LiteLoader/include/llapi/mc/RideableComponent.hpp
index c04da2475b..4212607092 100644
--- a/LiteLoader/include/llapi/mc/RideableComponent.hpp
+++ b/LiteLoader/include/llapi/mc/RideableComponent.hpp
@@ -27,10 +27,6 @@ class RideableComponent {
 #endif
 
 public:
-    /**
-     * @symbol ??0RideableComponent\@\@QEAA\@XZ
-     */
-    MCAPI RideableComponent();
     /**
      * @symbol ??0RideableComponent\@\@QEAA\@AEBV0\@\@Z
      */
@@ -39,6 +35,10 @@ class RideableComponent {
      * @symbol ??0RideableComponent\@\@QEAA\@$$QEAV0\@\@Z
      */
     MCAPI RideableComponent(class RideableComponent &&);
+    /**
+     * @symbol ??0RideableComponent\@\@QEAA\@XZ
+     */
+    MCAPI RideableComponent();
     /**
      * @symbol ?areSeatsFull\@RideableComponent\@\@QEBA_NAEBVActor\@\@\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/RotationUtil.hpp b/LiteLoader/include/llapi/mc/RotationUtil.hpp
index 0eadd8a8f2..69b1aa0a1f 100644
--- a/LiteLoader/include/llapi/mc/RotationUtil.hpp
+++ b/LiteLoader/include/llapi/mc/RotationUtil.hpp
@@ -33,13 +33,13 @@ namespace RotationUtil {
      * @symbol ?getShuffledRotations\@RotationUtil\@\@YA?AV?$vector\@W4Rotation\@\@V?$allocator\@W4Rotation\@\@\@std\@\@\@std\@\@AEAVRandom\@\@\@Z
      */
     MCAPI std::vector<enum class Rotation> getShuffledRotations(class Random &);
-    /**
-     * @symbol ?rotate\@RotationUtil\@\@YA?AVBlockPos\@\@AEBV2\@W4Rotation\@\@\@Z
-     */
-    MCAPI class BlockPos rotate(class BlockPos const &, enum class Rotation);
     /**
      * @symbol ?rotate\@RotationUtil\@\@YAEW4Rotation\@\@E\@Z
      */
     MCAPI unsigned char rotate(enum class Rotation, unsigned char);
+    /**
+     * @symbol ?rotate\@RotationUtil\@\@YA?AVBlockPos\@\@AEBV2\@W4Rotation\@\@\@Z
+     */
+    MCAPI class BlockPos rotate(class BlockPos const &, enum class Rotation);
 
 };
\ No newline at end of file
diff --git a/LiteLoader/include/llapi/mc/Scoreboard.hpp b/LiteLoader/include/llapi/mc/Scoreboard.hpp
index ceee13eb85..fdbed1fc40 100644
--- a/LiteLoader/include/llapi/mc/Scoreboard.hpp
+++ b/LiteLoader/include/llapi/mc/Scoreboard.hpp
@@ -426,14 +426,14 @@ class Scoreboard {
      * @symbol ?getScoreboardEventCoordinator\@Scoreboard\@\@QEAAAEAVScoreboardEventCoordinator\@\@XZ
      */
     MCAPI class ScoreboardEventCoordinator & getScoreboardEventCoordinator();
-    /**
-     * @symbol ?getScoreboardId\@Scoreboard\@\@QEBAAEBUScoreboardId\@\@AEBVActor\@\@\@Z
-     */
-    MCAPI struct ScoreboardId const & getScoreboardId(class Actor const &) const;
     /**
      * @symbol ?getScoreboardId\@Scoreboard\@\@QEBAAEBUScoreboardId\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z
      */
     MCAPI struct ScoreboardId const & getScoreboardId(std::string const &) const;
+    /**
+     * @symbol ?getScoreboardId\@Scoreboard\@\@QEBAAEBUScoreboardId\@\@AEBVActor\@\@\@Z
+     */
+    MCAPI struct ScoreboardId const & getScoreboardId(class Actor const &) const;
     /**
      * @symbol ?getScoreboardId\@Scoreboard\@\@QEBAAEBUScoreboardId\@\@AEBVPlayer\@\@\@Z
      */
@@ -470,10 +470,6 @@ class Scoreboard {
      * @symbol ?registerScoreboardIdentity\@Scoreboard\@\@QEAAAEBVScoreboardIdentityRef\@\@AEBUScoreboardId\@\@AEBUActorUniqueID\@\@\@Z
      */
     MCAPI class ScoreboardIdentityRef const & registerScoreboardIdentity(struct ScoreboardId const &, struct ActorUniqueID const &);
-    /**
-     * @symbol ?registerScoreboardIdentity\@Scoreboard\@\@QEAAAEBVScoreboardIdentityRef\@\@AEBUScoreboardId\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z
-     */
-    MCAPI class ScoreboardIdentityRef const & registerScoreboardIdentity(struct ScoreboardId const &, std::string const &);
     /**
      * @symbol ?registerScoreboardIdentity\@Scoreboard\@\@QEAAAEBVScoreboardIdentityRef\@\@AEBUScoreboardId\@\@AEBUPlayerScoreboardId\@\@\@Z
      */
@@ -483,17 +479,21 @@ class Scoreboard {
      */
     MCAPI class ScoreboardIdentityRef const & registerScoreboardIdentity(class CompoundTag const &);
     /**
-     * @symbol ?removeObjective\@Scoreboard\@\@QEAA_NPEAVObjective\@\@\@Z
+     * @symbol ?registerScoreboardIdentity\@Scoreboard\@\@QEAAAEBVScoreboardIdentityRef\@\@AEBUScoreboardId\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z
      */
-    MCAPI bool removeObjective(class Objective *);
+    MCAPI class ScoreboardIdentityRef const & registerScoreboardIdentity(struct ScoreboardId const &, std::string const &);
     /**
-     * @symbol ?removeScoreListener\@Scoreboard\@\@QEAAXAEBVPlayer\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z
+     * @symbol ?removeObjective\@Scoreboard\@\@QEAA_NPEAVObjective\@\@\@Z
      */
-    MCAPI void removeScoreListener(class Player const &, std::string const &);
+    MCAPI bool removeObjective(class Objective *);
     /**
      * @symbol ?removeScoreListener\@Scoreboard\@\@QEAAXAEBVPlayer\@\@\@Z
      */
     MCAPI void removeScoreListener(class Player const &);
+    /**
+     * @symbol ?removeScoreListener\@Scoreboard\@\@QEAAXAEBVPlayer\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z
+     */
+    MCAPI void removeScoreListener(class Player const &, std::string const &);
     /**
      * @symbol ?replaceFakePlayer\@Scoreboard\@\@QEAAXAEBUScoreboardId\@\@AEBUPlayerScoreboardId\@\@\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/ScoreboardId.hpp b/LiteLoader/include/llapi/mc/ScoreboardId.hpp
index 25e3b26ae1..27995b0859 100644
--- a/LiteLoader/include/llapi/mc/ScoreboardId.hpp
+++ b/LiteLoader/include/llapi/mc/ScoreboardId.hpp
@@ -24,14 +24,14 @@ struct ScoreboardId {
     void* null;
 #undef AFTER_EXTRA
 public:
-    /**
-     * @symbol ??0ScoreboardId\@\@QEAA\@_J\@Z
-     */
-    MCAPI ScoreboardId(__int64);
     /**
      * @symbol ??0ScoreboardId\@\@QEAA\@XZ
      */
     MCAPI ScoreboardId();
+    /**
+     * @symbol ??0ScoreboardId\@\@QEAA\@_J\@Z
+     */
+    MCAPI ScoreboardId(__int64);
     /**
      * @symbol ??0ScoreboardId\@\@QEAA\@AEBU0\@\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/ScriptCustomEventPacket.hpp b/LiteLoader/include/llapi/mc/ScriptCustomEventPacket.hpp
index 344b56db1a..7116dcf8f9 100644
--- a/LiteLoader/include/llapi/mc/ScriptCustomEventPacket.hpp
+++ b/LiteLoader/include/llapi/mc/ScriptCustomEventPacket.hpp
@@ -50,7 +50,7 @@ class ScriptCustomEventPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@ScriptCustomEventPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/ScriptMessagePacket.hpp b/LiteLoader/include/llapi/mc/ScriptMessagePacket.hpp
index c4cfdbc0f5..b060f77d27 100644
--- a/LiteLoader/include/llapi/mc/ScriptMessagePacket.hpp
+++ b/LiteLoader/include/llapi/mc/ScriptMessagePacket.hpp
@@ -48,7 +48,7 @@ class ScriptMessagePacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@ScriptMessagePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/ScriptPackConfiguration.hpp b/LiteLoader/include/llapi/mc/ScriptPackConfiguration.hpp
index 40eeac5637..bf69b94761 100644
--- a/LiteLoader/include/llapi/mc/ScriptPackConfiguration.hpp
+++ b/LiteLoader/include/llapi/mc/ScriptPackConfiguration.hpp
@@ -27,17 +27,17 @@ class ScriptPackConfiguration {
 
 public:
     /**
-     * @symbol ??0ScriptPackConfiguration\@\@QEAA\@$$QEAV0\@\@Z
+     * @symbol ??0ScriptPackConfiguration\@\@QEAA\@AEBV0\@\@Z
      */
-    MCAPI ScriptPackConfiguration(class ScriptPackConfiguration &&);
+    MCAPI ScriptPackConfiguration(class ScriptPackConfiguration const &);
     /**
      * @symbol ??0ScriptPackConfiguration\@\@QEAA\@XZ
      */
     MCAPI ScriptPackConfiguration();
     /**
-     * @symbol ??0ScriptPackConfiguration\@\@QEAA\@AEBV0\@\@Z
+     * @symbol ??0ScriptPackConfiguration\@\@QEAA\@$$QEAV0\@\@Z
      */
-    MCAPI ScriptPackConfiguration(class ScriptPackConfiguration const &);
+    MCAPI ScriptPackConfiguration(class ScriptPackConfiguration &&);
     /**
      * @symbol ?getPermissions\@ScriptPackConfiguration\@\@QEAAAEAVScriptPackPermissions\@\@XZ
      */
diff --git a/LiteLoader/include/llapi/mc/ScriptPackConfigurationManager.hpp b/LiteLoader/include/llapi/mc/ScriptPackConfigurationManager.hpp
index 262a6a3576..39f4e45448 100644
--- a/LiteLoader/include/llapi/mc/ScriptPackConfigurationManager.hpp
+++ b/LiteLoader/include/llapi/mc/ScriptPackConfigurationManager.hpp
@@ -26,14 +26,14 @@ class ScriptPackConfigurationManager {
 #endif
 
 public:
-    /**
-     * @symbol ??0ScriptPackConfigurationManager\@\@QEAA\@XZ
-     */
-    MCAPI ScriptPackConfigurationManager();
     /**
      * @symbol ??0ScriptPackConfigurationManager\@\@QEAA\@AEBV0\@\@Z
      */
     MCAPI ScriptPackConfigurationManager(class ScriptPackConfigurationManager const &);
+    /**
+     * @symbol ??0ScriptPackConfigurationManager\@\@QEAA\@XZ
+     */
+    MCAPI ScriptPackConfigurationManager();
     /**
      * @symbol ?getPackConfiguration\@ScriptPackConfigurationManager\@\@QEBAAEBVScriptPackConfiguration\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/ScriptPluginHandleStats.hpp b/LiteLoader/include/llapi/mc/ScriptPluginHandleStats.hpp
index 9d1e682cd1..16dd79f862 100644
--- a/LiteLoader/include/llapi/mc/ScriptPluginHandleStats.hpp
+++ b/LiteLoader/include/llapi/mc/ScriptPluginHandleStats.hpp
@@ -26,14 +26,14 @@ struct ScriptPluginHandleStats {
 #endif
 
 public:
-    /**
-     * @symbol ??4ScriptPluginHandleStats\@\@QEAAAEAU0\@$$QEAU0\@\@Z
-     */
-    MCAPI struct ScriptPluginHandleStats & operator=(struct ScriptPluginHandleStats &&);
     /**
      * @symbol ??4ScriptPluginHandleStats\@\@QEAAAEAU0\@AEBU0\@\@Z
      */
     MCAPI struct ScriptPluginHandleStats & operator=(struct ScriptPluginHandleStats const &);
+    /**
+     * @symbol ??4ScriptPluginHandleStats\@\@QEAAAEAU0\@$$QEAU0\@\@Z
+     */
+    MCAPI struct ScriptPluginHandleStats & operator=(struct ScriptPluginHandleStats &&);
     /**
      * @symbol ??1ScriptPluginHandleStats\@\@QEAA\@XZ
      */
diff --git a/LiteLoader/include/llapi/mc/ScriptPluginStats.hpp b/LiteLoader/include/llapi/mc/ScriptPluginStats.hpp
index 117dbc756c..f109e71406 100644
--- a/LiteLoader/include/llapi/mc/ScriptPluginStats.hpp
+++ b/LiteLoader/include/llapi/mc/ScriptPluginStats.hpp
@@ -26,14 +26,14 @@ struct ScriptPluginStats {
 #endif
 
 public:
-    /**
-     * @symbol ??4ScriptPluginStats\@\@QEAAAEAU0\@$$QEAU0\@\@Z
-     */
-    MCAPI struct ScriptPluginStats & operator=(struct ScriptPluginStats &&);
     /**
      * @symbol ??4ScriptPluginStats\@\@QEAAAEAU0\@AEBU0\@\@Z
      */
     MCAPI struct ScriptPluginStats & operator=(struct ScriptPluginStats const &);
+    /**
+     * @symbol ??4ScriptPluginStats\@\@QEAAAEAU0\@$$QEAU0\@\@Z
+     */
+    MCAPI struct ScriptPluginStats & operator=(struct ScriptPluginStats &&);
     /**
      * @symbol ??1ScriptPluginStats\@\@QEAA\@XZ
      */
diff --git a/LiteLoader/include/llapi/mc/ScriptResultUtil.hpp b/LiteLoader/include/llapi/mc/ScriptResultUtil.hpp
index 4cb5b52311..61db3b1ca7 100644
--- a/LiteLoader/include/llapi/mc/ScriptResultUtil.hpp
+++ b/LiteLoader/include/llapi/mc/ScriptResultUtil.hpp
@@ -22,14 +22,14 @@ namespace ScriptResultUtil {
 // Add Member There
 
 #undef AFTER_EXTRA
-    /**
-     * @symbol ?GametestResultToScriptingValueResult\@ScriptResultUtil\@\@YA?AV?$Result\@V?$StrongTypedObjectHandle\@VVec3\@\@\@Scripting\@\@\@Scripting\@\@AEBV?$variant\@UGameTestError\@gametest\@\@VBlockPos\@\@\@std\@\@AEBVWeakLifetimeScope\@3\@\@Z
-     */
-    MCAPI class Scripting::Result<class Scripting::StrongTypedObjectHandle<class Vec3>> GametestResultToScriptingValueResult(class std::variant<struct gametest::GameTestError, class BlockPos> const &, class Scripting::WeakLifetimeScope const &);
     /**
      * @symbol ?GametestResultToScriptingValueResult\@ScriptResultUtil\@\@YA?AV?$Result\@V?$StrongTypedObjectHandle\@VVec3\@\@\@Scripting\@\@\@Scripting\@\@AEBV?$variant\@UGameTestError\@gametest\@\@VVec3\@\@\@std\@\@AEBVWeakLifetimeScope\@3\@\@Z
      */
     MCAPI class Scripting::Result<class Scripting::StrongTypedObjectHandle<class Vec3>> GametestResultToScriptingValueResult(class std::variant<struct gametest::GameTestError, class Vec3> const &, class Scripting::WeakLifetimeScope const &);
+    /**
+     * @symbol ?GametestResultToScriptingValueResult\@ScriptResultUtil\@\@YA?AV?$Result\@V?$StrongTypedObjectHandle\@VVec3\@\@\@Scripting\@\@\@Scripting\@\@AEBV?$variant\@UGameTestError\@gametest\@\@VBlockPos\@\@\@std\@\@AEBVWeakLifetimeScope\@3\@\@Z
+     */
+    MCAPI class Scripting::Result<class Scripting::StrongTypedObjectHandle<class Vec3>> GametestResultToScriptingValueResult(class std::variant<struct gametest::GameTestError, class BlockPos> const &, class Scripting::WeakLifetimeScope const &);
     /**
      * @symbol ?ScriptingResultToGameTestResult\@ScriptResultUtil\@\@YA?AV?$optional\@UGameTestError\@gametest\@\@\@std\@\@AEBVResultAny\@Scripting\@\@\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/ScriptingEventCoordinator.hpp b/LiteLoader/include/llapi/mc/ScriptingEventCoordinator.hpp
index 2fee3019a0..8f59b315cf 100644
--- a/LiteLoader/include/llapi/mc/ScriptingEventCoordinator.hpp
+++ b/LiteLoader/include/llapi/mc/ScriptingEventCoordinator.hpp
@@ -35,13 +35,13 @@ class ScriptingEventCoordinator {
      * @symbol ?registerScriptingEventHandler\@ScriptingEventCoordinator\@\@QEAAX$$QEAV?$unique_ptr\@VScriptingEventHandler\@\@U?$default_delete\@VScriptingEventHandler\@\@\@std\@\@\@std\@\@\@Z
      */
     MCAPI void registerScriptingEventHandler(std::unique_ptr<class ScriptingEventHandler> &&);
-    /**
-     * @symbol ?sendEvent\@ScriptingEventCoordinator\@\@QEAA?AW4CoordinatorResult\@\@V?$EventRef\@U?$ScriptingGameplayEvent\@W4CoordinatorResult\@\@\@\@\@\@\@Z
-     */
-    MCAPI enum class CoordinatorResult sendEvent(class EventRef<struct ScriptingGameplayEvent<enum class CoordinatorResult>>);
     /**
      * @symbol ?sendEvent\@ScriptingEventCoordinator\@\@QEAA?AW4CoordinatorResult\@\@V?$EventRef\@U?$MutableScriptingGameplayEvent\@W4CoordinatorResult\@\@\@\@\@\@\@Z
      */
     MCAPI enum class CoordinatorResult sendEvent(class EventRef<struct MutableScriptingGameplayEvent<enum class CoordinatorResult>>);
+    /**
+     * @symbol ?sendEvent\@ScriptingEventCoordinator\@\@QEAA?AW4CoordinatorResult\@\@V?$EventRef\@U?$ScriptingGameplayEvent\@W4CoordinatorResult\@\@\@\@\@\@\@Z
+     */
+    MCAPI enum class CoordinatorResult sendEvent(class EventRef<struct ScriptingGameplayEvent<enum class CoordinatorResult>>);
 
 };
diff --git a/LiteLoader/include/llapi/mc/SemVersion.hpp b/LiteLoader/include/llapi/mc/SemVersion.hpp
index f86ec8c394..360b9b183e 100644
--- a/LiteLoader/include/llapi/mc/SemVersion.hpp
+++ b/LiteLoader/include/llapi/mc/SemVersion.hpp
@@ -45,10 +45,6 @@ bool mValidVersion, mAnyVersion;                      // 104, 105
      * @symbol ??0SemVersion\@\@QEAA\@GGGAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z
      */
     MCAPI SemVersion(unsigned short, unsigned short, unsigned short, std::string const &, std::string const &);
-    /**
-     * @symbol ??0SemVersion\@\@QEAA\@XZ
-     */
-    MCAPI SemVersion();
     /**
      * @symbol ??0SemVersion\@\@QEAA\@Uany_version_constructor\@0\@\@Z
      */
@@ -57,6 +53,10 @@ bool mValidVersion, mAnyVersion;                      // 104, 105
      * @symbol ??0SemVersion\@\@QEAA\@AEBV0\@\@Z
      */
     MCAPI SemVersion(class SemVersion const &);
+    /**
+     * @symbol ??0SemVersion\@\@QEAA\@XZ
+     */
+    MCAPI SemVersion();
     /**
      * @symbol ?asString\@SemVersion\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ
      */
diff --git a/LiteLoader/include/llapi/mc/SerializedAbilitiesData.hpp b/LiteLoader/include/llapi/mc/SerializedAbilitiesData.hpp
index 4ac638f63d..974ae5f029 100644
--- a/LiteLoader/include/llapi/mc/SerializedAbilitiesData.hpp
+++ b/LiteLoader/include/llapi/mc/SerializedAbilitiesData.hpp
@@ -27,14 +27,14 @@ struct SerializedAbilitiesData {
 #endif
 
 public:
-    /**
-     * @symbol ??0SerializedAbilitiesData\@\@QEAA\@UActorUniqueID\@\@AEBVLayeredAbilities\@\@\@Z
-     */
-    MCAPI SerializedAbilitiesData(struct ActorUniqueID, class LayeredAbilities const &);
     /**
      * @symbol ??0SerializedAbilitiesData\@\@QEAA\@XZ
      */
     MCAPI SerializedAbilitiesData();
+    /**
+     * @symbol ??0SerializedAbilitiesData\@\@QEAA\@UActorUniqueID\@\@AEBVLayeredAbilities\@\@\@Z
+     */
+    MCAPI SerializedAbilitiesData(struct ActorUniqueID, class LayeredAbilities const &);
     /**
      * @symbol ?fillIn\@SerializedAbilitiesData\@\@QEBAXAEAVLayeredAbilities\@\@\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/SerializedSkin.hpp b/LiteLoader/include/llapi/mc/SerializedSkin.hpp
index cf13ff4e5d..5e6f890125 100644
--- a/LiteLoader/include/llapi/mc/SerializedSkin.hpp
+++ b/LiteLoader/include/llapi/mc/SerializedSkin.hpp
@@ -23,14 +23,14 @@ class SerializedSkin {
     char filler[620];
 #undef AFTER_EXTRA
 public:
-    /**
-     * @symbol ??0SerializedSkin\@\@QEAA\@AEBVSubClientConnectionRequest\@\@\@Z
-     */
-    MCAPI SerializedSkin(class SubClientConnectionRequest const &);
     /**
      * @symbol ??0SerializedSkin\@\@QEAA\@AEBV0\@\@Z
      */
     MCAPI SerializedSkin(class SerializedSkin const &);
+    /**
+     * @symbol ??0SerializedSkin\@\@QEAA\@AEBVSubClientConnectionRequest\@\@\@Z
+     */
+    MCAPI SerializedSkin(class SubClientConnectionRequest const &);
     /**
      * @symbol ??0SerializedSkin\@\@QEAA\@XZ
      */
diff --git a/LiteLoader/include/llapi/mc/SerializerContext.hpp b/LiteLoader/include/llapi/mc/SerializerContext.hpp
index 54d62fa47d..a961565474 100644
--- a/LiteLoader/include/llapi/mc/SerializerContext.hpp
+++ b/LiteLoader/include/llapi/mc/SerializerContext.hpp
@@ -27,14 +27,14 @@ class SerializerContext {
 #endif
 
 public:
-    /**
-     * @symbol ??0SerializerContext\@\@QEAA\@XZ
-     */
-    MCAPI SerializerContext();
     /**
      * @symbol ??0SerializerContext\@\@QEAA\@AEBV0\@\@Z
      */
     MCAPI SerializerContext(class SerializerContext const &);
+    /**
+     * @symbol ??0SerializerContext\@\@QEAA\@XZ
+     */
+    MCAPI SerializerContext();
     /**
      * @symbol ?clear\@SerializerContext\@\@QEAAXXZ
      */
diff --git a/LiteLoader/include/llapi/mc/ServerNetworkHandler.hpp b/LiteLoader/include/llapi/mc/ServerNetworkHandler.hpp
index 951d48368a..86459b5e87 100644
--- a/LiteLoader/include/llapi/mc/ServerNetworkHandler.hpp
+++ b/LiteLoader/include/llapi/mc/ServerNetworkHandler.hpp
@@ -62,6 +62,14 @@ class ServerNetworkHandler {
      * @symbol ?getGameSpecificNetEventCallback\@ServerNetworkHandler\@\@UEAAPEAVGameSpecificNetEventCallback\@\@XZ
      */
     MCVAPI class GameSpecificNetEventCallback * getGameSpecificNetEventCallback();
+    /**
+     * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVMapCreateLockedCopyPacket\@\@\@Z
+     */
+    MCVAPI void handle(class NetworkIdentifier const &, class MapCreateLockedCopyPacket const &);
+    /**
+     * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVResourcePackChunkRequestPacket\@\@\@Z
+     */
+    MCVAPI void handle(class NetworkIdentifier const &, class ResourcePackChunkRequestPacket const &);
     /**
      * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVChangeMobPropertyPacket\@\@\@Z
      */
@@ -87,81 +95,89 @@ class ServerNetworkHandler {
      */
     MCVAPI void handle(class NetworkIdentifier const &, class CompletedUsingItemPacket const &);
     /**
-     * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVActorPickRequestPacket\@\@\@Z
+     * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVItemStackRequestPacket\@\@\@Z
      */
-    MCVAPI void handle(class NetworkIdentifier const &, class ActorPickRequestPacket const &);
+    MCVAPI void handle(class NetworkIdentifier const &, class ItemStackRequestPacket const &);
     /**
-     * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPlayerSkinPacket\@\@\@Z
+     * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVInventoryTransactionPacket\@\@\@Z
      */
-    MCVAPI void handle(class NetworkIdentifier const &, class PlayerSkinPacket const &);
+    MCVAPI void handle(class NetworkIdentifier const &, class InventoryTransactionPacket const &);
     /**
-     * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVClientCacheBlobStatusPacket\@\@\@Z
+     * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVTextPacket\@\@\@Z
      */
-    MCVAPI void handle(class NetworkIdentifier const &, class ClientCacheBlobStatusPacket const &);
+    MCVAPI void handle(class NetworkIdentifier const &, class TextPacket const &);
     /**
-     * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPlayerInputPacket\@\@\@Z
+     * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVRequestPermissionsPacket\@\@\@Z
      */
-    MCVAPI void handle(class NetworkIdentifier const &, class PlayerInputPacket const &);
+    MCVAPI void handle(class NetworkIdentifier const &, class RequestPermissionsPacket const &);
+    /**
+     * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPlayerSkinPacket\@\@\@Z
+     */
+    MCVAPI void handle(class NetworkIdentifier const &, class PlayerSkinPacket const &);
+    /**
+     * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVLabTablePacket\@\@\@Z
+     */
+    MCVAPI void handle(class NetworkIdentifier const &, class LabTablePacket const &);
     /**
      * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVCodeBuilderSourcePacket\@\@\@Z
      */
     MCVAPI void handle(class NetworkIdentifier const &, class CodeBuilderSourcePacket const &);
     /**
-     * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSpawnExperienceOrbPacket\@\@\@Z
+     * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVNpcRequestPacket\@\@\@Z
      */
-    MCVAPI void handle(class NetworkIdentifier const &, class SpawnExperienceOrbPacket const &);
+    MCVAPI void handle(class NetworkIdentifier const &, class NpcRequestPacket const &);
     /**
-     * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVMapCreateLockedCopyPacket\@\@\@Z
+     * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVMovePlayerPacket\@\@\@Z
      */
-    MCVAPI void handle(class NetworkIdentifier const &, class MapCreateLockedCopyPacket const &);
+    MCVAPI void handle(class NetworkIdentifier const &, class MovePlayerPacket const &);
     /**
      * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVClientCacheStatusPacket\@\@\@Z
      */
     MCVAPI void handle(class NetworkIdentifier const &, class ClientCacheStatusPacket const &);
     /**
-     * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVLabTablePacket\@\@\@Z
-     */
-    MCVAPI void handle(class NetworkIdentifier const &, class LabTablePacket const &);
-    /**
-     * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVResourcePackChunkRequestPacket\@\@\@Z
+     * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPlayerInputPacket\@\@\@Z
      */
-    MCVAPI void handle(class NetworkIdentifier const &, class ResourcePackChunkRequestPacket const &);
+    MCVAPI void handle(class NetworkIdentifier const &, class PlayerInputPacket const &);
     /**
-     * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVNpcRequestPacket\@\@\@Z
+     * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVBlockPickRequestPacket\@\@\@Z
      */
-    MCVAPI void handle(class NetworkIdentifier const &, class NpcRequestPacket const &);
+    MCVAPI void handle(class NetworkIdentifier const &, class BlockPickRequestPacket const &);
     /**
-     * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVRequestChunkRadiusPacket\@\@\@Z
+     * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVMapInfoRequestPacket\@\@\@Z
      */
-    MCVAPI void handle(class NetworkIdentifier const &, class RequestChunkRadiusPacket const &);
+    MCVAPI void handle(class NetworkIdentifier const &, class MapInfoRequestPacket const &);
     /**
-     * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVMovePlayerPacket\@\@\@Z
+     * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVRequestAbilityPacket\@\@\@Z
      */
-    MCVAPI void handle(class NetworkIdentifier const &, class MovePlayerPacket const &);
+    MCVAPI void handle(class NetworkIdentifier const &, class RequestAbilityPacket const &);
     /**
-     * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSetPlayerGameTypePacket\@\@\@Z
+     * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPlayerAuthInputPacket\@\@\@Z
      */
-    MCVAPI void handle(class NetworkIdentifier const &, class SetPlayerGameTypePacket const &);
+    MCVAPI void handle(class NetworkIdentifier const &, class PlayerAuthInputPacket const &);
     /**
      * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVItemFrameDropItemPacket\@\@\@Z
      */
     MCVAPI void handle(class NetworkIdentifier const &, class ItemFrameDropItemPacket const &);
     /**
-     * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@V?$shared_ptr\@VBlockActorDataPacket\@\@\@std\@\@\@Z
+     * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVBossEventPacket\@\@\@Z
      */
-    MCVAPI void handle(class NetworkIdentifier const &, class std::shared_ptr<class BlockActorDataPacket>);
+    MCVAPI void handle(class NetworkIdentifier const &, class BossEventPacket const &);
     /**
-     * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVBlockPickRequestPacket\@\@\@Z
+     * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVMobEquipmentPacket\@\@\@Z
      */
-    MCVAPI void handle(class NetworkIdentifier const &, class BlockPickRequestPacket const &);
+    MCVAPI void handle(class NetworkIdentifier const &, class MobEquipmentPacket const &);
     /**
-     * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPlayerAuthInputPacket\@\@\@Z
+     * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPassengerJumpPacket\@\@\@Z
      */
-    MCVAPI void handle(class NetworkIdentifier const &, class PlayerAuthInputPacket const &);
+    MCVAPI void handle(class NetworkIdentifier const &, class PassengerJumpPacket const &);
     /**
      * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVUpdatePlayerGameTypePacket\@\@\@Z
      */
     MCVAPI void handle(class NetworkIdentifier const &, class UpdatePlayerGameTypePacket const &);
+    /**
+     * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVRequestChunkRadiusPacket\@\@\@Z
+     */
+    MCVAPI void handle(class NetworkIdentifier const &, class RequestChunkRadiusPacket const &);
     /**
      * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVLevelSoundEventPacket\@\@\@Z
      */
@@ -170,22 +186,14 @@ class ServerNetworkHandler {
      * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVLevelSoundEventPacketV2\@\@\@Z
      */
     MCVAPI void handle(class NetworkIdentifier const &, class LevelSoundEventPacketV2 const &);
-    /**
-     * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVRequestAbilityPacket\@\@\@Z
-     */
-    MCVAPI void handle(class NetworkIdentifier const &, class RequestAbilityPacket const &);
-    /**
-     * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVMultiplayerSettingsPacket\@\@\@Z
-     */
-    MCVAPI void handle(class NetworkIdentifier const &, class MultiplayerSettingsPacket const &);
     /**
      * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPlayerHotbarPacket\@\@\@Z
      */
     MCVAPI void handle(class NetworkIdentifier const &, class PlayerHotbarPacket const &);
     /**
-     * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVRespawnPacket\@\@\@Z
+     * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVCommandBlockUpdatePacket\@\@\@Z
      */
-    MCVAPI void handle(class NetworkIdentifier const &, class RespawnPacket const &);
+    MCVAPI void handle(class NetworkIdentifier const &, class CommandBlockUpdatePacket const &);
     /**
      * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVEmotePacket\@\@\@Z
      */
@@ -195,13 +203,21 @@ class ServerNetworkHandler {
      */
     MCVAPI void handle(class NetworkIdentifier const &, class SubChunkRequestPacket const &);
     /**
-     * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVInventoryTransactionPacket\@\@\@Z
+     * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVClientCacheBlobStatusPacket\@\@\@Z
      */
-    MCVAPI void handle(class NetworkIdentifier const &, class InventoryTransactionPacket const &);
+    MCVAPI void handle(class NetworkIdentifier const &, class ClientCacheBlobStatusPacket const &);
     /**
-     * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVBossEventPacket\@\@\@Z
+     * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVScriptMessagePacket\@\@\@Z
      */
-    MCVAPI void handle(class NetworkIdentifier const &, class BossEventPacket const &);
+    MCVAPI void handle(class NetworkIdentifier const &, class ScriptMessagePacket const &);
+    /**
+     * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVActorEventPacket\@\@\@Z
+     */
+    MCVAPI void handle(class NetworkIdentifier const &, class ActorEventPacket const &);
+    /**
+     * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSpawnExperienceOrbPacket\@\@\@Z
+     */
+    MCVAPI void handle(class NetworkIdentifier const &, class SpawnExperienceOrbPacket const &);
     /**
      * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVCommandRequestPacket\@\@\@Z
      */
@@ -214,6 +230,10 @@ class ServerNetworkHandler {
      * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSetDifficultyPacket\@\@\@Z
      */
     MCVAPI void handle(class NetworkIdentifier const &, class SetDifficultyPacket const &);
+    /**
+     * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVContainerClosePacket\@\@\@Z
+     */
+    MCVAPI void handle(class NetworkIdentifier const &, class ContainerClosePacket const &);
     /**
      * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVEmoteListPacket\@\@\@Z
      */
@@ -222,10 +242,6 @@ class ServerNetworkHandler {
      * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSetLocalPlayerAsInitializedPacket\@\@\@Z
      */
     MCVAPI void handle(class NetworkIdentifier const &, class SetLocalPlayerAsInitializedPacket const &);
-    /**
-     * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPassengerJumpPacket\@\@\@Z
-     */
-    MCVAPI void handle(class NetworkIdentifier const &, class PassengerJumpPacket const &);
     /**
      * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSimpleEventPacket\@\@\@Z
      */
@@ -235,25 +251,17 @@ class ServerNetworkHandler {
      */
     MCVAPI void handle(class NetworkIdentifier const &, class ModalFormResponsePacket const &);
     /**
-     * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVMapInfoRequestPacket\@\@\@Z
-     */
-    MCVAPI void handle(class NetworkIdentifier const &, class MapInfoRequestPacket const &);
-    /**
-     * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVMobEquipmentPacket\@\@\@Z
-     */
-    MCVAPI void handle(class NetworkIdentifier const &, class MobEquipmentPacket const &);
-    /**
-     * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVScriptMessagePacket\@\@\@Z
+     * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@V?$shared_ptr\@VBlockActorDataPacket\@\@\@std\@\@\@Z
      */
-    MCVAPI void handle(class NetworkIdentifier const &, class ScriptMessagePacket const &);
+    MCVAPI void handle(class NetworkIdentifier const &, class std::shared_ptr<class BlockActorDataPacket>);
     /**
-     * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVRequestPermissionsPacket\@\@\@Z
+     * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVStructureTemplateDataRequestPacket\@\@\@Z
      */
-    MCVAPI void handle(class NetworkIdentifier const &, class RequestPermissionsPacket const &);
+    MCVAPI void handle(class NetworkIdentifier const &, class StructureTemplateDataRequestPacket const &);
     /**
-     * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVContainerClosePacket\@\@\@Z
+     * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSetPlayerGameTypePacket\@\@\@Z
      */
-    MCVAPI void handle(class NetworkIdentifier const &, class ContainerClosePacket const &);
+    MCVAPI void handle(class NetworkIdentifier const &, class SetPlayerGameTypePacket const &);
     /**
      * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVBookEditPacket\@\@\@Z
      */
@@ -267,25 +275,29 @@ class ServerNetworkHandler {
      */
     MCVAPI void handle(class NetworkIdentifier const &, class CraftingEventPacket const &);
     /**
-     * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVTextPacket\@\@\@Z
+     * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVStructureBlockUpdatePacket\@\@\@Z
      */
-    MCVAPI void handle(class NetworkIdentifier const &, class TextPacket const &);
+    MCVAPI void handle(class NetworkIdentifier const &, class StructureBlockUpdatePacket const &);
     /**
-     * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSettingsCommandPacket\@\@\@Z
+     * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVRespawnPacket\@\@\@Z
      */
-    MCVAPI void handle(class NetworkIdentifier const &, class SettingsCommandPacket const &);
+    MCVAPI void handle(class NetworkIdentifier const &, class RespawnPacket const &);
     /**
      * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVAnvilDamagePacket\@\@\@Z
      */
     MCVAPI void handle(class NetworkIdentifier const &, class AnvilDamagePacket const &);
     /**
-     * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVActorEventPacket\@\@\@Z
+     * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSettingsCommandPacket\@\@\@Z
      */
-    MCVAPI void handle(class NetworkIdentifier const &, class ActorEventPacket const &);
+    MCVAPI void handle(class NetworkIdentifier const &, class SettingsCommandPacket const &);
     /**
      * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVRequestNetworkSettingsPacket\@\@\@Z
      */
     MCVAPI void handle(class NetworkIdentifier const &, class RequestNetworkSettingsPacket const &);
+    /**
+     * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVNetworkStackLatencyPacket\@\@\@Z
+     */
+    MCVAPI void handle(class NetworkIdentifier const &, class NetworkStackLatencyPacket const &);
     /**
      * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPositionTrackingDBClientRequestPacket\@\@\@Z
      */
@@ -294,10 +306,6 @@ class ServerNetworkHandler {
      * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVClientToServerHandshakePacket\@\@\@Z
      */
     MCVAPI void handle(class NetworkIdentifier const &, class ClientToServerHandshakePacket const &);
-    /**
-     * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSubClientLoginPacket\@\@\@Z
-     */
-    MCVAPI void handle(class NetworkIdentifier const &, class SubClientLoginPacket const &);
     /**
      * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVTickSyncPacket\@\@\@Z
      */
@@ -310,18 +318,14 @@ class ServerNetworkHandler {
      * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVDebugInfoPacket\@\@\@Z
      */
     MCVAPI void handle(class NetworkIdentifier const &, class DebugInfoPacket const &);
-    /**
-     * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVItemStackRequestPacket\@\@\@Z
-     */
-    MCVAPI void handle(class NetworkIdentifier const &, class ItemStackRequestPacket const &);
     /**
      * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVLevelSoundEventPacketV1\@\@\@Z
      */
     MCVAPI void handle(class NetworkIdentifier const &, class LevelSoundEventPacketV1 const &);
     /**
-     * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVStructureBlockUpdatePacket\@\@\@Z
+     * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVActorPickRequestPacket\@\@\@Z
      */
-    MCVAPI void handle(class NetworkIdentifier const &, class StructureBlockUpdatePacket const &);
+    MCVAPI void handle(class NetworkIdentifier const &, class ActorPickRequestPacket const &);
     /**
      * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVFilterTextPacket\@\@\@Z
      */
@@ -331,17 +335,17 @@ class ServerNetworkHandler {
      */
     MCVAPI void handle(class NetworkIdentifier const &, class LoginPacket const &);
     /**
-     * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVCommandBlockUpdatePacket\@\@\@Z
+     * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVGameTestRequestPacket\@\@\@Z
      */
-    MCVAPI void handle(class NetworkIdentifier const &, class CommandBlockUpdatePacket const &);
+    MCVAPI void handle(class NetworkIdentifier const &, class GameTestRequestPacket const &);
     /**
-     * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVStructureTemplateDataRequestPacket\@\@\@Z
+     * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVMultiplayerSettingsPacket\@\@\@Z
      */
-    MCVAPI void handle(class NetworkIdentifier const &, class StructureTemplateDataRequestPacket const &);
+    MCVAPI void handle(class NetworkIdentifier const &, class MultiplayerSettingsPacket const &);
     /**
-     * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVNetworkStackLatencyPacket\@\@\@Z
+     * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSubClientLoginPacket\@\@\@Z
      */
-    MCVAPI void handle(class NetworkIdentifier const &, class NetworkStackLatencyPacket const &);
+    MCVAPI void handle(class NetworkIdentifier const &, class SubClientLoginPacket const &);
     /**
      * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVAnimatePacket\@\@\@Z
      */
@@ -354,10 +358,6 @@ class ServerNetworkHandler {
      * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVShowCreditsPacket\@\@\@Z
      */
     MCVAPI void handle(class NetworkIdentifier const &, class ShowCreditsPacket const &);
-    /**
-     * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVGameTestRequestPacket\@\@\@Z
-     */
-    MCVAPI void handle(class NetworkIdentifier const &, class GameTestRequestPacket const &);
     /**
      * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVLecternUpdatePacket\@\@\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/ServerSettingsRequestPacket.hpp b/LiteLoader/include/llapi/mc/ServerSettingsRequestPacket.hpp
index 7697726e3c..b1660c8353 100644
--- a/LiteLoader/include/llapi/mc/ServerSettingsRequestPacket.hpp
+++ b/LiteLoader/include/llapi/mc/ServerSettingsRequestPacket.hpp
@@ -50,7 +50,7 @@ class ServerSettingsRequestPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@ServerSettingsRequestPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/ServerSettingsResponsePacket.hpp b/LiteLoader/include/llapi/mc/ServerSettingsResponsePacket.hpp
index 3d67ae811a..2b94c8ca05 100644
--- a/LiteLoader/include/llapi/mc/ServerSettingsResponsePacket.hpp
+++ b/LiteLoader/include/llapi/mc/ServerSettingsResponsePacket.hpp
@@ -50,7 +50,7 @@ class ServerSettingsResponsePacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@ServerSettingsResponsePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/ServerStatsPacket.hpp b/LiteLoader/include/llapi/mc/ServerStatsPacket.hpp
index 724f4e38ff..175b997f88 100644
--- a/LiteLoader/include/llapi/mc/ServerStatsPacket.hpp
+++ b/LiteLoader/include/llapi/mc/ServerStatsPacket.hpp
@@ -49,7 +49,7 @@ class ServerStatsPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@ServerStatsPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/ServerToClientHandshakePacket.hpp b/LiteLoader/include/llapi/mc/ServerToClientHandshakePacket.hpp
index 35332cb88d..f09129c528 100644
--- a/LiteLoader/include/llapi/mc/ServerToClientHandshakePacket.hpp
+++ b/LiteLoader/include/llapi/mc/ServerToClientHandshakePacket.hpp
@@ -50,7 +50,7 @@ class ServerToClientHandshakePacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@ServerToClientHandshakePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/SetActorDataPacket.hpp b/LiteLoader/include/llapi/mc/SetActorDataPacket.hpp
index 0ac2f0e16e..1fda1340d7 100644
--- a/LiteLoader/include/llapi/mc/SetActorDataPacket.hpp
+++ b/LiteLoader/include/llapi/mc/SetActorDataPacket.hpp
@@ -50,7 +50,7 @@ class SetActorDataPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@SetActorDataPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
@@ -60,13 +60,13 @@ class SetActorDataPacket : public Packet {
      */
     MCVAPI ~SetActorDataPacket();
 #endif
-    /**
-     * @symbol ??0SetActorDataPacket\@\@QEAA\@VActorRuntimeID\@\@AEAVSynchedActorDataEntityWrapper\@\@PEAVPropertyComponent\@\@_K_N\@Z
-     */
-    MCAPI SetActorDataPacket(class ActorRuntimeID, class SynchedActorDataEntityWrapper &, class PropertyComponent *, unsigned __int64, bool);
     /**
      * @symbol ??0SetActorDataPacket\@\@QEAA\@XZ
      */
     MCAPI SetActorDataPacket();
+    /**
+     * @symbol ??0SetActorDataPacket\@\@QEAA\@VActorRuntimeID\@\@AEAVSynchedActorDataEntityWrapper\@\@PEAVPropertyComponent\@\@_K_N\@Z
+     */
+    MCAPI SetActorDataPacket(class ActorRuntimeID, class SynchedActorDataEntityWrapper &, class PropertyComponent *, unsigned __int64, bool);
 
 };
diff --git a/LiteLoader/include/llapi/mc/SetActorLinkPacket.hpp b/LiteLoader/include/llapi/mc/SetActorLinkPacket.hpp
index 481822f765..9a3236fdb7 100644
--- a/LiteLoader/include/llapi/mc/SetActorLinkPacket.hpp
+++ b/LiteLoader/include/llapi/mc/SetActorLinkPacket.hpp
@@ -50,7 +50,7 @@ class SetActorLinkPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@SetActorLinkPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
@@ -60,13 +60,13 @@ class SetActorLinkPacket : public Packet {
      */
     MCVAPI ~SetActorLinkPacket();
 #endif
-    /**
-     * @symbol ??0SetActorLinkPacket\@\@QEAA\@AEBUActorLink\@\@\@Z
-     */
-    MCAPI SetActorLinkPacket(struct ActorLink const &);
     /**
      * @symbol ??0SetActorLinkPacket\@\@QEAA\@XZ
      */
     MCAPI SetActorLinkPacket();
+    /**
+     * @symbol ??0SetActorLinkPacket\@\@QEAA\@AEBUActorLink\@\@\@Z
+     */
+    MCAPI SetActorLinkPacket(struct ActorLink const &);
 
 };
diff --git a/LiteLoader/include/llapi/mc/SetActorMotionPacket.hpp b/LiteLoader/include/llapi/mc/SetActorMotionPacket.hpp
index e1aca41f59..40fef1f17a 100644
--- a/LiteLoader/include/llapi/mc/SetActorMotionPacket.hpp
+++ b/LiteLoader/include/llapi/mc/SetActorMotionPacket.hpp
@@ -50,7 +50,7 @@ class SetActorMotionPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@SetActorMotionPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
@@ -60,13 +60,13 @@ class SetActorMotionPacket : public Packet {
      */
     MCVAPI ~SetActorMotionPacket();
 #endif
-    /**
-     * @symbol ??0SetActorMotionPacket\@\@QEAA\@XZ
-     */
-    MCAPI SetActorMotionPacket();
     /**
      * @symbol ??0SetActorMotionPacket\@\@QEAA\@AEBVActor\@\@\@Z
      */
     MCAPI SetActorMotionPacket(class Actor const &);
+    /**
+     * @symbol ??0SetActorMotionPacket\@\@QEAA\@XZ
+     */
+    MCAPI SetActorMotionPacket();
 
 };
diff --git a/LiteLoader/include/llapi/mc/SetCommandsEnabledPacket.hpp b/LiteLoader/include/llapi/mc/SetCommandsEnabledPacket.hpp
index 90b54440d3..4368511a07 100644
--- a/LiteLoader/include/llapi/mc/SetCommandsEnabledPacket.hpp
+++ b/LiteLoader/include/llapi/mc/SetCommandsEnabledPacket.hpp
@@ -50,7 +50,7 @@ class SetCommandsEnabledPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@SetCommandsEnabledPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/SetDefaultGameTypePacket.hpp b/LiteLoader/include/llapi/mc/SetDefaultGameTypePacket.hpp
index e44e72d23e..5254178fa9 100644
--- a/LiteLoader/include/llapi/mc/SetDefaultGameTypePacket.hpp
+++ b/LiteLoader/include/llapi/mc/SetDefaultGameTypePacket.hpp
@@ -50,7 +50,7 @@ class SetDefaultGameTypePacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@SetDefaultGameTypePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/SetDifficultyPacket.hpp b/LiteLoader/include/llapi/mc/SetDifficultyPacket.hpp
index 5b286cd4e6..c4270961d5 100644
--- a/LiteLoader/include/llapi/mc/SetDifficultyPacket.hpp
+++ b/LiteLoader/include/llapi/mc/SetDifficultyPacket.hpp
@@ -50,7 +50,7 @@ class SetDifficultyPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@SetDifficultyPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/SetDisplayObjectivePacket.hpp b/LiteLoader/include/llapi/mc/SetDisplayObjectivePacket.hpp
index ac90bac1ff..c59d4b3010 100644
--- a/LiteLoader/include/llapi/mc/SetDisplayObjectivePacket.hpp
+++ b/LiteLoader/include/llapi/mc/SetDisplayObjectivePacket.hpp
@@ -51,7 +51,7 @@ class SetDisplayObjectivePacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@SetDisplayObjectivePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/SetHealthPacket.hpp b/LiteLoader/include/llapi/mc/SetHealthPacket.hpp
index b58eee5fdc..a3cc5e65bb 100644
--- a/LiteLoader/include/llapi/mc/SetHealthPacket.hpp
+++ b/LiteLoader/include/llapi/mc/SetHealthPacket.hpp
@@ -51,7 +51,7 @@ class SetHealthPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@SetHealthPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/SetLastHurtByPacket.hpp b/LiteLoader/include/llapi/mc/SetLastHurtByPacket.hpp
index e962fa0ec0..32782552fe 100644
--- a/LiteLoader/include/llapi/mc/SetLastHurtByPacket.hpp
+++ b/LiteLoader/include/llapi/mc/SetLastHurtByPacket.hpp
@@ -50,7 +50,7 @@ class SetLastHurtByPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@SetLastHurtByPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/SetLocalPlayerAsInitializedPacket.hpp b/LiteLoader/include/llapi/mc/SetLocalPlayerAsInitializedPacket.hpp
index d47d5081d2..c21267f12b 100644
--- a/LiteLoader/include/llapi/mc/SetLocalPlayerAsInitializedPacket.hpp
+++ b/LiteLoader/include/llapi/mc/SetLocalPlayerAsInitializedPacket.hpp
@@ -50,7 +50,7 @@ class SetLocalPlayerAsInitializedPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@SetLocalPlayerAsInitializedPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/SetPlayerGameTypePacket.hpp b/LiteLoader/include/llapi/mc/SetPlayerGameTypePacket.hpp
index 252c9d10f4..3922db046c 100644
--- a/LiteLoader/include/llapi/mc/SetPlayerGameTypePacket.hpp
+++ b/LiteLoader/include/llapi/mc/SetPlayerGameTypePacket.hpp
@@ -50,7 +50,7 @@ class SetPlayerGameTypePacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@SetPlayerGameTypePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/SetScorePacket.hpp b/LiteLoader/include/llapi/mc/SetScorePacket.hpp
index b4adb3ceee..a853fe7edf 100644
--- a/LiteLoader/include/llapi/mc/SetScorePacket.hpp
+++ b/LiteLoader/include/llapi/mc/SetScorePacket.hpp
@@ -51,7 +51,7 @@ class SetScorePacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@SetScorePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/SetScoreboardIdentityPacket.hpp b/LiteLoader/include/llapi/mc/SetScoreboardIdentityPacket.hpp
index 006c2f98f0..73396824ca 100644
--- a/LiteLoader/include/llapi/mc/SetScoreboardIdentityPacket.hpp
+++ b/LiteLoader/include/llapi/mc/SetScoreboardIdentityPacket.hpp
@@ -51,7 +51,7 @@ class SetScoreboardIdentityPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@SetScoreboardIdentityPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/SetSpawnPositionPacket.hpp b/LiteLoader/include/llapi/mc/SetSpawnPositionPacket.hpp
index 393c916a3a..d685ae3552 100644
--- a/LiteLoader/include/llapi/mc/SetSpawnPositionPacket.hpp
+++ b/LiteLoader/include/llapi/mc/SetSpawnPositionPacket.hpp
@@ -50,7 +50,7 @@ class SetSpawnPositionPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@SetSpawnPositionPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
@@ -60,6 +60,10 @@ class SetSpawnPositionPacket : public Packet {
      */
     MCVAPI ~SetSpawnPositionPacket();
 #endif
+    /**
+     * @symbol ??0SetSpawnPositionPacket\@\@QEAA\@W4SpawnPositionType\@\@V?$AutomaticID\@VDimension\@\@H\@\@AEBVBlockPos\@\@\@Z
+     */
+    MCAPI SetSpawnPositionPacket(enum class SpawnPositionType, class AutomaticID<class Dimension, int>, class BlockPos const &);
     /**
      * @symbol ??0SetSpawnPositionPacket\@\@QEAA\@V?$AutomaticID\@VDimension\@\@H\@\@AEBVBlockPos\@\@1\@Z
      */
@@ -68,9 +72,5 @@ class SetSpawnPositionPacket : public Packet {
      * @symbol ??0SetSpawnPositionPacket\@\@QEAA\@XZ
      */
     MCAPI SetSpawnPositionPacket();
-    /**
-     * @symbol ??0SetSpawnPositionPacket\@\@QEAA\@W4SpawnPositionType\@\@V?$AutomaticID\@VDimension\@\@H\@\@AEBVBlockPos\@\@\@Z
-     */
-    MCAPI SetSpawnPositionPacket(enum class SpawnPositionType, class AutomaticID<class Dimension, int>, class BlockPos const &);
 
 };
diff --git a/LiteLoader/include/llapi/mc/SetTimePacket.hpp b/LiteLoader/include/llapi/mc/SetTimePacket.hpp
index 9d815677c0..a833adb12a 100644
--- a/LiteLoader/include/llapi/mc/SetTimePacket.hpp
+++ b/LiteLoader/include/llapi/mc/SetTimePacket.hpp
@@ -50,7 +50,7 @@ class SetTimePacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@SetTimePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/SetTitlePacket.hpp b/LiteLoader/include/llapi/mc/SetTitlePacket.hpp
index 003aa63102..2c7e7ef2de 100644
--- a/LiteLoader/include/llapi/mc/SetTitlePacket.hpp
+++ b/LiteLoader/include/llapi/mc/SetTitlePacket.hpp
@@ -51,7 +51,7 @@ enum class TitleType;
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@SetTitlePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
@@ -73,6 +73,10 @@ enum class TitleType;
      * @symbol ??0SetTitlePacket\@\@QEAA\@W4TitleType\@0\@\@Z
      */
     MCAPI SetTitlePacket(enum class SetTitlePacket::TitleType);
+    /**
+     * @symbol ??0SetTitlePacket\@\@QEAA\@HHH\@Z
+     */
+    MCAPI SetTitlePacket(int, int, int);
     /**
      * @symbol ??0SetTitlePacket\@\@QEAA\@W4TitleType\@0\@AEBVResolvedTextObject\@\@\@Z
      */
@@ -81,10 +85,6 @@ enum class TitleType;
      * @symbol ??0SetTitlePacket\@\@QEAA\@W4TitleType\@0\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z
      */
     MCAPI SetTitlePacket(enum class SetTitlePacket::TitleType, std::string const &);
-    /**
-     * @symbol ??0SetTitlePacket\@\@QEAA\@HHH\@Z
-     */
-    MCAPI SetTitlePacket(int, int, int);
     /**
      * @symbol ??4SetTitlePacket\@\@QEAAAEAV0\@$$QEAV0\@\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/SettingsCommandPacket.hpp b/LiteLoader/include/llapi/mc/SettingsCommandPacket.hpp
index 3b73095167..4b754b5932 100644
--- a/LiteLoader/include/llapi/mc/SettingsCommandPacket.hpp
+++ b/LiteLoader/include/llapi/mc/SettingsCommandPacket.hpp
@@ -50,7 +50,7 @@ class SettingsCommandPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@SettingsCommandPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/ShareableComponent.hpp b/LiteLoader/include/llapi/mc/ShareableComponent.hpp
index dc081f9a6b..2fbf255d43 100644
--- a/LiteLoader/include/llapi/mc/ShareableComponent.hpp
+++ b/LiteLoader/include/llapi/mc/ShareableComponent.hpp
@@ -29,14 +29,14 @@ class ShareableComponent {
 #endif
 
 public:
-    /**
-     * @symbol ?getCountToPickUp\@ShareableComponent\@\@QEBAHAEBVActor\@\@AEBVItemStack\@\@\@Z
-     */
-    MCAPI int getCountToPickUp(class Actor const &, class ItemStack const &) const;
     /**
      * @symbol ?getCountToPickUp\@ShareableComponent\@\@QEBAHAEBVActor\@\@AEBVItemActor\@\@\@Z
      */
     MCAPI int getCountToPickUp(class Actor const &, class ItemActor const &) const;
+    /**
+     * @symbol ?getCountToPickUp\@ShareableComponent\@\@QEBAHAEBVActor\@\@AEBVItemStack\@\@\@Z
+     */
+    MCAPI int getCountToPickUp(class Actor const &, class ItemStack const &) const;
     /**
      * @symbol ?getSlotToSwap\@ShareableComponent\@\@QEBAHAEAVActor\@\@AEBVItemActor\@\@\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/ShortTag.hpp b/LiteLoader/include/llapi/mc/ShortTag.hpp
index 83ac9b103c..ace2cf27df 100644
--- a/LiteLoader/include/llapi/mc/ShortTag.hpp
+++ b/LiteLoader/include/llapi/mc/ShortTag.hpp
@@ -78,13 +78,13 @@ short val;
      * @symbol ?hash\@ShortTag\@\@UEBA_KXZ
      */
     virtual unsigned __int64 hash() const;
-    /**
-     * @symbol ??0ShortTag\@\@QEAA\@F\@Z
-     */
-    MCAPI ShortTag(short);
     /**
      * @symbol ??0ShortTag\@\@QEAA\@XZ
      */
     MCAPI ShortTag();
+    /**
+     * @symbol ??0ShortTag\@\@QEAA\@F\@Z
+     */
+    MCAPI ShortTag(short);
 
 };
diff --git a/LiteLoader/include/llapi/mc/ShowCreditsPacket.hpp b/LiteLoader/include/llapi/mc/ShowCreditsPacket.hpp
index 51e4dcce48..cfc3b13602 100644
--- a/LiteLoader/include/llapi/mc/ShowCreditsPacket.hpp
+++ b/LiteLoader/include/llapi/mc/ShowCreditsPacket.hpp
@@ -63,7 +63,7 @@ class ShowCreditsPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@ShowCreditsPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
@@ -73,13 +73,13 @@ class ShowCreditsPacket : public Packet {
      */
     MCVAPI ~ShowCreditsPacket();
 #endif
-    /**
-     * @symbol ??0ShowCreditsPacket\@\@QEAA\@VActorRuntimeID\@\@W4CreditsState\@0\@\@Z
-     */
-    MCAPI ShowCreditsPacket(class ActorRuntimeID, enum class ShowCreditsPacket::CreditsState);
     /**
      * @symbol ??0ShowCreditsPacket\@\@QEAA\@XZ
      */
     MCAPI ShowCreditsPacket();
+    /**
+     * @symbol ??0ShowCreditsPacket\@\@QEAA\@VActorRuntimeID\@\@W4CreditsState\@0\@\@Z
+     */
+    MCAPI ShowCreditsPacket(class ActorRuntimeID, enum class ShowCreditsPacket::CreditsState);
 
 };
diff --git a/LiteLoader/include/llapi/mc/ShowProfilePacket.hpp b/LiteLoader/include/llapi/mc/ShowProfilePacket.hpp
index 57baa01887..77a27f179d 100644
--- a/LiteLoader/include/llapi/mc/ShowProfilePacket.hpp
+++ b/LiteLoader/include/llapi/mc/ShowProfilePacket.hpp
@@ -50,7 +50,7 @@ class ShowProfilePacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@ShowProfilePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/ShowStoreOfferPacket.hpp b/LiteLoader/include/llapi/mc/ShowStoreOfferPacket.hpp
index ff2e75a9ce..3eb7799642 100644
--- a/LiteLoader/include/llapi/mc/ShowStoreOfferPacket.hpp
+++ b/LiteLoader/include/llapi/mc/ShowStoreOfferPacket.hpp
@@ -50,7 +50,7 @@ class ShowStoreOfferPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@ShowStoreOfferPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/SideBySideTrigger.hpp b/LiteLoader/include/llapi/mc/SideBySideTrigger.hpp
index 94e61c9a5a..9059c66465 100644
--- a/LiteLoader/include/llapi/mc/SideBySideTrigger.hpp
+++ b/LiteLoader/include/llapi/mc/SideBySideTrigger.hpp
@@ -59,14 +59,14 @@ class SideBySideTrigger {
      * @symbol ?tryRecordBlockSource\@SideBySideTrigger\@\@SA?AVConditionalRecordingConstBlockSource\@\@_NV?$not_null\@PEBVIConstBlockSource\@\@\@gsl\@\@\@Z
      */
     MCAPI static class ConditionalRecordingConstBlockSource tryRecordBlockSource(bool, class gsl::not_null<class IConstBlockSource const *>);
-    /**
-     * @symbol ?tryTrigger\@SideBySideTrigger\@\@SA_NAEAUIActorMovementProxy\@\@W4SideBySideExtractionId\@\@W4SideBySideExtractionStep\@\@\@Z
-     */
-    MCAPI static bool tryTrigger(struct IActorMovementProxy &, enum class SideBySideExtractionId, enum class SideBySideExtractionStep);
     /**
      * @symbol ?tryTrigger\@SideBySideTrigger\@\@SA_NAEAVActor\@\@W4SideBySideExtractionId\@\@W4SideBySideExtractionStep\@\@\@Z
      */
     MCAPI static bool tryTrigger(class Actor &, enum class SideBySideExtractionId, enum class SideBySideExtractionStep);
+    /**
+     * @symbol ?tryTrigger\@SideBySideTrigger\@\@SA_NAEAUIActorMovementProxy\@\@W4SideBySideExtractionId\@\@W4SideBySideExtractionStep\@\@\@Z
+     */
+    MCAPI static bool tryTrigger(struct IActorMovementProxy &, enum class SideBySideExtractionId, enum class SideBySideExtractionStep);
     /**
      * @symbol ?tryTriggerCurrentPostSimulation\@SideBySideTrigger\@\@SA_NAEAUIActorMovementProxy\@\@V?$optional\@W4SideBySideExtractionId\@\@\@std\@\@\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/SignBlockActor.hpp b/LiteLoader/include/llapi/mc/SignBlockActor.hpp
index 6aa7733dac..607b92149b 100644
--- a/LiteLoader/include/llapi/mc/SignBlockActor.hpp
+++ b/LiteLoader/include/llapi/mc/SignBlockActor.hpp
@@ -164,14 +164,14 @@ enum class SignType;
     MCAPI void setType(enum class SignBlockActor::SignType);
 
 //private:
-    /**
-     * @symbol ?_setMessage\@SignBlockActor\@\@AEAAXVTextObjectRoot\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z
-     */
-    MCAPI void _setMessage(class TextObjectRoot, std::string);
     /**
      * @symbol ?_setMessage\@SignBlockActor\@\@AEAAXV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z
      */
     MCAPI void _setMessage(std::string, std::string);
+    /**
+     * @symbol ?_setMessage\@SignBlockActor\@\@AEAAXVTextObjectRoot\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z
+     */
+    MCAPI void _setMessage(class TextObjectRoot, std::string);
 
 private:
 
diff --git a/LiteLoader/include/llapi/mc/SimpleEventPacket.hpp b/LiteLoader/include/llapi/mc/SimpleEventPacket.hpp
index 4c7d234a4d..11ad5fa9c2 100644
--- a/LiteLoader/include/llapi/mc/SimpleEventPacket.hpp
+++ b/LiteLoader/include/llapi/mc/SimpleEventPacket.hpp
@@ -52,7 +52,7 @@ enum class Subtype;
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@SimpleEventPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/SimulatedPlayer.hpp b/LiteLoader/include/llapi/mc/SimulatedPlayer.hpp
index f36c080999..4d37424370 100644
--- a/LiteLoader/include/llapi/mc/SimulatedPlayer.hpp
+++ b/LiteLoader/include/llapi/mc/SimulatedPlayer.hpp
@@ -324,14 +324,14 @@ class SimulatedPlayer : public ServerPlayer {
      * @symbol ?setXuid\@SimulatedPlayer\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z
      */
     MCAPI void setXuid(std::string const &);
-    /**
-     * @symbol ?simulateAttack\@SimulatedPlayer\@\@QEAA_NPEAVActor\@\@\@Z
-     */
-    MCAPI bool simulateAttack(class Actor *);
     /**
      * @symbol ?simulateAttack\@SimulatedPlayer\@\@QEAA_NXZ
      */
     MCAPI bool simulateAttack();
+    /**
+     * @symbol ?simulateAttack\@SimulatedPlayer\@\@QEAA_NPEAVActor\@\@\@Z
+     */
+    MCAPI bool simulateAttack(class Actor *);
     /**
      * @symbol ?simulateDestroyBlock\@SimulatedPlayer\@\@QEAA_NAEBVBlockPos\@\@W4ScriptFacing\@ScriptModuleMinecraft\@\@\@Z
      */
@@ -364,14 +364,14 @@ class SimulatedPlayer : public ServerPlayer {
      * @symbol ?simulateLocalMove\@SimulatedPlayer\@\@QEAAXAEBVVec3\@\@M\@Z
      */
     MCAPI void simulateLocalMove(class Vec3 const &, float);
-    /**
-     * @symbol ?simulateLookAt\@SimulatedPlayer\@\@QEAAXAEAVActor\@\@\@Z
-     */
-    MCAPI void simulateLookAt(class Actor &);
     /**
      * @symbol ?simulateLookAt\@SimulatedPlayer\@\@QEAAXAEBVBlockPos\@\@\@Z
      */
     MCAPI void simulateLookAt(class BlockPos const &);
+    /**
+     * @symbol ?simulateLookAt\@SimulatedPlayer\@\@QEAAXAEAVActor\@\@\@Z
+     */
+    MCAPI void simulateLookAt(class Actor &);
     /**
      * @symbol ?simulateLookAt\@SimulatedPlayer\@\@QEAAXAEBVVec3\@\@\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/SimulationTypePacket.hpp b/LiteLoader/include/llapi/mc/SimulationTypePacket.hpp
index 4398dbb8d0..31ec27f3b6 100644
--- a/LiteLoader/include/llapi/mc/SimulationTypePacket.hpp
+++ b/LiteLoader/include/llapi/mc/SimulationTypePacket.hpp
@@ -50,7 +50,7 @@ class SimulationTypePacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@SimulationTypePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/SpawnActorParameters.hpp b/LiteLoader/include/llapi/mc/SpawnActorParameters.hpp
index 1d43538f4a..d4137d6339 100644
--- a/LiteLoader/include/llapi/mc/SpawnActorParameters.hpp
+++ b/LiteLoader/include/llapi/mc/SpawnActorParameters.hpp
@@ -31,14 +31,14 @@ struct SpawnActorParameters {
      * @symbol ??0SpawnActorParameters\@\@QEAA\@$$QEAU0\@\@Z
      */
     MCAPI SpawnActorParameters(struct SpawnActorParameters &&);
-    /**
-     * @symbol ??0SpawnActorParameters\@\@QEAA\@XZ
-     */
-    MCAPI SpawnActorParameters();
     /**
      * @symbol ??0SpawnActorParameters\@\@QEAA\@AEBU0\@\@Z
      */
     MCAPI SpawnActorParameters(struct SpawnActorParameters const &);
+    /**
+     * @symbol ??0SpawnActorParameters\@\@QEAA\@XZ
+     */
+    MCAPI SpawnActorParameters();
     /**
      * @symbol ?setItem\@SpawnActorParameters\@\@QEAAXAEBVItemDescriptor\@\@\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/SpawnExperienceOrbPacket.hpp b/LiteLoader/include/llapi/mc/SpawnExperienceOrbPacket.hpp
index 68db29a260..3b04fca433 100644
--- a/LiteLoader/include/llapi/mc/SpawnExperienceOrbPacket.hpp
+++ b/LiteLoader/include/llapi/mc/SpawnExperienceOrbPacket.hpp
@@ -50,7 +50,7 @@ class SpawnExperienceOrbPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@SpawnExperienceOrbPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/SpawnParticleEffectPacket.hpp b/LiteLoader/include/llapi/mc/SpawnParticleEffectPacket.hpp
index 0fdaf49f34..a58c89b8ed 100644
--- a/LiteLoader/include/llapi/mc/SpawnParticleEffectPacket.hpp
+++ b/LiteLoader/include/llapi/mc/SpawnParticleEffectPacket.hpp
@@ -50,7 +50,7 @@ class SpawnParticleEffectPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@SpawnParticleEffectPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
@@ -60,13 +60,13 @@ class SpawnParticleEffectPacket : public Packet {
      */
     MCVAPI ~SpawnParticleEffectPacket();
 #endif
-    /**
-     * @symbol ??0SpawnParticleEffectPacket\@\@QEAA\@XZ
-     */
-    MCAPI SpawnParticleEffectPacket();
     /**
      * @symbol ??0SpawnParticleEffectPacket\@\@QEAA\@AEBVVec3\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@EV?$optional\@VMolangVariableMap\@\@\@3\@\@Z
      */
     MCAPI SpawnParticleEffectPacket(class Vec3 const &, std::string const &, unsigned char, class std::optional<class MolangVariableMap>);
+    /**
+     * @symbol ??0SpawnParticleEffectPacket\@\@QEAA\@XZ
+     */
+    MCAPI SpawnParticleEffectPacket();
 
 };
diff --git a/LiteLoader/include/llapi/mc/StackResultStorageEntity.hpp b/LiteLoader/include/llapi/mc/StackResultStorageEntity.hpp
index 4e5ebb7858..cd0aab2176 100644
--- a/LiteLoader/include/llapi/mc/StackResultStorageEntity.hpp
+++ b/LiteLoader/include/llapi/mc/StackResultStorageEntity.hpp
@@ -45,14 +45,14 @@ class StackResultStorageEntity {
      * @symbol ??0StackResultStorageEntity\@\@IEAA\@$$QEAV0\@\@Z
      */
     MCAPI StackResultStorageEntity(class StackResultStorageEntity &&);
-    /**
-     * @symbol ??0StackResultStorageEntity\@\@IEAA\@AEBVWeakStorageEntity\@\@\@Z
-     */
-    MCAPI StackResultStorageEntity(class WeakStorageEntity const &);
     /**
      * @symbol ??0StackResultStorageEntity\@\@IEAA\@AEBVOwnerStorageEntity\@\@\@Z
      */
     MCAPI StackResultStorageEntity(class OwnerStorageEntity const &);
+    /**
+     * @symbol ??0StackResultStorageEntity\@\@IEAA\@AEBVWeakStorageEntity\@\@\@Z
+     */
+    MCAPI StackResultStorageEntity(class WeakStorageEntity const &);
     /**
      * @symbol ?_getStackRef\@StackResultStorageEntity\@\@IEBAAEAVEntityContext\@\@XZ
      */
diff --git a/LiteLoader/include/llapi/mc/StartGamePacket.hpp b/LiteLoader/include/llapi/mc/StartGamePacket.hpp
index 01ed1134b5..24de339611 100644
--- a/LiteLoader/include/llapi/mc/StartGamePacket.hpp
+++ b/LiteLoader/include/llapi/mc/StartGamePacket.hpp
@@ -50,7 +50,7 @@ class StartGamePacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@StartGamePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/StopSoundPacket.hpp b/LiteLoader/include/llapi/mc/StopSoundPacket.hpp
index 428f28b83e..70126da795 100644
--- a/LiteLoader/include/llapi/mc/StopSoundPacket.hpp
+++ b/LiteLoader/include/llapi/mc/StopSoundPacket.hpp
@@ -50,7 +50,7 @@ class StopSoundPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@StopSoundPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
@@ -60,13 +60,13 @@ class StopSoundPacket : public Packet {
      */
     MCVAPI ~StopSoundPacket();
 #endif
-    /**
-     * @symbol ??0StopSoundPacket\@\@QEAA\@XZ
-     */
-    MCAPI StopSoundPacket();
     /**
      * @symbol ??0StopSoundPacket\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z
      */
     MCAPI StopSoundPacket(std::string const &, bool);
+    /**
+     * @symbol ??0StopSoundPacket\@\@QEAA\@XZ
+     */
+    MCAPI StopSoundPacket();
 
 };
diff --git a/LiteLoader/include/llapi/mc/StrictEntityContextOwner.hpp b/LiteLoader/include/llapi/mc/StrictEntityContextOwner.hpp
index 4e7d554776..c1ed998a1b 100644
--- a/LiteLoader/include/llapi/mc/StrictEntityContextOwner.hpp
+++ b/LiteLoader/include/llapi/mc/StrictEntityContextOwner.hpp
@@ -27,14 +27,14 @@ class StrictEntityContextOwner {
 #endif
 
 public:
-    /**
-     * @symbol ??0StrictEntityContextOwner\@\@QEAA\@$$QEAV0\@\@Z
-     */
-    MCAPI StrictEntityContextOwner(class StrictEntityContextOwner &&);
     /**
      * @symbol ??0StrictEntityContextOwner\@\@QEAA\@AEAVEntityRegistryBase\@\@VEntityId\@\@\@Z
      */
     MCAPI StrictEntityContextOwner(class EntityRegistryBase &, class EntityId);
+    /**
+     * @symbol ??0StrictEntityContextOwner\@\@QEAA\@$$QEAV0\@\@Z
+     */
+    MCAPI StrictEntityContextOwner(class StrictEntityContextOwner &&);
     /**
      * @symbol ?getStrictContext\@StrictEntityContextOwner\@\@QEBA?AVStrictEntityContext\@\@XZ
      */
diff --git a/LiteLoader/include/llapi/mc/StructureBlockUpdatePacket.hpp b/LiteLoader/include/llapi/mc/StructureBlockUpdatePacket.hpp
index df1fd47c86..1fb97b7c8a 100644
--- a/LiteLoader/include/llapi/mc/StructureBlockUpdatePacket.hpp
+++ b/LiteLoader/include/llapi/mc/StructureBlockUpdatePacket.hpp
@@ -49,7 +49,7 @@ class StructureBlockUpdatePacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@StructureBlockUpdatePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/StructureFeature.hpp b/LiteLoader/include/llapi/mc/StructureFeature.hpp
index a0fa40eae3..54a9123758 100644
--- a/LiteLoader/include/llapi/mc/StructureFeature.hpp
+++ b/LiteLoader/include/llapi/mc/StructureFeature.hpp
@@ -56,12 +56,12 @@ class StructureFeature {
     virtual void initMobSpawnTypes(class HardcodedSpawnAreaRegistry &);
     /**
      * @vftbl 5
-     * @symbol ?isFeatureChunk\@OceanRuinFeature\@\@UEAA_NAEBVBiomeSource\@\@AEAVRandom\@\@AEBVChunkPos\@\@IAEBVIPreliminarySurfaceProvider\@\@AEBVDimension\@\@\@Z
+     * @symbol ?isFeatureChunk\@AncientCityFeature\@\@UEAA_NAEBVBiomeSource\@\@AEAVRandom\@\@AEBVChunkPos\@\@IAEBVIPreliminarySurfaceProvider\@\@AEBVDimension\@\@\@Z
      */
     virtual bool isFeatureChunk(class BiomeSource const &, class Random &, class ChunkPos const &, unsigned int, class IPreliminarySurfaceProvider const &, class Dimension const &) = 0;
     /**
      * @vftbl 6
-     * @symbol ?createStructureStart\@OceanRuinFeature\@\@MEAA?AV?$unique_ptr\@VStructureStart\@\@U?$default_delete\@VStructureStart\@\@\@std\@\@\@std\@\@AEAVDimension\@\@AEBVBiomeSource\@\@AEAVRandom\@\@AEBVChunkPos\@\@AEBVIPreliminarySurfaceProvider\@\@\@Z
+     * @symbol ?createStructureStart\@AncientCityFeature\@\@MEAA?AV?$unique_ptr\@VStructureStart\@\@U?$default_delete\@VStructureStart\@\@\@std\@\@\@std\@\@AEAVDimension\@\@AEBVBiomeSource\@\@AEAVRandom\@\@AEBVChunkPos\@\@AEBVIPreliminarySurfaceProvider\@\@\@Z
      */
     virtual std::unique_ptr<class StructureStart> createStructureStart(class Dimension &, class BiomeSource const &, class Random &, class ChunkPos const &, class IPreliminarySurfaceProvider const &) = 0;
     /**
diff --git a/LiteLoader/include/llapi/mc/StructureManager.hpp b/LiteLoader/include/llapi/mc/StructureManager.hpp
index 51d9ded98a..0395b5c6e2 100644
--- a/LiteLoader/include/llapi/mc/StructureManager.hpp
+++ b/LiteLoader/include/llapi/mc/StructureManager.hpp
@@ -121,14 +121,14 @@ class StructureManager {
      * @symbol ?_createLevelStorageId\@StructureManager\@\@AEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@0\@Z
      */
     MCAPI std::string _createLevelStorageId(std::string const &, std::string const &);
-    /**
-     * @symbol ?_findResource\@StructureManager\@\@AEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$PathBuffer\@V?$StackString\@D$0EAA\@\@Core\@\@\@Core\@\@1AEBVPackInstance\@\@AEAV23\@\@Z
-     */
-    MCAPI bool _findResource(std::string const &, class Core::PathBuffer<class Core::StackString<char, 1024>> const &, class Core::PathBuffer<class Core::StackString<char, 1024>> const &, class PackInstance const &, std::string &);
     /**
      * @symbol ?_findResource\@StructureManager\@\@AEAA_NAEBV?$PathBuffer\@V?$StackString\@D$0EAA\@\@Core\@\@\@Core\@\@AEBVPackInstance\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z
      */
     MCAPI bool _findResource(class Core::PathBuffer<class Core::StackString<char, 1024>> const &, class PackInstance const &, std::string &);
+    /**
+     * @symbol ?_findResource\@StructureManager\@\@AEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$PathBuffer\@V?$StackString\@D$0EAA\@\@Core\@\@\@Core\@\@1AEBVPackInstance\@\@AEAV23\@\@Z
+     */
+    MCAPI bool _findResource(std::string const &, class Core::PathBuffer<class Core::StackString<char, 1024>> const &, class Core::PathBuffer<class Core::StackString<char, 1024>> const &, class PackInstance const &, std::string &);
     /**
      * @symbol ?_placeSegment\@StructureManager\@\@AEAA_NAEAVStructureAnimationData\@\@\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/StructureSettings.hpp b/LiteLoader/include/llapi/mc/StructureSettings.hpp
index 3bf517ea1f..230d61e2d0 100644
--- a/LiteLoader/include/llapi/mc/StructureSettings.hpp
+++ b/LiteLoader/include/llapi/mc/StructureSettings.hpp
@@ -38,14 +38,14 @@ inline StructureSettings(BlockPos const& size, bool ignoreEntities, bool ignoreB
 #endif
 
 public:
-    /**
-     * @symbol ??0StructureSettings\@\@QEAA\@XZ
-     */
-    MCAPI StructureSettings();
     /**
      * @symbol ??0StructureSettings\@\@QEAA\@$$QEAV0\@\@Z
      */
     MCAPI StructureSettings(class StructureSettings &&);
+    /**
+     * @symbol ??0StructureSettings\@\@QEAA\@XZ
+     */
+    MCAPI StructureSettings();
     /**
      * @symbol ?getAnimationMode\@StructureSettings\@\@QEBA?AW4AnimationMode\@\@XZ
      */
@@ -118,14 +118,14 @@ inline StructureSettings(BlockPos const& size, bool ignoreEntities, bool ignoreB
      * @symbol ?isAnimated\@StructureSettings\@\@QEBA_NXZ
      */
     MCAPI bool isAnimated() const;
-    /**
-     * @symbol ??4StructureSettings\@\@QEAAAEAV0\@AEBV0\@\@Z
-     */
-    MCAPI class StructureSettings & operator=(class StructureSettings const &);
     /**
      * @symbol ??4StructureSettings\@\@QEAAAEAV0\@$$QEAV0\@\@Z
      */
     MCAPI class StructureSettings & operator=(class StructureSettings &&);
+    /**
+     * @symbol ??4StructureSettings\@\@QEAAAEAV0\@AEBV0\@\@Z
+     */
+    MCAPI class StructureSettings & operator=(class StructureSettings const &);
     /**
      * @symbol ?setAllowNonTickingPlayerAndTickingAreaChunks\@StructureSettings\@\@QEAAX_N\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/StructureTemplate.hpp b/LiteLoader/include/llapi/mc/StructureTemplate.hpp
index 8103e316a6..963813096c 100644
--- a/LiteLoader/include/llapi/mc/StructureTemplate.hpp
+++ b/LiteLoader/include/llapi/mc/StructureTemplate.hpp
@@ -91,10 +91,7 @@ class StructureTemplate {
      * @symbol __unk_vfn_8
      */
     virtual void __unk_vfn_8();
-    /**
-     * @symbol ?getName\@StructureTemplate\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ
-     */
-    MCAPI std::string const & getName() const;
+
 #ifdef ENABLE_VIRTUAL_FAKESYMBOL_STRUCTURETEMPLATE
     /**
      * @symbol __unk_destructor_-1
@@ -121,6 +118,10 @@ class StructureTemplate {
      * @symbol ?getJigsawMarkers\@StructureTemplate\@\@QEBA?AV?$vector\@VJigsawStructureBlockInfo\@\@V?$allocator\@VJigsawStructureBlockInfo\@\@\@std\@\@\@std\@\@XZ
      */
     MCAPI std::vector<class JigsawStructureBlockInfo> getJigsawMarkers() const;
+    /**
+     * @symbol ?getName\@StructureTemplate\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ
+     */
+    MCAPI std::string const & getName() const;
     /**
      * @symbol ?getSize\@StructureTemplate\@\@QEBAAEBVBlockPos\@\@XZ
      */
diff --git a/LiteLoader/include/llapi/mc/StructureTemplateDataRequestPacket.hpp b/LiteLoader/include/llapi/mc/StructureTemplateDataRequestPacket.hpp
index 7784b18a98..c9820f2a9a 100644
--- a/LiteLoader/include/llapi/mc/StructureTemplateDataRequestPacket.hpp
+++ b/LiteLoader/include/llapi/mc/StructureTemplateDataRequestPacket.hpp
@@ -50,7 +50,7 @@ class StructureTemplateDataRequestPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@StructureTemplateDataRequestPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/StructureTemplateDataResponsePacket.hpp b/LiteLoader/include/llapi/mc/StructureTemplateDataResponsePacket.hpp
index 0a444e3244..32452090ab 100644
--- a/LiteLoader/include/llapi/mc/StructureTemplateDataResponsePacket.hpp
+++ b/LiteLoader/include/llapi/mc/StructureTemplateDataResponsePacket.hpp
@@ -50,7 +50,7 @@ class StructureTemplateDataResponsePacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@StructureTemplateDataResponsePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/SubChunk.hpp b/LiteLoader/include/llapi/mc/SubChunk.hpp
index 06fffddc1a..75bc365a14 100644
--- a/LiteLoader/include/llapi/mc/SubChunk.hpp
+++ b/LiteLoader/include/llapi/mc/SubChunk.hpp
@@ -34,14 +34,14 @@ struct SubChunk {
      * @symbol ??0SubChunk\@\@QEAA\@PEBVBlock\@\@_N1AEAVSpinLock\@\@C\@Z
      */
     MCAPI SubChunk(class Block const *, bool, bool, class SpinLock &, signed char);
-    /**
-     * @symbol ??0SubChunk\@\@QEAA\@$$QEAU0\@\@Z
-     */
-    MCAPI SubChunk(struct SubChunk &&);
     /**
      * @symbol ??0SubChunk\@\@QEAA\@XZ
      */
     MCAPI SubChunk();
+    /**
+     * @symbol ??0SubChunk\@\@QEAA\@$$QEAU0\@\@Z
+     */
+    MCAPI SubChunk(struct SubChunk &&);
     /**
      * @symbol ?deserialize\@SubChunk\@\@QEAAXAEAVIDataInput\@\@AEBVBlockPalette\@\@AEBVSubChunkPos\@\@V?$optional\@PEAUDeserializationChanges\@\@\@std\@\@\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/SubChunkPacket.hpp b/LiteLoader/include/llapi/mc/SubChunkPacket.hpp
index e75d2670a0..8600ffb399 100644
--- a/LiteLoader/include/llapi/mc/SubChunkPacket.hpp
+++ b/LiteLoader/include/llapi/mc/SubChunkPacket.hpp
@@ -52,7 +52,7 @@ class SubChunkPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@SubChunkPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
@@ -62,13 +62,13 @@ class SubChunkPacket : public Packet {
      */
     MCVAPI ~SubChunkPacket();
 #endif
-    /**
-     * @symbol ??0SubChunkPacket\@\@QEAA\@XZ
-     */
-    MCAPI SubChunkPacket();
     /**
      * @symbol ??0SubChunkPacket\@\@QEAA\@AEBV?$AutomaticID\@VDimension\@\@H\@\@AEBVSubChunkPos\@\@_N\@Z
      */
     MCAPI SubChunkPacket(class AutomaticID<class Dimension, int> const &, class SubChunkPos const &, bool);
+    /**
+     * @symbol ??0SubChunkPacket\@\@QEAA\@XZ
+     */
+    MCAPI SubChunkPacket();
 
 };
diff --git a/LiteLoader/include/llapi/mc/SubChunkRelighter.hpp b/LiteLoader/include/llapi/mc/SubChunkRelighter.hpp
index dba17a284e..3d8472b3eb 100644
--- a/LiteLoader/include/llapi/mc/SubChunkRelighter.hpp
+++ b/LiteLoader/include/llapi/mc/SubChunkRelighter.hpp
@@ -62,14 +62,14 @@ class SubChunkRelighter {
      * @symbol ?_propagateSubtractiveBlockLight\@SubChunkRelighter\@\@QEAAXXZ
      */
     MCAPI void _propagateSubtractiveBlockLight();
-    /**
-     * @symbol ?_propagateSubtractiveSkyLight\@SubChunkRelighter\@\@QEAAXUSubChunkLightIndex\@\@E\@Z
-     */
-    MCAPI void _propagateSubtractiveSkyLight(struct SubChunkLightIndex, unsigned char);
     /**
      * @symbol ?_propagateSubtractiveSkyLight\@SubChunkRelighter\@\@QEAAXXZ
      */
     MCAPI void _propagateSubtractiveSkyLight();
+    /**
+     * @symbol ?_propagateSubtractiveSkyLight\@SubChunkRelighter\@\@QEAAXUSubChunkLightIndex\@\@E\@Z
+     */
+    MCAPI void _propagateSubtractiveSkyLight(struct SubChunkLightIndex, unsigned char);
     /**
      * @symbol ?_setLightHelper\@SubChunkRelighter\@\@QEAAXUSubChunkLightIndex\@\@UBrightness\@\@111II\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/SubChunkRequestPacket.hpp b/LiteLoader/include/llapi/mc/SubChunkRequestPacket.hpp
index 920a3885b9..5704be4e23 100644
--- a/LiteLoader/include/llapi/mc/SubChunkRequestPacket.hpp
+++ b/LiteLoader/include/llapi/mc/SubChunkRequestPacket.hpp
@@ -50,7 +50,7 @@ class SubChunkRequestPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@SubChunkRequestPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/SubClientLoginPacket.hpp b/LiteLoader/include/llapi/mc/SubClientLoginPacket.hpp
index 6ed41f9a7d..967a0fe6c7 100644
--- a/LiteLoader/include/llapi/mc/SubClientLoginPacket.hpp
+++ b/LiteLoader/include/llapi/mc/SubClientLoginPacket.hpp
@@ -55,7 +55,7 @@ class SubClientLoginPacket : public Packet {
      */
     virtual bool disallowBatching() const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@SubClientLoginPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/SyncActorPropertyPacket.hpp b/LiteLoader/include/llapi/mc/SyncActorPropertyPacket.hpp
index d962ac064d..2a8af818c5 100644
--- a/LiteLoader/include/llapi/mc/SyncActorPropertyPacket.hpp
+++ b/LiteLoader/include/llapi/mc/SyncActorPropertyPacket.hpp
@@ -55,7 +55,7 @@ class SyncActorPropertyPacket : public Packet {
      */
     virtual struct ExtendedStreamReadResult readExtended(class ReadOnlyBinaryStream &);
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@SyncActorPropertyPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/SyncedPlayerMovementSettings.hpp b/LiteLoader/include/llapi/mc/SyncedPlayerMovementSettings.hpp
index 613b0606e5..8edbc4612a 100644
--- a/LiteLoader/include/llapi/mc/SyncedPlayerMovementSettings.hpp
+++ b/LiteLoader/include/llapi/mc/SyncedPlayerMovementSettings.hpp
@@ -26,13 +26,13 @@ class SyncedPlayerMovementSettings {
 #endif
 
 public:
-    /**
-     * @symbol ??0SyncedPlayerMovementSettings\@\@QEAA\@XZ
-     */
-    MCAPI SyncedPlayerMovementSettings();
     /**
      * @symbol ??0SyncedPlayerMovementSettings\@\@QEAA\@AEBUPlayerMovementSettings\@\@\@Z
      */
     MCAPI SyncedPlayerMovementSettings(struct PlayerMovementSettings const &);
+    /**
+     * @symbol ??0SyncedPlayerMovementSettings\@\@QEAA\@XZ
+     */
+    MCAPI SyncedPlayerMovementSettings();
 
 };
diff --git a/LiteLoader/include/llapi/mc/TakeItemActorPacket.hpp b/LiteLoader/include/llapi/mc/TakeItemActorPacket.hpp
index e95aad08a2..e7dcf70716 100644
--- a/LiteLoader/include/llapi/mc/TakeItemActorPacket.hpp
+++ b/LiteLoader/include/llapi/mc/TakeItemActorPacket.hpp
@@ -50,7 +50,7 @@ class TakeItemActorPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@TakeItemActorPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/TargetGoal.hpp b/LiteLoader/include/llapi/mc/TargetGoal.hpp
index 919319ca43..302962fa93 100644
--- a/LiteLoader/include/llapi/mc/TargetGoal.hpp
+++ b/LiteLoader/include/llapi/mc/TargetGoal.hpp
@@ -36,7 +36,7 @@ class TargetGoal {
     virtual void __unk_vfn_0();
     /**
      * @vftbl 1
-     * @symbol ?canUse\@OwnerHurtByTargetGoal\@\@UEAA_NXZ
+     * @symbol ?canUse\@DefendVillageTargetGoal\@\@UEAA_NXZ
      */
     virtual bool canUse() = 0;
     /**
diff --git a/LiteLoader/include/llapi/mc/TemplateStructurePiece.hpp b/LiteLoader/include/llapi/mc/TemplateStructurePiece.hpp
index ee85144c14..74a82536c0 100644
--- a/LiteLoader/include/llapi/mc/TemplateStructurePiece.hpp
+++ b/LiteLoader/include/llapi/mc/TemplateStructurePiece.hpp
@@ -47,7 +47,7 @@ class TemplateStructurePiece : public StructurePiece {
     virtual bool postProcess(class BlockSource &, class Random &, class BoundingBox const &);
     /**
      * @vftbl 13
-     * @symbol ?_handleDataMarker\@PillagerOutpostPiece\@PillagerOutpostPieces\@\@MEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlockPos\@\@AEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z
+     * @symbol ?_handleDataMarker\@EndCityPiece\@EndCityPieces\@\@MEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlockPos\@\@AEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z
      */
     virtual void _handleDataMarker(std::string const &, class BlockPos const &, class BlockSource &, class Random &, class BoundingBox const &) = 0;
 #ifdef ENABLE_VIRTUAL_FAKESYMBOL_TEMPLATESTRUCTUREPIECE
diff --git a/LiteLoader/include/llapi/mc/TemporalAttributeBuff.hpp b/LiteLoader/include/llapi/mc/TemporalAttributeBuff.hpp
index 79a19cc409..f547f3b96f 100644
--- a/LiteLoader/include/llapi/mc/TemporalAttributeBuff.hpp
+++ b/LiteLoader/include/llapi/mc/TemporalAttributeBuff.hpp
@@ -63,14 +63,14 @@ class TemporalAttributeBuff {
      */
     MCVAPI ~TemporalAttributeBuff();
 #endif
-    /**
-     * @symbol ??0TemporalAttributeBuff\@\@QEAA\@AEBV0\@\@Z
-     */
-    MCAPI TemporalAttributeBuff(class TemporalAttributeBuff const &);
     /**
      * @symbol ??0TemporalAttributeBuff\@\@QEAA\@MHW4AttributeBuffType\@\@_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z
      */
     MCAPI TemporalAttributeBuff(float, int, enum class AttributeBuffType, bool, std::string const &);
+    /**
+     * @symbol ??0TemporalAttributeBuff\@\@QEAA\@AEBV0\@\@Z
+     */
+    MCAPI TemporalAttributeBuff(class TemporalAttributeBuff const &);
     /**
      * @symbol ?getBaseAmount\@TemporalAttributeBuff\@\@QEBAMXZ
      */
diff --git a/LiteLoader/include/llapi/mc/TextPacket.hpp b/LiteLoader/include/llapi/mc/TextPacket.hpp
index cf2560c6f8..4aea0ae5de 100644
--- a/LiteLoader/include/llapi/mc/TextPacket.hpp
+++ b/LiteLoader/include/llapi/mc/TextPacket.hpp
@@ -51,7 +51,7 @@ class TextPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@TextPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
@@ -89,14 +89,14 @@ class TextPacket : public Packet {
      * @symbol ?createTextObjectMessage\@TextPacket\@\@SA?AV1\@AEBVResolvedTextObject\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@1\@Z
      */
     MCAPI static class TextPacket createTextObjectMessage(class ResolvedTextObject const &, std::string, std::string);
-    /**
-     * @symbol ?createTextObjectWhisperMessage\@TextPacket\@\@SA?AV1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@00\@Z
-     */
-    MCAPI static class TextPacket createTextObjectWhisperMessage(std::string const &, std::string const &, std::string const &);
     /**
      * @symbol ?createTextObjectWhisperMessage\@TextPacket\@\@SA?AV1\@AEBVResolvedTextObject\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@1\@Z
      */
     MCAPI static class TextPacket createTextObjectWhisperMessage(class ResolvedTextObject const &, std::string const &, std::string const &);
+    /**
+     * @symbol ?createTextObjectWhisperMessage\@TextPacket\@\@SA?AV1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@00\@Z
+     */
+    MCAPI static class TextPacket createTextObjectWhisperMessage(std::string const &, std::string const &, std::string const &);
     /**
      * @symbol ?createTranslated\@TextPacket\@\@SA?AV1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@3\@\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/ThirdPartyInfo.hpp b/LiteLoader/include/llapi/mc/ThirdPartyInfo.hpp
index 93bd38658c..f5bf8343b7 100644
--- a/LiteLoader/include/llapi/mc/ThirdPartyInfo.hpp
+++ b/LiteLoader/include/llapi/mc/ThirdPartyInfo.hpp
@@ -25,14 +25,14 @@ class ThirdPartyInfo {
 #endif
 
 public:
-    /**
-     * @symbol ??0ThirdPartyInfo\@\@QEAA\@AEBV0\@\@Z
-     */
-    MCAPI ThirdPartyInfo(class ThirdPartyInfo const &);
     /**
      * @symbol ??0ThirdPartyInfo\@\@QEAA\@XZ
      */
     MCAPI ThirdPartyInfo();
+    /**
+     * @symbol ??0ThirdPartyInfo\@\@QEAA\@AEBV0\@\@Z
+     */
+    MCAPI ThirdPartyInfo(class ThirdPartyInfo const &);
     /**
      * @symbol ??1ThirdPartyInfo\@\@QEAA\@XZ
      */
diff --git a/LiteLoader/include/llapi/mc/TickSyncPacket.hpp b/LiteLoader/include/llapi/mc/TickSyncPacket.hpp
index 98ff1e8ae5..0c273c50c9 100644
--- a/LiteLoader/include/llapi/mc/TickSyncPacket.hpp
+++ b/LiteLoader/include/llapi/mc/TickSyncPacket.hpp
@@ -51,7 +51,7 @@ class TickSyncPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@TickSyncPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/TickingAreasLoadStatusPacket.hpp b/LiteLoader/include/llapi/mc/TickingAreasLoadStatusPacket.hpp
index 6d6e4e1590..8c404a1788 100644
--- a/LiteLoader/include/llapi/mc/TickingAreasLoadStatusPacket.hpp
+++ b/LiteLoader/include/llapi/mc/TickingAreasLoadStatusPacket.hpp
@@ -48,7 +48,7 @@ class TickingAreasLoadStatusPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@TickingAreasLoadStatusPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/ToastRequestPacket.hpp b/LiteLoader/include/llapi/mc/ToastRequestPacket.hpp
index 2eb89ca042..19f24d7ad2 100644
--- a/LiteLoader/include/llapi/mc/ToastRequestPacket.hpp
+++ b/LiteLoader/include/llapi/mc/ToastRequestPacket.hpp
@@ -50,7 +50,7 @@ class ToastRequestPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@ToastRequestPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/TransferPacket.hpp b/LiteLoader/include/llapi/mc/TransferPacket.hpp
index d6f2f8441e..e68a6a4112 100644
--- a/LiteLoader/include/llapi/mc/TransferPacket.hpp
+++ b/LiteLoader/include/llapi/mc/TransferPacket.hpp
@@ -51,7 +51,7 @@ class TransferPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@TransferPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/UnlockedRecipesPacket.hpp b/LiteLoader/include/llapi/mc/UnlockedRecipesPacket.hpp
index 751588af74..263a2cde4d 100644
--- a/LiteLoader/include/llapi/mc/UnlockedRecipesPacket.hpp
+++ b/LiteLoader/include/llapi/mc/UnlockedRecipesPacket.hpp
@@ -45,7 +45,7 @@ class UnlockedRecipesPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@UnlockedRecipesPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/UpdateAbilitiesPacket.hpp b/LiteLoader/include/llapi/mc/UpdateAbilitiesPacket.hpp
index ad5c1b1b72..f9c95dbc2a 100644
--- a/LiteLoader/include/llapi/mc/UpdateAbilitiesPacket.hpp
+++ b/LiteLoader/include/llapi/mc/UpdateAbilitiesPacket.hpp
@@ -48,7 +48,7 @@ class UpdateAbilitiesPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@UpdateAbilitiesPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/UpdateAdventureSettingsPacket.hpp b/LiteLoader/include/llapi/mc/UpdateAdventureSettingsPacket.hpp
index 1fd9ff206a..1734ba88a8 100644
--- a/LiteLoader/include/llapi/mc/UpdateAdventureSettingsPacket.hpp
+++ b/LiteLoader/include/llapi/mc/UpdateAdventureSettingsPacket.hpp
@@ -48,7 +48,7 @@ class UpdateAdventureSettingsPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@UpdateAdventureSettingsPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/UpdateAttributesPacket.hpp b/LiteLoader/include/llapi/mc/UpdateAttributesPacket.hpp
index 731a66ff95..6972636bb8 100644
--- a/LiteLoader/include/llapi/mc/UpdateAttributesPacket.hpp
+++ b/LiteLoader/include/llapi/mc/UpdateAttributesPacket.hpp
@@ -50,7 +50,7 @@ class UpdateAttributesPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@UpdateAttributesPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
@@ -60,13 +60,13 @@ class UpdateAttributesPacket : public Packet {
      */
     MCVAPI ~UpdateAttributesPacket();
 #endif
-    /**
-     * @symbol ??0UpdateAttributesPacket\@\@QEAA\@AEBVActor\@\@AEBV?$vector\@VAttributeInstanceHandle\@\@V?$allocator\@VAttributeInstanceHandle\@\@\@std\@\@\@std\@\@\@Z
-     */
-    MCAPI UpdateAttributesPacket(class Actor const &, std::vector<class AttributeInstanceHandle> const &);
     /**
      * @symbol ??0UpdateAttributesPacket\@\@QEAA\@XZ
      */
     MCAPI UpdateAttributesPacket();
+    /**
+     * @symbol ??0UpdateAttributesPacket\@\@QEAA\@AEBVActor\@\@AEBV?$vector\@VAttributeInstanceHandle\@\@V?$allocator\@VAttributeInstanceHandle\@\@\@std\@\@\@std\@\@\@Z
+     */
+    MCAPI UpdateAttributesPacket(class Actor const &, std::vector<class AttributeInstanceHandle> const &);
 
 };
diff --git a/LiteLoader/include/llapi/mc/UpdateBlockPacket.hpp b/LiteLoader/include/llapi/mc/UpdateBlockPacket.hpp
index f51487f906..1157683d8b 100644
--- a/LiteLoader/include/llapi/mc/UpdateBlockPacket.hpp
+++ b/LiteLoader/include/llapi/mc/UpdateBlockPacket.hpp
@@ -50,7 +50,7 @@ class UpdateBlockPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@UpdateBlockPacket\@\@MEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
@@ -60,13 +60,13 @@ class UpdateBlockPacket : public Packet {
      */
     MCVAPI ~UpdateBlockPacket();
 #endif
-    /**
-     * @symbol ??0UpdateBlockPacket\@\@QEAA\@AEBVBlockPos\@\@IIE\@Z
-     */
-    MCAPI UpdateBlockPacket(class BlockPos const &, unsigned int, unsigned int, unsigned char);
     /**
      * @symbol ??0UpdateBlockPacket\@\@QEAA\@XZ
      */
     MCAPI UpdateBlockPacket();
+    /**
+     * @symbol ??0UpdateBlockPacket\@\@QEAA\@AEBVBlockPos\@\@IIE\@Z
+     */
+    MCAPI UpdateBlockPacket(class BlockPos const &, unsigned int, unsigned int, unsigned char);
 
 };
diff --git a/LiteLoader/include/llapi/mc/UpdateBlockSyncedPacket.hpp b/LiteLoader/include/llapi/mc/UpdateBlockSyncedPacket.hpp
index 79ae79a535..cdafc4df44 100644
--- a/LiteLoader/include/llapi/mc/UpdateBlockSyncedPacket.hpp
+++ b/LiteLoader/include/llapi/mc/UpdateBlockSyncedPacket.hpp
@@ -50,7 +50,7 @@ class UpdateBlockSyncedPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@UpdateBlockSyncedPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/UpdateClientInputLocksPacket.hpp b/LiteLoader/include/llapi/mc/UpdateClientInputLocksPacket.hpp
index 868e9803d8..f772fb2bf7 100644
--- a/LiteLoader/include/llapi/mc/UpdateClientInputLocksPacket.hpp
+++ b/LiteLoader/include/llapi/mc/UpdateClientInputLocksPacket.hpp
@@ -48,7 +48,7 @@ class UpdateClientInputLocksPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@UpdateClientInputLocksPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/UpdateEquipPacket.hpp b/LiteLoader/include/llapi/mc/UpdateEquipPacket.hpp
index 36760f4011..e791fee6f9 100644
--- a/LiteLoader/include/llapi/mc/UpdateEquipPacket.hpp
+++ b/LiteLoader/include/llapi/mc/UpdateEquipPacket.hpp
@@ -50,7 +50,7 @@ class UpdateEquipPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@UpdateEquipPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/UpdatePlayerGameTypePacket.hpp b/LiteLoader/include/llapi/mc/UpdatePlayerGameTypePacket.hpp
index b742b3ff75..99f44416b0 100644
--- a/LiteLoader/include/llapi/mc/UpdatePlayerGameTypePacket.hpp
+++ b/LiteLoader/include/llapi/mc/UpdatePlayerGameTypePacket.hpp
@@ -50,7 +50,7 @@ class UpdatePlayerGameTypePacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@UpdatePlayerGameTypePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/UpdateSoftEnumPacket.hpp b/LiteLoader/include/llapi/mc/UpdateSoftEnumPacket.hpp
index 4838d7235f..b8aaa124bb 100644
--- a/LiteLoader/include/llapi/mc/UpdateSoftEnumPacket.hpp
+++ b/LiteLoader/include/llapi/mc/UpdateSoftEnumPacket.hpp
@@ -56,7 +56,7 @@ class UpdateSoftEnumPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@UpdateSoftEnumPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/UpdateSubChunkBlocksPacket.hpp b/LiteLoader/include/llapi/mc/UpdateSubChunkBlocksPacket.hpp
index 528b8172e1..4788a36bdb 100644
--- a/LiteLoader/include/llapi/mc/UpdateSubChunkBlocksPacket.hpp
+++ b/LiteLoader/include/llapi/mc/UpdateSubChunkBlocksPacket.hpp
@@ -50,7 +50,7 @@ class UpdateSubChunkBlocksPacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@UpdateSubChunkBlocksPacket\@\@MEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
diff --git a/LiteLoader/include/llapi/mc/UpdateTradePacket.hpp b/LiteLoader/include/llapi/mc/UpdateTradePacket.hpp
index d3ba144f74..295b1863c9 100644
--- a/LiteLoader/include/llapi/mc/UpdateTradePacket.hpp
+++ b/LiteLoader/include/llapi/mc/UpdateTradePacket.hpp
@@ -50,7 +50,7 @@ class UpdateTradePacket : public Packet {
      */
     virtual void write(class BinaryStream &) const;
     /**
-     * @vftbl 6
+     * @vftbl 7
      * @symbol ?_read\@UpdateTradePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z
      */
     virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &);
@@ -60,13 +60,13 @@ class UpdateTradePacket : public Packet {
      */
     MCVAPI ~UpdateTradePacket();
 #endif
-    /**
-     * @symbol ??0UpdateTradePacket\@\@QEAA\@XZ
-     */
-    MCAPI UpdateTradePacket();
     /**
      * @symbol ??0UpdateTradePacket\@\@QEAA\@W4ContainerID\@\@W4ContainerType\@\@HAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$$QEAVCompoundTag\@\@AEBUActorUniqueID\@\@4H_N5\@Z
      */
     MCAPI UpdateTradePacket(enum class ContainerID, enum class ContainerType, int, std::string const &, class CompoundTag &&, struct ActorUniqueID const &, struct ActorUniqueID const &, int, bool, bool);
+    /**
+     * @symbol ??0UpdateTradePacket\@\@QEAA\@XZ
+     */
+    MCAPI UpdateTradePacket();
 
 };
diff --git a/LiteLoader/include/llapi/mc/Util.hpp b/LiteLoader/include/llapi/mc/Util.hpp
index 5fb711827b..521dd55d9e 100644
--- a/LiteLoader/include/llapi/mc/Util.hpp
+++ b/LiteLoader/include/llapi/mc/Util.hpp
@@ -82,14 +82,14 @@ struct FormattedString {
      * @symbol ?base64_decode\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@\@Z
      */
     MCAPI std::string base64_decode(std::string const &);
-    /**
-     * @symbol ?base64_encode\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEBE_K_N\@Z
-     */
-    MCAPI std::string base64_encode(unsigned char const *, unsigned __int64, bool);
     /**
      * @symbol ?base64_encode\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@_N\@Z
      */
     MCAPI std::string base64_encode(std::string const &, bool);
+    /**
+     * @symbol ?base64_encode\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEBE_K_N\@Z
+     */
+    MCAPI std::string base64_encode(unsigned char const *, unsigned __int64, bool);
     /**
      * @symbol ?base64url_decode\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V23\@\@Z
      */
@@ -310,14 +310,14 @@ struct FormattedString {
      * @symbol ?toIntWithMinMax\@Util\@\@YA?AW4NumberConversionResult\@1\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@AEAHHH\@Z
      */
     MCAPI enum class Util::NumberConversionResult toIntWithMinMax(class std::basic_string_view<char, struct std::char_traits<char>>, int &, int, int);
-    /**
-     * @symbol ?toLower\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEBD\@Z
-     */
-    MCAPI std::string toLower(char const *);
     /**
      * @symbol ?toLower\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@3\@\@Z
      */
     MCAPI std::string toLower(class std::basic_string_view<char, struct std::char_traits<char>> const &);
+    /**
+     * @symbol ?toLower\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEBD\@Z
+     */
+    MCAPI std::string toLower(char const *);
     /**
      * @symbol ?toLowerInPlace\@Util\@\@YAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/VanillaStates.hpp b/LiteLoader/include/llapi/mc/VanillaStates.hpp
index 018a31563c..08f40e33dc 100644
--- a/LiteLoader/include/llapi/mc/VanillaStates.hpp
+++ b/LiteLoader/include/llapi/mc/VanillaStates.hpp
@@ -538,14 +538,14 @@ struct CachedItemStateMapPtr {
      * @symbol ?WoodType\@VanillaStates\@\@3V?$ItemStateVariant\@W4WoodType\@\@\@\@B
      */
     MCAPI extern class ItemStateVariant<enum class WoodType> const WoodType;
-    /**
-     * @symbol ?getState\@VanillaStates\@\@YAPEBVItemState\@\@AEBVHashedString\@\@AEAUCachedItemStateMapPtr\@1\@\@Z
-     */
-    MCAPI class ItemState const * getState(class HashedString const &, struct VanillaStates::CachedItemStateMapPtr &);
     /**
      * @symbol ?getState\@VanillaStates\@\@YAPEBVItemState\@\@AEBVHashedString\@\@\@Z
      */
     MCAPI class ItemState const * getState(class HashedString const &);
+    /**
+     * @symbol ?getState\@VanillaStates\@\@YAPEBVItemState\@\@AEBVHashedString\@\@AEAUCachedItemStateMapPtr\@1\@\@Z
+     */
+    MCAPI class ItemState const * getState(class HashedString const &, struct VanillaStates::CachedItemStateMapPtr &);
     /**
      * @symbol ?registerStates\@VanillaStates\@\@YAXXZ
      */
diff --git a/LiteLoader/include/llapi/mc/WallBlock.hpp b/LiteLoader/include/llapi/mc/WallBlock.hpp
index 13bf3d34f8..da01022daa 100644
--- a/LiteLoader/include/llapi/mc/WallBlock.hpp
+++ b/LiteLoader/include/llapi/mc/WallBlock.hpp
@@ -329,14 +329,14 @@ class WallBlock : public BlockLegacy {
      */
     MCVAPI ~WallBlock();
 #endif
-    /**
-     * @symbol ??0WallBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z
-     */
-    MCAPI WallBlock(std::string const &, int, class Material const &);
     /**
      * @symbol ??0WallBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVBlockLegacy\@\@\@Z
      */
     MCAPI WallBlock(std::string const &, int, class BlockLegacy const &);
+    /**
+     * @symbol ??0WallBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z
+     */
+    MCAPI WallBlock(std::string const &, int, class Material const &);
     /**
      * @symbol ?tryFixWallStates\@WallBlock\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z
      */
diff --git a/LiteLoader/include/llapi/mc/WeakStorageFeature.hpp b/LiteLoader/include/llapi/mc/WeakStorageFeature.hpp
index d9c9c659ab..b057350f21 100644
--- a/LiteLoader/include/llapi/mc/WeakStorageFeature.hpp
+++ b/LiteLoader/include/llapi/mc/WeakStorageFeature.hpp
@@ -35,14 +35,14 @@ class WeakStorageFeature {
      * @symbol ??0WeakStorageFeature\@\@IEAA\@W4EmptyInit\@0\@\@Z
      */
     MCAPI WeakStorageFeature(enum class WeakStorageFeature::EmptyInit);
-    /**
-     * @symbol ??0WeakStorageFeature\@\@IEAA\@AEBVOwnerStorageFeature\@\@\@Z
-     */
-    MCAPI WeakStorageFeature(class OwnerStorageFeature const &);
     /**
      * @symbol ??0WeakStorageFeature\@\@IEAA\@$$QEAV0\@\@Z
      */
     MCAPI WeakStorageFeature(class WeakStorageFeature &&);
+    /**
+     * @symbol ??0WeakStorageFeature\@\@IEAA\@AEBVOwnerStorageFeature\@\@\@Z
+     */
+    MCAPI WeakStorageFeature(class OwnerStorageFeature const &);
     /**
      * @symbol ?_isSet\@WeakStorageFeature\@\@IEBA_NXZ
      */
diff --git a/LiteLoader/src/llapi/mc/PlayerAPI.cpp b/LiteLoader/src/llapi/mc/PlayerAPI.cpp
index a89005d5f4..b478298ba2 100644
--- a/LiteLoader/src/llapi/mc/PlayerAPI.cpp
+++ b/LiteLoader/src/llapi/mc/PlayerAPI.cpp
@@ -631,8 +631,9 @@ bool Player::sendTextPacket(string text, TextType Type) const {
     wp.writeString("");
     wp.writeString("");
 
-    NetworkPacket<(int)MinecraftPacketIds::Text> pkt(wp.getAndReleaseData());
-    sendNetworkPacket(pkt);
+    auto pkt = MinecraftPackets::createPacket(MinecraftPacketIds::Text);
+    pkt->read(wp);
+    sendNetworkPacket(*pkt);
     return true;
 }
 
@@ -884,8 +885,9 @@ bool Player::sendRawFormPacket(unsigned formId, const string& data) const {
     wp.writeUnsignedVarInt(formId);
     wp.writeString(data);
 
-    NetworkPacket<(int)MinecraftPacketIds::ModalFormRequest> pkt(wp.getAndReleaseData());
-    sendNetworkPacket(pkt);
+    auto pkt = MinecraftPackets::createPacket(MinecraftPacketIds::ModalFormRequest);
+    pkt->read(wp);
+    sendNetworkPacket(*pkt);
     return true;
 }
 
diff --git a/scripts/LINK.txt b/scripts/LINK.txt
index e5b1f41f10..ed9978b96b 100644
--- a/scripts/LINK.txt
+++ b/scripts/LINK.txt
@@ -1 +1 @@
-https://minecraft.azureedge.net/bin-win/bedrock-server-1.19.70.02.zip
\ No newline at end of file
+https://minecraft.azureedge.net/bin-win/bedrock-server-1.19.72.01.zip
\ No newline at end of file