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

# Conflicts:
#	src/mc/server/commands/CommandOutputMessage.h
#	src/mc/server/commands/CommandRegistry.h
#	src/mc/server/commands/CommandWildcardInt.h
#	src/mc/util/rotation_command_utils/RotationData.h

src/mc/certificates/Certificate.h

@@ -71,10 +71,12 @@ class Certificate {
     // thunks
 public:
     // NOLINTBEGIN
-    template <class... Args>
-    auto* ctor$(Args... args) {
-        return std::construct_at(this, std::forward<Args>(args)...);
-    }
+    MCAPI void* ctor$(class Certificate const& other);
+
+    MCAPI void* ctor$(
+        class UnverifiedCertificate const& unverifiedCertificate,
+        std::unique_ptr<class Certificate> parentCertificate
+    );
 
     MCAPI void dtor$();
 

src/mc/certificates/KeyManager.h

@@ -31,10 +31,7 @@ class KeyManager {
     // NOLINTBEGIN
     MCAPI static void** $vftable();
 
-    template <class... Args>
-    auto* ctor$(Args... args) {
-        return std::construct_at(this, std::forward<Args>(args)...);
-    }
+    MCAPI void* ctor$(std::string const& publicKey, ::Crypto::Asymmetric::System system);
 
     MCAPI void dtor$();
 

src/mc/certificates/PrivateKeyManager.h

@@ -32,10 +32,7 @@ class PrivateKeyManager : public ::KeyManager {
     // NOLINTBEGIN
     MCAPI static void** $vftable();
 
-    template <class... Args>
-    auto* ctor$(Args... args) {
-        return std::construct_at(this, std::forward<Args>(args)...);
-    }
+    MCAPI void* ctor$(::Crypto::Asymmetric::System system);
 
     MCAPI void dtor$();
 

src/mc/certificates/UnverifiedCertificate.h

@@ -47,10 +47,12 @@ class UnverifiedCertificate {
     // thunks
 public:
     // NOLINTBEGIN
-    template <class... Args>
-    auto* ctor$(Args... args) {
-        return std::construct_at(this, std::forward<Args>(args)...);
-    }
+    MCAPI void* ctor$(class UnverifiedCertificate const& other);
+
+    MCAPI void* ctor$(class UnverifiedCertificate&& other);
+
+    MCAPI void*
+    ctor$(class WebToken const& rawToken, std::unique_ptr<class UnverifiedCertificate> parentUnverifiedCertificate);
 
     MCAPI void dtor$();
 

src/mc/certificates/WebToken.h

@@ -49,10 +49,7 @@ class WebToken {
     // thunks
 public:
     // NOLINTBEGIN
-    template <class... Args>
-    auto* ctor$(Args... args) {
-        return std::construct_at(this, std::forward<Args>(args)...);
-    }
+    MCAPI void* ctor$(std::string token);
 
     MCAPI void dtor$();
 

src/mc/certificates/identity/RoleChecker.h

@@ -29,10 +29,7 @@ class RoleChecker {
     // thunks
 public:
     // NOLINTBEGIN
-    template <class... Args>
-    auto* ctor$(Args... args) {
-        return std::construct_at(this, std::forward<Args>(args)...);
-    }
+    MCAPI void* ctor$();
 
     MCAPI void dtor$();
 

src/mc/client/services/integrity/IntegrityTokenResult.h

@@ -20,10 +20,7 @@ struct IntegrityTokenResult {
     // thunks
 public:
     // NOLINTBEGIN
-    template <class... Args>
-    auto* ctor$(Args... args) {
-        return std::construct_at(this, std::forward<Args>(args)...);
-    }
+    MCAPI void* ctor$(struct IntegrityTokenResult&&);
 
     MCAPI void dtor$();
 

src/mc/codebuilder/ChatSubscription.h

@@ -22,10 +22,7 @@ struct ChatSubscription {
     // thunks
 public:
     // NOLINTBEGIN
-    template <class... Args>
-    auto* ctor$(Args... args) {
-        return std::construct_at(this, std::forward<Args>(args)...);
-    }
+    MCAPI void* ctor$(struct CodeBuilder::ChatSubscription&&);
 
     MCAPI void dtor$();
 

src/mc/codebuilder/ErrorMessage.h

@@ -29,10 +29,9 @@ struct ErrorMessage {
     // thunks
 public:
     // NOLINTBEGIN
-    template <class... Args>
-    auto* ctor$(Args... args) {
-        return std::construct_at(this, std::forward<Args>(args)...);
-    }
+    MCAPI void* ctor$(std::string const& requestId, struct MCRESULT result);
+
+    MCAPI void* ctor$(std::string const& requestId, struct MCRESULT result, std::string const& message);
 
     MCAPI void dtor$();
 

src/mc/codebuilder/EventMessage.h

@@ -27,10 +27,7 @@ struct EventMessage {
     // thunks
 public:
     // NOLINTBEGIN
-    template <class... Args>
-    auto* ctor$(Args... args) {
-        return std::construct_at(this, std::forward<Args>(args)...);
-    }
+    MCAPI void* ctor$(struct Util::CodeBuilder::Event const& event);
 
     MCAPI void dtor$();
 

src/mc/codebuilder/GameContext.h

@@ -37,10 +37,7 @@ class GameContext {
         // thunks
     public:
         // NOLINTBEGIN
-        template <class... Args>
-        auto* ctor$(Args... args) {
-            return std::construct_at(this, std::forward<Args>(args)...);
-        }
+        MCAPI void* ctor$(struct CodeBuilder::GameContext::ItemTypeList&&);
 
         MCAPI void dtor$();
 
@@ -65,10 +62,7 @@ class GameContext {
         // thunks
     public:
         // NOLINTBEGIN
-        template <class... Args>
-        auto* ctor$(Args... args) {
-            return std::construct_at(this, std::forward<Args>(args)...);
-        }
+        MCAPI void* ctor$(struct CodeBuilder::GameContext::ObjectTypeList&&);
 
         MCAPI void dtor$();
 

src/mc/codebuilder/Manager.h

@@ -43,10 +43,7 @@ class Manager : public ::CodeBuilder::IManager {
     // NOLINTBEGIN
     MCAPI static void** $vftable();
 
-    template <class... Args>
-    auto* ctor$(Args... args) {
-        return std::construct_at(this, std::forward<Args>(args)...);
-    }
+    MCAPI void* ctor$(class IMinecraftApp& minecraftApp);
 
     MCAPI Bedrock::NotNullNonOwnerPtr<class Automation::AutomationClient> getAutomationClient$() const;
 

src/mc/codebuilder/Messenger.h

@@ -162,10 +162,7 @@ class Messenger : public ::CodeBuilder::IMessenger {
 
     MCAPI static void** $vftableForCodeBuilderCommandOutputObserver();
 
-    template <class... Args>
-    auto* ctor$(Args... args) {
-        return std::construct_at(this, std::forward<Args>(args)...);
-    }
+    MCAPI void* ctor$(class Bedrock::NonOwnerPointer<class CodeBuilder::IClient> codeBuilderClient);
 
     MCAPI void
     blockBroken$(class Player const* player, class Block const& block, int method, int variantData, ushort auxType)

src/mc/codebuilder/utils/Event.h

@@ -22,10 +22,7 @@ struct Event {
     // thunks
 public:
     // NOLINTBEGIN
-    template <class... Args>
-    auto* ctor$(Args... args) {
-        return std::construct_at(this, std::forward<Args>(args)...);
-    }
+    MCAPI void* ctor$(std::string const& name);
 
     MCAPI void dtor$();
 

src/mc/common/AppPlatformListener.h

@@ -89,10 +89,7 @@ class AppPlatformListener {
     // NOLINTBEGIN
     MCAPI static void** $vftable();
 
-    template <class... Args>
-    auto* ctor$(Args... args) {
-        return std::construct_at(this, std::forward<Args>(args)...);
-    }
+    MCAPI void* ctor$(bool doInit);
 
     MCAPI void dtor$();
 

src/mc/common/Brightness.h

@@ -21,10 +21,9 @@ struct Brightness {
     // thunks
 public:
     // NOLINTBEGIN
-    template <class... Args>
-    auto* ctor$(Args... args) {
-        return std::construct_at(this, std::forward<Args>(args)...);
-    }
+    MCAPI void* ctor$(struct Brightness const&);
+
+    MCAPI void* ctor$(uchar const&);
 
     MCAPI static struct Brightness const& INVALID();
 

src/mc/common/GameVersion.h

@@ -36,10 +36,13 @@ class GameVersion {
     // thunks
 public:
     // NOLINTBEGIN
-    template <class... Args>
-    auto* ctor$(Args... args) {
-        return std::construct_at(this, std::forward<Args>(args)...);
-    }
+    MCAPI void* ctor$(uint major, uint minor, uint patch, uint revision, uint isBeta);
+
+    MCAPI void* ctor$(class ListTag const& tag);
+
+    MCAPI void* ctor$();
+
+    MCAPI void* ctor$(class GameVersion const&);
 
     MCAPI void dtor$();
 

src/mc/common/JsonValidator.h

@@ -53,10 +53,11 @@ class JsonValidator {
         // thunks
     public:
         // NOLINTBEGIN
-        template <class... Args>
-        auto* ctor$(Args... args) {
-            return std::construct_at(this, std::forward<Args>(args)...);
-        }
+        MCAPI void* ctor$();
+
+        MCAPI void* ctor$(class JsonValidator::Property const&);
+
+        MCAPI void* ctor$(class JsonValidator::Property&&);
 
         MCAPI void dtor$();
 

src/mc/config/ScreenCapabilitiesRepo.h

@@ -19,10 +19,7 @@ class ScreenCapabilitiesRepo {
     // thunks
 public:
     // NOLINTBEGIN
-    template <class... Args>
-    auto* ctor$(Args... args) {
-        return std::construct_at(this, std::forward<Args>(args)...);
-    }
+    MCAPI void* ctor$();
 
     // NOLINTEND
 };

src/mc/config/player_capabilities/PlayerData.h

@@ -46,10 +46,7 @@ class PlayerData : public ::PlayerCapabilities::IPlayerData {
     // NOLINTBEGIN
     MCAPI static void** $vftable();
 
-    template <class... Args>
-    auto* ctor$(Args... args) {
-        return std::construct_at(this, std::forward<Args>(args)...);
-    }
+    MCAPI void* ctor$(class Player const& player);
 
     MCAPI bool isAbilityEnabled$(::AbilitiesIndex ability) const;
 

src/mc/dataloadhelper/NewUniqueIdsDataLoadHelper.h

@@ -84,10 +84,7 @@ class NewUniqueIdsDataLoadHelper : public ::DataLoadHelper {
     // NOLINTBEGIN
     MCAPI static void** $vftable();
 
-    template <class... Args>
-    auto* ctor$(Args... args) {
-        return std::construct_at(this, std::forward<Args>(args)...);
-    }
+    MCAPI void* ctor$(class ILevel& level);
 
     MCAPI void dtor$();
 

src/mc/dataloadhelper/StructureDataLoadHelper.h

@@ -100,10 +100,15 @@ class StructureDataLoadHelper : public ::DataLoadHelper {
     // NOLINTBEGIN
     MCAPI static void** $vftable();
 
-    template <class... Args>
-    auto* ctor$(Args... args) {
-        return std::construct_at(this, std::forward<Args>(args)...);
-    }
+    MCAPI void* ctor$(
+        class BlockPos const& structurePlacementLocation,
+        class BlockPos const& structureWorldOrigin,
+        class Vec3 const&     rotationPivot,
+        struct ActorUniqueID  ownerID,
+        ::Rotation            rotation,
+        ::Mirror              mirror,
+        class Level&          level
+    );
 
     MCAPI void dtor$();
 

src/mc/debug/DebugEndPoint.h

@@ -90,10 +90,7 @@ class DebugEndPoint : public ::ContentLogEndPoint {
 
     MCAPI static void** $vftableForBedrockLogEndPoint();
 
-    template <class... Args>
-    auto* ctor$(Args... args) {
-        return std::construct_at(this, std::forward<Args>(args)...);
-    }
+    MCAPI void* ctor$(std::optional<::LogLevel> minLogLevel);
 
     MCAPI void contentAssert$(::LogArea area, ::LogLevel level, char const* message);
 

src/mc/deps/application/AppPlatform.h

@@ -555,10 +555,7 @@ class AppPlatform {
 
     MCAPI static void** $vftableForISecureStorageKeySystem();
 
-    template <class... Args>
-    auto* ctor$(Args... args) {
-        return std::construct_at(this, std::forward<Args>(args)...);
-    }
+    MCAPI void* ctor$(bool registerService);
 
     MCAPI void dtor$();
 

src/mc/deps/core/container/Blob.h

@@ -79,10 +79,11 @@ class Blob {
     // thunks
 public:
     // NOLINTBEGIN
-    template <class... Args>
-    auto* ctor$(Args... args) {
-        return std::construct_at(this, std::forward<Args>(args)...);
-    }
+    MCAPI void* ctor$();
+
+    MCAPI void* ctor$(uint64 size);
+
+    MCAPI void* ctor$(class mce::Blob&& rhs);
 
     MCAPI void dtor$();
 

src/mc/deps/core/data_store/DataStore.h

@@ -117,10 +117,7 @@ class DataStore : public ::Bedrock::EnableNonOwnerReferences {
         // thunks
     public:
         // NOLINTBEGIN
-        template <class... Args>
-        auto* ctor$(Args... args) {
-            return std::construct_at(this, std::forward<Args>(args)...);
-        }
+        MCAPI void* ctor$(class Bedrock::DataStore* owner);
 
         // NOLINTEND
     };
@@ -218,10 +215,7 @@ class DataStore : public ::Bedrock::EnableNonOwnerReferences {
     // NOLINTBEGIN
     MCAPI static void** $vftable();
 
-    template <class... Args>
-    auto* ctor$(Args... args) {
-        return std::construct_at(this, std::forward<Args>(args)...);
-    }
+    MCAPI void* ctor$();
 
     MCAPI void dtor$();
 

src/mc/deps/core/debug/DebugAssertException.h

@@ -27,10 +27,9 @@ class DebugAssertException {
     // NOLINTBEGIN
     MCAPI static void** $vftable();
 
-    template <class... Args>
-    auto* ctor$(Args... args) {
-        return std::construct_at(this, std::forward<Args>(args)...);
-    }
+    MCAPI void* ctor$(char const* desc, char const* arg, int line, char const* file, char const* function);
+
+    MCAPI void* ctor$(class DebugAssertException const& e);
 
     MCAPI void dtor$();
 

src/mc/deps/core/debug/bedrock_log/CategoryLogFile.h

@@ -26,10 +26,7 @@ struct CategoryLogFile {
     // thunks
 public:
     // NOLINTBEGIN
-    template <class... Args>
-    auto* ctor$(Args... args) {
-        return std::construct_at(this, std::forward<Args>(args)...);
-    }
+    MCAPI void* ctor$();
 
     MCAPI void dtor$();