Skip to content

Commit

Permalink
Merge branch 'header'
Browse files Browse the repository at this point in the history
# Conflicts:
#	src/mc/common/SharedPtr.h
#	src/mc/common/WeakPtr.h
#	src/mc/deps/application/common/utility/ThreadOwnerBase.h
#	src/mc/deps/core/container/MovePriorityQueue.h
#	src/mc/deps/core/container/list_base_hook.h
#	src/mc/deps/core/file/Path.h
#	src/mc/deps/core/file/PathBuffer.h
#	src/mc/deps/core/file/PathPart.h
#	src/mc/deps/core/string/HashedString.h
#	src/mc/deps/core/threading/IAsyncResult.h
#	src/mc/deps/core/threading/SPSCQueue.h
#	src/mc/deps/core/threading/TaskStartInfoEx.h
#	src/mc/deps/core/utility/AutomaticID.h
#	src/mc/deps/core/utility/BinaryStream.h
#	src/mc/deps/core/utility/NonOwnerPointer.h
#	src/mc/deps/core/utility/ServiceReference.h
#	src/mc/deps/core/utility/buffer_span.h
#	src/mc/deps/core/utility/optional_ref.h
#	src/mc/deps/core/utility/typeid_t.h
#	src/mc/deps/ecs/Optional.h
#	src/mc/deps/game_refs/EnableGetWeakRef.h
#	src/mc/deps/game_refs/OwnerPtr.h
#	src/mc/deps/game_refs/StackRefResult.h
#	src/mc/deps/game_refs/WeakRef.h
#	src/mc/nbt/CompoundTag.h
#	src/mc/nbt/CompoundTagVariant.h
#	src/mc/platform/ErrorInfo.h
#	src/mc/platform/Result.h
#	src/mc/platform/brstd/function_ref.h
#	src/mc/platform/threading/LockGuard.h
#	src/mc/platform/threading/ThreadLocalObject.h
#	src/mc/server/commands/CommandRegistry.h
#	src/mc/server/commands/CommandSelector.h
#	src/mc/server/commands/CommandSelectorResults.h
#	src/mc/server/commands/WildcardCommandSelector.h
#	src/mc/util/BidirectionalUnorderedMap.h
#	src/mc/util/GridArea.h
#	src/mc/util/MolangLoopBreak.h
#	src/mc/util/MolangLoopContinue.h
#	src/mc/util/MolangScriptArg.h
#	src/mc/util/MultidimensionalArray.h
#	src/mc/util/NewType.h
#	src/mc/util/OwnerPtrFactory.h
#	src/mc/util/ThreadOwner.h
#	src/mc/world/TypedRuntimeId.h
#	src/mc/world/actor/selectors/InvertableFilter.h
#	src/mc/world/events/EventListenerDispatcher.h
#	src/mc/world/inventory/network/TypedClientNetId.h
#	src/mc/world/inventory/network/TypedServerNetId.h
#	src/mc/world/level/DividedPos2d.h
#	src/mc/world/level/block/ActorBlockBase.h
#	src/mc/world/level/block/states/BlockStateVariant.h
#	src/mc/world/level/block/states/BuiltInBlockStateVariant.h
#	src/mc/world/level/chunk/SubChunkStorage.h
  • Loading branch information
OEOTYAN committed Jan 11, 2025
2 parents 604c7f2 + 4b6f16c commit 7db3b4a
Show file tree
Hide file tree
Showing 5,910 changed files with 9,729 additions and 32,557 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
1 change: 1 addition & 0 deletions src/mc/_HeaderOutputPredefine.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

#define MCAPI LL_SHARED_IMPORT
#define MCTAPI template<> MCAPI
#define MCFOLD MCAPI /*Identical COMDAT Folding*/

#include <algorithm> // STL general algorithms
#include <array> // STL array container
Expand Down
6 changes: 3 additions & 3 deletions src/mc/certificates/Certificate.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@ class Certificate {

MCAPI int64 getNotBeforeDate() const;

MCAPI bool isSelfSigned() const;
MCFOLD bool isSelfSigned() const;

MCAPI bool isValid() const;
MCFOLD bool isValid() const;

MCAPI ::std::string toString() const;
MCFOLD ::std::string toString() const;

MCAPI bool validate(int64 currentTime, bool isSelfSigned, bool checkExpired);

Expand Down
2 changes: 1 addition & 1 deletion src/mc/certificates/CertificateSNIType.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@ struct CertificateSNIType {
public:
// destructor thunk
// NOLINTBEGIN
MCAPI void $dtor();
MCFOLD void $dtor();
// NOLINTEND
};
6 changes: 0 additions & 6 deletions src/mc/certificates/ExtendedCertificate.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,6 @@ namespace mce { class UUID; }
// clang-format on

class ExtendedCertificate {
public:
// prevent constructor by default
ExtendedCertificate& operator=(ExtendedCertificate const&);
ExtendedCertificate(ExtendedCertificate const&);
ExtendedCertificate();

public:
// static functions
// NOLINTBEGIN
Expand Down
6 changes: 0 additions & 6 deletions src/mc/certificates/MessPublicKeyManager.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,6 @@ namespace Bedrock::Threading { class Mutex; }
// clang-format on

class MessPublicKeyManager {
public:
// prevent constructor by default
MessPublicKeyManager& operator=(MessPublicKeyManager const&);
MessPublicKeyManager(MessPublicKeyManager const&);
MessPublicKeyManager();

public:
// static functions
// NOLINTBEGIN
Expand Down
8 changes: 1 addition & 7 deletions src/mc/certificates/PublicKeySignatureType.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,4 @@

#include "mc/_HeaderOutputPredefine.h"

struct PublicKeySignatureType {
public:
// prevent constructor by default
PublicKeySignatureType& operator=(PublicKeySignatureType const&);
PublicKeySignatureType(PublicKeySignatureType const&);
PublicKeySignatureType();
};
struct PublicKeySignatureType {};
6 changes: 0 additions & 6 deletions src/mc/certificates/ResponseVerifier.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,6 @@ namespace Json { class Value; }
// clang-format on

class ResponseVerifier {
public:
// prevent constructor by default
ResponseVerifier& operator=(ResponseVerifier const&);
ResponseVerifier(ResponseVerifier const&);
ResponseVerifier();

public:
// virtual functions
// NOLINTBEGIN
Expand Down
2 changes: 1 addition & 1 deletion src/mc/certificates/UnverifiedCertificate.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class UnverifiedCertificate {

MCAPI ::std::string getIdentityPublicKey() const;

MCAPI ::std::string toString() const;
MCFOLD ::std::string toString() const;

MCAPI ::std::unique_ptr<::Certificate> verify(::std::vector<::std::string> const& trustedKeys) const;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,6 @@
#include "mc/events/identity/EduSignInStage.h"

class IActiveDirectoryIdentityTelemetry {
public:
// prevent constructor by default
IActiveDirectoryIdentityTelemetry& operator=(IActiveDirectoryIdentityTelemetry const&);
IActiveDirectoryIdentityTelemetry(IActiveDirectoryIdentityTelemetry const&);
IActiveDirectoryIdentityTelemetry();

public:
// virtual functions
// NOLINTBEGIN
Expand Down
6 changes: 0 additions & 6 deletions src/mc/certificates/identity/IEduSsoStrategy.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,6 @@ namespace Json { class Value; }
namespace Identity {

class IEduSsoStrategy {
public:
// prevent constructor by default
IEduSsoStrategy& operator=(IEduSsoStrategy const&);
IEduSsoStrategy(IEduSsoStrategy const&);
IEduSsoStrategy();

public:
// virtual functions
// NOLINTBEGIN
Expand Down
6 changes: 0 additions & 6 deletions src/mc/certificates/identity/ISettingStorageStrategy.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,6 @@ namespace Json { class Value; }
namespace Identity {

struct ISettingStorageStrategy {
public:
// prevent constructor by default
ISettingStorageStrategy& operator=(ISettingStorageStrategy const&);
ISettingStorageStrategy(ISettingStorageStrategy const&);
ISettingStorageStrategy();

public:
// virtual functions
// NOLINTBEGIN
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,6 @@
namespace edu::auth {

template <typename T0, typename T1>
class CredentialReplaySubject {
public:
// prevent constructor by default
CredentialReplaySubject& operator=(CredentialReplaySubject const&);
CredentialReplaySubject(CredentialReplaySubject const&);
CredentialReplaySubject();
};
class CredentialReplaySubject {};

} // namespace edu::auth
6 changes: 0 additions & 6 deletions src/mc/certificates/identity/edu/auth/CredentialsObserver.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,6 @@ namespace edu::auth { struct SignInCredsRefreshFailed; }
namespace edu::auth {

struct CredentialsObserver : public ::Core::Observer<::edu::auth::CredentialsObserver, ::Core::SingleThreadedLock> {
public:
// prevent constructor by default
CredentialsObserver& operator=(CredentialsObserver const&);
CredentialsObserver(CredentialsObserver const&);
CredentialsObserver();

public:
// virtual functions
// NOLINTBEGIN
Expand Down
8 changes: 1 addition & 7 deletions src/mc/certificates/identity/edu/auth/CredsAuthComplete.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,6 @@

namespace edu::auth {

struct CredsAuthComplete {
public:
// prevent constructor by default
CredsAuthComplete& operator=(CredsAuthComplete const&);
CredsAuthComplete(CredsAuthComplete const&);
CredsAuthComplete();
};
struct CredsAuthComplete {};

} // namespace edu::auth
8 changes: 1 addition & 7 deletions src/mc/certificates/identity/edu/auth/CredsExpired.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,6 @@

namespace edu::auth {

struct CredsExpired {
public:
// prevent constructor by default
CredsExpired& operator=(CredsExpired const&);
CredsExpired(CredsExpired const&);
CredsExpired();
};
struct CredsExpired {};

} // namespace edu::auth
8 changes: 1 addition & 7 deletions src/mc/certificates/identity/edu/auth/CredsLost.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,6 @@

namespace edu::auth {

struct CredsLost {
public:
// prevent constructor by default
CredsLost& operator=(CredsLost const&);
CredsLost(CredsLost const&);
CredsLost();
};
struct CredsLost {};

} // namespace edu::auth
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,6 @@
namespace edu::auth {

template <typename T0>
struct GenericCredentialsEvent {
public:
// prevent constructor by default
GenericCredentialsEvent& operator=(GenericCredentialsEvent const&);
GenericCredentialsEvent(GenericCredentialsEvent const&);
GenericCredentialsEvent();
};
struct GenericCredentialsEvent {};

} // namespace edu::auth
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,6 @@

namespace edu::auth {

struct GraphCredsRefreshFailed {
public:
// prevent constructor by default
GraphCredsRefreshFailed& operator=(GraphCredsRefreshFailed const&);
GraphCredsRefreshFailed(GraphCredsRefreshFailed const&);
GraphCredsRefreshFailed();
};
struct GraphCredsRefreshFailed {};

} // namespace edu::auth
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,6 @@

namespace edu::auth {

struct SignInCredsRefreshFailed {
public:
// prevent constructor by default
SignInCredsRefreshFailed& operator=(SignInCredsRefreshFailed const&);
SignInCredsRefreshFailed(SignInCredsRefreshFailed const&);
SignInCredsRefreshFailed();
};
struct SignInCredsRefreshFailed {};

} // namespace edu::auth
6 changes: 0 additions & 6 deletions src/mc/certificates/identity/web_services/IEduWebService.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,6 @@ namespace WebServices::EduSignin { struct SigninResponse; }
namespace WebServices {

struct IEduWebService {
public:
// prevent constructor by default
IEduWebService& operator=(IEduWebService const&);
IEduWebService(IEduWebService const&);
IEduWebService();

public:
// virtual functions
// NOLINTBEGIN
Expand Down
8 changes: 1 addition & 7 deletions src/mc/client/3d_export/glTFExportData.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,4 @@

#include "mc/_HeaderOutputPredefine.h"

struct glTFExportData {
public:
// prevent constructor by default
glTFExportData& operator=(glTFExportData const&);
glTFExportData(glTFExportData const&);
glTFExportData();
};
struct glTFExportData {};
8 changes: 1 addition & 7 deletions src/mc/client/commands/AutomationCmdOutput.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,4 @@

#include "mc/_HeaderOutputPredefine.h"

class AutomationCmdOutput {
public:
// prevent constructor by default
AutomationCmdOutput& operator=(AutomationCmdOutput const&);
AutomationCmdOutput(AutomationCmdOutput const&);
AutomationCmdOutput();
};
class AutomationCmdOutput {};
8 changes: 1 addition & 7 deletions src/mc/client/game/ExternalWorldTransferActionFunc.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,4 @@ struct ExternalWorldTransferActionFunc
: public ::type_safe::strong_typedef<
::ExternalWorldTransferActionFunc,
::std::function<void(::IWorldTransferHandler const&, ::WorldTransferActionContext const&)>>,
public ::type_safe::strong_typedef_op::equality_comparison<::ExternalWorldTransferActionFunc> {
public:
// prevent constructor by default
ExternalWorldTransferActionFunc& operator=(ExternalWorldTransferActionFunc const&);
ExternalWorldTransferActionFunc(ExternalWorldTransferActionFunc const&);
ExternalWorldTransferActionFunc();
};
public ::type_safe::strong_typedef_op::equality_comparison<::ExternalWorldTransferActionFunc> {};
6 changes: 0 additions & 6 deletions src/mc/client/game/IClientInstance.h
Original file line number Diff line number Diff line change
Expand Up @@ -178,12 +178,6 @@ namespace ui { class ScreenTechStackSelector; }
// clang-format on

class IClientInstance : public ::Bedrock::EnableNonOwnerReferences {
public:
// prevent constructor by default
IClientInstance& operator=(IClientInstance const&);
IClientInstance(IClientInstance const&);
IClientInstance();

public:
// virtual functions
// NOLINTBEGIN
Expand Down
6 changes: 0 additions & 6 deletions src/mc/client/game/IClientInstances.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,6 @@ class ItemRegistryRef;
// clang-format on

class IClientInstances {
public:
// prevent constructor by default
IClientInstances& operator=(IClientInstances const&);
IClientInstances(IClientInstances const&);
IClientInstances();

public:
// virtual functions
// NOLINTBEGIN
Expand Down
6 changes: 0 additions & 6 deletions src/mc/client/game/IConfigListener.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,6 @@ class Config;
// clang-format on

class IConfigListener {
public:
// prevent constructor by default
IConfigListener& operator=(IConfigListener const&);
IConfigListener(IConfigListener const&);
IConfigListener();

public:
// virtual functions
// NOLINTBEGIN
Expand Down
8 changes: 1 addition & 7 deletions src/mc/client/game/IExternalServerFile.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,4 @@

#include "mc/_HeaderOutputPredefine.h"

class IExternalServerFile {
public:
// prevent constructor by default
IExternalServerFile& operator=(IExternalServerFile const&);
IExternalServerFile(IExternalServerFile const&);
IExternalServerFile();
};
class IExternalServerFile {};
6 changes: 0 additions & 6 deletions src/mc/client/game/IGameServerShutdown.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,6 @@
#include "mc/_HeaderOutputPredefine.h"

struct IGameServerShutdown {
public:
// prevent constructor by default
IGameServerShutdown& operator=(IGameServerShutdown const&);
IGameServerShutdown(IGameServerShutdown const&);
IGameServerShutdown();

public:
// virtual functions
// NOLINTBEGIN
Expand Down
6 changes: 0 additions & 6 deletions src/mc/client/game/IGameServerStartup.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,6 @@ struct LevelSummary;
// clang-format on

class IGameServerStartup {
public:
// prevent constructor by default
IGameServerStartup& operator=(IGameServerStartup const&);
IGameServerStartup(IGameServerStartup const&);
IGameServerStartup();

public:
// virtual functions
// NOLINTBEGIN
Expand Down
6 changes: 0 additions & 6 deletions src/mc/client/game/IMinecraftGame.h
Original file line number Diff line number Diff line change
Expand Up @@ -163,12 +163,6 @@ class IMinecraftGame : public ::Bedrock::EnableNonOwnerReferences,
public ::IClientInstances,
public ::IWorldTransfer,
public ::ISplitScreenChangedPublisher {
public:
// prevent constructor by default
IMinecraftGame& operator=(IMinecraftGame const&);
IMinecraftGame(IMinecraftGame const&);
IMinecraftGame();

public:
// virtual functions
// NOLINTBEGIN
Expand Down
6 changes: 0 additions & 6 deletions src/mc/client/game/INetworkGameConnector.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,6 @@ namespace Social { class GameConnectionInfo; }
// clang-format on

class INetworkGameConnector {
public:
// prevent constructor by default
INetworkGameConnector& operator=(INetworkGameConnector const&);
INetworkGameConnector(INetworkGameConnector const&);
INetworkGameConnector();

public:
// virtual functions
// NOLINTBEGIN
Expand Down
Loading

0 comments on commit 7db3b4a

Please sign in to comment.